justinfrench-formtastic 0.2.1 → 0.2.2

data/README.textile

@@ -72,6 +72,11 @@ h2. Opinions
 * make the common things we do easy, yet still ensure uncommon things are still possible
 
 
+h2. Documentation
+
+RDoc documentation _should_ be automatically generated after each commit and made available on the "rdoc.info website":http://rdoc.info/projects/justinfrench/formtastic.
+
+
 h2. Installation
 
 You can (and should) get it as a gem:
@@ -245,6 +250,123 @@ h2. The Available Inputs
 
 The documentation is pretty good for each of these (what it does, what the output is, what the options are, etc) so go check it out.
 
+h2. Internationalization (I18n)
+
+Formtastic got some neat I18n-features. ActiveRecord object names and attributes are, by default, taken from calling @object.human_name and @object.human_attribute_name(attr) respectively. There are a few words specific to Formtastic that can be translated. See lib/locale/en.yml for more information.
+
+h3. Label/Hint-localization
+
+Formtastic supports localized *labels* and *hints* using the I18n API for more advanced usage. Your forms can now be DRYer and more flexible than ever, and still fully localized. This is how:
+
+Basic localization (labels only):
+
+<pre>
+  <% semantic_form_for @post do |form| %>
+    <%= form.input :title %>        # => :label => I18n.t('activerecord.attributes.user.title')    or 'Title'
+    <%= form.input :body %>         # => :label => I18n.t('activerecord.attributes.user.body')     or 'Body'
+    <%= form.input :section %>      # => :label => I18n.t('activerecord.attributes.user.section')  or 'Section'
+  <% end %>
+</pre>
+
+*Note:* This is perfectly fine if you just want your labels to be translated using *ActiveRecord I18n attribute translations*, and you don't use input hints. But what if you do? And what if you don't want same labels in all forms?
+
+Enhanced localization (labels and hints):
+
+1. Enable I18n lookups by default (@config/initializers/formtastic.rb@):
+
+<pre>
+  Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
+</pre>
+
+2. Add some cool label-translations/variants (@config/locale/en.yml@):
+
+<pre>
+  en:
+    formtastic:
+      labels:
+        post:
+          title: "Choose a title..."
+          body: "Write something..."
+      hints:
+        post:
+          title: "Choose a good title for you post."
+          body: "Write something inspiring here."
+</pre>
+
+*Note:* We are using English here still, but you get the point.
+
+3. ...and now you'll get:
+
+<pre>
+  <% semantic_form_for @post do |form| %>
+    <%= form.input :title %>      # => :label => "Choose a title...", :hint => "Choose a good title for you post."
+    <%= form.input :body %>       # => :label => "Write something...", :hint => "Write something inspiring here."
+    <%= form.input :section %>    # => :label => I18n.t('activerecord.attributes.user.section')  or 'Section'
+  <% end %>
+</pre>
+
+4. Override I18n settings:
+
+<pre>
+  <% semantic_form_for @post do |form| %>
+    <%= form.input :title %>      # => :label => "Choose a title...", :hint => "Choose a good title for you post."
+    <%= form.input :body, :hint => false %>     # => :label => "Write something..."
+    <%= form.input :section %>    # => :label => I18n.t('activerecord.attributes.user.section')  or 'Section'
+  <% end %>
+</pre>
+
+If I18n-lookups is disabled, i.e.:
+
+<pre>
+  Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
+</pre>
+
+...then you can enable I18n within the forms instead:
+
+<pre>
+  <% semantic_form_for @post do |form| %>
+    <%= form.input :title, :label => true %>      # => :label => "Choose a title..."
+    <%= form.input :body, :label => true %>       # => :label => "Write something..."
+    <%= form.input :section, :label => true %>    # => :label => I18n.t('activerecord.attributes.user.section')  or 'Section'
+  <% end %>
+</pre>
+
+5. Advanced I18n lookups
+
+For more flexible forms; Formtastic find translations using a bottom-up approach taking the following variables in account:
+
+* @model@, e.g. "post"
+* @action@, e.g. "edit"
+* @attribute@, e.g. "title"
+
+...in the following order:
+
+1. @formtastic.{labels,hints}.MODEL.ACTION.ATTRIBUTE@       # By model and action
+2. @formtastic.{labels,hints}.MODEL.ATTRIBUTE@              # By model
+3. @formtastic.{labels,hints}.ATTRIBUTE@                    # Global default
+
+...which means that you can define translations like this:
+
+<pre>
+  en:
+    formtastic:
+      labels:
+        title: "Title"  # Default global value
+        article:
+          body: "Article content"
+        post:
+          new:
+            title: "Choose a title..."
+            body: "Write something..."
+          edit:
+            title: "Edit title"
+            body: "Edit body"
+      ...
+</pre>
+
+h2. ValidationReflection plugin
+
+If you have the "ValidationReflection":http://github.com/redinger/validation_reflection plugin installed, you won't have to specify the :required option (it checks the validations on the model instead).
 
 h2. Configuration
 
@@ -291,19 +413,13 @@ If you wish, put something like this in config/initializers/formtastic_config.rb
   
   # Set the default "priority countries" to suit your user base when using :as => :country
   Formtastic::SemanticFormBuilder.priority_countries = ["Australia", "New Zealand"]
+  
+  # Specifies if labels/hints for input fields automatically be looked up using I18n.
+  # Default value: false. Overridden for specific fields by setting value to true,
+  # i.e. :label => true, or :hint => true (or opposite depending on initialized value)
+  # Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
 </pre>
 
-
-h2. Internationalization (I18n)
-
-Supports I18n! ActiveRecord object names and attributes are, by default, taken from calling @object.human_name and @object.human_attribute_name(attr) respectively. There are a few words specific to Formtastic that can be translated.  See lib/locale/en.yml for more information.
-
-
-h2. ValidationReflection plugin
-
-If you have the "ValidationReflection":http://github.com/redinger/validation_reflection plugin installed, you won't have to specify the :required option (it checks the validations on the model instead).
-
-
 h2. Status
 
 *THINGS ARE GOING TO CHANGE A BIT BEFORE WE HIT 1.0.*

data/generators/formtastic_stylesheets/templates/formtastic.css

@@ -83,6 +83,7 @@ form.formtastic fieldset ol li ul.errors li { padding:0; border:none; display:li
 /* STRING & NUMERIC OVERRIDES
 --------------------------------------------------------------------------------------------------*/
 form.formtastic fieldset ol li.string input { width:74%; }
+form.formtastic fieldset ol li.password input { width:74%; }
 form.formtastic fieldset ol li.numeric input { width:74%; }
 
 

data/lib/formtastic.rb

@@ -19,10 +19,15 @@ module Formtastic #:nodoc:
     @@inline_order = [ :input, :hints, :errors ]
     @@file_methods = [ :file?, :public_filename ]
     @@priority_countries = ["Australia", "Canada", "United Kingdom", "United States"]
+    @@i18n_lookups_by_default = false
 
     cattr_accessor :default_text_field_size, :all_fields_required_by_default, :required_string,
                    :optional_string, :inline_errors, :label_str_method, :collection_label_methods,
-                   :inline_order, :file_methods, :priority_countries
+                   :inline_order, :file_methods, :priority_countries, :i18n_lookups_by_default
+
+    I18N_SCOPES = [ '{{model}}.{{action}}.{{attribute}}',
+                    '{{model}}.{{attribute}}',
+                    '{{attribute}}']
 
     # Keeps simple mappings in a hash
     INPUT_MAPPINGS = {
@@ -85,7 +90,7 @@ module Formtastic #:nodoc:
       options[:as]     ||= default_input_type(method)
 
       html_class = [ options[:as], (options[:required] ? :required : :optional) ]
-      html_class << 'error' if @object && @object.respond_to?(:errors) && @object.errors.on(method.to_s)
+      html_class << 'error' if @object && @object.respond_to?(:errors) && @object.errors[method.to_sym]
 
       wrapper_html = options.delete(:wrapper_html) || {}
       wrapper_html[:id]  ||= generate_html_id(method)
@@ -95,7 +100,15 @@ module Formtastic #:nodoc:
         ::ActiveSupport::Deprecation.warn(":as => :#{options[:as]} is deprecated, use :as => :#{options[:as].to_s[8..-1]} instead", caller[3..-1])
       end
 
-      list_item_content = @@inline_order.map do |type|
+      if options[:input_html] && options[:input_html][:id]
+        options[:label_html] ||= {}
+        options[:label_html][:for] ||= options[:input_html][:id]
+      end
+
+      input_parts = @@inline_order.dup
+      input_parts.delete(:errors) if options[:as] == :hidden
+      
+      list_item_content = input_parts.map do |type|
         send(:"inline_#{type}_for", method, options)
       end.compact.join("\n")
 
@@ -325,6 +338,8 @@ module Formtastic #:nodoc:
     # * :label - An alternative form to give the label content. Whenever label
     #            is false, a blank string is returned.
     # * :as_span - When true returns a span tag with class label instead of a label element
+    # * :input_name - Gives the input to match for. This is needed when you want to
+    #                 to call f.label :authors but it should match :author_ids.
     #
     # == Examples
     #
@@ -337,23 +352,23 @@ module Formtastic #:nodoc:
     #
     def label(method, options_or_text=nil, options=nil)
       if options_or_text.is_a?(Hash)
-        return if options_or_text[:label] == false
-
+        return "" if options_or_text[:label] == false
         options = options_or_text
-        text    = options.delete(:label)
+        text = options.delete(:label)
       else
-        text      = options_or_text
+        text = options_or_text
         options ||= {}
       end
 
-      text ||= humanized_attribute_name(method)
-      text  << required_or_optional_string(options.delete(:required))
+      text = localized_attribute_string(method, text, :label) || humanized_attribute_name(method)
+      text += required_or_optional_string(options.delete(:required))
 
+      input_name = options.delete(:input_name) || method
       if options.delete(:as_span)
         options[:class] ||= 'label'
         template.content_tag(:span, text, options)
       else
-        super(method, text, options)
+        super(input_name, text, options)
       end
     end
 
@@ -371,13 +386,19 @@ module Formtastic #:nodoc:
     def inline_errors_for(method, options=nil) #:nodoc:
       return nil unless @object && @object.respond_to?(:errors) && [:sentence, :list].include?(@@inline_errors)
 
-      errors = @object.errors.on(method.to_s)
+      errors = @object.errors[method.to_sym]
       send("error_#{@@inline_errors}", Array(errors)) unless errors.blank?
     end
     alias :errors_on :inline_errors_for
 
     protected
 
+    # Prepare options to be sent to label
+    #
+    def options_for_label(options)
+      options.slice(:label, :required).merge!(options.fetch(:label_html, {}))
+    end
+
     # Deals with :for option when it's supplied to inputs methods. Additional
     # options to be passed down to :for should be supplied using :for_options
     # key.
@@ -457,9 +478,9 @@ module Formtastic #:nodoc:
     #
     def input_simple(type, method, options)
       html_options = options.delete(:input_html) || {}
-      html_options = default_string_options(method).merge(html_options) if STRING_MAPPINGS.include?(type)
+      html_options = default_string_options(method, type).merge(html_options) if STRING_MAPPINGS.include?(type)
 
-      self.label(method, options.slice(:label, :required)) +
+      self.label(method, options_for_label(options)) +
       self.send(INPUT_MAPPINGS[type], method, html_options)
     end
 
@@ -510,10 +531,10 @@ module Formtastic #:nodoc:
     #   </select>
     #
     #
-    # You can customize the options available in the select by passing in a collection (Array) of
-    # ActiveRecord objects through the :collection option.  If not provided, the choices are found
-    # by inferring the parent's class name from the method name and simply calling find(:all) on
-    # it (VehicleOwner.find(:all) in the example above).
+    # You can customize the options available in the select by passing in a collection (an Array or 
+    # Hash) through the :collection option.  If not provided, the choices are found by inferring the 
+    # parent's class name from the method name and simply calling find(:all) on it 
+    # (VehicleOwner.find(:all) in the example above).
     #
     # Examples:
     #
@@ -521,6 +542,7 @@ module Formtastic #:nodoc:
     #   f.input :author, :collection => Author.find(:all)
     #   f.input :author, :collection => [@justin, @kate]
     #   f.input :author, :collection => {@justin.name => @justin.id, @kate.name => @kate.id}
+    #   f.input :author, :collection => ["Justin", "Kate", "Amelia", "Gus", "Meg"]
     #
     # Note: This input looks for a label method in the parent association.
     #
@@ -565,12 +587,13 @@ module Formtastic #:nodoc:
 
       reflection = find_reflection(method)
       if reflection && [ :has_many, :has_and_belongs_to_many ].include?(reflection.macro)
+        options[:include_blank]   = false
         html_options[:multiple] ||= true
         html_options[:size]     ||= 5
        end
 
       input_name = generate_association_input_name(method)
-      self.label(input_name, options.slice(:label, :required)) +
+      self.label(method, options_for_label(options).merge(:input_name => input_name)) +
       self.select(input_name, collection, set_options(options), html_options)
     end
     alias :boolean_select_input :select_input
@@ -585,7 +608,7 @@ module Formtastic #:nodoc:
     def time_zone_input(method, options)
       html_options = options.delete(:input_html) || {}
 
-      self.label(method, options.slice(:label, :required)) +
+      self.label(method, options_for_label(options)) +
       self.time_zone_select(method, options.delete(:priority_zones), set_options(options), html_options)
     end
 
@@ -611,16 +634,17 @@ module Formtastic #:nodoc:
     #     </ol>
     #   </fieldset>
     #
-    # You can customize the options available in the set by passing in a collection (Array) of
-    # ActiveRecord objects through the :collection option.  If not provided, the choices are found
-    # by inferring the parent's class name from the method name and simply calling find(:all) on
-    # it (Author.find(:all) in the example above).
+    # You can customize the options available in the select by passing in a collection (an Array or 
+    # Hash) through the :collection option.  If not provided, the choices are found by inferring the 
+    # parent's class name from the method name and simply calling find(:all) on it 
+    # (Author.find(:all) in the example above).
     #
     # Examples:
     #
     #   f.input :author, :as => :radio, :collection => @authors
     #   f.input :author, :as => :radio, :collection => Author.find(:all)
     #   f.input :author, :as => :radio, :collection => [@justin, @kate]
+    #   f.input :author, :collection => ["Justin", "Kate", "Amelia", "Gus", "Meg"]
     #
     # You can also customize the text label inside each option tag, by naming the correct method
     # (:full_name, :display_name, :account_number, etc) to call on each object in the collection
@@ -865,7 +889,7 @@ module Formtastic #:nodoc:
       html_options = options.delete(:input_html) || {}
       priority_countries = options.delete(:priority_countries) || @@priority_countries
 
-      self.label(method, options.slice(:label, :required)) +
+      self.label(method, options_for_label(options)) +
       self.country_select(method, priority_countries, set_options(options), html_options)
     end
     
@@ -881,7 +905,7 @@ module Formtastic #:nodoc:
                              options.delete(:checked_value) || '1', options.delete(:unchecked_value) || '0')
 
       label = options.delete(:label) || humanized_attribute_name(method)
-      self.label(method, input + label, options.slice(:required))
+      self.label(method, input + label, options_for_label(options))
     end
 
     # Generates an input for the given method using the type supplied with :as.
@@ -904,6 +928,7 @@ module Formtastic #:nodoc:
     # Generates hints for the given method using the text supplied in :hint.
     #
     def inline_hints_for(method, options) #:nodoc:
+      options[:hint] = localized_attribute_string(method, options[:hint], :hint)
       return if options[:hint].blank?
       template.content_tag(:p, options[:hint], :class => 'inline-hints')
     end
@@ -978,7 +1003,7 @@ module Formtastic #:nodoc:
       contents = contents.join if contents.respond_to?(:join)
 
       template.content_tag(:fieldset,
-        %{<legend>#{self.label(method, options.slice(:label, :required).merge!(:as_span => true))}</legend>} +
+        %{<legend>#{self.label(method, options_for_label(options).merge!(:as_span => true))}</legend>} +
         template.content_tag(:ol, contents)
       )
     end
@@ -992,8 +1017,6 @@ module Formtastic #:nodoc:
     # default is a :string, a similar behaviour to Rails' scaffolding.
     #
     def default_input_type(method) #:nodoc:
-      return :string if @object.nil?
-
       column = @object.column_for_attribute(method) if @object.respond_to?(:column_for_attribute)
 
       if column
@@ -1008,10 +1031,13 @@ module Formtastic #:nodoc:
         # 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)
+        if @object
+          return :select if find_reflection(method)
+
+          file = @object.send(method) if @object.respond_to?(method)
+          return :file   if file && @@file_methods.any? { |m| file.respond_to?(m) }
+        end
 
-        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
       end
@@ -1073,13 +1099,14 @@ module Formtastic #:nodoc:
       options[:false] ||= I18n.t('no', :default => 'No', :scope => [:formtastic])
       options[:value_as_class] = true unless options.key?(:value_as_class)
 
-      { options.delete(:true) => true, options.delete(:false) => false }
+      [ [ options.delete(:true), true], [ options.delete(:false), false ] ]
     end
 
     # Used by association inputs (select, radio) to generate the name that should
     # be used for the input
     #
     #   belongs_to :author; f.input :author; will generate 'author_id'
+    #   belongs_to :entity, :foreign_key = :owner_id; f.input :author; will generate 'owner_id'
     #   has_many :authors; f.input :authors; will generate 'author_ids'
     #   has_and_belongs_to_many will act like has_many
     #
@@ -1088,7 +1115,7 @@ module Formtastic #:nodoc:
         if [:has_and_belongs_to_many, :has_many].include?(reflection.macro)
           "#{method.to_s.singularize}_ids"
         else
-          "#{method}_id"
+          reflection.options[:foreign_key] || "#{method}_id"
         end
       else
         method
@@ -1105,10 +1132,10 @@ module Formtastic #:nodoc:
     # Generates default_string_options by retrieving column information from
     # the database.
     #
-    def default_string_options(method) #:nodoc:
+    def default_string_options(method, type) #:nodoc:
       column = @object.column_for_attribute(method) if @object.respond_to?(:column_for_attribute)
 
-      if column.nil? || column.limit.nil?
+      if type == :numeric || column.nil? || column.limit.nil?
         { :size => @@default_text_field_size }
       else
         { :maxlength => column.limit, :size => [column.limit, @@default_text_field_size].min }
@@ -1128,8 +1155,8 @@ module Formtastic #:nodoc:
       else
         index = ""
       end
-      sanitized_method_name = method_name.to_s.sub(/\?$/,"")
-
+      sanitized_method_name = method_name.to_s.gsub(/[\?\/\-]$/, '')
+      
       "#{sanitized_object_name}#{index}_#{sanitized_method_name}_#{value}"
     end
 
@@ -1161,6 +1188,54 @@ module Formtastic #:nodoc:
       end
     end
 
+    # Internal generic method for looking up localized values within Formtastic
+    # using I18n, if no explicit value is set and I18n-lookups are enabled.
+    # 
+    # Enabled/Disable this by setting:
+    #
+    #   Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true/false
+    #
+    # Lookup priority:
+    #
+    #   'formtastic.{{type}}.{{model}}.{{action}}.{{attribute}}'
+    #   'formtastic.{{type}}.{{model}}.{{attribute}}'
+    #   'formtastic.{{type}}.{{attribute}}'
+    # 
+    # Example:
+    #   
+    #   'formtastic.labels.post.edit.title'
+    #   'formtastic.labels.post.title'
+    #   'formtastic.labels.title'
+    # 
+    # NOTE: Generic, but only used for form input labels/hints.
+    #
+    def localized_attribute_string(attr_name, attr_value, i18n_key)
+      if attr_value.is_a?(String)
+        attr_value
+      else
+        use_i18n = attr_value.nil? ? @@i18n_lookups_by_default : attr_value
+        if use_i18n
+          model_name = @object.class.name.underscore
+          action_name = template.params[:action].to_s rescue ''
+          attribute_name = attr_name.to_s
+
+          defaults = I18N_SCOPES.collect do |i18n_scope|
+            i18n_path = i18n_scope.dup
+            i18n_path.gsub!('{{action}}', action_name)
+            i18n_path.gsub!('{{model}}', model_name)
+            i18n_path.gsub!('{{attribute}}', attribute_name)
+            i18n_path.gsub!('..', '.')
+            i18n_path.to_sym
+          end
+          defaults << ''
+
+          i18n_value = ::I18n.t(defaults.shift, :default => defaults,
+                                :scope => "formtastic.#{i18n_key.to_s.pluralize}")
+          i18n_value.blank? ? nil : i18n_value
+        end
+      end
+    end
+
   end
 
   # Wrappers around form_for (etc) with :builder => SemanticFormBuilder.

data/lib/justin_french/formtastic.rb

@@ -1,6 +1,6 @@
-module JustinFrench
-  module Formtastic
-    class SemanticFormBuilder < ::Formtastic::SemanticFormBuilder
+module JustinFrench #:nodoc:
+  module Formtastic #:nodoc:
+    class SemanticFormBuilder < ::Formtastic::SemanticFormBuilder #:nodoc:
       def initialize(*args)
         ::ActiveSupport::Deprecation.warn("JustinFrench::Formtastic::SemanticFormBuilder is deprecated. User Formtastic::SemanticFormBuilder instead", caller)
         super

data/spec/formtastic_spec.rb

@@ -62,7 +62,7 @@ describe 'Formtastic' do
     @fred.stub!(:login).and_return('fred_smith')
     @fred.stub!(:id).and_return(37)
     @fred.stub!(:new_record?).and_return(false)
-    @fred.stub!(:errors).and_return(mock('errors', :on => nil))
+    @fred.stub!(:errors).and_return(mock('errors', :[] => nil))
 
     @bob = mock('user')
     @bob.stub!(:class).and_return(Author)
@@ -72,20 +72,20 @@ describe 'Formtastic' do
     @bob.stub!(:posts).and_return([])
     @bob.stub!(:post_ids).and_return([])
     @bob.stub!(:new_record?).and_return(false)
-    @bob.stub!(:errors).and_return(mock('errors', :on => nil))
+    @bob.stub!(:errors).and_return(mock('errors', :[] => nil))
 
     Author.stub!(:find).and_return([@fred, @bob])
     Author.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
     Author.stub!(:human_name).and_return('Author')
     Author.stub!(:reflect_on_all_validations).and_return([])
-    Author.stub!(:reflect_on_association).and_return { |column_name| mock('reflection', :klass => Post, :macro => :has_many) if column_name == :posts }
+    Author.stub!(:reflect_on_association).and_return { |column_name| mock('reflection', :options => {}, :klass => Post, :macro => :has_many) if column_name == :posts }
 
     # Sometimes we need a mock @post object and some Authors for belongs_to
     @new_post = mock('post')
     @new_post.stub!(:class).and_return(Post)
     @new_post.stub!(:id).and_return(nil)
     @new_post.stub!(:new_record?).and_return(true)
-    @new_post.stub!(:errors).and_return(mock('errors', :on => nil))
+    @new_post.stub!(:errors).and_return(mock('errors', :[] => nil))
     @new_post.stub!(:author).and_return(nil)
 
     @freds_post = mock('post')
@@ -97,7 +97,7 @@ describe 'Formtastic' do
     @freds_post.stub!(:authors).and_return([@fred])
     @freds_post.stub!(:author_ids).and_return([@fred.id])
     @freds_post.stub!(:new_record?).and_return(false)
-    @freds_post.stub!(:errors).and_return(mock('errors', :on => nil))
+    @freds_post.stub!(:errors).and_return(mock('errors', :[] => nil))
     @fred.stub!(:posts).and_return([@freds_post])
     @fred.stub!(:post_ids).and_return([@freds_post.id])
 
@@ -107,9 +107,9 @@ describe 'Formtastic' do
     Post.stub!(:reflect_on_association).and_return do |column_name|
       case column_name
       when :author, :author_status
-        mock('reflection', :klass => Author, :macro => :belongs_to)
+        mock('reflection', :options => {}, :klass => Author, :macro => :belongs_to)
       when :authors
-        mock('reflection', :klass => Author, :macro => :has_and_belongs_to_many)
+        mock('reflection', :options => {}, :klass => Author, :macro => :has_and_belongs_to_many)
       end
     end
     Post.stub!(:find).and_return([@freds_post])
@@ -326,7 +326,7 @@ describe 'Formtastic' do
 
         it 'should return nil if label is false' do
           semantic_form_for(@new_post) do |builder|
-            builder.label(:login, :label => false).should be_nil
+            builder.label(:login, :label => false).should be_blank
           end
         end
       end
@@ -336,8 +336,8 @@ describe 'Formtastic' do
       before(:each) do
         @title_errors = ['must not be blank', 'must be longer than 10 characters', 'must be awesome']
         @errors = mock('errors')
-        @errors.stub!(:on).with('title').and_return(@title_errors)
-        @errors.stub!(:on).with('body').and_return(nil)
+        @errors.stub!(:[]).with(:title).and_return(@title_errors)
+        @errors.stub!(:[]).with(:body).and_return(nil)
         @new_post.stub!(:errors).and_return(@errors)
       end
 
@@ -573,13 +573,22 @@ describe 'Formtastic' do
 
           describe 'when not provided' do
 
-            it 'should default to a string for forms without objects' do
+            it 'should default to a string for forms without objects unless column is password' do
               semantic_form_for(:project, :url => 'http://test.host') do |builder|
                 concat(builder.input(:anything))
               end
               output_buffer.should have_tag('form li.string')
             end
 
+            it 'should default to password for forms without objects if column is password' do
+              semantic_form_for(:project, :url => 'http://test.host') do |builder|
+                concat(builder.input(:password))
+                concat(builder.input(:password_confirmation))
+                concat(builder.input(:confirm_password))
+              end
+              output_buffer.should have_tag('form li.password', :count => 3)
+            end
+
             it 'should default to a string for methods on objects that don\'t respond to "column_for_attribute"' do
               @new_post.stub!(:method_without_a_database_column)
               @new_post.stub!(:column_for_attribute).and_return(nil)
@@ -688,9 +697,8 @@ describe 'Formtastic' do
         end
 
         describe ':label option' do
-
+          
           describe 'when provided' do
-
             it 'should be passed down to the label tag' do
               semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :label => "Kustom"))
@@ -698,35 +706,89 @@ describe 'Formtastic' do
               output_buffer.should have_tag("form li label", /Kustom/)
             end
 
+            it 'should not generate a label if false' do
+              semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title, :label => false))
+              end
+              output_buffer.should_not have_tag("form li label")
+            end
+
+            it 'should be dupped if frozen' do
+              semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title, :label => "Kustom".freeze))
+              end
+              output_buffer.should have_tag("form li label", /Kustom/)
+            end
           end
 
           describe 'when not provided' do
-            describe 'and object is not given' do
-              it 'should default the humanized method name, passing it down to the label tag' do
-                Formtastic::SemanticFormBuilder.label_str_method = :humanize
-
-                semantic_form_for(:project, :url => 'http://test.host') do |builder|
-                  concat(builder.input(:meta_description))
+            describe 'when localized label is NOT provided' do
+              describe 'and object is not given' do
+                it 'should default the humanized method name, passing it down to the label tag' do
+                  Formtastic::SemanticFormBuilder.label_str_method = :humanize
+              
+                  semantic_form_for(:project, :url => 'http://test.host') do |builder|
+                    concat(builder.input(:meta_description))
+                  end
+              
+                  output_buffer.should have_tag("form li label", /#{'meta_description'.humanize}/)
+                end
+              end
+              
+              describe 'and object is given' do
+                it 'should delegate the label logic to class human attribute name and pass it down to the label tag' do
+                  @new_post.stub!(:meta_description) # a two word method name
+                  @new_post.class.should_receive(:human_attribute_name).with('meta_description').and_return('meta_description'.humanize)
+              
+                  semantic_form_for(@new_post) do |builder|
+                    concat(builder.input(:meta_description))
+                  end
+              
+                  output_buffer.should have_tag("form li label", /#{'meta_description'.humanize}/)
                 end
-
-                output_buffer.should have_tag("form li label", /#{'meta_description'.humanize}/)
               end
             end
-
-            describe 'and object is given' do
-              it 'should delegate the label logic to class human attribute name and pass it down to the label tag' do
-                @new_post.stub!(:meta_description) # a two word method name
-                @new_post.class.should_receive(:human_attribute_name).with('meta_description').and_return('meta_description'.humanize)
-
+            
+            describe 'when localized label is provided' do
+              before do
+                @localized_label_text = 'Localized title'
+                @default_localized_label_text = 'Default localized title'
+                ::I18n.backend.store_translations :en,
+                  :formtastic => {
+                      :labels => {
+                        :title => @default_localized_label_text,
+                        :post => {
+                          :title => @localized_label_text
+                         }
+                       }
+                    }
+                ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
+              end
+
+              it 'should render a label with localized label (I18n)' do
                 semantic_form_for(@new_post) do |builder|
-                  concat(builder.input(:meta_description))
+                  concat(builder.input(:title, :label => true))
                 end
-
-                output_buffer.should have_tag("form li label", /#{'meta_description'.humanize}/)
+                output_buffer.should have_tag('form li label', @localized_label_text)
+              end
+
+              it 'should render a hint paragraph containing an optional localized label (I18n) if first is not set' do
+                ::I18n.backend.store_translations :en,
+                  :formtastic => {
+                      :labels => {
+                        :post => {
+                          :title => nil
+                         }
+                       }
+                    }
+                semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:title, :label => true))
+                end
+                output_buffer.should have_tag('form li label', @default_localized_label_text)
               end
             end
           end
-
+          
         end
 
         describe ':hint option' do
@@ -742,12 +804,63 @@ describe 'Formtastic' do
           end
 
           describe 'when not provided' do
-            it 'should not render a hint paragraph' do
-              hint_text = "this is the title of the post"
-              semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:title))
+            describe 'when localized hint (I18n) is provided' do
+              before do
+                @localized_hint_text = "This is the localized hint."
+                @default_localized_hint_text = "This is the default localized hint."
+                ::I18n.backend.store_translations :en,
+                  :formtastic => {
+                      :hints => {
+                        :title => @default_localized_hint_text,
+                        :post => {
+                          :title => @localized_hint_text
+                         }
+                       }
+                    }
+                ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
+              end
+              
+              describe 'when provided value (hint value) is set to TRUE' do
+                it 'should render a hint paragraph containing a localized hint (I18n)' do
+                  semantic_form_for(@new_post) do |builder|
+                    concat(builder.input(:title, :hint => true))
+                  end
+                  output_buffer.should have_tag('form li p.inline-hints', @localized_hint_text)
+                end
+                
+                it 'should render a hint paragraph containing an optional localized hint (I18n) if first is not set' do
+                  ::I18n.backend.store_translations :en,
+                  :formtastic => {
+                      :hints => {
+                        :post => {
+                          :title => nil
+                         }
+                       }
+                    }
+                  semantic_form_for(@new_post) do |builder|
+                    concat(builder.input(:title, :hint => true))
+                  end
+                  output_buffer.should have_tag('form li p.inline-hints', @default_localized_hint_text)
+                end
+              end
+              
+              describe 'when provided value (label value) is set to FALSE' do
+                it 'should not render a hint paragraph' do
+                  semantic_form_for(@new_post) do |builder|
+                    concat(builder.input(:title, :hint => false))
+                  end
+                  output_buffer.should_not have_tag('form li p.inline-hints', @localized_hint_text)
+                end
+              end
+            end
+            
+            describe 'when localized hint (I18n) is not provided' do
+              it 'should not render a hint paragraph' do
+                semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:title))
+                end
+                output_buffer.should_not have_tag('form li p.inline-hints')
               end
-              output_buffer.should_not have_tag("form li p.inline-hints")
             end
           end
 
@@ -809,7 +922,7 @@ describe 'Formtastic' do
           before do
             @title_errors = ['must not be blank', 'must be longer than 10 characters', 'must be awesome']
             @errors = mock('errors')
-            @errors.stub!(:on).with('title').and_return(@title_errors)
+            @errors.stub!(:[]).with(:title).and_return(@title_errors)
             @new_post.stub!(:errors).and_return(@errors)
           end
 
@@ -922,31 +1035,33 @@ describe 'Formtastic' do
             output_buffer.should have_tag("form li input[@name=\"post[title]\"]")
           end
 
-          it 'should have a maxlength matching the column limit' do
-            @new_post.column_for_attribute(:title).limit.should == 50
-            output_buffer.should have_tag("form li input[@maxlength='50']")
-          end
+          unless type == :numeric
+            it 'should have a maxlength matching the column limit' do
+              @new_post.column_for_attribute(:title).limit.should == 50
+              output_buffer.should have_tag("form li input[@maxlength='50']")
+            end
 
-          it 'should use default_text_field_size for columns longer than default_text_field_size' do
-            default_size = Formtastic::SemanticFormBuilder.default_text_field_size
-            @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => type, :limit => default_size * 2))
+            it 'should use default_text_field_size for columns longer than default_text_field_size' do
+              default_size = Formtastic::SemanticFormBuilder.default_text_field_size
+              @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => type, :limit => default_size * 2))
 
-            semantic_form_for(@new_post) do |builder|
-              concat(builder.input(:title, :as => type))
+              semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title, :as => type))
+              end
+
+              output_buffer.should have_tag("form li input[@size='#{default_size}']")
             end
 
-            output_buffer.should have_tag("form li input[@size='#{default_size}']")
-          end
+            it 'should use the column size for columns shorter than default_text_field_size' do
+              column_limit_shorted_than_default = 1
+              @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => type, :limit => column_limit_shorted_than_default))
 
-          it 'should use the column size for columns shorter than default_text_field_size' do
-            column_limit_shorted_than_default = 1
-            @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => type, :limit => column_limit_shorted_than_default))
+              semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title, :as => type))
+              end
 
-            semantic_form_for(@new_post) do |builder|
-              concat(builder.input(:title, :as => type))
+              output_buffer.should have_tag("form li input[@size='#{column_limit_shorted_than_default}']")
             end
-
-            output_buffer.should have_tag("form li input[@size='#{column_limit_shorted_than_default}']")
           end
 
           it 'should use default_text_field_size for methods without database columns' do
@@ -967,6 +1082,13 @@ describe 'Formtastic' do
             output_buffer.should have_tag("form li input.myclass")
           end
 
+          it 'should consider input_html :id in labels' do
+            semantic_form_for(@new_post) do |builder|
+              concat(builder.input(:title, :as => type, :input_html => { :id => 'myid' }))
+            end
+            output_buffer.should have_tag('form li label[@for="myid"]')
+          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(:title, :as => type))
@@ -1080,11 +1202,11 @@ describe 'Formtastic' do
 
       describe ":as => :hidden" do
         before do
-          @new_post.stub!(:hidden)
+          @new_post.stub!(:secret)
           @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => :string))
 
           semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:hidden, :as => :hidden))
+            concat(builder.input(:secret, :as => :hidden))
           end
         end
 
@@ -1093,7 +1215,7 @@ describe 'Formtastic' do
         end
 
         it 'should have a post_hidden_input id on the wrapper' do
-          output_buffer.should have_tag('form li#post_hidden_input')
+          output_buffer.should have_tag('form li#post_secret_input')
         end
 
         it 'should not generate a label for the input' do
@@ -1101,10 +1223,24 @@ describe 'Formtastic' do
         end
 
         it "should generate a input field" do
-          output_buffer.should have_tag("form li input#post_hidden")
+          output_buffer.should have_tag("form li input#post_secret")
           output_buffer.should have_tag("form li input[@type=\"hidden\"]")
-          output_buffer.should have_tag("form li input[@name=\"post[hidden]\"]")
+          output_buffer.should have_tag("form li input[@name=\"post[secret]\"]")
+        end
+        
+        it "should not render inline errors" do
+          @errors = mock('errors')
+          @errors.stub!(:[]).with(:secret).and_return(["foo", "bah"])
+          @new_post.stub!(:errors).and_return(@errors)
+          
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:secret, :as => :hidden))
+          end
+          
+          output_buffer.should_not have_tag("form li p.inline-errors")
+          output_buffer.should_not have_tag("form li ul.errors")
         end
+        
       end
 
       describe ":as => :time_zone" do
@@ -1247,7 +1383,7 @@ describe 'Formtastic' do
         before do
           @new_post.stub!(:author).and_return(@bob)
           @new_post.stub!(:author_id).and_return(@bob.id)
-          Post.stub!(:reflect_on_association).and_return { |column_name| mock('reflection', :klass => Author, :macro => :belongs_to) }
+          Post.stub!(:reflect_on_association).and_return { |column_name| mock('reflection', :options => {}, :klass => Author, :macro => :belongs_to) }
         end
 
         describe 'for belongs_to association' do
@@ -1393,7 +1529,11 @@ describe 'Formtastic' do
           it 'should create a select without size' do
             output_buffer.should_not have_tag('form li select[@size]')
           end
-
+          
+          it 'should have a blank option' do
+            output_buffer.should have_tag("form li select option[@value='']")
+          end
+          
           it 'should have a select option for each Author' do
             output_buffer.should have_tag('form li select option', :count => Author.find(:all).size + 1)
             Author.find(:all).each do |author|
@@ -1435,7 +1575,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', /Post ids/)
+            output_buffer.should have_tag('form li label', /Post/)
             output_buffer.should have_tag("form li label[@for='author_post_ids']")
           end
 
@@ -1449,11 +1589,15 @@ describe 'Formtastic' do
           end
 
           it 'should have a select option for each Post' do
-            output_buffer.should have_tag('form li select option', :count => Post.find(:all).size + 1)
+            output_buffer.should have_tag('form li select option', :count => Post.find(:all).size)
             Post.find(:all).each do |post|
               output_buffer.should have_tag("form li select option[@value='#{post.id}']", /#{post.to_label}/)
             end
           end
+          
+          it 'should not have a blank option' do
+            output_buffer.should_not have_tag("form li select option[@value='']")
+          end
 
           it 'should have one option with a "selected" attribute' do
             output_buffer.should have_tag('form li select option[@selected]', :count => 1)
@@ -1477,7 +1621,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', /Author ids/)
+            output_buffer.should have_tag('form li label', /Author/)
             output_buffer.should have_tag("form li label[@for='post_author_ids']")
           end
 
@@ -1491,11 +1635,15 @@ describe 'Formtastic' do
           end
 
           it 'should have a select option for each Author' do
-            output_buffer.should have_tag('form li select option', :count => Author.find(:all).size + 1)
+            output_buffer.should have_tag('form li select option', :count => Author.find(:all).size)
             Author.find(:all).each do |author|
               output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
             end
           end
+          
+          it 'should not have a blank option' do
+            output_buffer.should_not have_tag("form li select option[@value='']")
+          end
 
           it 'should have one option with a "selected" attribute' do
             output_buffer.should have_tag('form li select option[@selected]', :count => 1)
@@ -2463,8 +2611,8 @@ describe 'Formtastic' do
       describe 'without a block' do
 
         before do
-          Post.stub!(:reflections).and_return({:author   => mock('reflection', :macro => :belongs_to),
-                                               :comments => mock('reflection', :macro => :has_many) })
+          Post.stub!(:reflections).and_return({:author   => mock('reflection', :options => {}, :macro => :belongs_to),
+                                               :comments => mock('reflection', :options => {}, :macro => :has_many) })
           Post.stub!(:content_columns).and_return([mock('column', :name => 'title'), mock('column', :name => 'body'), mock('column', :name => 'created_at')])
           Author.stub!(:find).and_return([@fred, @bob])
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: justinfrench-formtastic
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Justin French
@@ -9,7 +9,7 @@ autorequire: formtastic
 bindir: bin
 cert_chain: []
 
-date: 2009-06-17 00:00:00 -07:00
+date: 2009-08-30 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -36,6 +36,7 @@ files:
 - spec/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/justinfrench/formtastic/tree/master
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -56,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A Rails form builder plugin/gem with semantically rich and accessible markup