nofxx-formtastic 0.1.6 → 0.1.7

data/README.textile

@@ -1,7 +1,11 @@
-h1. Formtastic 0.1.3
+h1. Formtastic 0.1.4
 
 Formtastic is a Rails FormBuilder DSL (with some other goodies) to make it far easier to create beautiful, semantically rich, syntactically awesome, readily stylable and wonderfully accessible HTML forms in your Rails applications.
 
+h2. Warning
+
+This fork adds jQuery only add/remove nested partial.
+
 h2. The Story
 
 One day, I finally had enough, so I opened up my text editor, and wrote a DSL for how I'd like to author forms:
@@ -83,10 +87,10 @@ You can (and should) get it as a gem:
 And then add it as a dependency in your environment.rb file:
 
 <pre>
-  config.gem "justinfrench-formtastic", 
-    :lib     => 'formtastic', 
-    :source  => 'http://gems.github.com', 
-    :version => '0.1.3'
+  config.gem "justinfrench-formtastic",
+    :lib     => 'formtastic',
+    :source  => 'http://gems.github.com',
+    :version => '0.1.4'
 </pre>
 
 If you're a little more old school, install it as a plugin:
@@ -95,6 +99,13 @@ If you're a little more old school, install it as a plugin:
   ./script/plugin install git://github.com/justinfrench/formtastic.git
 </pre>
 
+h3. jQuery
+
+To use the cliente side add/remove partial, make sure you got:
+
+* "jquery.template":http://stanlemon.net/projects/jquery-templates.html
+
+Avaiable on the DOM.
 
 h2. Usage
 
@@ -156,18 +167,20 @@ If you want to customize the label text, or render some hint text below the fiel
   <% end %>
 </pre>
 
-If you want to customize html elements for any non button inputs you just need
-to specify the :input_html options hash.
+If you want to customize html elements for any non button inputs and the li
+wrapper you just need to specify the :input_html and :wrapper_html options hash.
 
 <pre>
     <% semantic_form_for @post do |form| %>
       <%= form.input :title, :input_html => {:size => 60} %>
-      <%= form.input :body %>
+      <%= form.input :body, :wrapper_html => { :class => 'body_wrapper' } %>
       <%= form.input :created_at, :input_html => {:disabled => true} %>
       <%= form.buttons %>
     <% end %>
 </pre>
 
+To customize buttons, :button_html is available.
+
 Nested forms (Rails 2.3) are also supported. You can do it in the Rails way:
 
 <pre>
@@ -237,14 +250,14 @@ If you wish, put something like this in config/initializers/formtastic_config.rb
   # Should all fields be considered "required" by default
   # Defaults to true, see ValidationReflection notes below
   Formtastic::SemanticFormBuilder.all_fields_required_by_default = false
-  
+
   # Set the string that will be appended to the labels/fieldsets which are required
   # It accepts string or procs and the default is a localized version of
   # '<abbr title="required">*</abbr>'. In other words, if you configure formtastic.required
   # in your locale, it will replace the abbr title properly. But if you don't want to use
   # abbr tag, you can simply give a string as below
   Formtastic::SemanticFormBuilder.required_string = "(required)"
-  
+
   # Set the string that will be appended to the labels/fieldsets which are optional
   # Defaults to an empty string ("") and also accepts procs (see required_string above)
   Formtastic::SemanticFormBuilder.optional_string = "(optional)"
@@ -329,22 +342,24 @@ h2. Contributors
 Formtastic wouldn't be as awesome as it is today if it weren't for the wonderful contributions of these fine, fine coders.  An extra huge thanks goes out to "José Valim":http://github.com/josevalim for nearly 50 patches.
 
 * "Justin French":http://justinfrench.com
+* "José Valim":http://github.com/josevalim
+* "Jeff Smick":http://github.com/sprsquish
+* "Tien Dung":http://github.com/tiendung
+* "Mark Mansour":http://stateofflux.com
+* "Andy Pearson":http://github.com/andypearson
+* "negonicrac":http://github.com/negonicrac
 * "Xavier Shay":http://rhnh.net
-* "Bin Dong":http://github.com/dongbin
-* "Ben Hamill":http://blog.benhamill.com/
 * "Pat Allan":http://github.com/freelancing-god
-* "negonicrac":http://github.com/negonicrac
-* "Andy Pearson":http://github.com/andypearson
-* "Mark Mansour":http://stateofflux.com
-* "Tien Dung":http://github.com/tiendung
-* "Sascha Hoellger":http://github.com/mitnal
-* "Jeff Smick":http://github.com/sprsquish
-* "José Valim":http://github.com/josevalim
-* "Greg Fitzgerald":http://github.com/gregf/
 * "Gareth Townsend":http://github.com/quamen
+* "Sascha Hoellger":http://github.com/mitnal
+* "Andrew Carpenter":http://github.com/andrewcarpenter
 * "Jack Dempsey":http://github.com/jackdempsey/
+* "Greg Fitzgerald":http://github.com/gregf/
+* "Hector E. Gomez Morales":http://github.com/hectoregm
+* "Ben Hamill":http://blog.benhamill.com/
 * "Simon Chiu":http://github.com/tolatomeow
-
+* "Bin Dong":http://github.com/dongbin
+* "Marcos Piccinini":http://github.com/nofxx
 
 h2. Hey, join the Google group!
 

data/Rakefile

@@ -20,7 +20,7 @@ begin
     
     s.require_path = 'lib'
     s.autorequire = GEM
-    s.files = %w(MIT-LICENSE README.textile Rakefile) + Dir.glob("{rails,lib,spec}/**/*")
+    s.files = %w(MIT-LICENSE README.textile Rakefile) + Dir.glob("{rails,lib,generators,spec}/**/*")
   end
 rescue LoadError
   puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/generators/formtastic_stylesheets/formtastic_stylesheets_generator.rb

@@ -0,0 +1,21 @@
+class FormtasticStylesheetsGenerator < Rails::Generator::Base
+  
+  def initialize(*runtime_args)
+    super
+  end
+  
+  def manifest
+    record do |m|
+      m.directory File.join('public', 'stylesheets')
+      m.template 'formtastic.css',   File.join('public', 'stylesheets', 'formtastic.css')
+      m.template 'formtastic_changes.css',   File.join('public', 'stylesheets', 'formtastic_changes.css')
+    end
+  end
+  
+  protected
+  
+  def banner
+    %{Usage: #{$0} #{spec.name}\nCopies formtastic.css and formtastic_changes.css to public/}
+  end
+  
+end

data/generators/formtastic_stylesheets/templates/formtastic.css

@@ -0,0 +1,119 @@
+/* -------------------------------------------------------------------------------------------------
+
+It's *strongly* suggested that you don't modify this file.  Instead, load a new stylesheet after
+this one in your layouts (eg formtastic_changes.css) and override the styles to suit your needs.
+This will allow you to update formtastic.css with new releases without clobbering your own changes.
+
+This stylesheet forms part of the Formtastic Rails Plugin
+(c) 2008 Justin French
+
+--------------------------------------------------------------------------------------------------*/
+
+
+/* NORMALIZE AND RESET - obviously inspired by Yahoo's reset.css, but scoped to just form.formtastic
+--------------------------------------------------------------------------------------------------*/
+form.formtastic, form.formtastic ul, form.formtastic ol, form.formtastic li, form.formtastic fieldset, form.formtastic legend, form.formtastic input, form.formtastic textarea, form.formtastic select, form.formtastic p { margin:0; padding:0; }
+form.formtastic fieldset { border:0; }
+form.formtastic em, form.formtastic strong { font-style:normal; font-weight:normal; }
+form.formtastic ol, form.formtastic ul { list-style:none; }
+form.formtastic abbr, form.formtastic acronym { border:0; font-variant:normal; }
+form.formtastic input, form.formtastic textarea, form.formtastic select { font-family:inherit; font-size:inherit; font-weight:inherit; }
+form.formtastic input, form.formtastic textarea, form.formtastic select { font-size:100%; }
+form.formtastic legend { color:#000; }
+
+
+/* FIELDSETS & LISTS
+--------------------------------------------------------------------------------------------------*/
+form.formtastic fieldset { }
+form.formtastic fieldset.inputs { }
+form.formtastic fieldset.buttons { padding-left:25%; }
+form.formtastic fieldset ol { }
+
+/* clearfixing the fieldsets */
+form.formtastic fieldset { display: inline-block; }
+form.formtastic fieldset:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+html[xmlns] form.formtastic fieldset { display: block; }
+* html form.formtastic fieldset { height: 1%; }
+
+
+/* INPUT LIs
+--------------------------------------------------------------------------------------------------*/
+form.formtastic fieldset ol li { margin-bottom:1.5em; }
+
+/* clearfixing the li's */
+form.formtastic fieldset ol li { display: inline-block; }
+form.formtastic fieldset ol li:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+html[xmlns] form.formtastic fieldset ol li { display: block; }
+* html form.formtastic fieldset ol li { height: 1%; }
+
+form.formtastic fieldset ol li.required { }
+form.formtastic fieldset ol li.optional { }
+form.formtastic fieldset ol li.error { }
+
+
+/* LABELS
+--------------------------------------------------------------------------------------------------*/
+form.formtastic fieldset ol li label { display:block; width:25%; float:left; padding-top:.2em; }
+form.formtastic fieldset ol li li label { line-height:100%; padding-top:0; }
+form.formtastic fieldset ol li li label input { line-height:100%; vertical-align:middle; margin-top:-0.1em;}
+
+
+/* NESTED FIELDSETS AND LEGENDS (radio 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:25%; padding-top:0.1em; }
+form.formtastic fieldset ol li fieldset legend span { position:absolute; }
+form.formtastic fieldset ol li fieldset ol { float:left; width:74%; margin:0; padding:0 0 0 25%; }
+form.formtastic fieldset ol li fieldset ol li { padding:0; border:0; }
+
+/* INLINE HINTS
+--------------------------------------------------------------------------------------------------*/
+form.formtastic fieldset ol li p.inline-hints { color:#666; margin:0.5em 0 0 25%; }
+
+
+/* INLINE ERRORS
+--------------------------------------------------------------------------------------------------*/
+form.formtastic fieldset ol li p.inline-errors { color:#cc0000; margin:0.5em 0 0 25%; }
+form.formtastic fieldset ol li ul.errors { color:#cc0000; margin:0.5em 0 0 25%; list-style:square; }
+form.formtastic fieldset ol li ul.errors li { padding:0; border:none; display:list-item; }
+
+
+/* STRING & NUMERIC OVERRIDES
+--------------------------------------------------------------------------------------------------*/
+form.formtastic fieldset ol li.string input { width:74%; }
+form.formtastic fieldset ol li.numeric input { width:74%; }
+
+
+/* TEXTAREA OVERRIDES
+--------------------------------------------------------------------------------------------------*/
+form.formtastic fieldset ol li.text textarea { width:74%; }
+
+
+/* CHECKBOX OVERRIDES
+--------------------------------------------------------------------------------------------------*/
+form.formtastic fieldset ol li.boolean label { padding-left:25%; width:auto; }
+form.formtastic fieldset ol li.boolean label input { margin:0 0.5em 0 0.2em; }
+
+
+/* RADIO OVERRIDES
+--------------------------------------------------------------------------------------------------*/
+form.formtastic fieldset ol li.radio { }
+form.formtastic fieldset ol li.radio fieldset ol { margin-bottom:-0.6em; }
+form.formtastic fieldset ol li.radio fieldset ol li { margin:0.1em 0 0.5em 0; }
+form.formtastic fieldset ol li.radio fieldset ol li label { float:none; width:100%; }
+form.formtastic fieldset ol li.radio fieldset ol li label input { margin-right:0.2em; }
+
+
+/* DATE & TIME OVERRIDES
+--------------------------------------------------------------------------------------------------*/
+form.formtastic fieldset ol li.date fieldset ol li,
+form.formtastic fieldset ol li.time fieldset ol li,
+form.formtastic fieldset ol li.datetime fieldset ol li { float:left; width:auto; margin:0 .3em 0 0; }
+
+form.formtastic fieldset ol li.date fieldset ol li label,
+form.formtastic fieldset ol li.time fieldset ol li label,
+form.formtastic fieldset ol li.datetime fieldset ol li label { display:none; }
+
+form.formtastic fieldset ol li.date fieldset ol li label input,
+form.formtastic fieldset ol li.time fieldset ol li label input,
+form.formtastic fieldset ol li.datetime fieldset ol li label input { display:inline; margin:0; padding:0;  }

data/generators/formtastic_stylesheets/templates/formtastic_changes.css

@@ -0,0 +1,10 @@
+/* -------------------------------------------------------------------------------------------------
+
+Load this stylesheet after formtastic.css in your layouts to override the CSS to suit your needs.
+This will allow you to update formtastic.css with new releases without clobbering your own changes.
+
+For example, to make the inline hint paragraphs a little darker in color than the standard #666:
+
+form.formtastic fieldset ol li p.inline-hints { color:#333; }
+
+--------------------------------------------------------------------------------------------------*/

data/lib/formtastic.rb

@@ -35,7 +35,6 @@ module Formtastic #:nodoc:
     STRING_MAPPINGS = [ :string, :password, :numeric ]
 
     attr_accessor :template
-    attr_writer   :nested_child_index
 
     # Returns a suitable form input for the given +method+, using the database column information
     # and other factors (like the method name) to figure out what you probably want.
@@ -47,6 +46,7 @@ module Formtastic #:nodoc:
     # * :required - specify if the column is required (true) or not (false)
     # * :hint - provide some text to hint or help the user provide the correct information for a field
     # * :input_html - provide options that will be passed down to the generated input
+    # * :wrapper_html - provide options that will be passed down to the li wrapper
     #
     # Input Types:
     #
@@ -55,6 +55,7 @@ module Formtastic #:nodoc:
     # columns all map to a single numeric_input, for example).
     #
     # * :select (a select menu for associations) - default to association names
+    # * :time_zone (a select menu with time zones)
     # * :radio (a set of radio inputs for associations) - default to association names
     # * :password (a password input) - default for :string column types with 'password' in the method name
     # * :text (a textarea) - default for :text column types
@@ -80,26 +81,22 @@ module Formtastic #:nodoc:
       options[:required] = method_required?(method, options[:required])
       options[:as]     ||= default_input_type(method)
 
-      options[:label]  ||= if @object
-        @object.class.human_attribute_name(method.to_s)
-      else
-        method.to_s.send(@@label_str_method)
-      end
+      html_class = [ options[:as], (options[:required] ? :required : :optional) ]
+      html_class << 'error' if @object && @object.respond_to?(:errors) && @object.errors.on(method.to_s)
+
+      wrapper_html = options.delete(:wrapper_html) || {}
+      wrapper_html[:id]  ||= generate_html_id(method)
+      wrapper_html[:class] = (html_class << wrapper_html[:class]).flatten.compact.join(' ')
 
       if [:boolean_select, :boolean_radio].include?(options[:as])
         ::ActiveSupport::Deprecation.warn(":as => :#{options[:as]} is deprecated, use :as => :#{options[:as].to_s[8..-1]} instead", caller[3..-1])
       end
 
-      html_class = [ options[:as], (options[:required] ? :required : :optional) ].join(' ')
-      html_class << ' error' if @object && @object.errors.on(method.to_s)
-
-      html_id = generate_html_id(method)
-
       list_item_content = @@inline_order.map do |type|
         send(:"inline_#{type}_for", method, options)
       end.compact.join("\n")
 
-      return template.content_tag(:li, list_item_content, { :id => html_id, :class => html_class })
+      return template.content_tag(:li, list_item_content, wrapper_html)
     end
 
     # Creates an input fieldset and ol tag wrapping for use around a set of inputs.  It can be
@@ -233,21 +230,15 @@ module Formtastic #:nodoc:
       html_options = args.extract_options!
       html_options[:class] ||= "inputs"
 
-      if fields_for_object = html_options.delete(:for)
-        html_options.merge!(:parent_builder => self)
-        inputs_for_nested_attributes(fields_for_object, args << html_options,
-                                     html_options.delete(:for_options) || {}, &block)
+      if html_options[:for]
+        inputs_for_nested_attributes(args, html_options, &block)
       elsif block_given?
         field_set_and_list_wrapping(html_options, &block)
       else
         if @object && args.empty?
-          # Get all belongs_to association
           args  = @object.class.reflections.map { |n,_| n if _.macro == :belongs_to }
-
-          # Get content columns and remove timestamps columns from it
           args += @object.class.content_columns.map(&:name)
           args -= %w[created_at updated_at created_on updated_on]
-
           args.compact!
         end
         contents = args.map { |method| input(method.to_sym) }
@@ -285,9 +276,10 @@ module Formtastic #:nodoc:
     #
     #  <%= form.commit_button "Go" %> => <input name="commit" type="submit" value="Go" />
     #
-    def commit_button(value=nil, options = {})
-      value ||= save_or_create_button_text
-      template.content_tag(:li, template.submit_tag(value), :class => "commit")
+    def commit_button(value=nil, options={})
+      value     ||= save_or_create_button_text
+      button_html = options.delete(:button_html) || {}
+      template.content_tag(:li, self.submit(value, button_html), :class => "commit")
     end
 
     # A thin wrapper around #fields_for to set :builder => Formtastic::SemanticFormBuilder
@@ -323,7 +315,14 @@ module Formtastic #:nodoc:
     #  Dinamically add and remove nested forms for a has_many relation.
     #
 
-    # Add a link to remove the associated partial
+    # Add a link to remove the associated partial. You should add this on the partial
+    #
+    # Example:
+    #
+    # #contacts
+    #   = f.input :phone
+    #   = f.remove_link
+    #
     def remove_link(name, *args)
       options = args.extract_options!
       css_selector = options.delete(:selector) || ".#{@object.class.name.split("::").last.underscore}"
@@ -336,6 +335,12 @@ module Formtastic #:nodoc:
     end
 
     # Add a link to add more partials
+    #
+    # Example:
+    #
+    # - f.inputs "contacts" do
+    #   = f.add_associated_link :contacts, :partial => "other/path"
+    #
     def add_associated_link(name, association, opts = {})
       object = @object.send(association).build
       associated_name = extract_option_or_class_name(opts, :name, object)
@@ -345,7 +350,7 @@ module Formtastic #:nodoc:
       partial = opts.delete(:partial) || associated_name
       container = opts.delete(:expression) || "'#{opts.delete(:container) || '#'+associated_name.pluralize}'"
 
-      form = self.render_associated_form(object, :partial => partial)
+      form = render_associated_form(object, :partial => partial)
       form.gsub!(/attributes_(\d+)/, '__idx__')
       form.gsub!(/\[(\d+)\]/, '__idxx__')
 
@@ -363,7 +368,6 @@ module Formtastic #:nodoc:
       opts.symbolize_keys!
       (opts[:new] - associated.select(&:new_record?).length).times { associated.build } if opts[:new]
 
-
       unless associated.empty?
         name = extract_option_or_class_name(opts, :name, associated.first)
         partial = opts[:partial] || name
@@ -371,7 +375,7 @@ module Formtastic #:nodoc:
 
         output = associated.map do |element|
           fields_for(association_name(name), element, (opts[:fields_for] || {}).merge(:name => name)) do |f|
-            template.render({:partial => "#{partial}", :locals => {local_assign_name.to_sym => element, :f => f}.merge(opts[:locals] || {})}.merge(opts[:render] || {}))
+            render({:partial => "#{partial}", :locals => {local_assign_name.to_sym => element, :f => f}.merge(opts[:locals] || {})}.merge(opts[:render] || {}))
           end
         end
       output.join
@@ -397,17 +401,20 @@ module Formtastic #:nodoc:
     #
     # It should raise an error if a block with arity zero is given.
     #
-    def inputs_for_nested_attributes(fields_for_object, inputs, options, &block)
+    def inputs_for_nested_attributes(args, options, &block)
+      args << options.merge!(:parent => { :builder => self, :for => options[:for] })
+
       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
 
-        proc { |f| f.inputs(*inputs){ block.call(f) } }
+        proc { |f| f.inputs(*args){ block.call(f) } }
       else
-        proc { |f| f.inputs(*inputs) }
+        proc { |f| f.inputs(*args) }
       end
 
-      semantic_fields_for(*(Array(fields_for_object) << options), &fields_for_block)
+      fields_for_args = [options.delete(:for), options.delete(:for_options) || {}].flatten
+      semantic_fields_for(*fields_for_args, &fields_for_block)
     end
 
     # Remove any Formtastic-specific options before passing the down options.
@@ -568,6 +575,20 @@ module Formtastic #:nodoc:
     end
     alias :boolean_select_input :select_input
 
+    # Outputs a timezone select input as Rails' time_zone_select helper. You
+    # can give priority zones as option.
+    #
+    # Examples:
+    #
+    #   f.input :time_zone, :as => :time_zone, :priority_zones => /Australia/
+    #
+    def time_zone_input(method, options)
+      html_options = options.delete(:input_html) || {}
+
+      input_label(method, options.delete(:label), options.slice(:required)) +
+      self.time_zone_select(method, options.delete(:priority_zones), set_options(options), html_options)
+    end
+
     # Outputs a fieldset containing a legend for the label text, and an ordered list (ol) of list
     # items, one for each possible choice in the belongs_to association.  Each li contains a
     # label and a radio input.
@@ -748,11 +769,13 @@ module Formtastic #:nodoc:
     def boolean_input(method, options)
       html_options = options.delete(:input_html) || {}
 
-      content = self.check_box(method, set_options(options).merge(html_options),
-                               options.delete(:checked_value) || '1', options.delete(:unchecked_value) || '0')
+      input = self.check_box(method, set_options(options).merge(html_options),
+                             options.delete(:checked_value) || '1', options.delete(:unchecked_value) || '0')
 
-      # required does not make sense in check box
-      input_label(method, content + options.delete(:label), :skip_required => true)
+      # Generate the label by hand because required or optional does not make sense here
+      label = options.delete(:label) || humanized_attribute_name(method)
+
+      self.label(method, input + label, options)
     end
 
     # Generates an input for the given method using the type supplied with :as.
@@ -776,16 +799,32 @@ module Formtastic #:nodoc:
     # or as sentence. If :none is set, no error is shown.
     #
     def inline_errors_for(method, options)  #:nodoc:
-      return nil unless @object && [:sentence, :list].include?(@@inline_errors)
+      return nil unless @object && @object.respond_to?(:errors) && [:sentence, :list].include?(@@inline_errors)
+
+      # Ruby 1.9: Strings are not Enumerable, ie no String#to_a
+      errors = @object.errors.on(method.to_s)
+      unless errors.respond_to?(:to_a)
+        errors = [errors]
+      else
+        errors = errors.to_a
+      end
+
+      # Ruby 1.9: Strings are not Enumerable, ie no String#to_a
+      errors = @object.errors.on(method.to_s)
+      unless errors.respond_to?(:to_a)
+        errors = [errors]
+      else
+        errors = errors.to_a
+      end
 
-      errors = @object.errors.on(method.to_s).to_a
       send("error_#{@@inline_errors}", errors) unless errors.empty?
     end
 
     # Generates hints for the given method using the text supplied in :hint.
     #
     def inline_hints_for(method, options) #:nodoc:
-      options[:hint].blank? ? '' : template.content_tag(:p, options[:hint], :class => 'inline-hints')
+      return if options[:hint].blank?
+      template.content_tag(:p, options[:hint], :class => 'inline-hints')
     end
 
     # Creates an error sentence by calling to_sentence on the errors array.
@@ -809,7 +848,8 @@ module Formtastic #:nodoc:
     # with class label.
     #
     def input_label(method, text, options={}, as_span=false) #:nodoc:
-      text << required_or_optional_string(options.delete(:required)) unless options.delete(:skip_required)
+      text ||= humanized_attribute_name(method)
+      text  << required_or_optional_string(options.delete(:required))
 
       if as_span
         options[:class] ||= 'label'
@@ -841,23 +881,18 @@ module Formtastic #:nodoc:
     # And it will generate a fieldset for each task with legend 'Task #1', 'Task #2',
     # 'Task #3' and so on.
     #
-    # If you are using inputs :for, for more than one association in the same
-    # form builder, you might want to set the nested_child_index as well. You
-    # can do that doing:
-    #
-    #   f.nested_child_index = -1
-    #
-    def field_set_and_list_wrapping(html_options, contents = '', &block) #:nodoc:
-      # Generates the legend text allowing nested_child_index support for interpolation
-      legend_text  = html_options.delete(:name).to_s
-      legend_text %= html_options[:parent_builder].instance_variable_get('@nested_child_index').to_i + 1
+    def field_set_and_list_wrapping(html_options, contents='', &block) #:nodoc:
+      legend  = html_options.delete(:name).to_s
+      legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
+      legend  = template.content_tag(:legend, template.content_tag(:span, legend)) unless legend.blank?
 
-      legend = legend_text.blank? ? "" : template.content_tag(:legend, template.content_tag(:span, legend_text))
       contents = template.capture(&block) if block_given?
 
+      # Ruby 1.9: String#to_s behavior changed, need to make an explicit join.
+      contents = contents.join if contents.respond_to?(:join)
       fieldset = template.content_tag(:fieldset,
         legend + template.content_tag(:ol, contents),
-        html_options.except(:builder, :parent_builder)
+        html_options.except(:builder, :parent)
       )
 
       template.concat(fieldset) if block_given?
@@ -874,7 +909,7 @@ module Formtastic #:nodoc:
       )
     end
 
-    # For methods that have a database column, take a best guess as to what the inout method
+    # 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
     # something different (like :password and :select).
@@ -885,23 +920,22 @@ module Formtastic #:nodoc:
     def default_input_type(method) #:nodoc:
       return :string if @object.nil?
 
-      # Find the column object by attribute
       column = @object.column_for_attribute(method) if @object.respond_to?(:column_for_attribute)
 
-      # Associations map by default to a select
-      return :select if column.nil? && find_reflection(method)
-
       if column
         # handle the special cases where the column type doesn't map to an input method
-        return :select   if column.type == :integer && method.to_s =~ /_id$/
-        return :datetime if column.type == :timestamp
-        return :numeric  if [:integer, :float, :decimal].include?(column.type)
-        return :password if column.type == :string && method.to_s =~ /password/
+        return :time_zone if column.type == :string && method.to_s =~ /time_?zone/
+        return :select    if column.type == :integer && method.to_s =~ /_id$/
+        return :datetime  if column.type == :timestamp
+        return :numeric   if [:integer, :float, :decimal].include?(column.type)
+        return :password  if column.type == :string && method.to_s =~ /password/
+
         # otherwise assume the input name will be the same as the column type (eg string_input)
         return column.type
       else
         obj = @object.send(method) if @object.respond_to?(method)
 
+        return :select   if find_reflection(method)
         return :file     if obj && @@file_methods.any? { |m| obj.respond_to?(m) }
         return :password if method.to_s =~ /password/
         return :string
@@ -986,7 +1020,7 @@ module Formtastic #:nodoc:
     # reflection object.
     #
     def find_reflection(method)
-      object.class.reflect_on_association(method) if object.class.respond_to?(:reflect_on_association)
+      @object.class.reflect_on_association(method) if @object.class.respond_to?(:reflect_on_association)
     end
 
     # Generates default_string_options by retrieving column information from
@@ -1020,10 +1054,34 @@ module Formtastic #:nodoc:
       "#{sanitized_object_name}#{index}_#{sanitized_method_name}_#{value}"
     end
 
+    # Gets the nested_child_index value from the parent builder. In Rails 2.3
+    # it always returns a fixnum. In next versions it returns a hash with each
+    # association that the parent builds.
+    #
+    def parent_child_index(parent)
+      duck = parent[:builder].instance_variable_get('@nested_child_index')
+
+      if duck.is_a?(Hash)
+        child = parent[:for]
+        child = child.first if child.respond_to?(:first)
+        duck[child].to_i + 1
+      else
+        duck.to_i + 1
+      end
+    end
+
     def sanitized_object_name
       @sanitized_object_name ||= @object_name.to_s.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
     end
 
+    def humanized_attribute_name(method)
+      if @object && @object.class.respond_to?(:human_attribute_name)
+        @object.class.human_attribute_name(method.to_s)
+      else
+        method.to_s.send(@@label_str_method)
+      end
+    end
+
   end
 
 

data/spec/formtastic_spec.rb

@@ -28,6 +28,7 @@ describe 'Formtastic' do
   include ActionView::Helpers::CaptureHelper
   include ActiveSupport
   include ActionController::PolymorphicRoutes
+  include ActionController
 
   include Formtastic::SemanticFormHelper
 
@@ -561,7 +562,7 @@ describe 'Formtastic' do
           end
 
           it 'should call the corresponding input method' do
-            [:select, :radio, :date, :datetime, :time, :boolean].each do |input_style|
+            [:select, :time_zone, :radio, :date, :datetime, :time, :boolean].each do |input_style|
               @new_post.stub!(:generic_column_name)
               @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
               semantic_form_for(@new_post) do |builder|
@@ -647,6 +648,47 @@ describe 'Formtastic' do
           end
 
         end
+
+        describe ':wrapper_html option' do
+
+          describe 'when provided' do
+            it 'should be passed down to the li tag' do
+              semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title, :wrapper_html => {:id => :another_id}))
+              end
+              output_buffer.should have_tag("form li#another_id")
+            end
+
+            it 'should append given classes to li default classes' do
+              semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title, :wrapper_html => {:class => :another_class}, :required => true))
+              end
+              output_buffer.should have_tag("form li.string")
+              output_buffer.should have_tag("form li.required")
+              output_buffer.should have_tag("form li.another_class")
+            end
+
+            it 'should allow classes to be an array' do
+              semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title, :wrapper_html => {:class => [ :my_class, :another_class ]}))
+              end
+              output_buffer.should have_tag("form li.string")
+              output_buffer.should have_tag("form li.my_class")
+              output_buffer.should have_tag("form li.another_class")
+            end
+          end
+
+          describe 'when not provided' do
+            it 'should use default id and class' do
+              semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title))
+              end
+              output_buffer.should have_tag("form li#post_title_input")
+              output_buffer.should have_tag("form li.string")
+            end
+          end
+
+        end
       end
 
       describe ':as any type of input' do
@@ -971,6 +1013,57 @@ describe 'Formtastic' do
         end
       end
 
+      describe ":as => :time_zone" do
+        before do
+          @new_post.stub!(:time_zone)
+          @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => :string))
+
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:time_zone))
+          end
+        end
+
+        it "should have a time_zone class on the wrapper" do
+          output_buffer.should have_tag('form li.time_zone')
+        end
+
+        it 'should have a post_title_input id on the wrapper' do
+          output_buffer.should have_tag('form li#post_time_zone_input')
+        end
+
+        it 'should generate a label for the input' do
+          output_buffer.should have_tag('form li label')
+          output_buffer.should have_tag('form li label[@for="post_time_zone"')
+          output_buffer.should have_tag('form li label', /Time zone/)
+        end
+
+        it "should generate a select" do
+          output_buffer.should have_tag("form li select")
+          output_buffer.should have_tag("form li select#post_time_zone")
+          output_buffer.should have_tag("form li select[@name=\"post[time_zone]\"]")
+        end
+
+        it 'should use input_html to style inputs' do
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:time_zone, :input_html => { :class => 'myclass' }))
+          end
+          output_buffer.should have_tag("form li select.myclass")
+        end
+
+        it 'should generate input and labels even if no object is given' do
+          semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+            concat(builder.input(:time_zone, :as => :time_zone))
+          end
+
+          output_buffer.should have_tag('form li label')
+          output_buffer.should have_tag('form li label[@for="project_time_zone"')
+          output_buffer.should have_tag('form li label', /Time zone/)
+
+          output_buffer.should have_tag("form li select")
+          output_buffer.should have_tag("form li select#project_time_zone")
+          output_buffer.should have_tag("form li select[@name=\"project[time_zone]\"]")
+        end
+      end
 
       describe ':as => :radio' do
 
@@ -1145,7 +1238,7 @@ describe 'Formtastic' do
 
           it 'should have a label inside the wrapper' do
             output_buffer.should have_tag('form li label')
-            output_buffer.should have_tag('form li label', /Posts/)
+            output_buffer.should have_tag('form li label', /Post ids/)
             output_buffer.should have_tag("form li label[@for='author_post_ids']")
           end
 
@@ -1187,7 +1280,7 @@ describe 'Formtastic' do
 
           it 'should have a label inside the wrapper' do
             output_buffer.should have_tag('form li label')
-            output_buffer.should have_tag('form li label', /Authors/)
+            output_buffer.should have_tag('form li label', /Author ids/)
             output_buffer.should have_tag("form li label[@for='post_author_ids']")
           end
 
@@ -1658,22 +1751,20 @@ describe 'Formtastic' do
         describe 'when :discard_input => true is set' do
 
           it 'should use default hidden value equals to 1 when attribute returns nil' do
-                      pending
             semantic_form_for(@new_post) do |builder|
               concat(builder.input(:publish_at, :as => :datetime, :discard_day => true))
             end
 
-            output_buffer.should have_tag("form li fieldset ol input[@type='hidden'][@value='1']")
+            output_buffer.should have_tag("form li fieldset input[@type='hidden'][@value='1']")
           end
 
           it 'should use default attribute value when it is not nil' do
-            pending
             @new_post.stub!(:publish_at).and_return(Date.new(2007,12,27))
             semantic_form_for(@new_post) do |builder|
               concat(builder.input(:publish_at, :as => :datetime, :discard_day => true))
             end
 
-            output_buffer.should have_tag("form li fieldset ol input[@type='hidden'][@value='27']")
+            output_buffer.should have_tag("form li fieldset input[@type='hidden'][@value='27']")
           end
         end
 
@@ -1787,15 +1878,13 @@ describe 'Formtastic' do
         end
 
         it 'should have five labels for hour and minute' do
-          pending
-          output_buffer.should have_tag('form li.time fieldset ol li label', :count => 2)
-          output_buffer.should have_tag('form li.time fieldset ol li label', /hour/i)
-          output_buffer.should have_tag('form li.time fieldset ol li label', /minute/i)
+          output_buffer.should have_tag('form li.time fieldset li label', :count => 2)
+          output_buffer.should have_tag('form li.time fieldset li label', /hour/i)
+          output_buffer.should have_tag('form li.time fieldset li label', /minute/i)
         end
 
         it 'should have five selects for hour and minute' do
-          pending
-          output_buffer.should have_tag('form li.time fieldset ol li select', :count => 2)
+          output_buffer.should have_tag('form li.time fieldset li select', :count => 2)
         end
       end
 
@@ -1970,7 +2059,7 @@ describe 'Formtastic' do
 
           it 'should send parent_builder as an option to allow child index interpolation' do
             semantic_form_for(@new_post) do |builder|
-              builder.should_receive(:instance_variable_get).with('@nested_child_index').and_return(0)
+              builder.instance_variable_set('@nested_child_index', 0)
               builder.inputs :for => [:author, @bob], :name => 'Author #%i' do |bob_builder|
                 concat('input')
               end
@@ -1978,6 +2067,17 @@ describe 'Formtastic' do
 
             output_buffer.should have_tag('fieldset legend', 'Author #1')
           end
+
+          it 'should also provide child index interpolation when nested child index is a hash' do
+            semantic_form_for(@new_post) do |builder|
+              builder.instance_variable_set('@nested_child_index', :author => 10)
+              builder.inputs :for => [:author, @bob], :name => 'Author #%i' do |bob_builder|
+                concat('input')
+              end
+            end
+
+            output_buffer.should have_tag('fieldset legend', 'Author #11')
+          end
         end
 
         describe 'when a :name option is provided' do
@@ -2314,6 +2414,16 @@ describe 'Formtastic' do
           output_buffer.should have_tag('li.commit input[@name="commit"]')
         end
 
+        it 'should pass options given in :button_html to the button' do
+          @new_post.stub!(:new_record?).and_return(false)
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.commit_button('text', :button_html => {:class => 'my_class', :id => 'my_id'}))
+          end
+
+          output_buffer.should have_tag('li.commit input#my_id')
+          output_buffer.should have_tag('li.commit input.my_class')
+        end
+
       end
 
       describe 'when used on an existing record' do
@@ -2408,18 +2518,20 @@ describe 'Formtastic' do
     describe "Nested Js Helpers" do
 
       it "should have a add  method" do
-         @new_post.stub!(:authors).and_return(@mock_authors = mock("Authors", :build => []))
+        @new_post.stub!(:authors).and_return(mock("Authors", :build => mock('Author')))
 
         semantic_form_for(@new_post) do |builder|
-          builder.inputs :name => "Contacts" do
+          builder.should_receive(:render).with(hash_including(:partial => "mock")).and_return('"attributes___idx___test__idxx__"')
+          builder.inputs :name => "Contacts", :id => "contacts" do
             concat(builder.add_associated_link(:name, :authors))
           end
         end
 
-        output_buffer.should eql("<form action=\"/posts\" class=\"formtastic post\" id=\"new_post\" method=\"post\"><fieldset class=\"inputs\"><legend><span>Contacts</span></legend><ol><a href=\"#\" onclick=\"if (typeof formtastic_next_array_id == 'undefined') formtastic_next_array_id = 0;\n        $('#arrays').append($.template(null), { number: --formtastic_next_array_id});; return false;\">name</a></ol></fieldset></form>")
+        output_buffer.should have_tag('form fieldset a[@href=#]')
+        output_buffer.should match(/\\&quot;attributes___idx___test__idxx__\\&quot;&quot;.replace/)
       end
 
-      it "should have a  remove method" do
+      it "should have a remove method" do
         semantic_form_for(@new_post) do |builder|
           builder.semantic_fields_for(:links) do |link_builder|
             concat(link_builder.remove_link("Remove"))
@@ -2430,15 +2542,16 @@ describe 'Formtastic' do
       end
 
       it "should have a show method" do
-         @new_post.stub!(:authors).and_return(@mock_authors = mock("Authors"))
-         pending
+        @new_post.stub!(:authors).and_return([mock("Author")])
+
         semantic_form_for(@new_post) do |builder|
+          builder.should_receive(:render).with(hash_including(:partial => "mock")).and_return("fields")
           builder.inputs :name => "Contacts" do
             concat(builder.render_associated_form @new_post.authors)
           end
         end
 
-        output_buffer.should eql("<form action=\"/posts\" class=\"formtastic post\" id=\"new_post\" method=\"post\"><fieldset class=\"inputs\"><legend><span>Contacts</span></legend><ol><a href=\"#\" onclick=\"if (typeof formtastic_next_array_id == 'undefined') formtastic_next_array_id = 0;\n        $('#arrays').append($.template(null), { number: --formtastic_next_array_id});; return false;\">name</a></ol></fieldset></form>")
+        output_buffer.should eql("<form action=\"/posts\" class=\"formtastic post\" id=\"new_post\" method=\"post\"><fieldset class=\"inputs\"><legend><span>Contacts</span></legend><ol>fields</ol></fieldset></form>")
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nofxx-formtastic
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Justin French
@@ -9,7 +9,7 @@ autorequire: formtastic
 bindir: bin
 cert_chain: []
 
-date: 2009-04-17 00:00:00 -07:00
+date: 2009-04-18 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -25,6 +25,9 @@ files:
 - MIT-LICENSE
 - README.textile
 - Rakefile
+- generators/formtastic_stylesheets/formtastic_stylesheets_generator.rb
+- generators/formtastic_stylesheets/templates/formtastic.css
+- generators/formtastic_stylesheets/templates/formtastic_changes.css
 - lib/formtastic.rb
 - lib/justin_french/formtastic.rb
 - lib/locale/en.yml