formtastic 3.1.4 → 3.1.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 5fefdec8b2958a3bf5c17aabe98e7096d041023858b2a04798a1eae11c264e42
+  data.tar.gz: e5a5fdd71803d0f51b267324b6fdb50919ce5dfb564cf6c545b3bd655dd44d08
+SHA512:
+  metadata.gz: 183dcccafba6dad57c447a5a32f282cff80152d654e604208186ca20f8dddc201ebd7af8eeff8dbeee6a33aa99095b5c06261b3b404d1ec40ab9a037f4a0c08c
+  data.tar.gz: f5144105d6fd1b92b06421085e578f1bf87c2b002997a5ff8e7fc8e0b310d32a68274b0550b449fb6c37b840a28453b4c1eccd7305ac670edb152ddcdf86db17

data/.travis.yml

@@ -7,16 +7,17 @@ rvm:
   - 2.1.8
   - 2.2.4
   - 2.3.0
+  - 2.4.0
 gemfile:
   - gemfiles/rails_3.2.gemfile
   - gemfiles/rails_4.gemfile
   - gemfiles/rails_4.0.4.gemfile
   - gemfiles/rails_4.1.gemfile
   - gemfiles/rails_4.2.gemfile
+  - gemfiles/rails_5.0.gemfile
   - gemfiles/rails_edge.gemfile
 env:
-before_install:
-  - gem install bundler --version 1.11.2
+before_install: "gem install bundler --version 1.14.4"
 script: "bundle exec rake spec"
 matrix:
   exclude:
@@ -26,6 +27,20 @@ matrix:
       gemfile: gemfiles/rails_edge.gemfile
     - rvm: 2.1.8
       gemfile: gemfiles/rails_edge.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails_5.0.gemfile
+    - rvm: 2.1.8
+      gemfile: gemfiles/rails_5.0.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_4.1.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_4.2.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_3.2.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_4.0.4.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_4.gemfile
   allow_failures:
     - gemfile: gemfiles/rails_edge.gemfile
     - rvm: 1.9.3

data/Appraisals

@@ -1,33 +1,43 @@
 appraise 'rails-3.2' do
   gem 'rails', '~> 3.2.0'
   gem 'test-unit-minitest', :platform => [:ruby_22, :ruby_23]
+  gem 'nokogiri', '~>1.6.8', platform: :mri_20
 end
 
 appraise 'rails-4' do
   gem 'rails', '~> 4.0.0'
+  gem 'nokogiri', '~>1.6.8', platform: :mri_20
 end
 
 # Special case for a change in I18n
 appraise 'rails-4.0.4' do
   gem 'rails', '4.0.4'
+  gem 'nokogiri', '~>1.6.8', platform: :mri_20
 end
 
 appraise 'rails-4.1' do
   gem 'rails', '~>4.1.0'
+  gem 'nokogiri', '~>1.6.8', platform: :mri_20
 end
 
 appraise 'rails-4.2' do
-  gem 'rails', '~>4.2.0.beta4'
+  gem 'rails', '~>4.2.0'
+  gem 'nokogiri', '~>1.6.8', platform: :mri_20
+end
+
+appraise 'rails-5.0' do
+  gem 'rails', '~> 5.0.1'
+  gem 'rspec-rails', '~> 3.5'
 end
 
 appraise 'rails-edge' do
-  gem 'rails', :git => 'git://github.com/rails/rails.git'
-  gem 'rack', :github => 'rack/rack'
-  gem 'i18n', :github => 'svenfuchs/i18n'
-  gem 'arel', :github => 'rails/arel'
-  gem 'rspec-rails', :github => 'rspec/rspec-rails'
-  gem 'rspec-mocks', :github => 'rspec/rspec-mocks'
-  gem 'rspec-support', :github => 'rspec/rspec-support'
-  gem 'rspec-core', :github => 'rspec/rspec-core'
-  gem 'rspec-expectations', :github => 'rspec/rspec-expectations'
+  gem 'rails', github: 'rails/rails'
+  gem 'rack', github: 'rack/rack'
+  gem 'i18n', github: 'svenfuchs/i18n'
+  gem 'arel', github: 'rails/arel'
+  gem 'rspec-rails', github: 'rspec/rspec-rails'
+  gem 'rspec-mocks', github: 'rspec/rspec-mocks'
+  gem 'rspec-support', github: 'rspec/rspec-support'
+  gem 'rspec-core', github: 'rspec/rspec-core'
+  gem 'rspec-expectations', github: 'rspec/rspec-expectations'
 end

data/CHANGELOG

@@ -1,3 +1,6 @@
+3.1.5
+  * Backport use Integer instead of Fixnum for Ruby 2.4 support (#1235, #1243)
+
 3.1.4
   * Performance improvements (#1174)
   * Added priority time zones configuration (#1172)

data/formtastic.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.3'
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.rubygems_version = %q{1.3.6}
 
   s.add_dependency(%q<actionpack>, [">= 3.2.13"])
 
@@ -36,7 +35,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<colored>, ["~> 1.2"])
   s.add_development_dependency(%q<tzinfo>)
   s.add_development_dependency(%q<ammeter>, ["~> 1.1.3"])
-  s.add_development_dependency(%q<appraisal>, ["~> 1.0"])
-  s.add_development_dependency(%q<rake>)
+  s.add_development_dependency(%q<appraisal>, ["~> 2.1"])
+  s.add_development_dependency(%q<rake>, ["< 12"])
   s.add_development_dependency(%q<activemodel>, [">= 3.2.13"])
 end

data/gemfiles/rails_3.2.gemfile

@@ -4,5 +4,6 @@ source "https://rubygems.org"
 
 gem "rails", "~> 3.2.0"
 gem "test-unit-minitest", :platform => [:ruby_22, :ruby_23]
+gem "nokogiri", "~>1.6.8", :platform => :mri_20
 
 gemspec :path => "../"

data/gemfiles/rails_4.0.4.gemfile

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "4.0.4"
+gem "nokogiri", "~>1.6.8", :platform => :mri_20
 
 gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~>4.1.0"
+gem "nokogiri", "~>1.6.8", :platform => :mri_20
 
 gemspec :path => "../"

data/gemfiles/rails_4.2.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~>4.2.0.beta4"
+gem "rails", "~>4.2.0"
+gem "nokogiri", "~>1.6.8", :platform => :mri_20
 
 gemspec :path => "../"

data/gemfiles/rails_4.gemfile

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 4.0.0"
+gem "nokogiri", "~>1.6.8", :platform => :mri_20
 
 gemspec :path => "../"

data/gemfiles/rails_5.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.0.1"
+gem "rspec-rails", "~> 3.5"
+
+gemspec :path => "../"

data/gemfiles/rails_edge.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", :git => "git://github.com/rails/rails.git"
+gem "rails", :github => "rails/rails"
 gem "rack", :github => "rack/rack"
 gem "i18n", :github => "svenfuchs/i18n"
 gem "arel", :github => "rails/arel"

data/lib/formtastic/helpers/fieldset_wrapper.rb

@@ -69,7 +69,7 @@ module Formtastic
 
         # TODO: One of the tests produces a scenario where duck is "0" and the test looks for a "1"
         # in the legend, so if we have a number, return it with a +1 until we can verify this scenario.
-        return duck + 1 if duck.is_a?(Fixnum)
+        return duck + 1 if duck.is_a?(Integer)
 
         # First try to extract key from duck Hash, then try child
         (duck[key] || duck[child]).to_i + 1

data/lib/formtastic/inputs/base/collections.rb

@@ -50,9 +50,9 @@ module Formtastic
           # Return if we have a plain string
           return raw_collection if raw_collection.is_a?(String)
 
-          # Return if we have an Array of strings, fixnums or arrays
+          # Return if we have an Array of strings, integers or arrays
           return raw_collection if (raw_collection.instance_of?(Array) || raw_collection.instance_of?(Range)) &&
-                               [Array, Fixnum, String].include?(raw_collection.first.class) &&
+                               ([Array, String].include?(raw_collection.first.class) || raw_collection.first.is_a?(Integer)) &&
                                !(options.include?(:member_label) || options.include?(:member_value))
 
           raw_collection.map { |o| [send_or_call(label_method, o), send_or_call(value_method, o)] }

data/lib/formtastic/localizer.rb

@@ -115,10 +115,7 @@ module Formtastic
     protected
 
     def normalize_model_name(name)
-      if !name =~ /\[/ && builder.respond_to?(:parent_builder) && builder.parent_builder.object_name
-        # Rails 3.1 nested builder case
-        [builder.parent_builder.object_name.to_s, name]
-      elsif name =~ /(.+)\[(.+)\]/
+      if name =~ /(.+)\[(.+)\]/
         # Rails 3 (and 3.1?) nested builder case with :post rather than @post
         [$1, $2]
       elsif builder.respond_to?(:options) && builder.options.key?(:as)

data/lib/formtastic/version.rb

@@ -1,3 +1,3 @@
 module Formtastic
-  VERSION = "3.1.4"
+  VERSION = "3.1.6"
 end

metadata

@@ -1,222 +1,194 @@
 --- !ruby/object:Gem::Specification
 name: formtastic
 version: !ruby/object:Gem::Version
-  version: 3.1.4
-  prerelease: 
+  version: 3.1.6
 platform: ruby
 authors:
 - Justin French
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3.2
 - !ruby/object:Gem::Dependency
   name: rspec_tag_matchers
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: hpricot
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
 description: A Rails form builder plugin/gem with semantically rich and accessible
@@ -228,10 +200,10 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- .gitignore
-- .rspec
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - Appraisals
 - CHANGELOG
 - DEPRECATIONS
@@ -249,6 +221,7 @@ files:
 - gemfiles/rails_4.1.gemfile
 - gemfiles/rails_4.2.gemfile
 - gemfiles/rails_4.gemfile
+- gemfiles/rails_5.0.gemfile
 - gemfiles/rails_edge.gemfile
 - lib/formtastic.rb
 - lib/formtastic/action_class_finder.rb
@@ -406,28 +379,24 @@ files:
 homepage: http://github.com/justinfrench/formtastic
 licenses:
 - MIT
-post_install_message: 
+metadata: {}
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23
-signing_key: 
-specification_version: 3
+rubygems_version: 3.6.8
+specification_version: 4
 summary: A Rails form builder plugin/gem with semantically rich and accessible markup
 test_files:
 - spec/action_class_finder_spec.rb
@@ -496,4 +465,3 @@ test_files:
 - spec/support/specialized_class_finder_shared_example.rb
 - spec/support/test_environment.rb
 - spec/util_spec.rb
-has_rdoc: