html5_validators 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63928996c2fdfa1f44d24b9b3d700a92e80f7ed2
-  data.tar.gz: 60ec0b62245120edc8c0cf648e50a94bdab847cf
+  metadata.gz: dec1cf5335bfb01cad02332dbd5630bb2312f023
+  data.tar.gz: fc500e31d89cd2643d3b84f44b3fcd3730abb9f9
 SHA512:
-  metadata.gz: 3dd2029d72894922add01d958671899900eb3b8cc845af472bfe5e1125d3a55a9ec65d735fb501b1fbe5852868bda55613556944d56959f3e3dcba15d5cdad2e
-  data.tar.gz: 1121140455094da97eaec98714014ded79a9d6e54bdea1733853e3c5e8335a703d09073fdf6da32f04caecbc4311bf3d1119e427ec6a668892fc31a31475e1f5
+  metadata.gz: 1e5b3f52300d49e0ebbd992e60ce5b7c21192311e80ccebf555599a5942485ba853568d3b05d8c030ee1662e7be7b561d1dd2292ff1f1f591994349771b2c576
+  data.tar.gz: 8236980db90776ac268c598154ece5f5fff3c006cc45053d84cb2de1006769f510243d034ec79ce67bc85c233a5287b26ae92ff65877481834f611530aa4bf54

data/lib/html5_validators/action_view/form_helpers.rb

@@ -1,113 +1,67 @@
 module Html5Validators
   module ActionViewExtension
-    def inject_required_field
-      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)
-      end
-    end
-
-    def inject_maxlength_field
-      if object.class.ancestors.include?(ActiveModel::Validations) && (object.auto_html5_validation != false) && (object.class.auto_html5_validation != false)
-        @options["maxlength"] ||= @options[:maxlength] || object.class.attribute_maxlength(@method_name)
-      end
-    end
-  end
-end if ActionPack::VERSION::STRING >= '4'
-
-
-module ActionView
-  module Helpers
     module FormHelper
-      def form_for_with_auto_html5_validation_option(record, options = {}, &proc)
+      def form_for(record, options = {}, &block)
         if record.respond_to?(:auto_html5_validation=)
           if !Html5Validators.enabled || (options[:auto_html5_validation] == false)
             record.auto_html5_validation = false
           end
         end
-        form_for_without_auto_html5_validation_option record, options, &proc
+        super
       end
-      alias_method_chain :form_for, :auto_html5_validation_option
     end
 
-    if ActionPack::VERSION::STRING >= '4'
-      module Tags
-        class Base #:nodoc:
-          include Html5Validators::ActionViewExtension
+    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)
         end
+        super
+      end
+    end
 
-        class TextField
-          def render_with_html5_attributes
-            inject_required_field
-            inject_maxlength_field
+    module LengthValidator
+      def render
+        if object.class.ancestors.include?(ActiveModel::Validations) && (object.auto_html5_validation != false) && (object.class.auto_html5_validation != false)
+          @options["maxlength"] ||= @options[:maxlength] || object.class.attribute_maxlength(@method_name)
+          @options["minlength"] ||= @options[:minlength] || object.class.attribute_minlength(@method_name)
+        end
+        super
+      end
+    end
 
-            if object.class.ancestors.include?(ActiveModel::Validations) && (object.auto_html5_validation != false) && (object.class.auto_html5_validation != false)
-              @options["max"] ||= @options["max"] || @options[:max] || object.class.attribute_max(@method_name)
-              @options["min"] ||= @options["min"] || @options[:min] || object.class.attribute_min(@method_name)
-            end
-            render_without_html5_attributes
-          end
-          alias_method_chain :render, :html5_attributes
+    module NumericalityValidator
+      def render
+        if object.class.ancestors.include?(ActiveModel::Validations) && (object.auto_html5_validation != false) && (object.class.auto_html5_validation != false)
+          @options["max"] ||= @options["max"] || @options[:max] || object.class.attribute_max(@method_name)
+          @options["min"] ||= @options["min"] || @options[:min] || object.class.attribute_min(@method_name)
         end
+        super
+      end
+    end
+  end
+end
 
-        class TextArea
-          def render_with_html5_attributes
-            inject_required_field
-            inject_maxlength_field
 
-            render_without_html5_attributes
-          end
-          alias_method_chain :render, :html5_attributes
-        end
+module ActionView
+  Base.send :prepend, Html5Validators::ActionViewExtension::FormHelper
 
-        #TODO probably I have to add some more classes here
-        [RadioButton, CheckBox, Select, DateSelect, TimeZoneSelect].each do |kls|
-          kls.class_eval do
-            def render_with_html5_attributes
-              inject_required_field
-              render_without_html5_attributes
-            end
-            alias_method_chain :render, :html5_attributes
-          end
-        end
+  module Helpers
+    module Tags
+      class TextField
+        prepend Html5Validators::ActionViewExtension::NumericalityValidator
+        prepend Html5Validators::ActionViewExtension::LengthValidator
+        prepend Html5Validators::ActionViewExtension::PresenceValidator
       end
-    # ActionPack::VERSION::STRING == '3'
-    else
-      class InstanceTag
-        def to_input_field_tag_with_html5_attributes(field_type, options = {})
-          if object.class.ancestors.include?(ActiveModel::Validations) && (object.auto_html5_validation != false) && (object.class.auto_html5_validation != false)
-            options["required"] ||= object.class.attribute_required?(method_name)
-            options["maxlength"] ||= object.class.attribute_maxlength(method_name)
-            options["max"] ||= object.class.attribute_max(method_name)
-            options["min"] ||= object.class.attribute_min(method_name)
-          end
-          to_input_field_tag_without_html5_attributes field_type, options
-        end
-        alias_method_chain :to_input_field_tag, :html5_attributes
 
-        def to_text_area_tag_with_html5_attributes(options = {})
-          if object.class.ancestors.include?(ActiveModel::Validations) && (object.auto_html5_validation != false) && (object.class.auto_html5_validation != false)
-            options["required"] ||= object.class.attribute_required?(method_name)
-            options["maxlength"] ||= object.class.attribute_maxlength(method_name)
-          end
-          to_text_area_tag_without_html5_attributes options
-        end
-        alias_method_chain :to_text_area_tag, :html5_attributes
-
-        def to_radio_button_tag_with_html5_attributes(tag_value, options = {})
-          if object.class.ancestors.include?(ActiveModel::Validations) && (object.auto_html5_validation != false) && (object.class.auto_html5_validation != false)
-            options["required"] ||= object.class.attribute_required?(method_name)
-          end
-          to_radio_button_tag_without_html5_attributes tag_value, options
-        end
-        alias_method_chain :to_radio_button_tag, :html5_attributes
+      class TextArea
+        prepend Html5Validators::ActionViewExtension::LengthValidator
+        prepend Html5Validators::ActionViewExtension::PresenceValidator
+      end
 
-        def to_check_box_tag_with_html5_attributes(options = {}, checked_value = "1", unchecked_value = "0")
-          if object.class.ancestors.include?(ActiveModel::Validations) && (object.auto_html5_validation != false) && (object.class.auto_html5_validation != false)
-            options["required"] ||= object.class.attribute_required?(method_name)
-          end
-          to_check_box_tag_without_html5_attributes options, checked_value, unchecked_value
-        end
-        alias_method_chain :to_check_box_tag, :html5_attributes
+      #TODO probably I have to add some more classes here
+      [RadioButton, CheckBox, Select, DateSelect, TimeZoneSelect].each do |kls|
+        kls.send :prepend, Html5Validators::ActionViewExtension::PresenceValidator
       end
     end
   end

data/lib/html5_validators/action_view/form_helpers_rails3.rb

@@ -0,0 +1,56 @@
+# Legacy Rails 3.x support
+module ActionView
+  module Helpers
+    module FormHelper
+      def form_for_with_auto_html5_validation_option(record, options = {}, &proc)
+        if record.respond_to?(:auto_html5_validation=)
+          if !Html5Validators.enabled || (options[:auto_html5_validation] == false)
+            record.auto_html5_validation = false
+          end
+        end
+        form_for_without_auto_html5_validation_option record, options, &proc
+      end
+      alias_method_chain :form_for, :auto_html5_validation_option
+    end
+
+    class InstanceTag
+      def to_input_field_tag_with_html5_attributes(field_type, options = {})
+        if object.class.ancestors.include?(ActiveModel::Validations) && (object.auto_html5_validation != false) && (object.class.auto_html5_validation != false)
+          options["required"] ||= object.class.attribute_required?(method_name)
+          options["maxlength"] ||= object.class.attribute_maxlength(method_name)
+          options["minlength"] ||= object.class.attribute_minlength(method_name)
+          options["max"] ||= object.class.attribute_max(method_name)
+          options["min"] ||= object.class.attribute_min(method_name)
+        end
+        to_input_field_tag_without_html5_attributes field_type, options
+      end
+      alias_method_chain :to_input_field_tag, :html5_attributes
+
+      def to_text_area_tag_with_html5_attributes(options = {})
+        if object.class.ancestors.include?(ActiveModel::Validations) && (object.auto_html5_validation != false) && (object.class.auto_html5_validation != false)
+          options["required"] ||= object.class.attribute_required?(method_name)
+          options["maxlength"] ||= object.class.attribute_maxlength(method_name)
+          options["minlength"] ||= object.class.attribute_minlength(method_name)
+        end
+        to_text_area_tag_without_html5_attributes options
+      end
+      alias_method_chain :to_text_area_tag, :html5_attributes
+
+      def to_radio_button_tag_with_html5_attributes(tag_value, options = {})
+        if object.class.ancestors.include?(ActiveModel::Validations) && (object.auto_html5_validation != false) && (object.class.auto_html5_validation != false)
+          options["required"] ||= object.class.attribute_required?(method_name)
+        end
+        to_radio_button_tag_without_html5_attributes tag_value, options
+      end
+      alias_method_chain :to_radio_button_tag, :html5_attributes
+
+      def to_check_box_tag_with_html5_attributes(options = {}, checked_value = "1", unchecked_value = "0")
+        if object.class.ancestors.include?(ActiveModel::Validations) && (object.auto_html5_validation != false) && (object.class.auto_html5_validation != false)
+          options["required"] ||= object.class.attribute_required?(method_name)
+        end
+        to_check_box_tag_without_html5_attributes options, checked_value, unchecked_value
+      end
+      alias_method_chain :to_check_box_tag, :html5_attributes
+    end
+  end
+end

data/lib/html5_validators/action_view/form_helpers_ruby1.rb

@@ -0,0 +1,79 @@
+# Legacy Ruby 1.x on Rails 4.x support
+module Html5Validators
+  module ActionViewExtension
+    def inject_required_attribute
+      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)
+      end
+    end
+
+    def inject_maxlength_attribute
+      if object.class.ancestors.include?(ActiveModel::Validations) && (object.auto_html5_validation != false) && (object.class.auto_html5_validation != false)
+        @options["maxlength"] ||= @options[:maxlength] || object.class.attribute_maxlength(@method_name)
+        @options["minlength"] ||= @options[:minlength] || object.class.attribute_minlength(@method_name)
+      end
+    end
+
+    def inject_numericality_attributes
+      if object.class.ancestors.include?(ActiveModel::Validations) && (object.auto_html5_validation != false) && (object.class.auto_html5_validation != false)
+        @options["max"] ||= @options["max"] || @options[:max] || object.class.attribute_max(@method_name)
+        @options["min"] ||= @options["min"] || @options[:min] || object.class.attribute_min(@method_name)
+      end
+    end
+  end
+end
+
+
+module ActionView
+  module Helpers
+    module FormHelper
+      def form_for_with_auto_html5_validation_option(record, options = {}, &proc)
+        if record.respond_to?(:auto_html5_validation=)
+          if !Html5Validators.enabled || (options[:auto_html5_validation] == false)
+            record.auto_html5_validation = false
+          end
+        end
+        form_for_without_auto_html5_validation_option record, options, &proc
+      end
+      alias_method_chain :form_for, :auto_html5_validation_option
+    end
+
+    module Tags
+      class Base #:nodoc:
+        include Html5Validators::ActionViewExtension
+      end
+
+      class TextField
+        def render_with_html5_attributes
+          inject_required_attribute
+          inject_maxlength_attribute
+          inject_numericality_attributes
+
+          render_without_html5_attributes
+        end
+        alias_method_chain :render, :html5_attributes
+      end
+
+      class TextArea
+        def render_with_html5_attributes
+          inject_required_attribute
+          inject_maxlength_attribute
+
+          render_without_html5_attributes
+        end
+        alias_method_chain :render, :html5_attributes
+      end
+
+      #TODO probably I have to add some more classes here
+      [RadioButton, CheckBox, Select, DateSelect, TimeZoneSelect].each do |kls|
+        kls.class_eval do
+          def render_with_html5_attributes
+            inject_required_attribute
+            render_without_html5_attributes
+          end
+          alias_method_chain :render, :html5_attributes
+        end
+      end
+    end
+  end
+end

data/lib/html5_validators/active_model/helper_methods.rb

@@ -13,6 +13,12 @@ module ActiveModel
         }.map {|v| v.options.slice(:maximum, :is)}.map(&:values).flatten.max
       end
 
+      def attribute_minlength(attribute)
+        self.validators.grep(LengthValidator).select {|v|
+          v.attributes.include?(attribute.to_sym) && (v.options.keys & [:minimum, :is]).any? && (v.options.keys & [:if, :unless, :allow_nil, :allow_blank, :tokenizer]).empty?
+        }.map {|v| v.options.slice(:minimum, :is)}.map(&:values).flatten.min
+      end
+
       def attribute_max(attribute)
         self.validators.grep(NumericalityValidator).select {|v|
           v.attributes.include?(attribute.to_sym) && (v.options.keys & [:less_than, :less_than_or_equal_to]).any? && (v.options.keys & [:if, :unless, :allow_nil, :allow_blank]).empty?

data/lib/html5_validators/version.rb

@@ -1,3 +1,3 @@
 module Html5Validators
-  VERSION = '1.2.2'
+  VERSION = '1.3.0'
 end

data/lib/html5_validators.rb

@@ -22,7 +22,15 @@ module Html5Validators
         require 'html5_validators/active_record/base'
       end
       ActiveSupport.on_load(:action_view) do
-        require 'html5_validators/action_view/form_helpers'
+        if ActionPack::VERSION::STRING >= '4'
+          if RUBY_VERSION > '2'
+            require 'html5_validators/action_view/form_helpers'
+          else
+            require 'html5_validators/action_view/form_helpers_ruby1'
+          end
+        else
+          require 'html5_validators/action_view/form_helpers_rails3'
+        end
       end
     end
   end

data/spec/features/validation_spec.rb

@@ -86,6 +86,20 @@ feature 'person#new' do
       find('textarea#person_bio')[:maxlength].should == '100'
     end
   end
+
+  context 'with minlength validation' do
+    background do
+      Person.validates_length_of :name, {:minimum => 3}
+      Person.validates_length_of :bio, {:minimum => 10}
+    end
+
+    scenario 'new form' do
+      visit '/people/new'
+
+      find('input#person_name')[:minlength].should == '3'
+      find('textarea#person_bio')[:minlength].should == '10'
+    end
+  end
 end
 
 feature 'item#new' do
@@ -174,4 +188,18 @@ feature 'item#new' do
       find('textarea#item_description')[:maxlength].should == '100'
     end
   end
+
+  context 'with minlength validation' do
+    background do
+      Item.validates_length_of :name, {:minimum => 3}
+      Item.validates_length_of :description, {:minimum => 10}
+    end
+
+    scenario 'new form' do
+      visit '/items/new'
+
+      find('input#item_name')[:minlength].should == '3'
+      find('textarea#item_description')[:minlength].should == '10'
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html5_validators
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -91,6 +91,8 @@ files:
 - html5_validators.gemspec
 - lib/html5_validators.rb
 - lib/html5_validators/action_view/form_helpers.rb
+- lib/html5_validators/action_view/form_helpers_rails3.rb
+- lib/html5_validators/action_view/form_helpers_ruby1.rb
 - lib/html5_validators/active_model/helper_methods.rb
 - lib/html5_validators/active_model/initializer_monkey_patches.rb
 - lib/html5_validators/active_model/validations.rb