formtastic 1.2.3 → 1.2.4.beta2

data/README.textile

@@ -256,8 +256,8 @@ Customize HTML attributes for any input using the @:input_html@ option. Typicall
 
 <pre>
   <% semantic_form_for @post do |form| %>
-    <%= form.input :title,      :input_html => { :size => 60 } %>
-    <%= form.input :body,       :input_html => { :class => 'autogrow' } %>
+    <%= form.input :title,      :input_html => {  :cols => 10 } %>
+    <%= form.input :body,       :input_html => { :class => 'autogrow', :rows => 10, :cols => 20, :maxlength => 10  } %>
     <%= form.input :created_at, :input_html => { :disabled => true } %>
     <%= form.buttons %>
   <% end %>

data/lib/formtastic.rb

@@ -286,7 +286,7 @@ module Formtastic #:nodoc:
       html_options = args.extract_options!
       html_options[:class] ||= "inputs"
       html_options[:name] = title
-
+      
       if html_options[:for] # Nested form
         inputs_for_nested_attributes(*(args << html_options), &block)
       elsif block_given?
@@ -569,7 +569,6 @@ module Formtastic #:nodoc:
         fields_for_block = if block_given?
           raise ArgumentError, 'You gave :for option with a block to inputs method, ' <<
                                'but the block does not accept any argument.' if block.arity <= 0
-
           lambda do |f|
             contents = f.inputs(*args){ block.call(f) }
             template.concat(contents) if ::Formtastic::Util.rails3?
@@ -1257,12 +1256,13 @@ module Formtastic #:nodoc:
         html_options  = options.delete(:input_html) || {}
         checked_value = options.delete(:checked_value) || '1'
         unchecked_value = options.delete(:unchecked_value) || '0'
+        checked = @object && ActionView::Helpers::InstanceTag.check_box_checked?(@object.send(:"#{method}"), checked_value)
 
         html_options[:id] = html_options[:id] || generate_html_id(method, "")
         input = template.check_box_tag(
           "#{@object_name}[#{method}]",
           checked_value,
-          (@object && @object.send(:"#{method}")),
+          checked,
           html_options
         )
         
@@ -1272,7 +1272,7 @@ module Formtastic #:nodoc:
         # the label() method will insert this nested input into the label at the last minute
         options[:label_prefix_for_nested_input] = input
 
-        template.hidden_field_tag("#{@object_name}[#{method}]", unchecked_value, :id => nil) << label(method, options)
+        template.hidden_field_tag((html_options[:name] || "#{@object_name}[#{method}]"), unchecked_value, :id => nil, :disabled => html_options[:disabled]) << label(method, options)
       end
 
       # Generates an input for the given method using the type supplied with :as.
@@ -1356,7 +1356,7 @@ module Formtastic #:nodoc:
         contents = args.last.is_a?(::Hash) ? '' : args.pop.flatten
         html_options = args.extract_options!
 
-        legend  = html_options.delete(:name).to_s
+        legend  = html_options.dup.delete(:name).to_s
         legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
         legend  = template.content_tag(:legend, template.content_tag(:span, Formtastic::Util.html_safe(legend))) unless legend.blank?
 
@@ -1620,6 +1620,8 @@ module Formtastic #:nodoc:
         if reflection = reflection_for(method)
           if [:has_and_belongs_to_many, :has_many].include?(reflection.macro)
             "#{method.to_s.singularize}_ids"
+          elsif reflection.respond_to? :foreign_key
+            reflection.foreign_key
           else
             reflection.options[:foreign_key] || "#{method}_id"
           end

data/lib/generators/templates/formtastic.css

@@ -30,7 +30,7 @@ form.formtastic ul.errors li { padding:0; border:none; display:list-item; }
 
 /* FIELDSETS & LISTS
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset { overflow:auto; } /* clearing contained floats */
+form.formtastic fieldset { overflow:hidden; } /* clearing contained floats */
 form.formtastic fieldset.inputs { }
 form.formtastic fieldset.buttons { padding-left:25%; }
 form.formtastic fieldset ol { }
@@ -39,7 +39,7 @@ form.formtastic fieldset.buttons li { float:left; padding-right:0.5em; }
 /* INPUT LIs
 --------------------------------------------------------------------------------------------------*/
 form.formtastic fieldset > ol > li { padding:0.5em 0; margin-top:-0.5em; margin-bottom:1em; } /* padding and negative margin juggling is for Firefox */
-form.formtastic fieldset > ol > li { overflow:auto; } /* clearing contained floats */
+form.formtastic fieldset > ol > li { overflow:hidden; } /* clearing contained floats */
 
 form.formtastic fieldset > ol > li.required { }
 form.formtastic fieldset > ol > li.optional { }
@@ -56,7 +56,7 @@ form.formtastic fieldset > ol > li > li label input { line-height:100%; vertical
 /* NESTED FIELDSETS AND LEGENDS (radio, check boxes and date/time inputs use nested fieldsets)
 --------------------------------------------------------------------------------------------------*/
 form.formtastic fieldset > ol > li fieldset { position:relative; }
-form.formtastic fieldset > ol > li fieldset legend { position:absolute; width:95%; padding-top:0.1em; left: 0px; }
+form.formtastic fieldset > ol > li fieldset legend { position:absolute; width:95%; left: 0px; }
 form.formtastic fieldset > ol > li fieldset legend span { position:absolute; }
 form.formtastic fieldset > ol > li fieldset legend.label label { position:absolute; }
 form.formtastic fieldset > ol > li fieldset ol { float:left; width:74%; margin:0; padding:0 0 0 25%; }

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: formtastic
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: -1848230054
+  prerelease: true
   segments: 
   - 1
   - 2
-  - 3
-  version: 1.2.3
+  - 4
+  - beta2
+  version: 1.2.4.beta2
 platform: ruby
 authors: 
 - Justin French
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-07 00:00:00 +11:00
+date: 2011-05-16 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency