formtastic 1.0.0.rc → 1.0.0.rc2

data/Rakefile

@@ -53,8 +53,8 @@ begin
     
     # Runtime dependencies: When installing Formtastic these will be checked if they are installed.
     # Will be offered to install these if they are not already installed.
-    s.add_dependency 'activesupport', '>= 2.3.0'
-    s.add_dependency 'actionpack', '>= 2.3.0'
+    s.add_dependency 'activesupport', '>= 2.3.0', '< 3.0.0'
+    s.add_dependency 'actionpack', '>= 2.3.0', '< 3.0.0'
     s.add_dependency 'i18n', '< 0.4'
     
     # Development dependencies. Not installed by default.

data/lib/formtastic.rb

@@ -617,15 +617,14 @@ module Formtastic #:nodoc:
       end
 
       # Outputs a hidden field inside the wrapper, which should be hidden with CSS.
-      # Additionals options can be given and will be sent straight to hidden input
-      # element.
+      # Additionals options can be given using :input_hml. Should :input_html not be
+      # specified every option except for formtastic options will be sent straight
+      # to hidden input element.
       #
       def hidden_input(method, options)
         options ||= {}
-        if options[:input_html].present?
-          options[:value] = options[:input_html][:value] if options[:input_html][:value].present?
-        end
-        self.hidden_field(method, strip_formtastic_options(options))
+        html_options = options.delete(:input_html) || strip_formtastic_options(options)
+        self.hidden_field(method, html_options)
       end
 
       # Outputs a label and a select box containing options from the parent
@@ -888,10 +887,7 @@ module Formtastic #:nodoc:
         end
         
         template.content_tag(:fieldset,
-          template.content_tag(:legend, 
-            template.label_tag(nil, localized_string(method, options[:label], :label) || humanized_attribute_name(method), :for => nil), :class => :label
-          ) << 
-          template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
+          legend_tag(method, options) << template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
         )
       end
       alias :boolean_radio_input :radio_input
@@ -1159,12 +1155,9 @@ module Formtastic #:nodoc:
           template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
         end
 
-        template.content_tag(:fieldset,
-          template.content_tag(:legend, 
-            template.label_tag(nil, localized_string(method, options[:label], :label) || humanized_attribute_name(method), :for => nil), :class => :label
-          ) << 
-          template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
-        )
+        fieldset_content = legend_tag(method, options)
+        fieldset_content << template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
+        template.content_tag(:fieldset, fieldset_content)
       end
 
       # Outputs a country select input, wrapping around a regular country_select helper. 
@@ -1346,6 +1339,13 @@ module Formtastic #:nodoc:
           )
       end
 
+      # Generates the legend for radiobuttons and checkboxes
+      def legend_tag(method, options = {})
+        (options[:label] == false) ? Formtastic::Util.html_safe("") : template.content_tag(:legend, 
+            template.label_tag(nil, localized_string(method, options[:label], :label) || humanized_attribute_name(method), :for => nil), :class => :label
+          )
+      end
+
       # For methods that have a database column, take a best guess as to what the input method
       # should be.  In most cases, it will just return the column type (eg :string), but for special
       # cases it will simplify (like the case of :integer, :float & :decimal to :numeric), or do

data/spec/inputs/check_boxes_input_spec.rb

@@ -277,6 +277,20 @@ describe 'check_boxes input' do
         output_buffer.should have_tag("legend.label label", /The authors/)
       end
     end
+
+    describe "when :label option is false" do
+      before do
+        @output_buffer = ''
+        @new_post.stub!(:author_ids).and_return(nil)
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:authors, :as => :check_boxes, :label => false, :morton => true))
+        end
+      end
+
+      it "should not output the legend" do
+        output_buffer.should_not have_tag("legend.label")
+      end
+    end
   end
 end
 

data/spec/inputs/hidden_input_spec.rb

@@ -13,6 +13,8 @@ describe 'hidden input' do
       concat(builder.input(:secret, :as => :hidden))
       concat(builder.input(:author_id, :as => :hidden, :value => 99))
       concat(builder.input(:published, :as => :hidden, :input_html => {:value => true}))
+      concat(builder.input(:reviewer, :as => :hidden, :input_html => {:class => 'new_post_reviewer', :id => 'new_post_reviewer'}))
+      concat(builder.input(:author, :as => :hidden, :value => 'direct_value', :input_html => {:value => "formtastic_value"}))
     end
   end
 
@@ -34,6 +36,14 @@ describe 'hidden input' do
   it "should pass any explicitly specified value - using :input_html options" do
     output_buffer.should have_tag("form li input#post_published[@type=\"hidden\"][@value=\"true\"]")
   end
+
+  it "should pass any option specified using :input_html" do
+    output_buffer.should have_tag("form li input#new_post_reviewer[@type=\"hidden\"][@class=\"new_post_reviewer\"]")
+  end
+
+  it "should prefer :input_html over directly supplied options" do
+    output_buffer.should have_tag("form li input#post_author[@type=\"hidden\"][@value=\"formtastic_value\"]")
+  end
   
   it "should not render inline errors" do
     @errors = mock('errors')

data/spec/inputs/radio_input_spec.rb

@@ -207,4 +207,18 @@ describe 'radio input' do
       output_buffer.should have_tag("legend.label label", /The authors/)
     end
   end
+
+  describe "when :label option is false" do
+    before do
+      @output_buffer = ''
+      @new_post.stub!(:author_ids).and_return(nil)
+      semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:authors, :as => :radio, :label => false))
+      end
+    end
+
+    it "should not output the legend" do
+      output_buffer.should_not have_tag("legend.label")
+    end
+  end
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 0
   - 0
-  - rc
-  version: 1.0.0.rc
+  - rc2
+  version: 1.0.0.rc2
 platform: ruby
 authors: 
 - Justin French
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-01 00:00:00 +10:00
+date: 2010-08-09 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,6 +30,13 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
+    - - <
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,6 +51,13 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
+    - - <
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency