formtastic 2.2.1 → 2.3.0.rc

data/.travis.yml

@@ -1,26 +1,30 @@
-before_install: gem update --system
+before_install: 
+  - gem update --system
+  - gem update bundler
 rvm:
   - 1.8.7
   - ree
   - 1.9.2
   - 1.9.3
 gemfile:
-  - gemfiles/rails-3.0.gemfile
-  - gemfiles/rails-3.1.gemfile
-  - gemfiles/rails-3.2.gemfile
-  - gemfiles/rails-4.gemfile
+  - gemfiles/rails_3.0.gemfile
+  - gemfiles/rails_3.1.gemfile
+  - gemfiles/rails_3.2.gemfile
 env:
   - DEFER_GC=false RAILS_EDGE=true
 script: "rake spec"
 matrix:
-  exclude:
-    - rvm: 1.8.7
-      gemfile: gemfiles/rails-4.gemfile
+  include:
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails_4.gemfile
       env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: ree
-      gemfile: gemfiles/rails-4.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails_4.gemfile
       env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: 1.9.2
-      gemfile: gemfiles/rails-4.gemfile
+  allow_failures:
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails_edge.gemfile
+      env: DEFER_GC=false RAILS_EDGE=true
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails_edge.gemfile
       env: DEFER_GC=false RAILS_EDGE=true
-      

data/Appraisals

@@ -10,9 +10,12 @@ appraise 'rails-3.2' do
   gem 'rails',      '~> 3.2.0'
 end
 
+appraise 'rails-4' do
+  gem 'rails', '~> 4.0.0'
+end
+
 if ENV["RAILS_EDGE"] == "true"
-  appraise 'rails-4' do
+  appraise 'rails-edge' do
     gem 'rails', :git => 'git://github.com/rails/rails.git'
-    gem 'active_record_deprecated_finders', :git=>'https://github.com/rails/active_record_deprecated_finders.git'
   end
-end
+end

data/CHANGELOG

@@ -1,3 +1,7 @@
+HEAD
+
+* Allow to use a custom ActionView::Base.field_error_proc
+
 2.2.1
 
 * Rails 4 compatibilty updates

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec

data/README.textile

@@ -5,6 +5,15 @@ Formtastic is a Rails FormBuilder DSL (with some other goodies) to make it far e
 <a href='http://www.pledgie.com/campaigns/2178'><img alt='Click here to lend your support to: formtastic and make a donation at www.pledgie.com !' src='http://pledgie.com/campaigns/2178.png?skin_name=chrome' border='0' /></a>
 
 
+h2. Documentation & Support
+
+* "Documentation is available on rdoc.info":http://rdoc.info/projects/justinfrench/formtastic
+* "We track issues & bugs on GitHub":http://github.com/justinfrench/formtastic/issues
+* "We have a wiki on GitHub":http://github.com/justinfrench/formtastic/wiki
+* "StackOverflow can help":http://stackoverflow.com/questions/tagged/formtastic
+* "Follow @formtastic on Twitter for news & updates":http://twitter.com/formtastic
+
+
 h2. Compatibility
 
 * Formtastic 2.1.x is Rails 3.x compatible
@@ -75,11 +84,6 @@ h2. Opinions
 * Make the common things we do easy, yet ensure uncommon things are still possible.
 
 
-h2. Documentation
-
-RDoc documentation _should_ be automatically generated after each commit and made available on the "rdoc.info website":http://rdoc.info/projects/justinfrench/formtastic.
-
-
 h2. Installation
 
 Simply add Formtastic to your Gemfile and bundle it up:
@@ -250,12 +254,7 @@ Alternatively, the current index can be accessed via the `inputs` block's argume
 <pre>
   <%= semantic_form_for @post do |f| %>
     <%= f.inputs :for => :categories do |category, i| %>
-      <% if i <= 2 %>
-        <%= f.inputs :name => "Category ##{i}" %>
-      <% else %>
-        <%= f.inputs :name => "Category ##{i} (optional)" %>
-      <% end %>
-    <% end %>
+      ...
     <%= f.actions %>
   <% end %>
 </pre>
@@ -531,7 +530,7 @@ Values for @labels@/@hints@/@actions@ are can take values: @String@ (explicit va
 
 h2. Semantic errors
 
-You can show errors on base (by default) and any other attribute just passing it name to semantic_errors method:
+You can show errors on base (by default) and any other attribute just by passing its name to the semantic_errors method:
 
 <pre>
   <%= semantic_form_for @post do |f| %>
@@ -608,28 +607,20 @@ Formtastic::FormBuilder.escape_html_entities_in_hints_and_labels = false
 
 h2. Dependencies
 
-There are none, but...
+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/chrislerum/country_select (or any other country_select plugin with the same API).
-* "rspec":http://github.com/dchelimsky/rspec/, "rspec_hpricot_matchers":http://rubyforge.org/projects/rspec-hpricot/ and "rcov":http://github.com/relevance/rcov gems (plus any of their own dependencies) are required for the test suite.
+* There are a bunch of development dependencies
 
 
 h2. How to contribute
 
 * Fork the project on Github
 * Create a topic branch for your changes
+* Ensure that you provide test coverage for your changes
 * Ensure that all tests pass (`bundle exec rake`)
-* Ensure that the changes in your branch are as atomic as possible
 * Create a pull request on Github
 
-For significant changes, you may wish to discuss your idea on the Formtastic Google group before coding to ensure that your change is likely to be accepted. Formtastic relies heavily on i18n, so if you're unsure of the impact this has on your changes, please discuss them with the group.
-
-
-h2. Google Group, Twitter, etc
-
-Please join the "Formtastic Google Group":http://groups.google.com.au/group/formtastic, especially if you'd like to talk about a new feature, or report a bug.
-
-You can also follow "@justinfrench":http://twitter.com/formtastic or  "@formtastic":http://twitter.com/formtastic on Twitter for announcements, tutorials and links.
 
 h2. Project Info
 

data/Rakefile

@@ -3,7 +3,6 @@ require 'bundler/setup'
 require 'appraisal'
 require 'rdoc/task'
 require 'rspec/core/rake_task'
-require 'tasks/verify_rcov'
 
 Bundler::GemHelper.install_tasks
 
@@ -38,19 +37,3 @@ desc 'Test the formtastic plugin with specdoc formatting and colors'
 RSpec::Core::RakeTask.new('specdoc') do |t|
   t.pattern = FileList['spec/**/*_spec.rb']
 end
-
-desc 'Run all examples with RCov'
-RSpec::Core::RakeTask.new('rcov') do |t|
-  t.pattern = FileList['spec/**/*_spec.rb']
-  t.rcov = true
-  t.rcov_opts = %w(--exclude gems/*,spec/*,.bundle/*, --aggregate coverage.data)
-end
-
-RCov::VerifyTask.new(:verify_coverage) do |t|
-  t.require_exact_threshold = false
-  t.threshold = (RUBY_VERSION == "1.8.7" ? 95 : 0)
-end
-
-desc "Run all examples and verify coverage"
-task :spec_and_verify_coverage => [:rcov, :verify_coverage] do
-end

data/app/assets/stylesheets/formtastic.css

@@ -194,7 +194,8 @@ This stylesheet forms part of the Formtastic Rails Plugin
   width:72%;
 }
 
-.formtastic .stringish input[size] {
+.formtastic .stringish input[size],
+.formtastic .stringish input[max] {
   width:auto;
   max-width:72%;
 }

data/formtastic.gemspec

@@ -25,15 +25,16 @@ Gem::Specification.new do |s|
 
   s.add_dependency(%q<actionpack>, [">= 3.0"])
 
-  s.add_development_dependency(%q<rspec-rails>, ["~> 2.8.0"])
+  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.12.0"])
   s.add_development_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
   s.add_development_dependency(%q<hpricot>, ["~> 0.8.3"])
   s.add_development_dependency(%q<BlueCloth>) # for YARD
   s.add_development_dependency(%q<yard>, ["~> 0.6"])
-  s.add_development_dependency(%q<rcov>, ["~> 0.9.9"])
   s.add_development_dependency(%q<colored>)
   s.add_development_dependency(%q<tzinfo>)
-  s.add_development_dependency(%q<ammeter>, ["~> 0.2.5"])
+  s.add_development_dependency(%q<ammeter>, ["0.2.5"])
   s.add_development_dependency(%q<appraisal>)
   s.add_development_dependency(%q<rake>)
+  s.add_development_dependency(%q<activemodel>)
 end

data/gemfiles/{rails-3.0.gemfile → rails_3.0.gemfile}

@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "rails", "~> 3.0.0"
 

data/gemfiles/{rails-3.1.gemfile → rails_3.1.gemfile}

@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "rails", "~> 3.1.0"
 

data/gemfiles/{rails-3.2.gemfile → rails_3.2.gemfile}

@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "rails", "~> 3.2.0"
 

data/gemfiles/rails_4.gemfile

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

data/gemfiles/rails_edge.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", :git=>"git://github.com/rails/rails.git"
+
+gemspec :path=>"../"

data/lib/formtastic/form_builder.rb

@@ -81,6 +81,13 @@ module Formtastic
       fields_for(record_or_name_or_array, *(args << options), &block)
     end
     
+    def initialize(object_name, object, template, options, block=nil)
+      super
+      if respond_to?('multipart=') && options.is_a?(Hash) && options[:html]
+        self.multipart = options[:html][:multipart]
+      end
+    end
+    
   end
 
 end

data/lib/formtastic/helpers/fieldset_wrapper.rb

@@ -72,7 +72,7 @@ module Formtastic
         return duck + 1 if duck.is_a?(Fixnum)
         
         # First try to extract key from duck Hash, then try child
-        i = (duck[key] || duck[child]).to_i + 1
+        (duck[key] || duck[child]).to_i + 1
       end
 
     end

data/lib/formtastic/helpers/form_helper.rb

@@ -58,6 +58,12 @@ module Formtastic
       @@default_form_class = 'formtastic'
       mattr_accessor :default_form_class
 
+      # Allows to set a custom field_error_proc wrapper. By default this wrapper
+      # is disabled since `formtastic` already adds an error class to the LI tag
+      # containing the input. Change this from `config/initializers/formtastic.rb`.
+      @@field_error_proc = proc { |html_tag, instance_tag| html_tag }
+      mattr_accessor :field_error_proc
+
       # Wrapper around Rails' own `form_for` helper to set the `:builder` option to
       # `Formtastic::FormBuilder` and to set some class names on the `<form>` tag such as
       # `formtastic` and the downcased and underscored model name (eg `post`).
@@ -155,7 +161,7 @@ module Formtastic
           when Array then options[:as] || singularizer.call(record_or_name_or_array.last.class)  # [@post, @comment] # => "comment"
           else options[:as] || singularizer.call(record_or_name_or_array.class)                  # @post => "post"
         end
-        options[:html][:class] = class_names.join(" ")
+        options[:html][:class] = class_names.compact.join(" ")
 
         with_custom_field_error_proc do
           self.form_for(record_or_name_or_array, *(args << options), &proc)
@@ -178,17 +184,9 @@ module Formtastic
 
       protected
 
-      # Override the default ActiveRecordHelper behaviour of wrapping the input.
-      # This gets taken care of semantically by adding an error class to the LI tag
-      # containing the input.
-      # @private
-      FIELD_ERROR_PROC = proc do |html_tag, instance_tag|
-        html_tag
-      end
-
       def with_custom_field_error_proc(&block)
         default_field_error_proc = ::ActionView::Base.field_error_proc
-        ::ActionView::Base.field_error_proc = FIELD_ERROR_PROC
+        ::ActionView::Base.field_error_proc = @@field_error_proc
         yield
       ensure
         ::ActionView::Base.field_error_proc = default_field_error_proc

data/lib/formtastic/helpers/input_helper.rb

@@ -232,6 +232,7 @@ module Formtastic
       # @todo Many many more examples. Some of the detail probably needs to be pushed out to the relevant methods too.
       # @todo More i18n examples.
       def input(method, options = {})
+        method = method.to_sym if method.is_a?(String)
         options = options.dup # Allow options to be shared without being tainted by Formtastic
         options[:as] ||= default_input_type(method, options)
 

data/lib/formtastic/inputs/base.rb

@@ -65,7 +65,6 @@ module Formtastic
       include Html
       include Options
       include Database
-      include Database
       include Errors
       include Hints
       include Naming

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

@@ -85,10 +85,21 @@ module Formtastic
 
             scope_conditions = conditions_from_reflection.empty? ? nil : {:conditions => conditions_from_reflection}
             if conditions_from_options.any?
-              reflection.klass.scoped(scope_conditions).where(conditions_from_options)
+              if Util.rails3?
+                reflection.klass.scoped(scope_conditions).where(conditions_from_options)
+              else
+                reflection.klass.where(scope_conditions[:conditions]).where(conditions_from_options)
+              end
             else
-              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)
+              
+              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
             end
           end
         end
@@ -113,7 +124,7 @@ module Formtastic
         # Avoids an issue where `send_or_call` can be a String and duck can be something simple like
         # `:first`, which obviously String responds to.
         def send_or_call_or_object(duck, object)
-          return object if object.is_a?(String) # TODO what about other classes etc?
+          return object if object.is_a?(String) || object.is_a?(Integer) # TODO what about other classes etc?
           send_or_call(duck, object)
         end
 

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

@@ -10,13 +10,10 @@ module Formtastic
         end
         
         def label_html_options
-          # opts = options_for_label(options) # TODO
-          opts = {}
-          opts[:for] ||= input_html_options[:id]
-          opts[:class] = [opts[:class]]
-          opts[:class] << 'label'
-          
-          opts
+          {
+            :for => input_html_options[:id],
+            :class => ['label'],
+          }
         end
         
         def label_text

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

@@ -5,7 +5,7 @@ module Formtastic
         def input_html_options
           defaults = super
 
-          # override rails default size - not valid on numeric inputs
+          # override rails default size - does not apply to numeric inputs
           #@todo document/spec
           defaults[:size] = nil
           

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, :label_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, :find_options, :class]
         end
       
       end

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

@@ -65,6 +65,9 @@ module Formtastic
       # @example Change the labels for each fragment
       #   <%= f.input :publish_at, :as => :date_select, :labels => { :year => "Y", :month => "M", :day => "D" }  %>
       #
+      # @example Suppress the labels for all fragments
+      #   <%= f.input :publish_at, :as => :date_select, :labels => false  %>
+      #
       # @example Skip a fragment (defaults to 1, skips all following fragments)
       #   <%= f.input :publish_at, :as => :datetime_select, :discard_minute => true  %>
       #   <%= f.input :publish_at, :as => :datetime_select, :discard_hour => true  %>
@@ -130,8 +133,10 @@ module Formtastic
         end
         
         def fragment_label(fragment)
-          labels_from_options = options[:labels] || {}
-          if labels_from_options.key?(fragment)
+          labels_from_options = options.key?(:labels) ? options[:labels] : {}
+          if !labels_from_options
+            ''
+          elsif labels_from_options.key?(fragment)
             labels_from_options[fragment]
           else
             ::I18n.t(fragment.to_s, :default => fragment.to_s.humanize, :scope => [:datetime, :prompts])
@@ -183,8 +188,11 @@ module Formtastic
         
         def i18n_date_fragments
           order = ::I18n.t(:order, :scope => [:date])
-          order = nil unless order.is_a?(Array)
-          order
+          if order.is_a?(Array)
+            order.map &:to_sym
+          else
+            nil
+          end
         end
         
         def fragments_wrapping(&block)