html5_validators 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dec1cf5335bfb01cad02332dbd5630bb2312f023
-  data.tar.gz: fc500e31d89cd2643d3b84f44b3fcd3730abb9f9
+  metadata.gz: 8891b35efbfb6e9971f313d0d12e8444f0c4dae2
+  data.tar.gz: 2647e789f4e01c23c02c30edf310410fb70d44a5
 SHA512:
-  metadata.gz: 1e5b3f52300d49e0ebbd992e60ce5b7c21192311e80ccebf555599a5942485ba853568d3b05d8c030ee1662e7be7b561d1dd2292ff1f1f591994349771b2c576
-  data.tar.gz: 8236980db90776ac268c598154ece5f5fff3c006cc45053d84cb2de1006769f510243d034ec79ce67bc85c233a5287b26ae92ff65877481834f611530aa4bf54
+  metadata.gz: bf6eccda55ec7bb0b0aabfb012d6ba3609b269aaba7e5f0489aa165447f6677f6c5b74127bbae6d146af5e3e2b3e45ff5eda273f144c13626e4ce06d2fe51196
+  data.tar.gz: 55d5b995754d8ba2bec5201a49bad590d5c73e8224927e6e577e655a2669f261be05dc53b1d722b2ea69de84f6fb9a06bf27419c3b04296dc8c395e45810d2f4

data/.travis.yml

@@ -1,16 +1,13 @@
 language: ruby
 
 rvm:
-  - 1.8.7
-  - 1.9.3
   - 2.0.0
   - 2.1
-  - 2.2.2
+  - 2.2.4
+  - 2.3.0
   - ruby-head
 
 gemfile:
-  - gemfiles/Gemfile.rails-3.0
-  - gemfiles/Gemfile.rails-3.1
   - gemfiles/Gemfile.rails-3.2
   - gemfiles/Gemfile.rails-4.0
   - gemfiles/Gemfile.rails-4.1
@@ -21,30 +18,14 @@ sudo: false
 
 matrix:
   exclude:
-    - rvm: 1.8.7
-      gemfile: gemfiles/Gemfile.rails-4.0
-    - rvm: 1.8.7
-      gemfile: gemfiles/Gemfile.rails-4.1
-    - rvm: 1.8.7
-      gemfile: gemfiles/Gemfile.rails-4.2
-    - rvm: 1.8.7
-      gemfile: gemfiles/Gemfile.rails-edge
-    - rvm: 1.9.3
-      gemfile: gemfiles/Gemfile.rails-edge
     - rvm: 2.0.0
       gemfile: gemfiles/Gemfile.rails-edge
     - rvm: 2.1
       gemfile: gemfiles/Gemfile.rails-edge
-    - rvm: 2.2.2
-      gemfile: gemfiles/Gemfile.rails-3.0
-    - rvm: 2.2.2
-      gemfile: gemfiles/Gemfile.rails-3.1
-    - rvm: 2.2.2
+    - rvm: 2.2.4
+      gemfile: gemfiles/Gemfile.rails-3.2
+    - rvm: 2.3.0
       gemfile: gemfiles/Gemfile.rails-3.2
-    - rvm: ruby-head
-      gemfile: gemfiles/Gemfile.rails-3.0
-    - rvm: ruby-head
-      gemfile: gemfiles/Gemfile.rails-3.1
     - rvm: ruby-head
       gemfile: gemfiles/Gemfile.rails-3.2
   allow_failures:

data/README.md

@@ -167,9 +167,9 @@ end
 
 ## Supported versions
 
-* Ruby 1.8.7, 1.9.2, 1.9.3, 2.0, 2.1, 2.2, 2.3 (trunk)
+* Ruby 2.0, 2.1, 2.2, 2.3, 2.4 (trunk)
 
-* Rails 3.0.x, 3.1.x, 3.2.x, 4.0.x, 4.1, 4.2, 5.0 (edge)
+* Rails 3.2.x, 4.0.x, 4.1, 4.2, 5.0 (edge)
 
 * HTML5 compatible browsers
 

data/Rakefile

@@ -5,6 +5,6 @@ require 'rspec/core'
 require 'rspec/core/rake_task'
 
 task :noop do; end
-task :default => :spec
+task default: :spec
 
-RSpec::Core::RakeTask.new(:spec => :noop)
+RSpec::Core::RakeTask.new(spec: :noop)

data/gemfiles/Gemfile.rails-3.2

@@ -2,14 +2,12 @@ source 'https://rubygems.org'
 
 gem 'railties', '~> 3.2.0'
 gem 'activerecord', '~> 3.2.0'
-if RUBY_VERSION <= '1.8.7'
-  gem 'i18n', '~> 0.6.11'
-end
 gem 'nokogiri', '~> 1.5.0'
 gem 'rspec-rails', '~> 2.14.1'
+gem 'test-unit'
 gem 'capybara', '~> 2.0.0'
 # stick to versions that work under Ruby 1.8 for now
 gem 'mime-types', '< 2'
 gem 'rubyzip', '< 1'
 
-gemspec :path => '..'
+gemspec path: '..'

data/gemfiles/Gemfile.rails-4.0

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 gem 'railties', '~> 4.0.0'
 gem 'activerecord', '~> 4.0.0'
 
-gemspec :path => '..'
+gemspec path: '..'

data/gemfiles/Gemfile.rails-4.1

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 gem 'railties', '~> 4.1.0'
 gem 'activerecord', '~> 4.1.0'
 
-gemspec :path => '..'
+gemspec path: '..'

data/gemfiles/Gemfile.rails-4.2

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 gem 'railties', '~> 4.2.0'
 gem 'activerecord', '~> 4.2.0'
 
-gemspec :path => '..'
+gemspec path: '..'

data/gemfiles/Gemfile.rails-edge

@@ -1,7 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'railties', :git => 'git://github.com/rails/rails.git'
-gem 'activerecord', :git => 'git://github.com/rails/rails.git'
-gem 'arel', :git => 'git://github.com/rails/arel.git'
+gem 'railties', git: 'git://github.com/rails/rails.git'
+gem 'rack', git: 'git://github.com/rack/rack.git'
+gem 'activerecord', git: 'git://github.com/rails/rails.git'
+gem 'arel', git: 'git://github.com/rails/arel.git'
 
-gemspec :path => '..'
+gemspec path: '..'

data/lib/html5_validators/active_model/helper_methods.rb

@@ -9,7 +9,7 @@ module ActiveModel
 
       def attribute_maxlength(attribute)
         self.validators.grep(LengthValidator).select {|v|
-          v.attributes.include?(attribute.to_sym) && (v.options.keys & [:maximum, :is]).any? && (v.options.keys & [:if, :unless, :allow_nil, :allow_blank, :tokenizer]).empty?
+          v.attributes.include?(attribute.to_sym) && (v.options.keys & [:maximum, :is]).any? && (v.options.keys & [:if, :unless, :tokenizer]).empty?
         }.map {|v| v.options.slice(:maximum, :is)}.map(&:values).flatten.max
       end
 

data/lib/html5_validators/active_model/validations.rb

@@ -3,7 +3,7 @@ module Html5Validators
     extend ActiveSupport::Concern
 
     included do
-      cattr_accessor :auto_html5_validation, :instance_accessor => false, :instance_reader => false, :instance_writer => false
+      cattr_accessor :auto_html5_validation, instance_accessor: false, instance_reader: false, instance_writer: false
     end
   end
 end

data/lib/html5_validators/active_record/base.rb

@@ -8,7 +8,7 @@ module Html5Validators
       def inherited(kls)
         super
         kls.class_eval do
-          cattr_accessor :auto_html5_validation, :instance_accessor => false, :instance_reader => false, :instance_writer => false
+          cattr_accessor :auto_html5_validation, instance_accessor: false, instance_reader: false, instance_writer: false
         end if kls.superclass == ActiveRecord::Base
       end
     end
@@ -16,7 +16,7 @@ module Html5Validators
     included do
       # Existing subclasses pick up the model extension as well
       self.descendants.each do |kls|
-        cattr_accessor :auto_html5_validation, :instance_accessor => false, :instance_reader => false, :instance_writer => false if kls.superclass == ActiveRecord::Base
+        kls.cattr_accessor :auto_html5_validation, instance_accessor: false, instance_reader: false, instance_writer: false if kls.superclass == ActiveRecord::Base
       end
     end
   end

data/lib/html5_validators/version.rb

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

data/lib/html5_validators.rb

@@ -16,18 +16,11 @@ module Html5Validators
       ActiveSupport.on_load(:active_record) do
         require 'html5_validators/active_model/helper_methods'
         require 'html5_validators/active_model/validations'
-        if (Rails.version < '3.1.0.beta2') && (Rails.version != '3.1.0')
-          require 'html5_validators/active_model/initializer_monkey_patches'
-        end
         require 'html5_validators/active_record/base'
       end
       ActiveSupport.on_load(:action_view) do
         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
+          require 'html5_validators/action_view/form_helpers'
         else
           require 'html5_validators/action_view/form_helpers_rails3'
         end

data/spec/fake_app.rb

@@ -2,24 +2,24 @@ require 'active_record'
 require 'action_controller/railtie'
 
 # config
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
 
 app = Class.new(Rails::Application)
 app.config.secret_token = "You know I'm born to lose, and gambling's for fools, But that's the way I like it baby, I don't wanna live for ever, And don't forget the joker!"
-app.config.session_store :cookie_store, :key => '_myapp_session'
+app.config.session_store :cookie_store, key: '_myapp_session'
 app.config.active_support.deprecation = :log
 app.config.eager_load = false
 app.initialize!
 
 # routes
 app.routes.draw do
-  resources :people, :only => [:new, :create] do
+  resources :people, only: [:new, :create] do
     collection do
       get :new_without_html5_validation
       get :new_with_required_true
     end
   end
-  resources :items, :only => [:new, :create] do
+  resources :items, only: [:new, :create] do
     collection do
       get :new_without_html5_validation
       get :new_with_required_true
@@ -47,7 +47,7 @@ class ApplicationController < ActionController::Base; end
 class PeopleController < ApplicationController
   def new
     @person = Person.new
-    render :inline => <<-ERB
+    render inline: <<-ERB
 <%= form_for @person do |f| %>
 <%= f.text_field :name %>
 <%= f.text_area :bio %>
@@ -57,8 +57,8 @@ ERB
 
   def new_without_html5_validation
     @person = Person.new
-    render :inline => <<-ERB
-<%= form_for @person, :auto_html5_validation => false do |f| %>
+    render inline: <<-ERB
+<%= form_for @person, auto_html5_validation: false do |f| %>
 <%= f.text_field :name %>
 <%= f.text_field :email %>
 <% end %>
@@ -67,9 +67,9 @@ ERB
 
   def new_with_required_true
     @person = Person.new
-    render :inline => <<-ERB
+    render inline: <<-ERB
 <%= form_for @person do |f| %>
-<%= f.text_field :email, :required => true %>
+<%= f.text_field :email, required: true %>
 <% end %>
     ERB
   end
@@ -77,7 +77,7 @@ end
 class ItemsController < ApplicationController
   def new
     @item = Item.new
-    render :inline => <<-ERB
+    render inline: <<-ERB
 <%= form_for @item do |f| %>
 <%= f.text_field :name %>
 <%= f.text_area :description %>
@@ -87,8 +87,8 @@ ERB
 
   def new_without_html5_validation
     @item = Item.new
-    render :inline => <<-ERB
-<%= form_for @item, :auto_html5_validation => false do |f| %>
+    render inline: <<-ERB
+<%= form_for @item, auto_html5_validation: false do |f| %>
 <%= f.text_field :name %>
 <%= f.text_area :description %>
 <% end %>
@@ -97,9 +97,9 @@ ERB
 
   def new_with_required_true
     @item = Item.new
-    render :inline => <<-ERB
+    render inline: <<-ERB
 <%= form_for @item do |f| %>
-<%= f.text_field :name, :required => true %>
+<%= f.text_field :name, required: true %>
 <% end %>
     ERB
   end

data/spec/features/validation_spec.rb

@@ -75,8 +75,8 @@ feature 'person#new' do
 
   context 'with maxlength validation' do
     background do
-      Person.validates_length_of :name, {:maximum => 20}
-      Person.validates_length_of :bio, {:maximum => 100}
+      Person.validates_length_of :name, maximum: 20
+      Person.validates_length_of :bio, maximum: 100
     end
 
     scenario 'new form' do
@@ -89,8 +89,8 @@ feature 'person#new' do
 
   context 'with minlength validation' do
     background do
-      Person.validates_length_of :name, {:minimum => 3}
-      Person.validates_length_of :bio, {:minimum => 10}
+      Person.validates_length_of :name, minimum: 3
+      Person.validates_length_of :bio, minimum: 10
     end
 
     scenario 'new form' do
@@ -177,8 +177,8 @@ feature 'item#new' do
 
   context 'with maxlength validation' do
     background do
-      Item.validates_length_of :name, {:maximum => 20 }
-      Item.validates_length_of :description, {:maximum => 100}
+      Item.validates_length_of :name, maximum: 20
+      Item.validates_length_of :description, maximum: 100
     end
 
     scenario 'new form' do
@@ -191,8 +191,8 @@ feature 'item#new' do
 
   context 'with minlength validation' do
     background do
-      Item.validates_length_of :name, {:minimum => 3}
-      Item.validates_length_of :description, {:minimum => 10}
+      Item.validates_length_of :name, minimum: 3
+      Item.validates_length_of :description, minimum: 10
     end
 
     scenario 'new form' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html5_validators
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -81,8 +81,6 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- gemfiles/Gemfile.rails-3.0
-- gemfiles/Gemfile.rails-3.1
 - gemfiles/Gemfile.rails-3.2
 - gemfiles/Gemfile.rails-4.0
 - gemfiles/Gemfile.rails-4.1
@@ -92,9 +90,7 @@ files:
 - 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
 - lib/html5_validators/active_record/base.rb
 - lib/html5_validators/version.rb
@@ -122,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: html5_validators
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Automatic client side validation using HTML5 Form Validation
@@ -131,3 +127,4 @@ test_files:
 - spec/features/validation_spec.rb
 - spec/models/active_record/inherited_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/gemfiles/Gemfile.rails-3.0

@@ -1,12 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'railties', '~> 3.0.0'
-gem 'activerecord', '~> 3.0.0'
-gem 'nokogiri', '~> 1.5.0'
-gem 'rspec-rails', '~> 2.14.1'
-gem 'capybara', '~> 2.0.0'
-# stick to versions that work under Ruby 1.8 for now
-gem 'mime-types', '< 2'
-gem 'rubyzip', '< 1'
-
-gemspec :path => '..'

data/gemfiles/Gemfile.rails-3.1

@@ -1,15 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'railties', '~> 3.1.0'
-gem 'activerecord', '~> 3.1.0'
-if RUBY_VERSION <= '1.8.7'
-  gem 'i18n', '~> 0.6.11'
-end
-gem 'nokogiri', '~> 1.5.0'
-gem 'rspec-rails', '~> 2.14.1'
-gem 'capybara', '~> 2.0.0'
-# stick to versions that work under Ruby 1.8 for now
-gem 'mime-types', '< 2'
-gem 'rubyzip', '< 1'
-
-gemspec :path => '..'

data/lib/html5_validators/action_view/form_helpers_ruby1.rb

@@ -1,79 +0,0 @@
-# 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/initializer_monkey_patches.rb

@@ -1,29 +0,0 @@
-# A freedom patch for AMo 3.0.x and 3.1.0.beta1
-# see: https://github.com/rails/rails/pull/1085
-module ActiveModel
-  module Validations
-    class LengthValidator
-      def initialize(options)
-        if range = (options.delete(:in) || options.delete(:within))
-          raise ArgumentError, ":in and :within must be a Range" unless range.is_a?(Range)
-          options[:minimum], options[:maximum] = range.begin, range.end
-          options[:maximum] -= 1 if range.exclude_end?
-        end
-
-        super
-      end
-
-      def validate_each_with_default_tokenizer(record, attribute, value)
-        @options = (options || {}).reverse_merge(:tokenizer => DEFAULT_TOKENIZER).freeze
-        validate_each_without_default_tokenizer record, attribute, value
-      end
-      alias_method_chain :validate_each, :default_tokenizer
-    end
-
-    class NumericalityValidator
-      def initialize(options)
-        super
-      end
-    end
-  end
-end