justinfrench-formtastic 0.2.0 → 0.2.1

data/lib/formtastic.rb

@@ -554,10 +554,14 @@ module Formtastic #:nodoc:
     #
     # By default, all select inputs will have a blank option at the top of the list. You can add
     # a prompt with the :prompt option, or disable the blank option with :include_blank => false.
+    #
     def select_input(method, options)
       collection = find_collection_for_column(method, options)
       html_options = options.delete(:input_html) || {}
-      options[:include_blank] ||= true
+
+      unless options.key?(:include_blank) || options.key?(:prompt)
+        options[:include_blank] = true
+      end
 
       reflection = find_reflection(method)
       if reflection && [ :has_many, :has_and_belongs_to_many ].include?(reflection.macro)
@@ -1081,10 +1085,14 @@ module Formtastic #:nodoc:
     #
     def generate_association_input_name(method)
       if reflection = find_reflection(method)
-        method = "#{method.to_s.singularize}_id"
-        method = method.pluralize if [:has_and_belongs_to_many, :has_many].include?(reflection.macro)
+        if [:has_and_belongs_to_many, :has_many].include?(reflection.macro)
+          "#{method.to_s.singularize}_ids"
+        else
+          "#{method}_id"
+        end
+      else
+        method
       end
-      method
     end
 
     # If an association method is passed in (f.input :author) try to find the

data/spec/formtastic_spec.rb

@@ -106,7 +106,7 @@ describe 'Formtastic' do
     Post.stub!(:reflect_on_all_validations).and_return([])
     Post.stub!(:reflect_on_association).and_return do |column_name|
       case column_name
-      when :author
+      when :author, :author_status
         mock('reflection', :klass => Author, :macro => :belongs_to)
       when :authors
         mock('reflection', :klass => Author, :macro => :has_and_belongs_to_many)
@@ -1404,6 +1404,18 @@ describe 'Formtastic' do
           it 'should have one option with a "selected" attribute' do
             output_buffer.should have_tag('form li select option[@selected]', :count => 1)
           end
+
+          it 'should not singularize the association name' do
+            @new_post.stub!(:author_status).and_return(@bob)
+            @new_post.stub!(:author_status_id).and_return(@bob.id)
+            @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => :integer, :limit => 255))
+
+            semantic_form_for(@new_post) do |builder|
+              concat(builder.input(:author_status, :as => :select))
+            end
+
+            output_buffer.should have_tag('form li select#post_author_status_id')
+          end
         end
 
         describe 'for a has_many association' do
@@ -1499,7 +1511,7 @@ describe 'Formtastic' do
           end
           
           it 'should have a blank option by default' do
-            output_buffer.should have_tag("form li select option[@value='']", //)
+            output_buffer.should have_tag("form li select option[@value='']", "")
           end
         end
         
@@ -1512,25 +1524,25 @@ describe 'Formtastic' do
           end
           
           it 'should not have a blank option' do
-            output_buffer.should have_tag("form li select option[@value='']", //)
+            output_buffer.should_not have_tag("form li select option[@value='']", "")
           end
         end
-        
-        describe 'when :include_blank => true and :prompt => "choose something" is set' do
+
+        describe 'when :prompt => "choose something" is set' do
           before do
             @new_post.stub!(:author_id).and_return(nil)
             semantic_form_for(@new_post) do |builder|
-              concat(builder.input(:author, :as => :select, :include_blank => true, :prompt => "choose author"))
+              concat(builder.input(:author, :as => :select, :prompt => "choose author"))
             end
           end
 
-          it 'should have a blank select option' do
-            output_buffer.should have_tag("form li select option[@value='']", //)
-          end
-
           it 'should have a select with prompt' do
             output_buffer.should have_tag("form li select option[@value='']", /choose author/)
           end
+
+          it 'should not have a blank select option' do
+            output_buffer.should_not have_tag("form li select option[@value='']", "")
+          end
         end
 
         describe 'when no object is given' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: justinfrench-formtastic
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Justin French
@@ -9,7 +9,7 @@ autorequire: formtastic
 bindir: bin
 cert_chain: []
 
-date: 2009-05-30 00:00:00 -07:00
+date: 2009-06-17 00:00:00 -07:00
 default_executable: 
 dependencies: []