formtastic 2.0.0 → 2.0.1

data/CHANGELOG

@@ -1,3 +1,15 @@
+2.0.1
+
+* fixed that `:multiple => true` wasn't working when no association present
+
+2.0.0
+
+* Fixed that all check boxes were incorrectly checked if an Array was passed in to :collection 
+* Improved README 
+* Added form generator template for Slim template engine
+* Added support for Proc conditions in collection_from_association
+* Refactored commit button. Split it into a couple of different methods to make it easier to override.
+
 2.0.0.rc5
 
 * Changed perform_browser_validations and use_required_attribute configuration defaults from true to false for a better out-of-the-box experience and upgrade path

data/lib/formtastic/inputs/select_input.rb

@@ -184,7 +184,7 @@ module Formtastic
       
       def extra_input_html_options
         {
-          :multiple => multiple_by_association?,
+          :multiple => multiple?,
           :name => "#{object_name}[#{association_primary_key}]#{'[]' if multiple?}"
         }
       end
@@ -194,7 +194,7 @@ module Formtastic
       end
       
       def multiple_by_options?
-        options[:multiple]
+        options[:multiple] || (options[:input_html] && options[:input_html][:multiple])
       end
       
       def multiple?

data/lib/formtastic/version.rb

@@ -1,3 +1,3 @@
 module Formtastic
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/spec/inputs/select_input_spec.rb

@@ -452,15 +452,32 @@ describe 'select input' do
   end
 
   describe 'when no association exists' do
-    before(:each) do
+
+    it 'should still generate a valid name attribute' do
       concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:author_name, :as => :select, :collection => ::Author.all))
       end)
-    end
-
-    it 'should still generate a valid name attribute' do
       output_buffer.should have_tag("form li select[@name='project[author_name]']")
     end
+    
+    describe 'and :multiple is set to true through :input_html' do
+      it "should make the select a multi-select" do
+        concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          concat(builder.input(:author_name, :as => :select, :input_html => {:multiple => true} ))
+        end)
+        output_buffer.should have_tag("form li select[@multiple]")
+      end
+    end
+    
+    describe 'and :multiple is set to true' do
+      it "should make the select a multi-select" do
+        concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          concat(builder.input(:author_name, :as => :select, :multiple => true, :collection => ["Fred", "Bob"]))
+        end)
+        output_buffer.should have_tag("form li select[@multiple]")
+      end
+    end
+    
   end
 
   describe 'when a grouped collection collection is given' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: formtastic
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Justin French
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-23 00:00:00 +10:00
+date: 2011-10-03 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency