formtastic 1.2.1 → 1.2.2

data/README.textile

@@ -634,12 +634,37 @@ h2. Compatibility
 
 h2. How to contribute
 
-Please ensure that you provide appropriate spec/test coverage and ensure the documentation is up-to-date.  Bonus points if you perform your changes in a clean topic branch rather than master, and if you create an issue on GH for us to discuss your changes. Pull requests tend to get lost.
+Please ensure that you provide appropriate spec/test coverage and ensure the documentation is up-to-date.  Bonus points if you perform your changes in a clean topic branch rather than master, and if you create a pull request for your changes to be discussed and reviewed.
 
 Please also keep your commits *atomic* so that they are more likely to apply cleanly.  That means that each commit should contain the smallest possible logical change.  Don't commit two features at once, don't update the gemspec at the same time you add a feature, don't fix a whole bunch of whitespace in a file at the same time you change a few lines, etc, etc.
 
 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.
 
+See below for installation of a development environment.
+
+
+h2. Development Environment
+
+We currently support both Rails 2 and Rails 3, under Ruby 1.8.7-ish (and 1.9.2-ish). That means, at a bare minimum, you'll want to set-up two rvm gemsets to run your specs against. So, fork the project on Github, clone it, make some gemsets, run bundler, run your specs and then finally set-up an .rvmrc file that specifies Rails 3 as your default gemset and cd back into that directory to load in the .rvmrc file. Something like this:
+
+<pre>
+  $ cd ~/code/formtastic
+  $ rvm gemset create formtastic-rails3
+  $ rvm gemset use formtastic-rails3
+  $ gem install bundler
+  $ bundle install
+  $ rake spec
+  $ rm Gemfile.lock
+  $ rvm gemset create formtastic-rails2
+  $ rvm gemset use formtastic-rails2
+  $ gem install bundler
+  $ RAILS_2=true bundle install
+  $ rake spec
+  $ touch .rvmrc
+  $ echo "rvm gemset use formtastic-rails-3" > .rvmrc
+  $ cd ~/code/formtastic
+</pre>
+
 
 h2. Maintainers & Contributors
 

data/lib/formtastic.rb

@@ -295,11 +295,6 @@ module Formtastic #:nodoc:
       end
     end
 
-    def input_field_set(*args, &block)
-      ::ActiveSupport::Deprecation.warn("input_field_set() is deprecated and will be removed in Formtastic 1.3 or later, use inputs() instead.", caller)
-      inputs(args, &block)
-    end
-
     # Creates a fieldset and ol tag wrapping for form buttons / actions as list items.
     # See inputs documentation for a full example.  The fieldset's default class attriute
     # is set to "buttons".
@@ -318,11 +313,6 @@ module Formtastic #:nodoc:
       end
     end
 
-    def button_field_set(*args, &block)
-      ::ActiveSupport::Deprecation.warn("button_field_set() is deprecated and will be removed in Formtastic 1.3 or later, use inputs() instead.", caller)
-      buttons(args, &block)
-    end
-
     # Creates a submit input tag with the value "Save [model name]" (for existing records) or
     # "Create [model name]" (for new records) by default:
     #
@@ -335,15 +325,11 @@ module Formtastic #:nodoc:
     #
     # And you can pass html atributes down to the input, with or without the button text:
     #
-    #  <%= form.commit_button "Go" %> => <input name="commit" type="submit" value="Go" class="{create|update|submit}" />
-    #  <%= form.commit_button :class => "pretty" %> => <input name="commit" type="submit" value="Save Post" class="pretty {create|update|submit}" />
-    #
+    #  <%= form.commit_button :button_html => { :class => "pretty" } %> => <input name="commit" type="submit" value="Save Post" class="pretty {create|update|submit}" />
     def commit_button(*args)
       options = args.extract_options!
-      ::ActiveSupport::Deprecation.warn(":class => 'whatever' is deprecated on commit button, use :wrapper_html => { :class => 'whatever' } instead.", caller) if options.key?(:class)
       text = options.delete(:label) || args.shift
 
-
       if @object && (@object.respond_to?(:persisted?) || @object.respond_to?(:new_record?))
         if @object.respond_to?(:persisted?) # ActiveModel
           key = @object.persisted? ? :update : :create
@@ -374,9 +360,9 @@ module Formtastic #:nodoc:
       button_html = options.delete(:button_html) || {}
       button_html.merge!(:class => [button_html[:class], key].compact.join(' '))
 
-      wrapper_html_class = ['commit', options.delete(:class)].compact # TODO: Add class reflecting on form action.
+      wrapper_html_class = ['commit'] # TODO: Add class reflecting on form action.
       wrapper_html = options.delete(:wrapper_html) || {}
-      wrapper_html[:class] = (wrapper_html_class << wrapper_html[:class] << button_html[:class]).flatten.compact.join(' ')
+      wrapper_html[:class] = (wrapper_html_class << wrapper_html[:class]).flatten.compact.join(' ')
 
       accesskey = (options.delete(:accesskey) || self.class.default_commit_button_accesskey) unless button_html.has_key?(:accesskey)
       button_html = button_html.merge(:accesskey => accesskey) if accesskey
@@ -594,7 +580,7 @@ module Formtastic #:nodoc:
       #
       def strip_formtastic_options(options) #:nodoc:
         options.except(:value_method, :label_method, :collection, :required, :label,
-                       :as, :hint, :input_html, :label_html, :value_as_class, :find_options)
+                       :as, :hint, :input_html, :label_html, :value_as_class, :find_options, :class)
       end
 
       # Determins if the attribute (eg :title) should be considered required or not.
@@ -631,6 +617,8 @@ module Formtastic #:nodoc:
 
       # Determines whether the given options evaluate to true
       def options_require_validation?(options) #nodoc
+        allow_blank = options[:allow_blank]
+        return !allow_blank unless allow_blank.nil?
         if_condition = !options[:if].nil?
         condition = if_condition ? options[:if] : options[:unless]
 
@@ -818,12 +806,7 @@ module Formtastic #:nodoc:
         if reflection && [ :has_many, :has_and_belongs_to_many ].include?(reflection.macro)
           html_options[:multiple] = true if html_options[:multiple].nil?
           html_options[:size]     ||= 5
-
-          if html_options[:multiple]
-            options[:include_blank]   = false
-          else
-            options[:include_blank]   ||= false
-          end
+          options[:include_blank] ||= false
         end
         options = set_include_blank(options)
         input_name = generate_association_input_name(method)
@@ -855,11 +838,6 @@ module Formtastic #:nodoc:
         self.label(method, label_options) << select_html
       end
 
-      def boolean_select_input(method, options)
-        ::ActiveSupport::Deprecation.warn(":as => :boolean_select is deprecated and will be removed in Formtastic 1.3 or later. Use :as => :select instead.", caller)
-        select_input(method, options)
-      end
-
       # Outputs a timezone select input as Rails' time_zone_select helper. You
       # can give priority zones as option.
       #
@@ -963,11 +941,6 @@ module Formtastic #:nodoc:
         )
       end
 
-      def boolean_radio_input(method, options)
-        ::ActiveSupport::Deprecation.warn(":as => :boolean_radio is deprecated and will be removed in Formtastic 1.3 or later. Use :as => :radio instead.", caller)
-        radio_input(method, options)
-      end
-
       # Outputs a fieldset with a legend for the method label, and a ordered list (ol) of list
       # items (li), one for each fragment for the date (year, month, day).  Each li contains a label
       # (eg "Year") and a select box. Overwriting the label is possible by adding the :labels option.
@@ -1270,20 +1243,20 @@ module Formtastic #:nodoc:
       # to the column name (method name) and can be altered with the :label option.
       # :checked_value and :unchecked_value options are also available.
       def boolean_input(method, options)
-        html_options = options.delete(:input_html) || {}
+        html_options  = options.delete(:input_html) || {}
         checked_value = options.delete(:checked_value) || '1'
         unchecked_value = options.delete(:unchecked_value) || '0'
 
-        field_id = generate_html_id(method, "")
+        html_options[:id] = html_options[:id] || generate_html_id(method, "")
         input = template.check_box_tag(
           "#{@object_name}[#{method}]",
           checked_value,
           (@object && @object.send(:"#{method}")),
-          :id => field_id
+          html_options
         )
         
         options = options_for_label(options)
-        options[:for] ||= field_id
+        options[:for] ||= html_options[:id]
 
         # the label() method will insert this nested input into the label at the last minute
         options[:label_prefix_for_nested_input] = input

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: formtastic
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Justin French
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-22 00:00:00 +11:00
+date: 2010-11-29 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency