formtastic 2.3.1 → 3.0.0.rc

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTFjYzY2MDMyNWE2NGI2YzNkMzJkNTVkNTQ0ZTg2N2QxYjg0OTgwMQ==
+    ZWRiMTU5NmRkZjA1NTEzMDkyZTkzNjU4MjZlZjQ2M2JlNGUxNTllZg==
   data.tar.gz: !binary |-
-    ZmE5MzZiNWU2YTUxNTEzYTgxYjhiZjhiOTkyYzY1MGRmZWE3NDZiMw==
+    NTMyNjFhNjhhMjQxOGRkMmFjOGZkM2YxY2EzOWU0MzhjZjc3MWE0Yg==
 SHA512:
   metadata.gz: !binary |-
-    ZTlhMTIxZTcxNWJhMTU5NmRkMzk2OGE2ZDBlYzQzOGZmNTQxZjE0ZTA4YTE2
-    OTFlMWMyYTNiYTBjZmZhMTFhMjRiOTI4ZWFkYzI1MzFhMzRhOGI5ZWIwYzhk
-    NzFlZmMwYTE3MDE2NmFmNjY1NTg2MDM4YmNhMDc1YTE4M2NlMTg=
+    YzIxNDg1NzU1MzdhMmMxYTAzNDhkMDgxZDUyMzNiMTZjNTE3ODc1ZWRmNjk1
+    NzU5NmUzZjFhZDZhOTBlZGIxNDE5N2VmOTI1MDI1ZTM0NDY3ZTY4ZDk5YTNk
+    YjBmNjM0OTEyNTIzZWFmNWQxZTcxZmUzMWVhMDNmZTFlMWQ5ODE=
   data.tar.gz: !binary |-
-    OTYxODJlYjUxYWFmNDQyZDIyMjU2YjI2MWM3MzRhODEyOGY4MTE3YzliM2Q5
-    NmVlNGQ5ZTM4MDg2ZmQyMzc1MmVkZTYzMTVhMjFkNDEwNjE3YjEzYmUzYjY3
-    NDU1ZGZhYmRlNWZlYTcyNGE2N2RlZDMxOTY5YzMyN2QzM2VjZjE=
+    NmUzYWQ0Y2I5OWNhYzlmY2NlMjRjZjE5OTE1MzYwYTZmMjUxNGUwYmU2ZmEz
+    MWVhNTYyMTMyMDlmMDM0MTY3Zjk3NDYzMTdlOTU1YTI5Mjc2MGEzZjhjMWVm
+    YTVlNTBiMzJjNjIwNDBhZWI0OTY3ZmVlMjYxNzdjZGMzNDVlZWU=

data/.travis.yml

@@ -3,15 +3,10 @@ before_install:
   - gem update --system
   - gem update bundler
 rvm:
-  - 1.8.7
-  - ree
-  - 1.9.2
   - 1.9.3
   - 2.0.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
@@ -20,25 +15,6 @@ env:
   - DEFER_GC=false RAILS_EDGE=true
 script: "bundle exec rake spec"
 matrix:
-  exclude:
-    - rvm: 1.8.7
-      gemfile: gemfiles/rails_4.gemfile
-    - rvm: ree
-      gemfile: gemfiles/rails_4.gemfile
-    - rvm: 1.9.2
-      gemfile: gemfiles/rails_4.gemfile
-    - rvm: 1.8.7
-      gemfile: gemfiles/rails_4.0.4.gemfile
-    - rvm: ree
-      gemfile: gemfiles/rails_4.0.4.gemfile
-    - rvm: 1.9.2
-      gemfile: gemfiles/rails_4.0.4.gemfile
-    - rvm: 1.8.7
-      gemfile: gemfiles/rails_edge.gemfile
-    - rvm: ree
-      gemfile: gemfiles/rails_edge.gemfile
-    - rvm: 1.9.2
-      gemfile: gemfiles/rails_edge.gemfile
   allow_failures:
     - rvm: 1.9.3
       gemfile: gemfiles/rails_edge.gemfile

data/Appraisals

@@ -1,11 +1,3 @@
-appraise 'rails-3.0' do
-  gem 'rails',      '~> 3.0.0'
-end
-
-appraise 'rails-3.1' do
-  gem 'rails',      '~> 3.1.0'
-end
-
 appraise 'rails-3.2' do
   gem 'rails',      '~> 3.2.0'
 end

data/CHANGELOG

@@ -1,19 +1,3 @@
-2.3.0
-
-* No changes after 2.3.0.rc4
-
-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

data/README.textile

@@ -20,8 +20,8 @@ h2. Documentation & Support
 
 h2. Compatibility
 
-* 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 3 (master on Github) will require Rails 3.2.13 minimum
+* Formtastic 2.3 is Rails 3 and Rails 4 compatible (Rails < 3.2.13 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!
 

data/formtastic.gemspec

@@ -21,21 +21,22 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = ["README.textile"]
 
+  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.0"])
+  s.add_dependency(%q<actionpack>, [">= 3.2.13"])
 
   s.add_development_dependency(%q<nokogiri>, ["< 1.6.0"]) # 1.6 requires Ruby 1.9.2, drop in v3.0
-  s.add_development_dependency(%q<rspec-rails>, ["~> 2.14.0"])
-  s.add_development_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
+  s.add_development_dependency(%q<rspec-rails>, ["~> 2.14"])
+  s.add_development_dependency(%q<rspec_tag_matchers>, ["~> 1.0"])
   s.add_development_dependency(%q<hpricot>, ["~> 0.8.3"])
-  s.add_development_dependency(%q<BlueCloth>) # for YARD
+  s.add_development_dependency(%q<BlueCloth>, ["~> 1.0"]) # for YARD
   s.add_development_dependency(%q<yard>, ["~> 0.6"])
-  s.add_development_dependency(%q<colored>)
-  s.add_development_dependency(%q<tzinfo>)
+  s.add_development_dependency(%q<colored>, ["~> 1.2"])
+  s.add_development_dependency(%q<tzinfo>, ["~> 1.1"])
   s.add_development_dependency(%q<ammeter>, ["0.2.5"])
-  s.add_development_dependency(%q<appraisal>, ["1.0.0.beta3"])
+  s.add_development_dependency(%q<appraisal>, ["~> 1.0"])
   s.add_development_dependency(%q<rake>, ["<= 10.1.1"]) # Anything higher requires Ruby 1.9, drop in v3.0
-  s.add_development_dependency(%q<activemodel>)
+  s.add_development_dependency(%q<activemodel>, [">= 3.2.13"])
 end

data/lib/formtastic.rb

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

data/lib/formtastic/actions/button_action.rb

@@ -54,17 +54,10 @@ module Formtastic
       include Base
       include Buttonish
       
-      # TODO absolutely horrible hack to work-around Rails < 3.1 missing button_tag, need
-      # to figure out something more appropriate.
-      #
       # TODO reset_action class?
       def to_html
         wrapper do
-          if template.respond_to?(:button_tag)
-            template.button_tag(text, button_html)
-          else
-            template.content_tag(:button, text, button_html)
-          end
+          template.button_tag(text, button_html)
         end
       end
     end

data/lib/formtastic/helpers/input_helper.rb

@@ -88,6 +88,7 @@ module Formtastic
       #
       # * `:boolean`      (see {Inputs::BooleanInput})
       # * `:check_boxes`  (see {Inputs::CheckBoxesInput})
+      # * `:color`        (see {Inputs::ColorInput})
       # * `:country`      (see {Inputs::CountryInput})
       # * `:datetime_select` (see {Inputs::DatetimeSelectInput})
       # * `:date_select` (see {Inputs::DateSelectInput})
@@ -271,6 +272,7 @@ module Formtastic
             return :url       if method.to_s =~ /^url$|^website$|_url$/
             return :phone     if method.to_s =~ /(phone|fax)/
             return :search    if method.to_s =~ /^search$/
+            return :color     if method.to_s =~ /color/
           when :integer
             return :select    if reflection_for(method)
             return :number

data/lib/formtastic/inputs.rb

@@ -6,6 +6,7 @@ module Formtastic
     autoload :Basic
     autoload :BooleanInput
     autoload :CheckBoxesInput
+    autoload :ColorInput
     autoload :CountryInput
     autoload :DateInput
     autoload :DatePickerInput

data/lib/formtastic/inputs/base.rb

@@ -11,13 +11,6 @@ module Formtastic
         @object_name = object_name
         @method = method
         @options = options.dup
-        
-        warn_deprecated_option!(:value, ":input_html => { :value => '...'}")
-        warn_deprecated_option!(:hint_class, "default_hint_class configuration")
-        warn_deprecated_option!(:error_class, "default_error_class configuration")
-        warn_deprecated_option!(:group_by, ":collection option with a HTML string generated by Rails' grouped_options_for_select()")
-        warn_deprecated_option!(:group_label, ":collection option with a HTML string generated by Rails' grouped_options_for_select()")
-        warn_deprecated_option!(:find_options, "YourModel.find(...)")
       end
       
       # Usefull for deprecating options.
@@ -49,7 +42,6 @@ module Formtastic
       autoload :Database
       autoload :Errors
       autoload :Fileish
-      autoload :GroupedCollections
       autoload :Hints
       autoload :Html
       autoload :Labelling
@@ -77,4 +69,4 @@ module Formtastic
     end
   end
 end
-  
+  

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

@@ -78,28 +78,16 @@ module Formtastic
                     ) if reflection.options[:polymorphic] == true
             end
 
-            find_options_from_options = options[:find_options] || {}
-            conditions_from_options = find_options_from_options[:conditions] || {}
             conditions_from_reflection = (reflection.respond_to?(:options) && reflection.options[:conditions]) || {}
             conditions_from_reflection = conditions_from_reflection.call if conditions_from_reflection.is_a?(Proc)
 
             scope_conditions = conditions_from_reflection.empty? ? nil : {:conditions => conditions_from_reflection}
-            if conditions_from_options.any?
-              if Util.rails3?
-                reflection.klass.scoped(scope_conditions).where(conditions_from_options)
-              else
-                reflection.klass.where(scope_conditions[:conditions]).where(conditions_from_options)
-              end
+            where_conditions = (scope_conditions && scope_conditions[:conditions]) || {}
+            
+            if Util.rails3?
+              reflection.klass.scoped(scope_conditions).where({}) # where is uneccessary, but keeps the stubbing simpler while we support rails3
             else
-              
-              if Util.rails3?
-                find_options_from_options.merge!(:include => group_by) if self.respond_to?(:group_by) && group_by
-                reflection.klass.scoped(scope_conditions).where(find_options_from_options)
-              else
-                coll = reflection.klass.where(scope_conditions)
-                coll = coll.includes(group_by) if self.respond_to?(:group_by) && group_by
-                coll.where(find_options_from_options)
-              end
+              reflection.klass.where(where_conditions)
             end
           end
         end

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

@@ -8,12 +8,12 @@ module Formtastic
         end
         
         def error_sentence_html
-          error_class = options[:error_class] || builder.default_inline_error_class
+          error_class = builder.default_inline_error_class
           template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.html_safe), :class => error_class)
         end
                 
         def error_list_html
-          error_class = options[:error_class] || builder.default_error_list_class
+          error_class = builder.default_error_list_class
           list_elements = []
           errors.each do |error|
             list_elements << template.content_tag(:li, Formtastic::Util.html_safe(error.html_safe))
@@ -22,7 +22,7 @@ module Formtastic
         end
         
         def error_first_html
-          error_class = options[:error_class] || builder.default_inline_error_class
+          error_class = builder.default_inline_error_class
           template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => error_class)
         end
         

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

@@ -8,7 +8,7 @@ module Formtastic
             template.content_tag(
               :p, 
               Formtastic::Util.html_safe(hint_text), 
-              :class => (options[:hint_class] || builder.default_hint_class)
+              :class => builder.default_hint_class
             )
           end
         end

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

@@ -8,7 +8,7 @@ module Formtastic
         end
         
         def formtastic_options
-          [:priority_countries, :priority_zones, :member_label, :member_value, :collection, :required, :label, :as, :hint, :input_html, :value_as_class, :find_options, :class]
+          [:priority_countries, :priority_zones, :member_label, :member_value, :collection, :required, :label, :as, :hint, :input_html, :value_as_class, :class]
         end
       
       end

data/lib/formtastic/inputs/boolean_input.rb

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

data/lib/formtastic/inputs/color_input.rb

@@ -0,0 +1,42 @@
+module Formtastic
+  module Inputs
+
+    # Outputs a simple `<label>` with a HTML5 `<input type="color">` wrapped in the standard
+    # `<li>` wrapper. This is the default input choice for attributes with a name matching
+    # `/color/`, but can be applied to any text-like input with `:as => :color`.
+    #
+    # @example Full form context and output
+    #
+    #   <%= semantic_form_for(@user) do |f| %>
+    #     <%= f.inputs do %>
+    #       <%= f.input :color, :as => :color %>
+    #     <% end %>
+    #   <% end %>
+    #
+    #   <form...>
+    #     <fieldset>
+    #       <ol>
+    #         <li class="color">
+    #           <label for="user_color">Color</label>
+    #           <input type="color" id="user_color" name="user[color]">
+    #         </li>
+    #       </ol>
+    #     </fieldset>
+    #   </form>
+    #
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documentation of all possible options.
+    class ColorInput 
+      include Base
+      include Base::Stringish
+      include Base::Placeholder
+      
+      def to_html
+        raise "The :color input requires the color_field form helper, which is only available in Rails 4+" unless builder.respond_to?(:color_field)
+        input_wrapping do
+          label_html <<
+          builder.color_field(method, input_html_options)
+        end
+      end
+    end
+  end
+end

data/lib/formtastic/inputs/datetime_picker_input.rb

@@ -68,7 +68,10 @@ module Formtastic
     #   <%= f.input :publish_at, :as => :datetime_picker, :placeholder => "YYYY-MM-DD HH:MM" %>
     #   <%= f.input :publish_at, :as => :datetime_picker, :input_html => { :placeholder => "YYYY-MM-DD HH:MM" } %>
     #
-    # @example Using `datetime` (UTC) or `datetime-local` with `:local` (defaults to true, `datetime-local` input)
+    # @example Using `type=datetime-local` with `:local` option (this is the default, and recommended for browser support on iOS7 and Chrome)
+    #   <%= f.input :publish_at, :as => :datetime_picker, :local => true %>
+    #
+    # @example Using `type=datetime` with `:local` option (not recommended)
     #   <%= f.input :publish_at, :as => :datetime_picker, :local => false %>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documentation of all possible options.

data/lib/formtastic/inputs/hidden_input.rb

@@ -31,12 +31,8 @@ module Formtastic
     class HiddenInput 
       include Base
       
-      # Override to include :value set directly from options hash. The :value set in :input_html 
-      # hash will be preferred over :value set directly in the options.
-      #
-      # @deprecated :value option
       def input_html_options
-        options.slice(:value).merge(super).merge(:required => nil).merge(:autofocus => nil)
+        super.merge(:required => nil).merge(:autofocus => nil)
       end
       
       def to_html
@@ -63,4 +59,4 @@ module Formtastic
 
     end
   end
-end
+end

data/lib/formtastic/inputs/select_input.rb

@@ -140,22 +140,11 @@ module Formtastic
     class SelectInput
       include Base
       include Base::Collections
-      include Base::GroupedCollections
 
       def to_html
         input_wrapping do
-          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
+          select_html
         end
       end
 
@@ -163,19 +152,6 @@ module Formtastic
         builder.select(input_name, collection, input_options, input_html_options)
       end
 
-      def grouped_select_html
-        builder.grouped_collection_select(
-          input_name,
-          grouped_collection,
-          group_association,
-          group_label_method,
-          value_method,
-          label_method,
-          input_options,
-          input_html_options
-        )
-      end
-
       def include_blank
         options.key?(:include_blank) ? options[:include_blank] : (single? && builder.include_blank_for_select_by_default)
       end

data/lib/formtastic/localizer.rb

@@ -121,6 +121,8 @@ module Formtastic
       elsif 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)
+        [builder.options[:as].to_s]
       elsif builder.respond_to?(:options) && builder.options.key?(:parent_builder)
         # Rails 3.0 nested builder work-around case, where :parent_builder is provided by f.semantic_form_for
         [builder.options[:parent_builder].object_name.to_s, name]