html5_validators 1.0.0 → 1.1.0

data/README.rdoc

@@ -41,6 +41,7 @@ http://img.skitch.com/20110517-8sagqrkjnmkinapmcc5tduy2b8.jpg
 
   View:
     <%= f.text_field :name %>
+    text_area is also available
 
   HTML:
     <input id="user_name" maxlength="10" name="user[name]" size="10" type="text" />

data/lib/html5_validators/action_view/form_helpers.rb

@@ -5,6 +5,12 @@ module Html5Validators
         @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"] ||= object.class.attribute_maxlength(@method_name)
+      end
+    end
   end
 end if ActionPack::VERSION::STRING >= '4'
 
@@ -28,9 +34,9 @@ module ActionView
         class TextField
           def render_with_html5_attributes
             inject_required_field
+            inject_maxlength_field
 
             if object.class.ancestors.include?(ActiveModel::Validations) && (object.auto_html5_validation != false) && (object.class.auto_html5_validation != false)
-              @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
@@ -39,8 +45,17 @@ module ActionView
           alias_method_chain :render, :html5_attributes
         end
 
+        class TextArea
+          def render_with_html5_attributes
+            inject_required_field
+            inject_maxlength_field
+
+            render_without_html5_attributes
+          end
+        end
+
         #TODO probably I have to add some more classes here
-        [TextArea, RadioButton, CheckBox, Select, DateSelect, TimeZoneSelect].each do |kls|
+        [RadioButton, CheckBox, Select, DateSelect, TimeZoneSelect].each do |kls|
           kls.class_eval do
             def render_with_html5_attributes
               inject_required_field
@@ -67,6 +82,7 @@ module ActionView
         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

data/lib/html5_validators/version.rb

@@ -1,3 +1,3 @@
 module Html5Validators
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/fake_app.rb

@@ -31,6 +31,7 @@ class PeopleController < ApplicationController
     render :inline => <<-ERB
 <%= form_for @person do |f| %>
 <%= f.text_field :name %>
+<%= f.text_area :bio %>
 <% end %>
 ERB
   end
@@ -52,6 +53,11 @@ module ApplicationHelper; end
 #migrations
 class CreateAllTables < ActiveRecord::Migration
   def self.up
-    create_table(:people) {|t| t.string :name; t.string :email; t.integer :age}
+    create_table :people do |t|
+      t.string :name
+      t.string :email
+      t.integer :age
+      t.text :bio
+    end
   end
 end

data/spec/requests/validation_spec.rb

@@ -17,20 +17,21 @@ feature 'person#new' do
 
   context 'with required validation' do
     background do
-      Person.validates_presence_of :name
+      Person.validates_presence_of :name, :bio
     end
     after do
       Person._validators.clear
     end
     scenario 'new form' do
       visit '/people/new'
-      page.should have_css('input#person_name')
-      page.should have_css('input#person_name[required=required]')
+
+      find('input#person_name')[:required].should == 'required'
+      find('textarea#person_bio')[:required].should == 'required'
     end
     scenario 'new_without_html5_validation form' do
       visit '/people/new_without_html5_validation'
-      page.should have_css('input#person_name')
-      page.should_not have_css('input#person_name[required=required]')
+
+      find('input#person_name')[:required].should be_nil
     end
 
     context 'disabling html5_validation in class level' do
@@ -46,9 +47,23 @@ feature 'person#new' do
       end
       scenario 'new form' do
         visit '/people/new'
-        page.should have_css('input#person_name')
-        page.should_not have_css('input#person_name[required=required]')
+
+        find('input#person_name')[:required].should be_nil
       end
     end
   end
+
+  context 'with maxlength validation' do
+    background do
+      Person.validates_length_of :name, {:maximum => 20}
+      Person.validates_length_of :bio, {:maximum => 100}
+    end
+
+    scenario 'new form' do
+      visit '/people/new'
+
+      find('input#person_name')[:maxlength].should == '20'
+      find('textarea#person_bio')[:maxlength].should == '100'
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -12,6 +12,7 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
   config.before :all do
+    ActiveRecord::Migration.verbose = false
     CreateAllTables.up unless ActiveRecord::Base.connection.table_exists? 'people'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html5_validators
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-15 00:00:00.000000000 Z
+date: 2012-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70174708849260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174708849260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70174708848720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174708848720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70174708848200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174708848200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70174708847560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174708847560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A gem/plugin for Rails 3 that enables client-side validation using ActiveModel
   + HTML5
 email:
@@ -100,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: html5_validators
-rubygems_version: 1.8.16
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Automatic client side validation using HTML5 Form Validation