formtastic 2.3.0.rc3 → 2.3.0.rc4

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDM3NTE4ZDViMzMxYTExYmY4MWIxNTYxODMxNzYzYjdmMDM3NDY4YQ==
+  data.tar.gz: !binary |-
+    OTAwNmUwZGUyY2Q0NjQzMTM3NWRkMjBjMjY2YzU4YzEyZTQ1NWRmYw==
+SHA512:
+  metadata.gz: !binary |-
+    OGJmYmEyZDU3NDZlOTI4ZmI1YzhlZTc0M2RiMjEwMTY0NmM1NmRhMWMzOGY2
+    ZjdmZGY1NzBlMzhmNjE2NTliOWFjMTRhMWZmOGM0YTQwNTdkMzU5MDI4NmMx
+    ODgxOWFhMTQ4ODhkODEyMTVmNzRhNmZkNzY2M2YxNTNmZTBlNGQ=
+  data.tar.gz: !binary |-
+    MDQxOGFiNGQxMTNiNWMzZmRjNDM3NzYzMGY5ZGFiOGIzZmY3Mjk4ODMwNjZi
+    MjJhMTZkNjRiNGRmYjY0ZjJhMzczM2UwZTU3MGZlNTNlNmQzNmM4MGNkZmU0
+    MTY2ZDRkOGY5MTA1ZjMzZDY5MzczMjg4YzJlNWY2NGY2NzQ1ODA=

data/.travis.yml

@@ -1,3 +1,4 @@
+language: ruby
 before_install:
   - gem update --system
   - gem update bundler
@@ -7,40 +8,37 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1
 gemfile:
   - gemfiles/rails_3.0.gemfile
   - gemfiles/rails_3.1.gemfile
   - gemfiles/rails_3.2.gemfile
+  - gemfiles/rails_4.gemfile
+  - gemfiles/rails_4.0.4.gemfile
+  - gemfiles/rails_edge.gemfile
 env:
   - DEFER_GC=false RAILS_EDGE=true
-script: "rake spec"
+script: "bundle exec rake spec"
 matrix:
-  include:
-    - rvm: 1.9.3
+  exclude:
+    - rvm: 1.8.7
       gemfile: gemfiles/rails_4.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: 2.0.0
+    - rvm: ree
       gemfile: gemfiles/rails_4.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: 2.1.0
+    - rvm: 1.9.2
       gemfile: gemfiles/rails_4.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: 1.9.3
+    - rvm: 1.8.7
       gemfile: gemfiles/rails_4.0.4.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: 2.0.0
+    - rvm: ree
       gemfile: gemfiles/rails_4.0.4.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: 1.9.3
+    - rvm: 1.9.2
+      gemfile: gemfiles/rails_4.0.4.gemfile
+    - rvm: 1.8.7
       gemfile: gemfiles/rails_edge.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: 2.0.0
+    - rvm: ree
       gemfile: gemfiles/rails_edge.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: 2.1.0
+    - rvm: 1.9.2
       gemfile: gemfiles/rails_edge.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
   allow_failures:
     - rvm: 1.9.3
       gemfile: gemfiles/rails_edge.gemfile
@@ -48,9 +46,6 @@ matrix:
     - rvm: 2.0.0
       gemfile: gemfiles/rails_edge.gemfile
       env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: 2.1.0
-      gemfile: gemfiles/rails_4.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: 2.1.0
+    - rvm: 2.1
       gemfile: gemfiles/rails_edge.gemfile
       env: DEFER_GC=false RAILS_EDGE=true

data/CHANGELOG

@@ -1,3 +1,28 @@
+2.3.0.rc4
+
+* Removed deprecated date, time and datetime inputs
+* Fixed comparison checking of boolean checked values
+* Fixed errors raised when handling some validations
+* Fixed that we weren't rendering a label on checkbox inputs when hidden_fields was set to true
+* Fixed eager loading in test environments
+* Fixed documentation to point to the new official country_select gem
+* Fixed that we would previously render a default wrapper id if wrapper_html[:id] was deliberately set to nil
+* Fixed bg with duplicate hidden fields in Rails >= 3.2.13
+* Note: Re-built 2.3-stable branch from 2.3.0.rc3 onwards due to accidental merges of master inside PRs
+
+2.3.0.rc3
+
+* Fixed invalid HTML attributes in BooleanInput with a whitelist
+* Fixed compatibility with Rails 4.0.x, 4.1
+* Fixed compatibility with newer I18n
+* Fixed compatibility with Paperclip
+* Fixed submit button in slim template
+* Fixed class with Rails' field_error_proc
+* Deprecated :error_class option
+* Deprecated support for Rails < 3.2.13
+* Added ability to change the model-derived class we add to the form (eg 'post')
+* Added support for symbols & sets in collections
+
 2.3.0.rc2
 
 * deprecate support for Rails < 3.2

data/README.textile

@@ -1,7 +1,7 @@
 h1. Formtastic
 
 !https://travis-ci.org/justinfrench/formtastic.png?branch=master!:https://travis-ci.org/justinfrench/formtastic
-!http://inch-pages.github.io/github/justinfrench/formtastic.png!:http://inch-pages.github.io/github/justinfrench/formtastic
+!http://inch-ci.org/github/justinfrench/formtastic.png!:http://inch-ci.org/github/justinfrench/formtastic
 !https://codeclimate.com/github/justinfrench/formtastic.png!:https://codeclimate.com/github/justinfrench/formtastic
 !https://badge.fury.io/rb/formtastic.png!:http://badge.fury.io/rb/formtastic
 !https://gemnasium.com/justinfrench/formtastic.png!:https://gemnasium.com/justinfrench/formtastic
@@ -20,7 +20,7 @@ h2. Documentation & Support
 
 h2. Compatibility
 
-* Formtastic 4 (master on Github) will require Rails 3.2 minimum
+* Formtastic 3 (master on Github) will require Rails 3.2 minimum
 * Formtastic 2.3 is Rails 3 and Rails 4 compatible (Rails < 3.2 is deprecated)
 * Formtastic 2.1 & 2.2 is Rails 3 and Rails 4 compatible
 * Formtastic, much like Rails, is very ActiveRecord-centric. Many are successfully using other ActiveModel-like ORMs and objects (DataMapper, MongoMapper, Mongoid, Authlogic, Devise...) but we're not guaranteeing full compatibility at this stage. Patches are welcome!
@@ -602,7 +602,7 @@ h2. Dependencies
 
 There are none other than Rails itself, but...
 
-* If you want to use the @:country@ input, you'll need to install the "country-select plugin":https://github.com/stefanpenner/country_select (or any other country_select plugin with the same API).
+* If you want to use the @:country@ input, you'll need to install the "country-select plugin":https://github.com/stefanpenner/country_select (or any other country_select plugin with the same API). Both 1.x and 2.x are supported, but they behave differently when storing data, so please see their "upgrade notes":https://github.com/stefanpenner/country_select/blob/master/UPGRADING.md if switching from 1.x.
 * There are a bunch of development dependencies if you plan to contribute to Formtastic
 
 

data/lib/formtastic.rb

@@ -15,9 +15,9 @@ module Formtastic
   autoload :Util
   
   # Deprecate support for Rails < 3.2
-  if Util.deprecated_version_of_rails?
+  if defined?(::Rails) && Util.deprecated_version_of_rails?
     ::ActiveSupport::Deprecation.warn(
-      "Support for Rails 3.0 and 3.1 will be dropped from Formtastic 3.0",
+      "Support for Rails < 3.2.13 will be dropped from Formtastic 3.0",
       caller)
   end
 

data/lib/formtastic/helpers/input_helper.rb

@@ -321,7 +321,9 @@ module Formtastic
       def input_class(as)
         @input_classes_cache ||= {}
         @input_classes_cache[as] ||= begin
-          Rails.application.config.cache_classes ? input_class_with_const_defined(as) : input_class_by_trying(as)
+          config = Rails.application.config
+          use_const_defined = config.respond_to?(:eager_load) ? config.eager_load : config.cache_classes
+          use_const_defined ? input_class_with_const_defined(as) : input_class_by_trying(as)
         end
       end
       

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

@@ -37,6 +37,8 @@ module Formtastic
 
           result = if conditional.respond_to?(:call) && conditional.arity > 0
             conditional.call(object)
+          elsif conditional.respond_to?(:call) && conditional.arity == 0
+            object.instance_exec(&conditional)
           elsif conditional.is_a?(::Symbol) && object.respond_to?(conditional)
             object.send(conditional)
           else

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

@@ -3,33 +3,33 @@ module Formtastic
     module Base
       # @todo relies on `dom_id`, `required?`, `optional`, `errors?`, `association_primary_key` & `sanitized_method_name` methods from another module
       module Wrapping
-        
+
         # Override this method if you want to change the display order (for example, rendering the
         # errors before the body of the input).
         def input_wrapping(&block)
-          template.content_tag(:li, 
-            [template.capture(&block), error_html, hint_html].join("\n").html_safe, 
+          template.content_tag(:li,
+            [template.capture(&block), error_html, hint_html].join("\n").html_safe,
             wrapper_html_options
           )
         end
-        
+
         def wrapper_html_options
           opts = wrapper_html_options_raw
           opts[:class] = wrapper_classes
-          opts[:id] ||= wrapper_dom_id 
+          opts[:id] = wrapper_dom_id unless opts.has_key? :id
           opts
         end
-        
+
         def wrapper_html_options_raw
           (options[:wrapper_html] || {}).dup
         end
-        
+
         def wrapper_classes_raw
           classes = wrapper_html_options_raw[:class] || []
           return classes.dup if classes.is_a?(Array)
           return [classes]
         end
-        
+
         def wrapper_classes
           classes = wrapper_classes_raw
           classes << as
@@ -41,11 +41,11 @@ module Formtastic
 
           classes.join(' ')
         end
-        
+
         def wrapper_dom_id
           @wrapper_dom_id ||= "#{dom_id.to_s.gsub((association_primary_key || method).to_s, sanitized_method_name.to_s)}_input"
         end
-                
+
       end
     end
   end

data/lib/formtastic/inputs/boolean_input.rb

@@ -102,9 +102,7 @@ module Formtastic
           value
         when NilClass
           false
-        when Integer
-          value != 0
-        when String
+        when Integer, String
           value == checked_value
         when Array
           value.include?(checked_value)

data/lib/formtastic/inputs/check_boxes_input.rb

@@ -103,18 +103,16 @@ module Formtastic
       end
 
       def choice_html(choice)
-        template.content_tag(:label,
-          hidden_fields? ?
-            check_box_with_hidden_input(choice) :
-            check_box_without_hidden_input(choice) <<
-          choice_label(choice),
+        template.content_tag(
+          :label,
+          checkbox_input(choice) + choice_label(choice),
           label_html_options.merge(:for => choice_input_dom_id(choice), :class => nil)
         )
       end
 
       def hidden_field_for_all
         if hidden_fields?
-          ""
+          ''
         else
           options = {}
           options[:class] = [method.to_s.singularize, 'default'].join('_') if value_as_class?
@@ -183,6 +181,14 @@ module Formtastic
 
       protected
 
+      def checkbox_input(choice)
+        if hidden_fields?
+          check_box_with_hidden_input(choice)
+        else
+          check_box_without_hidden_input(choice)
+        end
+      end
+
       def make_selected_values
         if object.respond_to?(method)
           selected_items = object.send(method)

data/lib/formtastic/inputs/country_input.rb

@@ -4,13 +4,15 @@ module Formtastic
     # Rails doesn't come with a `country_select` helper by default any more, so you'll need to do
     # one of the following:
     #
-    # * install the [country-select](https://github.com/jamesds/country-select) gem
-    # * install the no longer maintained [official Rails plugin](http://github.com/rails/iso-3166-country-select)
+    # * install the [country_select](https://github.com/stefanpenner/country_select) gem
     # * install any other country_select plugin that behaves in a similar way
     # * roll your own `country_select` helper with the same args and options as the Rails one
     #
+    # Formtastic supports both 1.x and 2.x of stefanpenner/country_select, but if you're upgrading
+    # from 1.x, they behave quite differently, so please see their [upgrade instructions](https://github.com/stefanpenner/country_select/blob/master/UPGRADING.md).
+    #
     # By default, Formtastic includes a handful of English-speaking countries as "priority
-    # counties", which can be set in the `priority_countries` configuration array in the
+    # countries", which can be set in the `priority_countries` configuration array in the
     # formtastic.rb initializer to suit your market and user base (see README for more info on
     # configuration). Additionally, it is possible to set the :priority_countries on a per-input
     # basis through the `:priority_countries` option. These priority countries will be passed down
@@ -31,7 +33,7 @@ module Formtastic
     #       # ...
     #   </li>
     #
-    # @example `:priority_countries` set on a specific input
+    # @example `:priority_countries` set on a specific input (country_select 1.x)
     #
     #   <%= semantic_form_for @user do |f| %>
     #     <%= f.inputs do %>
@@ -46,12 +48,27 @@ module Formtastic
     #       # ...
     #   </li>
     #
+    # @example `:priority_countries` set on a specific input (country_select 2.x)
+    #
+    #   <%= semantic_form_for @user do |f| %>
+    #     <%= f.inputs do %>
+    #       <%= f.input :nationality, :as => :country, :priority_countries => ["AU", "NZ"] %>
+    #     <% end %>
+    #   <% end %>
+    #
+    #   <li class='country'>
+    #     <label for="user_nationality">Country</label>
+    #     <select id="user_nationality" name="user[nationality]">
+    #       <option value="...">...</option>
+    #       # ...
+    #   </li>
+    #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documentation of all possible options.
     class CountryInput 
       include Base
 
       def to_html
-        raise "To use the :country input, please install a country_select plugin, like this one: https://github.com/jamesds/country-select" unless builder.respond_to?(:country_select)
+        raise "To use the :country input, please install a country_select plugin, like this one: https://github.com/stefanpenner/country_select" unless builder.respond_to?(:country_select)
         input_wrapping do
           label_html <<
           builder.country_select(method, priority_countries, input_options, input_html_options)

data/lib/formtastic/inputs/select_input.rb

@@ -144,12 +144,21 @@ module Formtastic
 
       def to_html
         input_wrapping do
-          hidden_input <<
+          deprecated_hidden_input <<
           label_html <<
           (options[:group_by] ? grouped_select_html : select_html)
         end
       end
 
+      # TODO: remove from Formtastic 3.0
+      def deprecated_hidden_input
+        if multiple? && Util.rails3? && Util.deprecated_version_of_rails?
+          template.hidden_field_tag(input_html_options_name_multiple, '', :id => nil)
+        else
+          "".html_safe
+        end
+      end
+
       def select_html
         builder.select(input_name, collection, input_options, input_html_options)
       end
@@ -171,14 +180,6 @@ module Formtastic
         options.key?(:include_blank) ? options[:include_blank] : (single? && builder.include_blank_for_select_by_default)
       end
       
-      def hidden_input
-        if multiple?
-          template.hidden_field_tag(input_html_options_name_multiple, '', :id => nil)
-        else
-          "".html_safe
-        end
-      end
-
       def prompt?
         !!options[:prompt]
       end

data/lib/formtastic/inputs/time_select_input.rb

@@ -15,8 +15,12 @@ module Formtastic
         time_fragments
       end
       
+      def value_or_default_value
+        value ? value : Time.current
+      end
+      
       def fragment_value(fragment)
-        value ? value.send(fragment) : ""
+        value_or_default_value.send(fragment)
       end
       
       def hidden_fragments

data/lib/formtastic/util.rb

@@ -22,23 +22,31 @@ module Formtastic
     end
     
     def rails3?
-      ::Rails::VERSION::MAJOR == 3
+      rails_version >= Gem::Version.new("3.0.0") && 
+      rails_version < Gem::Version.new("4.0.0")
     end
 
     def rails4?
-      ::Rails::VERSION::MAJOR == 4
+      rails_version >= Gem::Version.new("4.0.0") && 
+      rails_version < Gem::Version.new("5.0.0")
     end
     
     def rails4_0?
-      ::Rails::VERSION::MAJOR == 4 && ::Rails::VERSION::MINOR == 0
+      rails_version >= Gem::Version.new("4.0.0") && 
+      rails_version < Gem::Version.new("4.1.0")
     end
 
     def rails4_1?
-      ::Rails::VERSION::MAJOR == 4 && ::Rails::VERSION::MINOR == 1
+      rails_version >= Gem::Version.new("4.1.0") && 
+      rails_version < Gem::Version.new("4.2.0")
     end
     
     def deprecated_version_of_rails?
-      const_defined?(:Rails) && ::Rails::VERSION::MAJOR == 3 && ::Rails::VERSION::MINOR < 2 && ::Rails::VERSION::PATCH < 13
+      rails_version < Gem::Version.new("3.2.13")
+    end
+
+    def rails_version
+      Gem::Version.new(::Rails::VERSION::STRING)
     end
 
   end

data/lib/formtastic/version.rb

@@ -1,3 +1,3 @@
 module Formtastic
-  VERSION = "2.3.0.rc3"
+  VERSION = "2.3.0.rc4"
 end

data/spec/helpers/input_helper_spec.rb

@@ -821,6 +821,15 @@ describe 'Formtastic::FormBuilder#input' do
           output_buffer.should have_tag("form li.my_class")
           output_buffer.should have_tag("form li.another_class")
         end
+
+        describe 'when nil' do
+          it 'should not put an id attribute on the div tag' do
+            concat(semantic_form_for(@new_post) do |builder|
+              concat(builder.input(:title, :wrapper_html => {:id => nil}))
+            end)
+            output_buffer.should have_tag('form li:not([id])')
+          end
+        end
       end
 
       describe 'when not provided' do

data/spec/inputs/boolean_input_spec.rb

@@ -127,6 +127,16 @@ describe 'boolean input' do
     output_buffer.should have_tag('form li label input[@type="checkbox"][@value="yes"][@checked="checked"]')
   end
 
+  it 'should generate a checked input if object.method returns checked value when inverted' do
+    @new_post.stub(:allow_comments).and_return(0)
+
+    concat(semantic_form_for(@new_post) do |builder|
+      concat(builder.input(:allow_comments, :as => :boolean, :checked_value => 0, :unchecked_value => 1))
+    end)
+
+    output_buffer.should have_tag('form li label input[@type="checkbox"][@value="0"][@checked="checked"]')
+  end
+
   it 'should not generate a checked input if object.method returns unchecked value' do
     @new_post.stub(:allow_comments).and_return('no')
 
@@ -227,5 +237,4 @@ describe 'boolean input' do
     end
     
   end
-
 end

data/spec/inputs/check_boxes_input_spec.rb

@@ -107,6 +107,7 @@ describe 'check_boxes input' do
         ::Post.all.each do |post|
           output_buffer.should have_tag("form li fieldset ol li label input#author_post_ids_#{post.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@name='author[post_ids][]']", :count => 2)
+          output_buffer.should have_tag('form li fieldset ol li label', /#{post.to_label}/)
         end
 
       end

data/spec/inputs/select_input_spec.rb

@@ -383,7 +383,7 @@ describe 'select input' do
     end
 
     it 'should have a hidden field' do
-      output_buffer.should have_tag('form li input[@type="hidden"][@name="author[post_ids][]"]')
+      output_buffer.should have_tag('form li input[@type="hidden"][@name="author[post_ids][]"]', :count => 1)
     end
 
     it 'should have a select option for each Post' do

data/spec/inputs/string_input_spec.rb

@@ -108,6 +108,46 @@ describe 'string input' do
           should_have_maxlength(42, :options => { :maximum => 42, :unless => :specify_maxlength })
         end
       end
+
+      describe 'any conditional validation' do
+        describe 'proc with arity that calls an instance method' do
+          it 'calls the method on the object' do
+            @new_post.should_receive(:something?)
+            @new_post.class.should_receive(:validators_on).with(:title).at_least(1).and_return([
+              active_model_presence_validator([:title], { :unless => Proc.new { |user| user.something? } })
+            ])
+            concat(semantic_form_for(@new_post) do |builder|
+              concat(builder.input(:title))
+            end)
+          end
+        end
+
+        describe 'symbol method name' do
+          it 'calls the method on the object if the method exists' do
+            @new_post.should_receive(:something?)
+            @new_post.class.should_receive(:validators_on).with(:title).at_least(1).and_return([
+              active_model_presence_validator([:title], { :unless => :something? })
+            ])
+            concat(semantic_form_for(@new_post) do |builder|
+              concat(builder.input(:title))
+            end)
+          end
+        end
+
+        describe 'any other conditional' do
+          it 'does not raise an error' do
+            @conditional = double()
+            @new_post.class.should_receive(:validators_on).with(:title).at_least(1).and_return([
+              active_model_presence_validator([:title], { :unless => @conditional })
+            ])
+            concat(semantic_form_for(@new_post) do |builder|
+              concat(builder.input(:title))
+            end)
+          end
+        end
+
+      end
+
     end
   end
 

data/spec/inputs/time_select_input_spec.rb

@@ -64,33 +64,6 @@ describe 'time select input' do
 
     end
 
-    describe "with :ignore_date => false and no initial Time" do
-      before do
-        @new_post.stub(:publish_at)
-        concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:publish_at, :as => :time_select, :ignore_date => false))
-        end)
-      end
-
-      it 'should have a hidden input for day, month and year' do
-        output_buffer.should have_tag('input#post_publish_at_1i')
-        output_buffer.should have_tag('input#post_publish_at_2i')
-        output_buffer.should have_tag('input#post_publish_at_3i')
-      end
-
-      it 'should not have values in hidden inputs for day, month and year' do
-        output_buffer.should have_tag('input#post_publish_at_1i[@value=""]')
-        output_buffer.should have_tag('input#post_publish_at_2i[@value=""]')
-        output_buffer.should have_tag('input#post_publish_at_3i[@value=""]')
-      end
-
-      it 'should have an select for hour and minute' do
-        output_buffer.should have_tag('select#post_publish_at_4i')
-        output_buffer.should have_tag('select#post_publish_at_5i')
-      end
-
-    end
-
     describe "without seconds" do
       before do
         concat(semantic_form_for(@new_post) do |builder|

data/spec/util_spec.rb

@@ -0,0 +1,59 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe 'Formtastic::Util' do
+
+  describe '.deprecated_version_of_rails?' do
+    
+    subject { Formtastic::Util.deprecated_version_of_rails? }
+    
+    context '3.0.0' do
+      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("3.0.0") } }
+      it 'should be true' do
+        expect(subject).to be_true
+      end
+    end
+
+    context '3.1.0' do
+      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("3.1.0") } }
+      it 'should be true' do
+        expect(subject).to be_true
+      end
+    end
+
+    context '3.2.12' do
+      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("3.2.12") } }
+      it 'should be true' do
+        expect(subject).to be_true
+      end
+    end
+
+    context '3.2.13' do
+      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("3.2.13") } }
+      it 'should be true' do
+        expect(subject).to be_false
+      end
+    end
+
+    context '3.2.14' do
+      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("3.2.14") } }
+      it 'should be true' do
+        expect(subject).to be_false
+      end
+    end
+
+    context '3.3.0' do
+      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("3.3.0") } }
+      it 'should be true' do
+        expect(subject).to be_false
+      end
+    end
+
+    context '4.0.0' do
+      before { allow(Formtastic::Util).to receive(:rails_version) { Gem::Version.new("4.0.0") } }
+      it 'should be true' do
+        expect(subject).to be_false
+      end
+    end
+  end
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: formtastic
 version: !ruby/object:Gem::Version
-  version: 2.3.0.rc3
-  prerelease: 6
+  version: 2.3.0.rc4
 platform: ruby
 authors:
 - Justin French
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-12 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec_tag_matchers
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hpricot
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: BlueCloth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -174,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -182,7 +160,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -190,7 +167,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - <=
       - !ruby/object:Gem::Version
@@ -198,7 +174,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - <=
       - !ruby/object:Gem::Version
@@ -206,7 +181,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -214,7 +188,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -294,10 +267,8 @@ files:
 - lib/formtastic/inputs/boolean_input.rb
 - lib/formtastic/inputs/check_boxes_input.rb
 - lib/formtastic/inputs/country_input.rb
-- lib/formtastic/inputs/date_input.rb
 - lib/formtastic/inputs/date_picker_input.rb
 - lib/formtastic/inputs/date_select_input.rb
-- lib/formtastic/inputs/datetime_input.rb
 - lib/formtastic/inputs/datetime_picker_input.rb
 - lib/formtastic/inputs/datetime_select_input.rb
 - lib/formtastic/inputs/email_input.rb
@@ -312,7 +283,6 @@ files:
 - lib/formtastic/inputs/select_input.rb
 - lib/formtastic/inputs/string_input.rb
 - lib/formtastic/inputs/text_input.rb
-- lib/formtastic/inputs/time_input.rb
 - lib/formtastic/inputs/time_picker_input.rb
 - lib/formtastic/inputs/time_select_input.rb
 - lib/formtastic/inputs/time_zone_input.rb
@@ -356,7 +326,6 @@ files:
 - spec/inputs/date_select_input_spec.rb
 - spec/inputs/datetime_picker_input_spec.rb
 - spec/inputs/datetime_select_input_spec.rb
-- spec/inputs/deprecated_time_date_datetime_inputs_spec.rb
 - spec/inputs/email_input_spec.rb
 - spec/inputs/file_input_spec.rb
 - spec/inputs/hidden_input_spec.rb
@@ -384,31 +353,31 @@ files:
 - spec/support/deferred_garbage_collection.rb
 - spec/support/deprecation.rb
 - spec/support/test_environment.rb
+- spec/util_spec.rb
 homepage: http://github.com/justinfrench/formtastic
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Rails form builder plugin/gem with semantically rich and accessible markup
 test_files:
 - spec/actions/button_action_spec.rb
@@ -436,7 +405,6 @@ test_files:
 - spec/inputs/date_select_input_spec.rb
 - spec/inputs/datetime_picker_input_spec.rb
 - spec/inputs/datetime_select_input_spec.rb
-- spec/inputs/deprecated_time_date_datetime_inputs_spec.rb
 - spec/inputs/email_input_spec.rb
 - spec/inputs/file_input_spec.rb
 - spec/inputs/hidden_input_spec.rb
@@ -464,4 +432,5 @@ test_files:
 - spec/support/deferred_garbage_collection.rb
 - spec/support/deprecation.rb
 - spec/support/test_environment.rb
+- spec/util_spec.rb
 has_rdoc: 

data/lib/formtastic/inputs/date_input.rb

@@ -1,10 +0,0 @@
-module Formtastic
-  module Inputs
-    class DateInput < DateSelectInput
-      def to_html
-        ::ActiveSupport::Deprecation.warn("DateInput (:as => :date) has been renamed to DateSelectInput (:as => :date_select) and will be removed or changed in the next version of Formtastic, please update your forms.", caller(2))
-        super
-      end
-    end
-  end
-end

data/lib/formtastic/inputs/datetime_input.rb

@@ -1,10 +0,0 @@
-module Formtastic
-  module Inputs
-    class DatetimeInput < DatetimeSelectInput
-      def to_html
-        ::ActiveSupport::Deprecation.warn("DatetimeInput (:as => :datetime) has been renamed to DatetimeSelectInput (:as => :datetime_select) and will be removed or changed in the next version of Formtastic, please update your forms.", caller(2))
-        super
-      end
-    end
-  end
-end

data/lib/formtastic/inputs/time_input.rb

@@ -1,10 +0,0 @@
-module Formtastic
-  module Inputs
-    class TimeInput < TimeSelectInput
-      def to_html
-        ::ActiveSupport::Deprecation.warn("TimeInput (:as => :time) has been renamed to TimeSelectInput (:as => :time_select) and will be removed or changed in the next version of Formtastic, please update your forms.", caller(2))
-        super
-      end
-    end
-  end
-end

data/spec/inputs/deprecated_time_date_datetime_inputs_spec.rb

@@ -1,48 +0,0 @@
-require 'spec_helper'
-
-describe 'deprecated time, datetime and date inputs' do
-  include FormtasticSpecHelper
-  
-  before do
-    @output_buffer = ''
-    mock_everything
-  end
-  
-  it 'should warn :time is deprecated' do
-    ::ActiveSupport::Deprecation.should_receive(:warn)
-    semantic_form_for(@new_post) do |f|
-      concat(f.input :created_at, :as => :time)
-    end
-  end
-
-  it 'should warn :datetime is deprecated' do
-    ::ActiveSupport::Deprecation.should_receive(:warn)
-    semantic_form_for(@new_post) do |f|
-      concat(f.input :created_at, :as => :datetime)
-    end
-  end
-  
-  it 'should warn :date is deprecated' do
-    ::ActiveSupport::Deprecation.should_receive(:warn)
-    semantic_form_for(@new_post) do |f|
-      concat(f.input :created_at, :as => :date)
-    end
-  end
-  
-  it 'should use wrapper css class based off :as, not off their parent class' do
-    with_deprecation_silenced do
-      concat(semantic_form_for(@new_post) do |f|
-        concat(f.input :created_at, :as => :time)
-        concat(f.input :created_at, :as => :datetime)
-        concat(f.input :created_at, :as => :date)
-      end)
-    end
-    output_buffer.should have_tag('li.time')
-    output_buffer.should have_tag('li.datetime')
-    output_buffer.should have_tag('li.date')
-    output_buffer.should_not have_tag('li.time_select')
-    output_buffer.should_not have_tag('li.datetime_select')
-    output_buffer.should_not have_tag('li.date_select')
-  end
-
-end