html5_validators 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8891b35efbfb6e9971f313d0d12e8444f0c4dae2
-  data.tar.gz: 2647e789f4e01c23c02c30edf310410fb70d44a5
+  metadata.gz: e661f883c54a76d6b77c4bfe4693d56a79292d04
+  data.tar.gz: d3eb675e09dbd2bcf4dacd142ac719f4c036f85b
 SHA512:
-  metadata.gz: bf6eccda55ec7bb0b0aabfb012d6ba3609b269aaba7e5f0489aa165447f6677f6c5b74127bbae6d146af5e3e2b3e45ff5eda273f144c13626e4ce06d2fe51196
-  data.tar.gz: 55d5b995754d8ba2bec5201a49bad590d5c73e8224927e6e577e655a2669f261be05dc53b1d722b2ea69de84f6fb9a06bf27419c3b04296dc8c395e45810d2f4
+  metadata.gz: 2e8e247612a555fcb2d48bbda8ec5780afc0fc04fdef16cc2c465bbc57e599a408a92cfa6597ffee50c689b45a5eeeb35ca272a559c8c444eeaf3dd5ec95c5aa
+  data.tar.gz: b7826041634d9996bf8616c1998de4072b6bfcb90894725b864bd22e555961ae4a160a39433725dde957ea8c2aa3751c80a1829b14e06daca0d94f5babf7bda6

data/.rspec

@@ -1,2 +1,3 @@
 --color
 --format=d
+--warning

data/.travis.yml

@@ -2,9 +2,9 @@ language: ruby
 
 rvm:
   - 2.0.0
-  - 2.1
-  - 2.2.4
-  - 2.3.0
+  - 2.1.10
+  - 2.2.6
+  - 2.3.3
   - ruby-head
 
 gemfile:
@@ -12,19 +12,24 @@ gemfile:
   - gemfiles/Gemfile.rails-4.0
   - gemfiles/Gemfile.rails-4.1
   - gemfiles/Gemfile.rails-4.2
+  - gemfiles/Gemfile.rails-5.0
   - gemfiles/Gemfile.rails-edge
 
 sudo: false
 
 matrix:
   exclude:
+    - rvm: 2.0.0
+      gemfile: gemfiles/Gemfile.rails-5.0
+    - rvm: 2.1.10
+      gemfile: gemfiles/Gemfile.rails-5.0
     - rvm: 2.0.0
       gemfile: gemfiles/Gemfile.rails-edge
-    - rvm: 2.1
+    - rvm: 2.1.10
       gemfile: gemfiles/Gemfile.rails-edge
-    - rvm: 2.2.4
+    - rvm: 2.2.6
       gemfile: gemfiles/Gemfile.rails-3.2
-    - rvm: 2.3.0
+    - rvm: 2.3.3
       gemfile: gemfiles/Gemfile.rails-3.2
     - rvm: ruby-head
       gemfile: gemfiles/Gemfile.rails-3.2

data/Gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in html5_validators.gemspec

data/README.md

@@ -127,7 +127,8 @@ Set `auto_html5_validation = false` attribute to ActiveModelish object.
 
 ### 3. Per model class (via model class attribute)
 
-Set `auto_html5_validation = false` to ActiveModelish class variable.
+Set `auto_html5_validation = false` to ActiveModelish class' class variable.
+This configuration will never be propagated to inherited children classes.
 
 * Model
 ```ruby
@@ -169,7 +170,7 @@ end
 
 * Ruby 2.0, 2.1, 2.2, 2.3, 2.4 (trunk)
 
-* Rails 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, 5.1 (edge)
 
 * HTML5 compatible browsers
 

data/Rakefile

@@ -1,10 +1,12 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
+# frozen_string_literal: true
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.warning = true
+  t.verbose = true
+end
 
-task :noop do; end
-task default: :spec
-
-RSpec::Core::RakeTask.new(spec: :noop)
+task default: :test

data/gemfiles/Gemfile.rails-3.2

@@ -3,11 +3,7 @@ source 'https://rubygems.org'
 gem 'railties', '~> 3.2.0'
 gem 'activerecord', '~> 3.2.0'
 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'
+gem 'test-unit-rails', '1.0.2'
 
 gemspec path: '..'

data/gemfiles/Gemfile.rails-5.0

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

data/html5_validators.gemspec

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: true
 $:.push File.expand_path('../lib', __FILE__)
 require 'html5_validators/version'
 
@@ -19,7 +20,7 @@ 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 'rspec-rails'
+  s.add_development_dependency 'test-unit-rails'
   s.add_development_dependency 'capybara', '>= 2'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'rake'

data/lib/html5_validators.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rails'
 
 module Html5Validators

data/lib/html5_validators/action_view/form_helpers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Html5Validators
   module ActionViewExtension
     module FormHelper

data/lib/html5_validators/action_view/form_helpers_rails3.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Legacy Rails 3.x support
 module ActionView
   module Helpers

data/lib/html5_validators/active_model/helper_methods.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveModel
   module Validations
     module HelperMethods

data/lib/html5_validators/active_model/validations.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Html5Validators
   module ActiveModelExtension
     extend ActiveSupport::Concern

data/lib/html5_validators/active_record/base.rb

@@ -1,22 +1,26 @@
+# frozen_string_literal: true
 module Html5Validators
   module ActiveRecordExtension
     extend ActiveSupport::Concern
 
     # Future subclasses will pick up the model extension
     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
+        class << kls
+          attr_accessor :auto_html5_validation
+        end
+        kls.auto_html5_validation = true
       end
     end
 
     included do
       # Existing subclasses pick up the model extension as well
       self.descendants.each do |kls|
-        kls.cattr_accessor :auto_html5_validation, instance_accessor: false, instance_reader: false, instance_writer: false if kls.superclass == ActiveRecord::Base
+        class << kls
+          attr_accessor :auto_html5_validation
+        end
+        kls.auto_html5_validation = true
       end
     end
   end

data/lib/html5_validators/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Html5Validators
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

data/{spec → test}/fake_app.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'active_record'
 require 'action_controller/railtie'
 
@@ -28,7 +29,10 @@ app.routes.draw do
 end
 
 # models
-class Person < ActiveRecord::Base
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end
+class Person < ApplicationRecord
 end
 class Item
   if ActiveModel::VERSION::STRING >= '4'

data/test/features/validation_test.rb

@@ -0,0 +1,206 @@
+# frozen_string_literal: true
+require 'test_helper'
+
+class ActiveRecordValidationTest < ActionDispatch::IntegrationTest
+  sub_test_case 'without validation' do
+    test 'new form' do
+      visit '/people/new'
+      assert page.has_css? 'input#person_name'
+      assert page.has_no_css? 'input#person_name[required=required]'
+    end
+
+    test 'new_without_html5_validation form' do
+      visit '/people/new_without_html5_validation'
+      assert page.has_css? 'input#person_email'
+      assert page.has_no_css? 'input#person_email[required=required]'
+    end
+  end
+
+  sub_test_case 'with required validation' do
+    setup do
+      Person.validates_presence_of :name, :bio
+    end
+    teardown do
+      Person._validators.clear
+    end
+    test 'new form' do
+      visit '/people/new'
+
+      assert_equal 'required', find('input#person_name')[:required]
+      assert_equal 'required', find('textarea#person_bio')[:required]
+    end
+    test 'new_without_html5_validation form' do
+      visit '/people/new_without_html5_validation'
+
+      assert_nil find('input#person_name')[:required]
+    end
+    test 'new_with_required_true form' do
+      visit '/people/new_with_required_true'
+
+      assert_equal 'required', find('input#person_email')[:required]
+    end
+
+    sub_test_case 'disabling html5_validation in class level' do
+      setup do
+        Person.class_eval do |kls|
+          kls.auto_html5_validation = false
+        end
+      end
+      teardown do
+        Person.class_eval do |kls|
+          kls.auto_html5_validation = nil
+        end
+      end
+      test 'new form' do
+        visit '/people/new'
+
+        assert_nil find('input#person_name')[:required]
+      end
+    end
+
+    sub_test_case 'disabling html5_validations in gem' do
+      setup do
+        Html5Validators.enabled = false
+      end
+      teardown do
+        Html5Validators.enabled = true
+      end
+      test 'new form' do
+        visit '/people/new'
+
+        assert_nil find('input#person_name')[:required]
+        assert_nil find('textarea#person_bio')[:required]
+      end
+    end
+  end
+
+  sub_test_case 'with maxlength validation' do
+    setup do
+      Person.validates_length_of :name, maximum: 20
+      Person.validates_length_of :bio, maximum: 100
+    end
+
+    test 'new form' do
+      visit '/people/new'
+
+      assert_equal '20', find('input#person_name')[:maxlength]
+      assert_equal '100', find('textarea#person_bio')[:maxlength]
+    end
+  end
+
+  sub_test_case 'with minlength validation' do
+    setup do
+      Person.validates_length_of :name, minimum: 3
+      Person.validates_length_of :bio, minimum: 10
+    end
+
+    test 'new form' do
+      visit '/people/new'
+
+      assert_equal '3', find('input#person_name')[:minlength]
+      assert_equal '10', find('textarea#person_bio')[:minlength]
+    end
+  end
+end
+
+class ActiveModelValidationTest < ActionDispatch::IntegrationTest
+  sub_test_case 'without validation' do
+    test 'new form' do
+      visit '/items/new'
+      assert page.has_css? 'input#item_name'
+      assert page.has_no_css? 'input#item_name[required=required]'
+    end
+
+    test 'new_without_html5_validation form' do
+      visit '/items/new_without_html5_validation'
+      assert page.has_css? 'textarea#item_description'
+      assert page.has_no_css? 'textarea#item_description[required=required]'
+    end
+  end
+
+  sub_test_case 'with required validation' do
+    setup do
+      Item.validates_presence_of :name, :description
+    end
+    teardown do
+      Item._validators.clear
+    end
+    test 'new form' do
+      visit '/items/new'
+
+      assert_equal 'required', find('input#item_name')[:required]
+      assert_equal 'required', find('textarea#item_description')[:required]
+    end
+    test 'new_without_html5_validation form' do
+      visit '/items/new_without_html5_validation'
+
+      assert_nil find('input#item_name')[:required]
+    end
+    test 'new_with_required_true form' do
+      visit '/items/new_with_required_true'
+
+      assert_equal 'required', find('input#item_name')[:required]
+    end
+
+    sub_test_case 'disabling html5_validation in class level' do
+      setup do
+        Item.class_eval do |kls|
+          kls.auto_html5_validation = false
+        end
+      end
+      teardown do
+        Item.class_eval do |kls|
+          kls.auto_html5_validation = nil
+        end
+      end
+      test 'new form' do
+        visit '/items/new'
+
+        assert_nil find('input#item_name')[:required]
+      end
+    end
+
+    sub_test_case 'disabling html5_validations in gem' do
+      setup do
+        Html5Validators.enabled = false
+      end
+      teardown do
+        Html5Validators.enabled = true
+      end
+      test 'new form' do
+        visit '/items/new'
+
+        assert_nil find('input#item_name')[:required]
+        assert_nil find('textarea#item_description')[:required]
+      end
+    end
+  end
+
+  sub_test_case 'with maxlength validation' do
+    setup do
+      Item.validates_length_of :name, maximum: 20
+      Item.validates_length_of :description, maximum: 100
+    end
+
+    test 'new form' do
+      visit '/items/new'
+
+      assert_equal '20', find('input#item_name')[:maxlength]
+      assert_equal '100', find('textarea#item_description')[:maxlength]
+    end
+  end
+
+  sub_test_case 'with minlength validation' do
+    setup do
+      Item.validates_length_of :name, minimum: 3
+      Item.validates_length_of :description, minimum: 10
+    end
+
+    test 'new form' do
+      visit '/items/new'
+
+      assert_equal '3', find('input#item_name')[:minlength]
+      assert_equal '10', find('textarea#item_description')[:minlength]
+    end
+  end
+end

data/test/models/active_record/inherited_test.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+require 'test_helper'
+
+if defined? ActiveRecord
+  class Html5Validators::ActiveRecordExtensionTest < ActiveSupport::TestCase
+    test 'An AR model' do
+      assert_respond_to Class.new(ActiveRecord::Base), :auto_html5_validation
+    end
+
+    test "Changing a model's auto_html5_validation value doesn't affect other model's auto_html5_validation value" do
+      cow = Class.new ApplicationRecord
+      horse = Class.new ApplicationRecord
+      cow.auto_html5_validation = false
+
+      assert_equal true, horse.auto_html5_validation
+    end
+  end
+end

data/{spec/spec_helper.rb → test/test_helper.rb}

@@ -1,22 +1,17 @@
+# frozen_string_literal: true
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 # load Rails first
 require 'rails'
-require 'html5_validators'
+require 'bundler/setup'
+Bundler.require
+
 # needs to load the app before loading rspec/rails => capybara
 require 'fake_app'
-require 'rspec/rails'
+require 'test/unit/rails/test_help'
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
-RSpec.configure do |config|
-  if config.respond_to? :expect_with
-    config.expect_with(:rspec) { |c| c.syntax = :should }
-  end
-
-  config.before :all do
-    ActiveRecord::Migration.verbose = false
-    CreateAllTables.up unless ActiveRecord::Base.connection.table_exists? 'people'
-  end
-end
+ActiveRecord::Migration.verbose = false
+CreateAllTables.up

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: html5_validators
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: test-unit-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -85,6 +85,7 @@ files:
 - gemfiles/Gemfile.rails-4.0
 - gemfiles/Gemfile.rails-4.1
 - gemfiles/Gemfile.rails-4.2
+- gemfiles/Gemfile.rails-5.0
 - gemfiles/Gemfile.rails-edge
 - html5_validators.gemspec
 - lib/html5_validators.rb
@@ -94,10 +95,10 @@ files:
 - lib/html5_validators/active_model/validations.rb
 - lib/html5_validators/active_record/base.rb
 - 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
+- test/fake_app.rb
+- test/features/validation_test.rb
+- test/models/active_record/inherited_test.rb
+- test/test_helper.rb
 homepage: https://github.com/amatsuda/html5_validators
 licenses:
 - MIT
@@ -118,13 +119,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: html5_validators
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 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
-has_rdoc: 
+- test/fake_app.rb
+- test/features/validation_test.rb
+- test/models/active_record/inherited_test.rb
+- test/test_helper.rb

data/spec/features/validation_spec.rb

@@ -1,205 +0,0 @@
-require 'spec_helper'
-
-feature 'person#new' do
-  context 'without validation' do
-    scenario 'new form' do
-      visit '/people/new'
-      page.should have_css('input#person_name')
-      page.should_not have_css('input#person_name[required=required]')
-    end
-
-    scenario 'new_without_html5_validation form' do
-      visit '/people/new_without_html5_validation'
-      page.should have_css('input#person_email')
-      page.should_not have_css('input#person_email[required=required]')
-    end
-  end
-
-  context 'with required validation' do
-    background do
-      Person.validates_presence_of :name, :bio
-    end
-    after do
-      Person._validators.clear
-    end
-    scenario 'new form' do
-      visit '/people/new'
-
-      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'
-
-      find('input#person_name')[:required].should be_nil
-    end
-    scenario 'new_with_required_true form' do
-      visit '/people/new_with_required_true'
-
-      find('input#person_email')[:required].should == 'required'
-    end
-
-    context 'disabling html5_validation in class level' do
-      background do
-        Person.class_eval do |kls|
-          kls.auto_html5_validation = false
-        end
-      end
-      after do
-        Person.class_eval do |kls|
-          kls.auto_html5_validation = nil
-        end
-      end
-      scenario 'new form' do
-        visit '/people/new'
-
-        find('input#person_name')[:required].should be_nil
-      end
-    end
-
-    context 'disabling html5_validations in gem' do
-      background do
-        Html5Validators.enabled = false
-      end
-      after do
-        Html5Validators.enabled = true
-      end
-      scenario 'new form' do
-        visit '/people/new'
-
-        find('input#person_name')[:required].should be_nil
-        find('textarea#person_bio')[: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
-
-  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
-  context 'without validation' do
-    scenario 'new form' do
-      visit '/items/new'
-      page.should have_css('input#item_name')
-      page.should_not have_css('input#item_name[required=required]')
-    end
-
-    scenario 'new_without_html5_validation form' do
-      visit '/items/new_without_html5_validation'
-      page.should have_css('textarea#item_description')
-      page.should_not have_css('textarea#item_description[required=required]')
-    end
-  end
-
-  context 'with required validation' do
-    background do
-      Item.validates_presence_of :name, :description
-    end
-    after do
-      Item._validators.clear
-    end
-    scenario 'new form' do
-      visit '/items/new'
-
-      find('input#item_name')[:required].should == 'required'
-      find('textarea#item_description')[:required].should == 'required'
-    end
-    scenario 'new_without_html5_validation form' do
-      visit '/items/new_without_html5_validation'
-
-      find('input#item_name')[:required].should be_nil
-    end
-    scenario 'new_with_required_true form' do
-      visit '/items/new_with_required_true'
-
-      find('input#item_name')[:required].should == 'required'
-    end
-
-    context 'disabling html5_validation in class level' do
-      background do
-        Item.class_eval do |kls|
-          kls.auto_html5_validation = false
-        end
-      end
-      after do
-        Item.class_eval do |kls|
-          kls.auto_html5_validation = nil
-        end
-      end
-      scenario 'new form' do
-        visit '/items/new'
-
-        find('input#item_name')[:required].should be_nil
-      end
-    end
-
-    context 'disabling html5_validations in gem' do
-      background do
-        Html5Validators.enabled = false
-      end
-      after do
-        Html5Validators.enabled = true
-      end
-      scenario 'new form' do
-        visit '/items/new'
-
-        find('input#item_name')[:required].should be_nil
-        find('textarea#item_description')[:required].should be_nil
-      end
-    end
-  end
-
-  context 'with maxlength validation' do
-    background do
-      Item.validates_length_of :name, maximum: 20
-      Item.validates_length_of :description, maximum: 100
-    end
-
-    scenario 'new form' do
-      visit '/items/new'
-
-      find('input#item_name')[:maxlength].should == '20'
-      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

data/spec/models/active_record/inherited_spec.rb

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