Check conditions for presence validators to see if an attribute is required

CONTRIBUTING.md

@@ -48,7 +48,7 @@ You may find the [demo application](#the-demo-application) useful for developmen
 
 - If you've never made a pull request (PR) before, read [this](https://help.github.com/articles/about-pull-requests/).
 - If your PR fixes an issues, be sure to put "Fixes #nnn" in the description of the PR (where `nnn` is the issue number). Github will automatically close the issue when the PR is merged.
-- When the PR is submitted, check if Travis CI ran all the tests successfully, and didn't raise any issues.
+- When the PR is submitted, check if GitHub Actions ran all the tests successfully, and didn't raise any issues.
 
 ### 7. Done
 

lib/bootstrap_form/components/validation.rb

@@ -26,29 +26,34 @@ def required_attribute?(obj, attribute)
         target = obj.instance_of?(Class) ? obj : obj.class
         return false unless target.respond_to? :validators_on
 
-        presence_validator?(target_unconditional_validators(target, attribute)) ||
-          required_association?(target, attribute)
+        presence_validators?(target, obj, attribute) || required_association?(target, obj, attribute)
       end
 
-      def required_association?(target, attribute)
-        target.try(:reflections)&.find do |name, a|
+      def required_association?(target, object, attribute)
+        target.try(:reflections)&.any? do |name, a|
           next unless a.is_a?(ActiveRecord::Reflection::BelongsToReflection)
           next unless a.foreign_key == attribute.to_s
 
-          presence_validator?(target_unconditional_validators(target, name))
+          presence_validators?(target, object, name)
         end
       end
 
-      def target_unconditional_validators(target, attribute)
-        target.validators_on(attribute)
-              .reject { |validator| validator.options[:if].present? || validator.options[:unless].present? }
-              .map(&:class)
+      def presence_validators?(target, object, attribute)
+        target.validators_on(attribute).select { |v| presence_validator?(v.class) }.any? do |validator|
+          if_option = validator.options[:if]
+          unless_opt = validator.options[:unless]
+          (!if_option || call_with_self(object, if_option)) && (!unless_opt || !call_with_self(object, unless_opt))
+        end
+      end
+
+      def call_with_self(object, proc)
+        object.instance_exec(*[(object if proc.arity >= 1)].compact, &proc)
       end
 
-      def presence_validator?(target_validators)
-        target_validators.include?(ActiveModel::Validations::PresenceValidator) ||
+      def presence_validator?(validator_class)
+        validator_class == ActiveModel::Validations::PresenceValidator ||
           (defined?(ActiveRecord::Validations::PresenceValidator) &&
-            target_validators.include?(ActiveRecord::Validations::PresenceValidator))
+            validator_class == ActiveRecord::Validations::PresenceValidator)
       end
 
       def inline_error?(name)

lib/bootstrap_form/helpers/field.rb

@@ -4,8 +4,11 @@ module Field
       def required_field_options(options, method)
         required = required_field?(options, method)
         {}.tap do |option|
-          option[:required] = required
-          option[:aria] = { required: true } if required
+          if required
+            option[:required] = true
+            option[:aria] ||= {}
+            option[:aria][:required] = true
+          end
         end
       end