formtastic 0.9.5 → 0.9.6

data/generators/form/USAGE

@@ -8,8 +8,9 @@ DESCRIPTION
     ExistingModelName - The name of an existing model for which the generator should generate form code.
     
   Options:
-    --haml      Generate HAML instead of ERB.
-    --partial   Generate a form partial in the model views path, i.e. "_form.html.erb" or _form.html.haml".
+    --haml              Generate HAML instead of ERB.
+    --partial           Generate a form partial in the model views path, i.e. "_form.html.erb" or _form.html.haml".
+    --controller PATH   Generate for custom controller/view path - in case model and controller namespace is different, i.e. "admin/posts".
     
 EXAMPLE
   ./script/generate form ExistingModelName [--haml] [--partial]

data/generators/formtastic/templates/formtastic.rb

@@ -25,7 +25,7 @@
 # Formtastic::SemanticFormBuilder.inline_errors = :sentence
 
 # Set the method to call on label text to transform or format it for human-friendly
-# reading when formtastic is user without object. Defaults to :humanize.
+# reading (overridden if :label or i18 used). Defaults to :humanize.
 # Formtastic::SemanticFormBuilder.label_str_method = :humanize
 
 # Set the array of methods to try calling on parent objects in :select and :radio inputs

data/lib/formtastic.rb

@@ -673,7 +673,8 @@ module Formtastic #:nodoc:
       def select_input(method, options)
         html_options = options.delete(:input_html) || {}
         options = set_include_blank(options)
-        html_options[:multiple] = options.delete(:multiple) if html_options[:multiple].nil?
+        html_options[:multiple] = html_options[:multiple] || options.delete(:multiple)
+        html_options.delete(:multiple) if html_options[:multiple].nil?
 
         reflection = self.reflection_for(method)
         if reflection && [ :has_many, :has_and_belongs_to_many ].include?(reflection.macro)
@@ -701,6 +702,7 @@ module Formtastic #:nodoc:
                                          strip_formtastic_options(options), html_options)
         else
           collection = find_collection_for_column(method, options)
+
           self.select(input_name, collection, strip_formtastic_options(options), html_options)
         end
 

data/spec/commit_button_spec.rb

@@ -46,42 +46,42 @@ describe 'SemanticFormBuilder#commit_button' do
   describe "its accesskey" do
   
     it 'should allow nil default' do
-      ::Formtastic::SemanticFormBuilder.default_commit_button_accesskey.should == nil
-      output_buffer.should_not have_tag('li.commit input[@accesskey]')
+      with_config :default_commit_button_accesskey, nil do
+        output_buffer.should_not have_tag('li.commit input[@accesskey]')
+      end
     end
 
     it 'should use the default if set' do
-      ::Formtastic::SemanticFormBuilder.default_commit_button_accesskey = 's'
-      @new_post.stub!(:new_record?).and_return(false)
-      semantic_form_for(@new_post) do |builder|
-        concat(builder.commit_button('text', :button_html => {}))
+      with_config :default_commit_button_accesskey, 's' do
+        @new_post.stub!(:new_record?).and_return(false)
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.commit_button('text', :button_html => {}))
+        end
+        output_buffer.should have_tag('li.commit input[@accesskey="s"]')
       end
-      output_buffer.should have_tag('li.commit input[@accesskey="s"]')
     end
 
     it 'should use the value set in options over the default' do
-      ::Formtastic::SemanticFormBuilder.default_commit_button_accesskey = 's'
-      @new_post.stub!(:new_record?).and_return(false)
-      semantic_form_for(@new_post) do |builder|
-        concat(builder.commit_button('text', :accesskey => 'o'))
+      with_config :default_commit_button_accesskey, 's' do
+        @new_post.stub!(:new_record?).and_return(false)
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.commit_button('text', :accesskey => 'o'))
+        end
+        output_buffer.should_not have_tag('li.commit input[@accesskey="s"]')
+        output_buffer.should have_tag('li.commit input[@accesskey="o"]')
       end
-      output_buffer.should_not have_tag('li.commit input[@accesskey="s"]')
-      output_buffer.should have_tag('li.commit input[@accesskey="o"]')
     end
 
     it 'should use the value set in button_html over options' do
-      ::Formtastic::SemanticFormBuilder.default_commit_button_accesskey = 's'
-      @new_post.stub!(:new_record?).and_return(false)
-      semantic_form_for(@new_post) do |builder|
-        concat(builder.commit_button('text', :accesskey => 'o', :button_html => {:accesskey => 't'}))
+      with_config :default_commit_button_accesskey, 's' do
+        @new_post.stub!(:new_record?).and_return(false)
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.commit_button('text', :accesskey => 'o', :button_html => {:accesskey => 't'}))
+        end
+        output_buffer.should_not have_tag('li.commit input[@accesskey="s"]')
+        output_buffer.should_not have_tag('li.commit input[@accesskey="o"]')
+        output_buffer.should have_tag('li.commit input[@accesskey="t"]')
       end
-      output_buffer.should_not have_tag('li.commit input[@accesskey="s"]')
-      output_buffer.should_not have_tag('li.commit input[@accesskey="o"]')
-      output_buffer.should have_tag('li.commit input[@accesskey="t"]')
-    end
-
-    after do
-      ::Formtastic::SemanticFormBuilder.default_commit_button_accesskey = nil
     end
 
   end

data/spec/input_spec.rb

@@ -413,15 +413,12 @@ describe 'SemanticFormBuilder#input' do
 
           describe 'and label_str_method is :capitalize' do
             it 'should capitalize method name, passing it down to the label tag' do
-              old_value = ::Formtastic::SemanticFormBuilder.label_str_method
-              ::Formtastic::SemanticFormBuilder.label_str_method = :capitalize
-
-              semantic_form_for(:project, :url => 'http://test.host') do |builder|
-                concat(builder.input(:meta_description))
+              with_config :label_str_method, :capitalize do
+                semantic_form_for(:project, :url => 'http://test.host') do |builder|
+                  concat(builder.input(:meta_description))
+                end
+                output_buffer.should have_tag("form li label", /#{'meta_description'.capitalize}/)
               end
-
-              output_buffer.should have_tag("form li label", /#{'meta_description'.capitalize}/)
-              ::Formtastic::SemanticFormBuilder.label_str_method = old_value
             end
           end
         end

data/spec/inputs/select_input_spec.rb

@@ -53,7 +53,7 @@ describe 'select input' do
         concat(builder.input(:author, :as => :select))
       end
     end
-    
+
     it_should_have_input_wrapper_with_class("select")
     it_should_have_input_wrapper_with_id("post_author_input")
     it_should_have_label_with_text(/Author/)
@@ -61,12 +61,17 @@ describe 'select input' do
     it_should_apply_error_logic_for_input_type(:select)
     it_should_call_find_on_association_class_when_no_collection_is_provided(:select)
     it_should_use_the_collection_when_provided(:select, 'option')
-    
+
     it 'should have a select inside the wrapper' do
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#post_author_id')
     end
 
+    it 'should have a valid name' do
+      output_buffer.should have_tag("form li select[@name='post[author_id]']")
+      output_buffer.should_not have_tag("form li select[@name='post[author_id][]']")
+    end
+
     it 'should not create a multi-select' do
       output_buffer.should_not have_tag('form li select[@multiple]')
     end

data/spec/spec_helper.rb

@@ -200,6 +200,13 @@ module FormtasticSpecHelper
     end
   end
   
+  def with_config(config_method_name, value, &block)
+    old_value = ::Formtastic::SemanticFormBuilder.send(config_method_name)
+    ::Formtastic::SemanticFormBuilder.send(:"#{config_method_name}=", value)
+    yield
+    ::Formtastic::SemanticFormBuilder.send(:"#{config_method_name}=", old_value)
+  end
+  
 end
 
 ::ActiveSupport::Deprecation.silenced = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: formtastic
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Justin French