simple handling of :if and :unless options

lib/html5_validators/action_view/form_helpers.rb

@@ -14,7 +14,7 @@ def form_for(record, options = {}, &block)
     module PresenceValidator
       def render
         if object.class.ancestors.include?(ActiveModel::Validations) && (object.auto_html5_validation != false) && (object.class.auto_html5_validation != false)
-          @options["required"] ||= @options[:required] || object.class.attribute_required?(@method_name)
+          @options["required"] ||= @options[:required] || object.class.attribute_required?(object, @method_name)
         end
         super
       end

lib/html5_validators/active_model/helper_methods.rb

@@ -1,9 +1,18 @@
 module ActiveModel
   module Validations
     module HelperMethods
-      def attribute_required?(attribute)
-        self.validators.grep(PresenceValidator).any? do |v|
-          v.attributes.include?(attribute.to_sym) && (v.options.keys & [:if, :unless]).empty?
+      def attribute_required?(object, attribute)
+        validator = object.class.validators.grep(PresenceValidator).find { |v| v.attributes.include?(attribute.to_sym) }
+        return false unless validator
+
+        if cant_handle_conditions?(validator)
+          (validator.options.keys & [:if, :unless]).empty?
+        else
+          if_condition = if_condition(validator)
+          return object.send(if_condition) if can_handle_condition?(if_condition)
+
+          unless_condition = unless_condition(validator)
+          return !object.send(unless_condition) if can_handle_condition?(unless_condition)
         end
       end
 
@@ -30,6 +39,24 @@ def attribute_min(attribute)
           v.attributes.include?(attribute.to_sym) && (v.options.keys & [:greater_than, :greater_than_or_equal_to]).any? && (v.options.keys & [:if, :unless, :allow_nil, :allow_blank]).empty?
         }.map {|v| v.options.slice(:greater_than, :greater_than_or_equal_to)}.map(&:values).flatten.min
       end
+
+      private
+
+      def unless_condition(validator)
+        validator.options[:unless]
+      end
+
+      def if_condition(validator)
+        validator.options[:if]
+      end
+
+      def can_handle_condition?(condition)
+        condition.is_a?(Symbol)
+      end
+
+      def cant_handle_conditions?(validator)
+        !can_handle_condition?(if_condition(validator)) && !can_handle_condition?(unless_condition(validator))
+      end
     end
   end
 end