formtastic 0.9.8 → 0.9.9

data/README.textile

@@ -206,7 +206,7 @@ When working in has many association, you can even supply @"%i"@ in your fieldse
 </pre>
 
 
-Customize HTML attributes for any input using the @:input_html@ option. Typically his is used to disable the input, change the size of a text field, change the rows in a textarea, or even to add a special class to an input to attach special behavior like "autogrow":http://plugins.jquery.com/project/autogrow textareas:
+Customize HTML attributes for any input using the @:input_html@ option. Typically this is used to disable the input, change the size of a text field, change the rows in a textarea, or even to add a special class to an input to attach special behavior like "autogrow":http://plugins.jquery.com/project/autogrow textareas:
 
 <pre>
   <% semantic_form_for @post do |form| %>
@@ -337,7 +337,7 @@ Formtastic supports localized *labels*, *hints*, *legends*, *actions* using the
           title: "Choose a good title for you post."
           body: "Write something inspiring here."
       actions:
-        create: "Create my {{model}}"
+        create: "Create my %{model}"
         update: "Save changes"
         dummie: "Launch!"
 </pre>
@@ -354,7 +354,7 @@ Formtastic supports localized *labels*, *hints*, *legends*, *actions* using the
       <%= form.input :section %>    # => :label => I18n.t('activerecord.attributes.user.section')  or 'Section'
     <% end %>
     <% form.buttons do %>
-      <%= form.commit_button %>     # => "Create my {{model}}"
+      <%= form.commit_button %>     # => "Create my %{model}"
     <% end %>
   <% end %>
 </pre>

data/generators/formtastic/templates/formtastic.rb

@@ -28,7 +28,7 @@
 # Formtastic::SemanticFormBuilder.inline_errors = :sentence
 
 # Set the method to call on label text to transform or format it for human-friendly
-# reading when formtastic is user without object. Defaults to :humanize.
+# reading when formtastic is used without object. Defaults to :humanize.
 # Formtastic::SemanticFormBuilder.label_str_method = :humanize
 
 # Set the array of methods to try calling on parent objects in :select and :radio inputs

data/lib/formtastic.rb

@@ -1,5 +1,6 @@
 # coding: utf-8
 require File.join(File.dirname(__FILE__), *%w[formtastic i18n])
+require File.join(File.dirname(__FILE__), *%w[formtastic util])
 
 module Formtastic #:nodoc:
 
@@ -9,7 +10,7 @@ module Formtastic #:nodoc:
     @@default_text_area_height = 20
     @@all_fields_required_by_default = true
     @@include_blank_for_select_by_default = true
-    @@required_string = proc { %{<abbr title="#{::Formtastic::I18n.t(:required)}">*</abbr>} }
+    @@required_string = proc { ::Formtastic::Util.html_safe(%{<abbr title="#{::Formtastic::I18n.t(:required)}">*</abbr>}) }
     @@optional_string = ''
     @@inline_errors = :sentence
     @@label_str_method = :humanize
@@ -105,7 +106,7 @@ module Formtastic #:nodoc:
         send(:"inline_#{type}_for", method, options)
       end.compact.join("\n")
 
-      return template.content_tag(:li, list_item_content, wrapper_html)
+      return template.content_tag(:li, Formtastic::Util.html_safe(list_item_content), wrapper_html)
     end
 
     # Creates an input fieldset and ol tag wrapping for use around a set of inputs.  It can be
@@ -342,7 +343,7 @@ module Formtastic #:nodoc:
       element_class = ['commit', options.delete(:class)].compact.join(' ') # TODO: Add class reflecting on form action.
       accesskey = (options.delete(:accesskey) || @@default_commit_button_accesskey) unless button_html.has_key?(:accesskey)
       button_html = button_html.merge(:accesskey => accesskey) if accesskey  
-      template.content_tag(:li, self.submit(text, button_html), :class => element_class)
+      template.content_tag(:li, Formtastic::Util.html_safe(self.submit(text, button_html)), :class => element_class)
     end
 
     # A thin wrapper around #fields_for to set :builder => Formtastic::SemanticFormBuilder
@@ -399,11 +400,15 @@ module Formtastic #:nodoc:
         text = options_or_text
         options ||= {}
       end
+
       text = localized_string(method, text, :label) || humanized_attribute_name(method)
       text += required_or_optional_string(options.delete(:required))
+      text = Formtastic::Util.html_safe(text)
 
       # special case for boolean (checkbox) labels, which have a nested input
-      text = (options.delete(:label_prefix_for_nested_input) || "") + text
+      if options.key?(:label_prefix_for_nested_input)
+        text = options.delete(:label_prefix_for_nested_input) + text
+      end
 
       input_name = options.delete(:input_name) || method
       super(input_name, text, options)
@@ -422,8 +427,10 @@ module Formtastic #:nodoc:
     #
     def inline_errors_for(method, options = nil) #:nodoc:
       if render_inline_errors?
-        errors = @object.errors[method.to_sym]
-        send(:"error_#{@@inline_errors}", [*errors]) if errors.present?
+        errors = [@object.errors[method.to_sym]]
+        errors << [@object.errors[association_primary_key(method)]] if association_macro_for_method(method) == :belongs_to
+        errors = errors.flatten.compact.uniq
+        send(:"error_#{@@inline_errors}", [*errors]) if errors.any?
       else
         nil
       end
@@ -452,7 +459,7 @@ module Formtastic #:nodoc:
       return nil if full_errors.blank?
       html_options[:class] ||= "errors"
       template.content_tag(:ul, html_options) do
-        full_errors.map { |error| template.content_tag(:li, error) }.join
+        Formtastic::Util.html_safe(full_errors.map { |error| template.content_tag(:li, Formtastic::Util.html_safe(error)) }.join)
       end
     end
 
@@ -483,6 +490,18 @@ module Formtastic #:nodoc:
           []
         end
       end
+      
+      # Returns nil, or a symbol like :belongs_to or :has_many
+      def association_macro_for_method(method) #:nodoc:
+        reflection = self.reflection_for(method)
+        reflection.macro if reflection
+      end
+      
+      def association_primary_key(method)
+        reflection = self.reflection_for(method)
+        reflection.options[:foreign_key] if reflection && !reflection.options[:foreign_key].blank?
+        :"#{method}_id"
+      end
 
       # Prepare options to be sent to label
       #
@@ -504,9 +523,9 @@ module Formtastic #:nodoc:
           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(*args){ block.call(f) } }
+          proc { |f| return f.inputs(*args){ block.call(f) } }
         else
-          proc { |f| f.inputs(*args) }
+          proc { |f| return f.inputs(*args) }
         end
 
         fields_for_args = [options.delete(:for), options.delete(:for_options) || {}].flatten
@@ -859,12 +878,12 @@ module Formtastic #:nodoc:
           html_options[:checked] = selected_value == value if selected_option_is_present
 
           li_content = template.content_tag(:label,
-            "#{self.radio_button(input_name, value, html_options)} #{label}",
+            Formtastic::Util.html_safe("#{self.radio_button(input_name, value, html_options)} #{label}"),
             :for => input_id
           )
 
           li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
-          template.content_tag(:li, li_content, li_options)
+          template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
         end
 
         field_set_and_list_wrapping_for_method(method, options, list_item_content)
@@ -994,8 +1013,8 @@ module Formtastic #:nodoc:
         list_items_capture = ""
         hidden_fields_capture = ""
 
-        datetime = options.key?(:selected) ? options[:selected] : Time.now # can't do an || because nil is an important value
-        datetime = @object.send(method) if @object && @object.send(method) # object trumps :selected
+        datetime = options[:selected]
+        datetime = @object.send(method) if @object && @object.send(method) # object value trumps :selected value
 
         html_options = options.delete(:input_html) || {}
         input_ids    = []
@@ -1013,10 +1032,10 @@ module Formtastic #:nodoc:
             opts = strip_formtastic_options(options).merge(:prefix => @object_name, :field_name => field_name, :default => datetime)
             item_label_text = labels[input] || ::I18n.t(input.to_s, :default => input.to_s.humanize, :scope => [:datetime, :prompts])
 
-            list_items_capture << template.content_tag(:li, [
-                !item_label_text.blank? ? template.content_tag(:label, item_label_text, :for => input_id) : "",
+            list_items_capture << template.content_tag(:li, Formtastic::Util.html_safe([
+                !item_label_text.blank? ? template.content_tag(:label, Formtastic::Util.html_safe(item_label_text), :for => input_id) : "",
                 template.send(:"select_#{input}", datetime, opts, html_options.merge(:id => input_id))
-              ].join("")
+              ].join(""))
             )
           end
         end
@@ -1110,7 +1129,10 @@ module Formtastic #:nodoc:
         selected_option_is_present = [:selected, :checked].any? { |k| options.key?(k) }
         selected_values = (options.key?(:checked) ? options[:checked] : options[:selected]) if selected_option_is_present
         selected_values  = [*selected_values].compact
-        
+
+        disabled_option_is_present = options.key?(:disabled)
+        disabled_values = [*options[:disabled]] if disabled_option_is_present
+
         list_item_content = collection.map do |c|
           label = c.is_a?(Array) ? c.first : c
           value = c.is_a?(Array) ? c.last : c
@@ -1118,15 +1140,16 @@ module Formtastic #:nodoc:
           input_ids << input_id
 
           html_options[:checked] = selected_values.include?(value) if selected_option_is_present
+          html_options[:disabled] = disabled_values.include?(value) if disabled_option_is_present
           html_options[:id] = input_id
 
           li_content = template.content_tag(:label,
-            "#{self.check_box(input_name, html_options, value, unchecked_value)} #{label}",
+            Formtastic::Util.html_safe("#{self.check_box(input_name, html_options, value, unchecked_value)} #{label}"),
             :for => input_id
           )
 
           li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
-          template.content_tag(:li, li_content, li_options)
+          template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
         end
 
         field_set_and_list_wrapping_for_method(method, options, list_item_content)
@@ -1191,13 +1214,13 @@ module Formtastic #:nodoc:
       def inline_hints_for(method, options) #:nodoc:
         options[:hint] = localized_string(method, options[:hint], :hint)
         return if options[:hint].blank?
-        template.content_tag(:p, options[:hint], :class => 'inline-hints')
+        template.content_tag(:p, Formtastic::Util.html_safe(options[:hint]), :class => 'inline-hints')
       end
 
       # Creates an error sentence by calling to_sentence on the errors array.
       #
       def error_sentence(errors) #:nodoc:
-        template.content_tag(:p, errors.to_sentence.untaint, :class => 'inline-errors')
+        template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.untaint), :class => 'inline-errors')
       end
 
       # Creates an error li list.
@@ -1205,15 +1228,15 @@ module Formtastic #:nodoc:
       def error_list(errors) #:nodoc:
         list_elements = []
         errors.each do |error|
-          list_elements <<  template.content_tag(:li, error.untaint)
+          list_elements <<  template.content_tag(:li, Formtastic::Util.html_safe(error.untaint))
         end
-        template.content_tag(:ul, list_elements.join("\n"), :class => 'errors')
+        template.content_tag(:ul, Formtastic::Util.html_safe(list_elements.join("\n")), :class => 'errors')
       end
 
       # Creates an error sentence containing only the first error
       #
       def error_first(errors) #:nodoc:
-        template.content_tag(:p, errors.first.untaint, :class => 'inline-errors')
+        template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => 'inline-errors')
       end
 
       # Generates the required or optional string. If the value set is a proc,
@@ -1260,7 +1283,7 @@ module Formtastic #: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  = template.content_tag(:legend, template.content_tag(:span, Formtastic::Util.html_safe(legend))) unless legend.blank?
 
         if block_given?
           contents = if template.respond_to?(:is_haml?) && template.is_haml?
@@ -1273,11 +1296,11 @@ module Formtastic #:nodoc:
         # 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),
+          Formtastic::Util.html_safe(legend) << template.content_tag(:ol, Formtastic::Util.html_safe(contents)),
           html_options.except(:builder, :parent)
         )
 
-        template.concat(fieldset) if block_given?
+        template.concat(fieldset) if block_given? && (!defined?(Rails::VERSION) || Rails::VERSION::MAJOR == 2)
         fieldset
       end
 
@@ -1305,7 +1328,7 @@ module Formtastic #:nodoc:
             template.content_tag(:legend,
                 self.label(method, options_for_label(options).merge(:for => options.delete(:label_for))), :class => 'label'
               ) <<
-            template.content_tag(:ol, contents)
+            template.content_tag(:ol, Formtastic::Util.html_safe(contents))
           )
       end
 
@@ -1323,7 +1346,7 @@ module Formtastic #:nodoc:
           case column.type
           when :string
             return :password  if method.to_s =~ /password/
-            return :country   if method.to_s =~ /country/
+            return :country   if method.to_s =~ /country$/
             return :time_zone if method.to_s =~ /time_zone/
           when :integer
             return :select    if method.to_s =~ /_id$/
@@ -1380,7 +1403,13 @@ module Formtastic #:nodoc:
         collection = if options[:collection]
           options.delete(:collection)
         elsif reflection = self.reflection_for(column)
-          reflection.klass.find(:all, options[:find_options] || {})
+          options[:find_options] ||= {}
+
+          if conditions = reflection.options[:conditions]
+            options[:find_options][:conditions] = reflection.klass.merge_conditions(conditions, options[:find_options][:conditions])
+          end
+
+          reflection.klass.find(:all, options[:find_options])
         else
           create_boolean_collection(options)
         end
@@ -1471,7 +1500,7 @@ module Formtastic #:nodoc:
           if [:has_and_belongs_to_many, :has_many].include?(reflection.macro)
             "#{method.to_s.singularize}_ids"
           else
-            reflection.options[:foreign_key] || reflection.options[:class_name].try(:foreign_key) || "#{method}_id"
+            reflection.options[:foreign_key] || "#{method}_id"
           end
         else
           method
@@ -1566,9 +1595,9 @@ module Formtastic #:nodoc:
       #
       # Lookup priority:
       #
-      #   'formtastic.{{type}}.{{model}}.{{action}}.{{attribute}}'
-      #   'formtastic.{{type}}.{{model}}.{{attribute}}'
-      #   'formtastic.{{type}}.{{attribute}}'
+      #   'formtastic.%{type}.%{model}.%{action}.%{attribute}'
+      #   'formtastic.%{type}.%{model}.%{attribute}'
+      #   'formtastic.%{type}.%{attribute}'
       # 
       # Example:
       #   
@@ -1587,15 +1616,16 @@ module Formtastic #:nodoc:
           use_i18n = value.nil? ? @@i18n_lookups_by_default : (value != false)
 
           if use_i18n
-            model_name  = self.model_name.underscore
+            model_name, nested_model_name  = normalize_model_name(self.model_name.underscore)
             action_name = template.params[:action].to_s rescue ''
             attribute_name = key.to_s
 
             defaults = ::Formtastic::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!('%{action}', action_name)
+              i18n_path.gsub!('%{model}', model_name)
+              i18n_path.gsub!('%{nested_model}', nested_model_name) unless nested_model_name.nil?
+              i18n_path.gsub!('%{attribute}', attribute_name)
               i18n_path.gsub!('..', '.')
               i18n_path.to_sym
             end
@@ -1612,6 +1642,14 @@ module Formtastic #:nodoc:
         @object.present? ? @object.class.name : @object_name.to_s.classify
       end
 
+      def normalize_model_name(name)
+        if name =~ /(.+)\[(.+)\]/
+          [$1, $2]
+        else
+          [name]
+        end
+      end
+
       def send_or_call(duck, object)
         if duck.is_a?(Proc)
           duck.call(object)

data/lib/formtastic/i18n.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 module Formtastic
   module I18n
     
@@ -6,13 +7,16 @@ module Formtastic
         :required       => 'required',
         :yes            => 'Yes',
         :no             => 'No',
-        :create         => 'Create {{model}}',
-        :update         => 'Update {{model}}'
+        :create         => 'Create %{model}',
+        :update         => 'Update %{model}'
       }.freeze
     SCOPES = [
-        '{{model}}.{{action}}.{{attribute}}',
-        '{{model}}.{{attribute}}',
-        '{{attribute}}'
+        '%{model}.%{nested_model}.%{action}.%{attribute}',
+        '%{model}.%{action}.%{attribute}',
+        '%{model}.%{nested_model}.%{attribute}',
+        '%{model}.%{attribute}',
+        '%{nested_model}.%{attribute}',
+        '%{attribute}'
       ]
       
     class << self

data/lib/formtastic/layout_helper.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 module Formtastic
   module LayoutHelper
     

data/lib/formtastic/util.rb

@@ -0,0 +1,25 @@
+# Adapted from the rails3 compatibility shim in Haml 2.2
+module Formtastic
+  module Util
+    extend self
+    ## Rails XSS Safety
+
+    # Returns the given text, marked as being HTML-safe.
+    # With older versions of the Rails XSS-safety mechanism,
+    # this destructively modifies the HTML-safety of `text`.
+    #
+    # @param text [String]
+    # @return [String] `text`, marked as HTML-safe
+    def html_safe(text)
+      return text if text.nil?
+      return text.html_safe if defined?(ActiveSupport::SafeBuffer)
+      return text.html_safe!
+    end
+
+    def rails_safe_buffer_class
+      return ActionView::SafeBuffer if defined?(ActionView::SafeBuffer)
+      ActiveSupport::SafeBuffer
+    end
+
+  end
+end

data/spec/commit_button_spec.rb

@@ -136,11 +136,11 @@ describe 'SemanticFormBuilder#commit_button' do
       describe 'when no explicit label is provided' do
         describe 'when no I18n-localized label is provided' do
           before do
-            ::I18n.backend.store_translations :en, :formtastic => {:submit => 'Submit {{model}}'}
+            ::I18n.backend.store_translations :en, :formtastic => {:submit => 'Submit %{model}'}
           end
           
           after do
-            ::I18n.backend.store_translations :en, :formtastic => {:submit => nil}
+            ::I18n.backend.reload!
           end
           
           it 'should render an input with default I18n-localized label (fallback)' do
@@ -157,33 +157,34 @@ describe 'SemanticFormBuilder#commit_button' do
              :formtastic => {
                  :actions => {
                    :submit => 'Custom Submit',
-                   :post => {
-                     :submit => 'Custom Submit {{model}}'
-                    }
                   }
                }
            ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
          end
 
-         it 'should render an input with localized label (I18n)' do
-           semantic_form_for(:post, :url => 'http://example.com') do |builder|
-             concat(builder.commit_button)
-           end
-           output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit Post"][@class~="submit"]})
+         after do
+           ::I18n.backend.reload!
          end
 
-         it 'should render an input with anoptional localized label (I18n) - if first is not set' do
+         it 'should render an input with localized label (I18n)' do
            ::I18n.backend.store_translations :en,
              :formtastic => {
                  :actions => {
                    :post => {
-                     :submit => nil
+                     :submit => 'Custom Submit %{model}'
                     }
                   }
                }
            semantic_form_for(:post, :url => 'http://example.com') do |builder|
              concat(builder.commit_button)
            end
+           output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit Post"][@class~="submit"]})
+         end
+
+         it 'should render an input with anoptional localized label (I18n) - if first is not set' do
+           semantic_form_for(:post, :url => 'http://example.com') do |builder|
+             concat(builder.commit_button)
+           end
            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit"][@class~="submit"]})
          end
 
@@ -209,11 +210,11 @@ describe 'SemanticFormBuilder#commit_button' do
       describe 'when no explicit label is provided' do
         describe 'when no I18n-localized label is provided' do
           before do
-            ::I18n.backend.store_translations :en, :formtastic => {:create => 'Create {{model}}'}
+            ::I18n.backend.store_translations :en, :formtastic => {:create => 'Create %{model}'}
           end
 
           after do
-            ::I18n.backend.store_translations :en, :formtastic => {:create => nil}
+            ::I18n.backend.reload!
           end
 
           it 'should render an input with default I18n-localized label (fallback)' do
@@ -230,40 +231,35 @@ describe 'SemanticFormBuilder#commit_button' do
               :formtastic => {
                   :actions => {
                     :create => 'Custom Create',
-                    :post => {
-                      :create => 'Custom Create {{model}}'
-                     }
                    }
                 }
             ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
           end
           
           after do
-            ::I18n.backend.store_translations :en, :formtastic => nil
+            ::I18n.backend.reload!
           end
 
           it 'should render an input with localized label (I18n)' do
-            semantic_form_for(@new_post) do |builder|
-              concat(builder.commit_button)
-            end
-            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create Post"][@class~="create"]})
-          end
-
-          it 'should render an input with anoptional localized label (I18n) - if first is not set' do
             ::I18n.backend.store_translations :en,
               :formtastic => {
                   :actions => {
                     :post => {
-                      :create => nil
+                      :create => 'Custom Create %{model}'
                      }
                    }
                 }
             semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
-            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create"][@class~="create"]})
-            ::I18n.backend.store_translations :en, :formtastic => nil
-            
+            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create Post"][@class~="create"]})
+          end
+
+          it 'should render an input with anoptional localized label (I18n) - if first is not set' do
+            semantic_form_for(@new_post) do |builder|
+              concat(builder.commit_button)
+            end
+            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create"][@class~="create"]})            
           end
 
         end
@@ -288,11 +284,11 @@ describe 'SemanticFormBuilder#commit_button' do
       describe 'when no explicit label is provided' do
         describe 'when no I18n-localized label is provided' do
           before do
-            ::I18n.backend.store_translations :en, :formtastic => {:update => 'Save {{model}}'}
+            ::I18n.backend.store_translations :en, :formtastic => {:update => 'Save %{model}'}
           end
           
           after do
-            ::I18n.backend.store_translations :en, :formtastic => {:update => nil}
+            ::I18n.backend.reload!
           end
 
           it 'should render an input with default I18n-localized label (fallback)' do
@@ -309,33 +305,34 @@ describe 'SemanticFormBuilder#commit_button' do
               :formtastic => {
                   :actions => {
                     :update => 'Custom Save',
-                    :post => {
-                      :update => 'Custom Save {{model}}'
-                     }
                    }
                 }
             ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
           end
 
-          it 'should render an input with localized label (I18n)' do
-            semantic_form_for(@new_post) do |builder|
-              concat(builder.commit_button)
-            end
-            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save Post"][@class~="update"]})
+          after do
+            ::I18n.backend.reload!
           end
-
-          it 'should render an input with anoptional localized label (I18n) - if first is not set' do
+          
+          it 'should render an input with localized label (I18n)' do
             ::I18n.backend.store_translations :en,
               :formtastic => {
                   :actions => {
                     :post => {
-                      :update => nil
+                      :update => 'Custom Save %{model}'
                      }
                    }
                 }
             semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
+            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save Post"][@class~="update"]})
+          end
+
+          it 'should render an input with anoptional localized label (I18n) - if first is not set' do
+            semantic_form_for(@new_post) do |builder|
+              concat(builder.commit_button)
+            end
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save"][@class~="update"]})
             ::I18n.backend.store_translations :en, :formtastic => {}
           end

data/spec/errors_spec.rb

@@ -81,5 +81,24 @@ describe 'SemanticFormBuilder#errors_on' do
     end
   end
   
+  
+  describe 'when there are errors on the association and column' do
+    
+    it "should list all unique errors" do
+      ::Formtastic::SemanticFormBuilder.inline_errors = :list
+      ::Post.stub!(:reflections).and_return({:author => mock('reflection', :options => {}, :macro => :belongs_to)})
+      
+      @errors.stub!(:[]).with(:author).and_return(['must not be blank'])
+      @errors.stub!(:[]).with(:author_id).and_return(['is already taken', 'must not be blank']) # note the duplicate of association
+      
+      semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:author))
+      end
+      output_buffer.should have_tag("ul.errors li", /must not be blank/, :count => 1)
+      output_buffer.should have_tag("ul.errors li", /is already taken/, :count => 1)
+    end
+    
+  end
+  
 end
 

data/spec/i18n_spec.rb

@@ -24,20 +24,24 @@ describe 'Formtastic::I18n' do
     
     before do
       @formtastic_strings = {
-          :required       => 'Default Required',
           :yes            => 'Default Yes',
           :no             => 'Default No',
-          :create         => 'Default Create {{model}}',
-          :update         => 'Default Update {{model}}',
+          :create         => 'Default Create %{model}',
+          :update         => 'Default Update %{model}',
           :custom_scope   => {
               :duck           => 'Duck',
-              :duck_pond      => '{{ducks}} ducks in a pond'
+              :duck_pond      => '%{ducks} ducks in a pond'
             }
         }
       ::I18n.backend.store_translations :en, :formtastic => @formtastic_strings
     end
+
+    after do
+      ::I18n.backend.reload!
+    end
     
     it "should translate core strings correctly" do
+      ::I18n.backend.store_translations :en, {:formtastic => {:required => 'Default Required'}}
       ::Formtastic::I18n.t(:required).should  == "Default Required"
       ::Formtastic::I18n.t(:yes).should       == "Default Yes"
       ::Formtastic::I18n.t(:no).should        == "Default No"
@@ -54,7 +58,6 @@ describe 'Formtastic::I18n' do
     end
     
     it "should be possible to override default values" do
-      ::I18n.backend.store_translations :en, {:formtastic => {:required => nil}}
       ::Formtastic::I18n.t(:required, :default => 'Nothing found!').should == 'Nothing found!'
     end
     
@@ -63,18 +66,12 @@ describe 'Formtastic::I18n' do
   describe "when no I18n locales are available" do
     
     before do
-      ::I18n.backend.store_translations :en, :formtastic => {
-          :required => nil,
-          :yes => nil,
-          :no => nil,
-          :create => nil,
-          :update => nil
-        }
+      ::I18n.backend.reload!
     end
-    
+
     it "should use default strings" do
       (::Formtastic::I18n::DEFAULT_VALUES.keys).each do |key|
-        ::Formtastic::I18n.t(key, :model => '{{model}}').should == ::Formtastic::I18n::DEFAULT_VALUES[key]
+        ::Formtastic::I18n.t(key, :model => '%{model}').should == ::Formtastic::I18n::DEFAULT_VALUES[key]
       end
     end
     
@@ -92,7 +89,8 @@ describe 'Formtastic::I18n' do
           :labels => {
               :title    => "Hello world!",
               :post     => {:title => "Hello post!"},
-              :project  => {:title => "Hello project!"}
+              :project  => {:title => "Hello project!", :task => {:name => "Hello task name!"}},
+              :line_item => {:name => "Hello line item name!"}
             }
         }
       ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
@@ -102,7 +100,7 @@ describe 'Formtastic::I18n' do
     end
     
     after do
-      ::I18n.backend.store_translations :en, :formtastic => nil
+      ::I18n.backend.reload!
       ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
     end
     
@@ -124,6 +122,25 @@ describe 'Formtastic::I18n' do
       output_buffer.should have_tag("form label", /Hello project!/)
     end
     
+    it 'should be able to translate nested objects with nested translations' do
+      semantic_form_for(:project, :url => 'http://test.host') do |builder|
+        builder.semantic_fields_for(:task) do |f|
+          concat(f.input(:name))
+        end
+      end
+      output_buffer.should have_tag("form label", /Hello task name!/)
+    end
+
+    it 'should be able to translated nested objects with top level translations' do
+      semantic_form_for(:order, :url => 'http://test.host') do |builder|
+        builder.semantic_fields_for(:line_item) do |f|
+          concat(f.input(:name))
+        end
+      end
+      output_buffer.should have_tag("form label", /Hello line item name!/)
+    end
+
+
     # TODO: Add spec for namespaced models?
     
   end

data/spec/input_spec.rb

@@ -528,34 +528,35 @@ describe 'SemanticFormBuilder#input' do
               :formtastic => {
                   :hints => {
                     :title => @default_localized_hint_text,
-                    :post => {
-                      :title => @localized_hint_text
-                     }
                    }
                 }
             ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
           end
           
+          after do
+            ::I18n.backend.reload!
+          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
+                      :title => @localized_hint_text
                      }
                    }
                 }
               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
+              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

data/spec/inputs/check_boxes_input_spec.rb

@@ -177,6 +177,61 @@ describe 'check_boxes input' do
     end
     
 
+    describe 'when :disabled is set' do
+      before do
+        @output_buffer = ''
+      end
+
+      describe "no disabled items" do
+        before do
+          @new_post.stub!(:author_ids).and_return(nil)
+
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:authors, :as => :check_boxes, :disabled => nil))
+          end
+        end
+
+        it 'should not have any disabled item(s)' do
+          output_buffer.should_not have_tag("form li fieldset ol li label input[@disabled='disabled']")
+        end
+      end
+
+      describe "single disabled item" do
+        before do
+          @new_post.stub!(:author_ids).and_return(nil)
+
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:authors, :as => :check_boxes, :disabled => @fred.id))
+          end
+        end
+
+        it "should have one item disabled; the specified one" do
+          output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 1)
+          output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
+          output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@fred.id}']")
+        end
+      end
+
+      describe "multiple disabled items" do
+        before do
+          @new_post.stub!(:author_ids).and_return(nil)
+
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:authors, :as => :check_boxes, :disabled => [@bob.id, @fred.id]))
+          end
+        end
+
+        it "should have multiple items disabled; the specified ones" do
+          output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 2)
+          output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@bob.id}']", /bob/i)
+          output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@bob.id}']")
+          output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
+          output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@fred.id}']")
+        end
+      end
+
+    end
+
   end
   
   

data/spec/inputs/country_input_spec.rb

@@ -26,7 +26,7 @@ describe 'country input' do
     
     before do
       semantic_form_for(@new_post) do |builder|
-        builder.stub!(:country_select).and_return("<select><option>...</option></select>")
+        builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         concat(builder.input(:country, :as => :country))
       end
     end
@@ -54,8 +54,8 @@ describe 'country input' do
     it "should be passed down to the country_select helper when provided" do
       priority_countries = ["Foo", "Bah"]
       semantic_form_for(@new_post) do |builder|
-        builder.stub!(:country_select).and_return("<select><option>...</option></select>")
-        builder.should_receive(:country_select).with(:country, priority_countries, {}, {}).and_return("<select><option>...</option></select>")
+        builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        builder.should_receive(:country_select).with(:country, priority_countries, {}, {}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         
         concat(builder.input(:country, :as => :country, :priority_countries => priority_countries))
       end
@@ -68,13 +68,47 @@ describe 'country input' do
       
       semantic_form_for(@new_post) do |builder|
         builder.stub!(:country_select).and_return("<select><option>...</option></select>")
-        builder.should_receive(:country_select).with(:country, priority_countries, {}, {}).and_return("<select><option>...</option></select>")
+        builder.should_receive(:country_select).with(:country, priority_countries, {}, {}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         
         concat(builder.input(:country, :as => :country))
       end
     end
     
   end
-
+  
+  describe "matching" do
+    
+    describe "when the attribute is 'country'" do
+      
+      before do
+        semantic_form_for(@new_post) do |builder|
+          builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+          concat(builder.input(:country))
+        end
+      end
+      
+      it "should render a country input" do
+        output_buffer.should have_tag "form li.country"
+      end
+    end
+    
+    describe "whent the attribute is 'country_something'" do
+      
+      before do
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:country_subdivision))
+          concat(builder.input(:country_code))
+        end
+      end
+      
+      it "should render a country input" do
+        output_buffer.should_not have_tag "form li.country"
+        output_buffer.should have_tag "form li.string", :count => 2
+      end
+      
+    end
+    
+  end
+  
 end
 

data/spec/inputs/date_input_spec.rb

@@ -68,7 +68,7 @@ describe 'date input' do
       end
     end
     
-    describe 'when the object has no value' do
+    describe 'when the object has no value (nil)' do
       it "should select the :selected if provided as a Date" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
@@ -104,14 +104,13 @@ describe 'date input' do
         output_buffer.should_not have_tag("form li ol li select#post_created_at_1i option[@selected]")
       end
       
-      it "should select Time.now if a :selected is not provided" do
+      it "should select nothing if a :selected is not provided" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
         semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :date))
         end
-        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
-        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='#{Time.now.year}'][@selected]", :count => 1)
+        output_buffer.should_not have_tag("form li ol li select option[@selected]")
         
       end
     end

data/spec/inputs/datetime_input_spec.rb

@@ -163,6 +163,21 @@ describe 'datetime input' do
     end
   end
   
+  #describe 'when an object is given and the attribute value is nil' do
+  #  before(:each) do
+  #    @new_post.stub!(:publish_at).and_return(nil)
+  #    output_buffer.replace ''
+  #    semantic_form_for(@new_post) do |builder|
+  #      concat(builder.input(:publish_at, :as => :datetime))
+  #    end
+  #  end
+  #  
+  #  it 'should not select a value' do
+  #    output_buffer.should_not have_tag('form li.datetime option[@selected]')
+  #  end
+  #  
+  #end
+  
   describe ':selected option' do
     
     describe "when the object has a value" do
@@ -215,15 +230,13 @@ describe 'datetime input' do
         output_buffer.should_not have_tag("form li ol li select#post_created_at_1i option[@selected]")
       end
       
-      it "should select Time.now if a :selected is not provided" do
+      it "should select nothing if a :selected is not provided" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
         semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :datetime))
         end
-        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
-        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='#{Time.now.year}'][@selected]", :count => 1)
-        
+        output_buffer.should_not have_tag("form li ol li select option[@selected]")
       end
     end
     

data/spec/inputs/select_input_spec.rb

@@ -94,6 +94,7 @@ describe 'select input' do
     before do
       semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select))
+				concat(builder.input(:reviewer, :as => :select))
       end
     end
 
@@ -108,11 +109,13 @@ describe 'select input' do
     it 'should have a select inside the wrapper' do
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#post_author_id')
+			output_buffer.should have_tag('form li select#post_reviewer_id')
     end
 
     it 'should have a valid name' do
       output_buffer.should have_tag("form li select[@name='post[author_id]']")
       output_buffer.should_not have_tag("form li select[@name='post[author_id][]']")
+			output_buffer.should_not have_tag("form li select[@name='post[reviewer_id][]']")
     end
 
     it 'should not create a multi-select' do
@@ -128,14 +131,14 @@ describe 'select input' 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[@name='post[author_id]'] option", :count => ::Author.find(:all).size + 1)
       ::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 have one option with a "selected" attribute' do
-      output_buffer.should have_tag('form li select option[@selected]', :count => 1)
+      output_buffer.should have_tag("form li select[@name='post[author_id]'] option[@selected]", :count => 1)
     end
 
     it 'should not singularize the association name' do
@@ -149,20 +152,6 @@ describe 'select input' do
 
       output_buffer.should have_tag('form li select#post_author_status_id')
     end
-
-    it 'should use the "class_name" option' do
-      @new_post.stub!(:status).and_return(@bob)
-      @new_post.stub!(:author_status_id).and_return(@bob.id)
-   
-      ::Post.stub!(:reflect_on_association).with(:status).and_return(
-        mock('reflection', :options => {:class_name => 'AuthorStatus'}, :klass => ::Author, :macro => :belongs_to))
-
-      semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:status, :as => :select))
-      end
-
-      output_buffer.should have_tag('form li select#post_author_status_id')
-    end
   end
   
   describe "for a belongs_to association with :group_by => :author" do
@@ -176,6 +165,34 @@ describe 'select input' do
     end
   end
 
+  describe "for a belongs_to association with :conditions" do
+    before do
+      ::Post.stub!(:reflect_on_association).with(:author).and_return do
+        mock = mock('reflection', :options => {:conditions => {:active => true}}, :klass => ::Author, :macro => :belongs_to)
+        mock.stub!(:[]).with(:class_name).and_return("Author")
+        mock
+      end
+    end
+
+    it "should call author.find with association conditions" do
+      ::Author.should_receive(:merge_conditions).with({:active => true}, nil).and_return(:active => true)
+      ::Author.should_receive(:find).with(:all, :conditions => {:active => true})
+
+      semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:author, :as => :select))
+      end
+    end
+
+    it "should call author.find with association conditions and find_options conditions" do
+      ::Author.should_receive(:merge_conditions).with({:active => true}, {:publisher => true}).and_return(:active => true, :publisher => true)
+      ::Author.should_receive(:find).with(:all, :conditions => {:active => true, :publisher => true})
+
+      semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:author, :as => :select, :find_options => {:conditions => {:publisher => true}}))
+      end
+    end
+  end
+
   describe 'for a belongs_to association with :group_by => :continent' do
     before do
       @authors = [@bob, @fred, @fred, @fred]

data/spec/inputs/time_input_spec.rb

@@ -12,6 +12,7 @@ describe 'time input' do
   
   describe "general" do
     before do
+      ::I18n.backend.reload!
       output_buffer.replace ''
     end
 
@@ -94,7 +95,7 @@ describe 'time input' do
       end
     end
     
-    describe 'when the object has no value' do
+    describe 'when the object has no value (nil)' do
       it "should select the :selected if provided as a Time" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
@@ -118,14 +119,13 @@ describe 'time input' do
         output_buffer.should_not have_tag("form li ol li select#post_created_at_4i option[@selected]")
       end
       
-      it "should select Time.now if a :selected is not provided" do
+      it "should select nothing if a :selected is not provided" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
         semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :time))
         end
-        output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@selected]", :count => 1)
-        output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@value='#{Time.now.hour.to_s.rjust(2,'0')}'][@selected]", :count => 1)
+        output_buffer.should_not have_tag("form li ol li select option[@selected]")
       end
     end
     

data/spec/inputs_spec.rb

@@ -391,5 +391,4 @@ describe 'SemanticFormBuilder#inputs' do
     end
 
   end
-
 end

data/spec/spec_helper.rb

@@ -1,8 +1,8 @@
 # coding: utf-8
 require 'rubygems'
 
-gem 'activesupport', '2.3.5'
-gem 'actionpack', '2.3.5'
+gem 'activesupport', '2.3.7'
+gem 'actionpack', '2.3.7'
 require 'active_support'
 require 'action_pack'
 require 'action_view'
@@ -22,6 +22,7 @@ Spec::Runner.configure do |config|
 end
 
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic'))
+require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic/util'))
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic/layout_helper'))
 
 
@@ -126,6 +127,7 @@ module FormtasticSpecHelper
     @new_post.stub!(:new_record?).and_return(true)
     @new_post.stub!(:errors).and_return(mock('errors', :[] => nil))
     @new_post.stub!(:author).and_return(nil)
+		@new_post.stub!(:reviewer).and_return(nil)
     @new_post.stub!(:main_post).and_return(nil)
     @new_post.stub!(:sub_posts).and_return([]) #TODO should be a mock with methods for adding sub posts
 
@@ -146,11 +148,16 @@ module FormtasticSpecHelper
     ::Post.stub!(:human_name).and_return('Post')
     ::Post.stub!(:reflect_on_all_validations).and_return([])
     ::Post.stub!(:reflect_on_validations_for).and_return([])
+    ::Post.stub!(:reflections).and_return({})
     ::Post.stub!(:reflect_on_association).and_return do |column_name|
       case column_name
       when :author, :author_status
         mock = mock('reflection', :options => {}, :klass => ::Author, :macro => :belongs_to)
         mock.stub!(:[]).with(:class_name).and_return("Author")
+        mock
+			when :reviewer
+				mock = mock('reflection', :options => {:class_name => 'Author'}, :klass => ::Author, :macro => :belongs_to)
+        mock.stub!(:[]).with(:class_name).and_return("Author")
         mock
       when :authors
         mock('reflection', :options => {}, :klass => ::Author, :macro => :has_and_belongs_to_many)
@@ -173,6 +180,9 @@ module FormtasticSpecHelper
     @new_post.stub!(:time_zone)
     @new_post.stub!(:category_name)
     @new_post.stub!(:allow_comments)
+    @new_post.stub!(:country)
+    @new_post.stub!(:country_subdivision)
+    @new_post.stub!(:country_code)
     @new_post.stub!(:column_for_attribute).with(:meta_description).and_return(mock('column', :type => :string, :limit => 255))
     @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :string, :limit => 50))
     @new_post.stub!(:column_for_attribute).with(:body).and_return(mock('column', :type => :text))
@@ -180,10 +190,17 @@ module FormtasticSpecHelper
     @new_post.stub!(:column_for_attribute).with(:publish_at).and_return(mock('column', :type => :date))
     @new_post.stub!(:column_for_attribute).with(:time_zone).and_return(mock('column', :type => :string))
     @new_post.stub!(:column_for_attribute).with(:allow_comments).and_return(mock('column', :type => :boolean))
+    @new_post.stub!(:column_for_attribute).with(:author).and_return(mock('column', :type => :integer))
+    @new_post.stub!(:column_for_attribute).with(:country).and_return(mock('column', :type => :string, :limit => 255))
+    @new_post.stub!(:column_for_attribute).with(:country_subdivision).and_return(mock('column', :type => :string, :limit => 255))
+    @new_post.stub!(:column_for_attribute).with(:country_code).and_return(mock('column', :type => :string, :limit => 255))
     
     @new_post.stub!(:author).and_return(@bob)
     @new_post.stub!(:author_id).and_return(@bob.id)
 
+		@new_post.stub!(:reviewer).and_return(@fred)
+		@new_post.stub!(:reviewer_id).and_return(@fred.id)
+
     @new_post.should_receive(:publish_at=).any_number_of_times
     @new_post.should_receive(:title=).any_number_of_times
     @new_post.stub!(:main_post_id).and_return(nil)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 8
-  version: 0.9.8
+  - 9
+  version: 0.9.9
 platform: ruby
 authors: 
 - Justin French
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-31 00:00:00 +11:00
+date: 2010-05-25 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -97,6 +97,7 @@ files:
 - lib/formtastic.rb
 - lib/formtastic/i18n.rb
 - lib/formtastic/layout_helper.rb
+- lib/formtastic/util.rb
 - lib/locale/en.yml
 - rails/init.rb
 - spec/buttons_spec.rb