html5_validators 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ff5ec0a7554d38261e38bddc75870287889c8b5
-  data.tar.gz: fe369b4ed887f8c6ec3466b091676f62ab9d5563
+  metadata.gz: ce3e90d93c4855d7bc7680fe214fd9d4715df134
+  data.tar.gz: b9c00e66bf79c7f2f1ba6cc7485dc499abfa0866
 SHA512:
-  metadata.gz: c52519002574af01ae89e8122a12132112c5ba5211a2470e9232e51d8230cdd2592461b0e99a31328f632bae3310709716c7ccccf563f55af4e2b86e941f0af6
-  data.tar.gz: f6f143ce2746e9b98a59f9d08e2a9f102a3d05ecac16e5182e6f4c18cc4406624e1d69db7e664849f9de828b8885b0865d93d07be2fa1b957436bf319d7efbb8
+  metadata.gz: 0897fd574293e79806322a314675fd41b5802709326ab508a19f276b70d11a57d2a4f1411a4f1711034c2fd44e9f287a4ca4de687256da97f9eedc354ae3ebd9
+  data.tar.gz: 819f6a2ab4e1ee7deb2741ef2f92ed5d1f3b433bebca0b863575286deda4de6d479330c018b582d71f2e03573228cf08eb2ee31bddc350ef62b34deee00290a2

data/.travis.yml

@@ -1,28 +1,51 @@
 language: ruby
+
 rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
+  - 2.1
+  - 2.2.1
   - 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
+  - gemfiles/Gemfile.rails-4.2
   - gemfiles/Gemfile.rails-edge
+
+sudo: false
+
 matrix:
   exclude:
-    - rvm: 2.0.0
-      gemfile: gemfiles/Gemfile-rails.3.0
-    - rvm: 2.0.0
-      gemfile: gemfiles/Gemfile-rails.3.1
-    - rvm: ruby-head
-      gemfile: gemfiles/Gemfile-rails.3.0
-    - rvm: ruby-head
-      gemfile: gemfiles/Gemfile-rails.3.1
     - 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.1
+      gemfile: gemfiles/Gemfile.rails-3.0
+    - rvm: 2.2.1
+      gemfile: gemfiles/Gemfile.rails-3.1
+    - rvm: 2.2.1
+      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:
     - rvm: ruby-head

data/README.rdoc

@@ -118,9 +118,9 @@ Write `auto_html5_validation = false` in ActiveModelish class
 
 == Supported versions
 
-* Ruby 1.8.7, 1.9.2, 1.9.3, 2.0, 2.1 (trunk)
+* Ruby 1.8.7, 1.9.2, 1.9.3, 2.0, 2.1, 2.2, 2.3 (trunk)
 
-* Rails 3.0.x, 3.1.x, 3.2.x, 4.0.x, 4.1 (edge)
+* Rails 3.0.x, 3.1.x, 3.2.x, 4.0.x, 4.1, 4.2, 5.0 (edge)
 
 * HTML5 compatible browsers
 

data/gemfiles/Gemfile.rails-3.0

@@ -3,6 +3,10 @@ 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

@@ -2,7 +2,14 @@ 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/gemfiles/Gemfile.rails-3.2

@@ -2,7 +2,14 @@ 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 '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-4.1

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

data/gemfiles/Gemfile.rails-4.2

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

data/gemfiles/Gemfile.rails-edge

@@ -2,5 +2,6 @@ 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'
 
 gemspec :path => '..'

data/html5_validators.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
-  s.add_development_dependency 'activerecord'
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'capybara', '>= 2'
   s.add_development_dependency 'sqlite3'

data/lib/html5_validators/active_record/base.rb

@@ -1,19 +1,25 @@
-module ActiveRecord
-  class Base
+module Html5Validators
+  module ActiveRecordExtension
+    extend ActiveSupport::Concern
+
     # Future subclasses will pick up the model extension
-    class << self
-      def inherited_with_html5_validation(kls) #:nodoc:
-        inherited_without_html5_validation kls
+    module ClassMethods
+
+      def inherited(kls)
+        super
         kls.class_eval do
           cattr_accessor :auto_html5_validation, :instance_accessor => false, :instance_reader => false, :instance_writer => false
         end if kls.superclass == ActiveRecord::Base
       end
-      alias_method_chain :inherited, :html5_validation
     end
 
-    # 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
+    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
+      end
     end
   end
 end
+
+ActiveRecord::Base.send(:include, Html5Validators::ActiveRecordExtension)

data/lib/html5_validators/version.rb

@@ -1,3 +1,3 @@
 module Html5Validators
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

data/spec/models/active_record/inherited_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+if defined? ActiveRecord
+  describe Html5Validators::ActiveRecordExtension do
+    subject { Class.new(ActiveRecord::Base) }
+    it { should respond_to :auto_html5_validation }
+  end
+end

metadata

@@ -1,83 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: html5_validators
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A gem/plugin for Rails 3+ that enables client-side validation using ActiveModel
@@ -88,9 +74,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - MIT-LICENSE
 - README.rdoc
@@ -99,6 +85,8 @@ files:
 - gemfiles/Gemfile.rails-3.1
 - gemfiles/Gemfile.rails-3.2
 - gemfiles/Gemfile.rails-4.0
+- gemfiles/Gemfile.rails-4.1
+- gemfiles/Gemfile.rails-4.2
 - gemfiles/Gemfile.rails-edge
 - html5_validators.gemspec
 - lib/html5_validators.rb
@@ -110,6 +98,7 @@ files:
 - lib/html5_validators/version.rb
 - spec/fake_app.rb
 - spec/features/validation_spec.rb
+- spec/models/active_record/inherited_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/amatsuda/html5_validators
 licenses: []
@@ -120,21 +109,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: html5_validators
-rubygems_version: 2.0.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Automatic client side validation using HTML5 Form Validation
 test_files:
 - spec/fake_app.rb
 - spec/features/validation_spec.rb
+- spec/models/active_record/inherited_spec.rb
 - spec/spec_helper.rb