formtastic 0.9.2 → 0.9.3

data/lib/formtastic.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+require File.join(File.dirname(__FILE__), *%w[formtastic i18n])
 
 module Formtastic #:nodoc:
 
@@ -7,7 +8,7 @@ module Formtastic #:nodoc:
     @@default_text_field_size = 50
     @@all_fields_required_by_default = true
     @@include_blank_for_select_by_default = true
-    @@required_string = proc { %{<abbr title="#{I18n.t 'formtastic.required', :default => 'required'}">*</abbr>} }
+    @@required_string = proc { %{<abbr title="#{::Formtastic::I18n.t 'formtastic.required', :default => 'required'}">*</abbr>} }
     @@optional_string = ''
     @@inline_errors = :sentence
     @@label_str_method = :humanize
@@ -22,10 +23,14 @@ module Formtastic #:nodoc:
                    :required_string, :optional_string, :inline_errors, :label_str_method, :collection_label_methods,
                    :inline_order, :file_methods, :priority_countries, :i18n_lookups_by_default, :default_commit_button_accesskey 
 
+    RESERVED_COLUMNS = [:created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
+
+    INLINE_ERROR_TYPES = [:sentence, :list, :first]
+
     I18N_SCOPES = [ '{{model}}.{{action}}.{{attribute}}',
                     '{{model}}.{{attribute}}',
                     '{{attribute}}']
-        
+
     attr_accessor :template
 
     # Returns a suitable form input for the given +method+, using the database column information
@@ -65,7 +70,8 @@ module Formtastic #:nodoc:
     #
     #   <% semantic_form_for @employee do |form| %>
     #     <% form.inputs do -%>
-    #       <%= form.input :name, :label => "Full Name"%>
+    #       <%= form.input :secret, :value => "Hello" %>
+    #       <%= form.input :name, :label => "Full Name" %>
     #       <%= form.input :manager_id, :as => :radio %>
     #       <%= form.input :hired_at, :as => :date, :label => "Date Hired" %>
     #       <%= form.input :phone, :required => false, :hint => "Eg: +1 555 1234" %>
@@ -136,11 +142,16 @@ module Formtastic #:nodoc:
     #     <%= form.inputs %>
     #   <% end %>
     #
+    #   With a few arguments:
+    #   <% semantic_form_for @post do |form| %>
+    #     <%= form.inputs "Post details", :title, :body %>
+    #   <% end %>
+    #
     # === Options
     #
-    # All options (with the exception of :name) are passed down to the fieldset as HTML
-    # attributes (id, class, style, etc).  If provided, the :name option is passed into a
-    # legend tag inside the fieldset (otherwise a legend is not generated).
+    # All options (with the exception of :name/:title) are passed down to the fieldset as HTML
+    # attributes (id, class, style, etc).  If provided, the :name/:title option is passed into a
+    # legend tag inside the fieldset.
     #
     #   # With a block:
     #   <% semantic_form_for @post do |form| %>
@@ -154,6 +165,11 @@ module Formtastic #:nodoc:
     #     <%= form.inputs :title, :body, :name => "Create a new post", :style => "border:1px;" %>
     #   <% end %>
     #
+    #   # ...or the equivalent:
+    #   <% semantic_form_for @post do |form| %>
+    #     <%= form.inputs "Create a new post", :title, :body, :style => "border:1px;" %>
+    #   <% end %>
+    #
     # === It's basically a fieldset!
     #
     # Instead of hard-coding fieldsets & legends into your form to logically group related fields,
@@ -168,6 +184,9 @@ module Formtastic #:nodoc:
     #       <%= f.input :created_at %>
     #       <%= f.input :user_id, :label => "Author" %>
     #     <% end %>
+    #     <% f.inputs "Extra" do %>
+    #       <%= f.input :update_at %>
+    #     <% end %>
     #   <% end %>
     #
     #   # Output:
@@ -185,6 +204,12 @@ module Formtastic #:nodoc:
     #         <li class="select">...</li>
     #       </ol>
     #     </fieldset>
+    #     <fieldset class="inputs">
+    #       <legend><span>Extra</span></legend>
+    #       <ol>
+    #         <li class="datetime">...</li>
+    #       </ol>
+    #     </fieldset>
     #   </form>
     #
     # === Nested attributes
@@ -232,17 +257,19 @@ module Formtastic #:nodoc:
       if html_options[:for]
         inputs_for_nested_attributes(args, html_options, &block)
       elsif block_given?
-        field_set_and_list_wrapping(html_options, &block)
+        field_set_and_list_wrapping(*(args << html_options), &block)
       else
         if @object && args.empty?
-          args  = @object.class.reflections.map { |n,_| n if _.macro == :belongs_to }
-          args += @object.class.content_columns.map(&:name)
-          args -= %w[created_at updated_at created_on updated_on lock_version version]
+          args  = self.association_columns(:belongs_to)
+          args += self.content_columns
+          args -= RESERVED_COLUMNS
           args.compact!
         end
-        contents = args.map { |method| input(method.to_sym) }
-
-        field_set_and_list_wrapping(html_options, contents)
+        legend = args.shift if args.first.is_a?(::String)
+        contents = args.collect { |method| input(method.to_sym) }
+        args.unshift(legend) if legend.present?
+        
+        field_set_and_list_wrapping(*((args << html_options) << contents))
       end
     end
     alias :input_field_set :inputs
@@ -295,7 +322,7 @@ module Formtastic #:nodoc:
       fallback_text ||= "#{key.to_s.humanize} {{model}}"
 
       text = (self.localized_string(key, text, :action, :model => object_name) ||
-              ::I18n.t(key, :model => object_name, :default => fallback_text, :scope => [:formtastic])) unless text.is_a?(::String)
+              ::Formtastic::I18n.t(key, :model => object_name)) unless text.is_a?(::String)
 
       button_html = options.delete(:button_html) || {}
       button_html.merge!(:class => [button_html[:class], key].compact.join(' '))
@@ -326,7 +353,7 @@ module Formtastic #:nodoc:
     #
     def semantic_fields_for(record_or_name_or_array, *args, &block)
       opts = args.extract_options!
-      opts.merge!(:builder => Formtastic::SemanticFormHelper.builder)
+      opts.merge!(:builder => ::Formtastic::SemanticFormHelper.builder)
       args.push(opts)
       fields_for(record_or_name_or_array, *args, &block)
     end
@@ -338,7 +365,6 @@ module Formtastic #:nodoc:
     # * :required - Appends an abbr tag if :required is true
     # * :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.
     #
@@ -362,17 +388,12 @@ module Formtastic #:nodoc:
       end
       text = localized_string(method, text, :label) || humanized_attribute_name(method)
       text += required_or_optional_string(options.delete(:required))
-      
+
       # special case for boolean (checkbox) labels, which have a nested input
       text = (options.delete(:label_prefix_for_nested_input) || "") + text
-      
+
       input_name = options.delete(:input_name) || method
-      if options.delete(:as_span)
-        options[:class] ||= 'label'
-        template.content_tag(:span, text, options)
-      else
-        super(input_name, text, options)
-      end
+      super(input_name, text, options)
     end
 
     # Generates error messages for the given method. Errors can be shown as list,
@@ -387,15 +408,41 @@ module Formtastic #:nodoc:
     #   end
     #
     def inline_errors_for(method, options=nil) #:nodoc:
-      return nil unless @object && @object.respond_to?(:errors) && [:sentence, :list, :first].include?(@@inline_errors)
+      return nil unless @object && @object.respond_to?(:errors) && INLINE_ERROR_TYPES.include?(@@inline_errors)
 
       errors = @object.errors[method.to_sym]
-      send("error_#{@@inline_errors}", Array(errors)) unless errors.blank?
+      send(:"error_#{@@inline_errors}", Array(errors)) unless errors.blank?
     end
     alias :errors_on :inline_errors_for
 
     protected
 
+    # Collects content columns (non-relation columns) for the current form object class.
+    #
+    def content_columns
+      if @object.present?
+        @object.class.name.constantize.content_columns.collect { |c| c.name.to_sym }.compact
+      else
+        @object_name.to_s.classify.constantize.content_columns.collect { |c| c.name.to_sym }.compact rescue []
+      end
+    end
+
+    # Collects association columns (relation columns) for the current form object class.
+    #
+    def association_columns(*by_associations)
+      if @object.present?
+        @object.class.reflections.collect do |name, _|
+          if by_associations.present?
+            name if by_associations.include?(_.macro)
+          else
+            name
+          end
+        end.compact
+      else
+        []
+      end
+    end
+
     # Prepare options to be sent to label
     #
     def options_for_label(options)
@@ -478,7 +525,7 @@ module Formtastic #:nodoc:
       html_options = options.delete(:input_html) || {}
       html_options = default_string_options(method, type).merge(html_options) if [:numeric, :string, :password].include?(type)
 
-      self.label(method, options_for_label(options)) +
+      self.label(method, options_for_label(options)) <<
       self.send(form_helper_method, method, html_options)
     end
     
@@ -491,17 +538,17 @@ module Formtastic #:nodoc:
     def password_input(method, options)
       basic_input_helper(:password_field, :password, method, options)
     end
-    
+
     # Outputs a label and standard Rails text field inside the wrapper.
     def numeric_input(method, options)
       basic_input_helper(:text_field, :numeric, method, options)
     end
-    
+
     # Ouputs a label and standard Rails text area inside the wrapper.
     def text_input(method, options)
       basic_input_helper(:text_area, :text, method, options)
     end
-    
+
     # Outputs a label and a standard Rails file field inside the wrapper.
     def file_input(method, options)
       basic_input_helper(:file_field, :file, method, options)
@@ -510,7 +557,12 @@ module Formtastic #:nodoc:
     # Outputs a hidden field inside the wrapper, which should be hidden with CSS.
     # Additionals options can be given and will be sent straight to hidden input
     # element.
+    #
     def hidden_input(method, options)
+      options ||= {}
+      if options[:input_html].present?
+        options[:value] = options[:input_html][:value] if options[:input_html][:value].present?
+      end
       self.hidden_field(method, set_options(options))
     end
 
@@ -625,12 +677,10 @@ module Formtastic #:nodoc:
         options[:include_blank]   = false
         html_options[:multiple] ||= true
         html_options[:size]     ||= 5
-       end
-
+      end
       input_name = generate_association_input_name(method)
-      self.label(method, options_for_label(options).merge(:input_name => input_name)) +
 
-      if options[:group_by]
+      select_html = if options[:group_by]
         # The grouped_options_select is a bit counter intuitive and not optimised (mostly due to ActiveRecord). 
         # The formtastic user however shouldn't notice this too much.
         raw_collection = find_raw_collection_for_column(method, options.reverse_merge(:find_options => { :include => options[:group_by] }))
@@ -648,6 +698,8 @@ module Formtastic #:nodoc:
         collection = find_collection_for_column(method, options)
         self.select(input_name, collection, set_options(options), html_options)
       end
+      
+      self.label(method, options_for_label(options).merge(:input_name => input_name)) << select_html
     end
     alias :boolean_select_input :select_input
 
@@ -661,7 +713,7 @@ module Formtastic #:nodoc:
     def time_zone_input(method, options)
       html_options = options.delete(:input_html) || {}
 
-      self.label(method, options_for_label(options)) +
+      self.label(method, options_for_label(options)) <<
       self.time_zone_select(method, options.delete(:priority_zones), set_options(options), html_options)
     end
 
@@ -732,22 +784,24 @@ module Formtastic #:nodoc:
 
       input_name = generate_association_input_name(method)
       value_as_class = options.delete(:value_as_class)
+      input_ids = []
 
       list_item_content = collection.map do |c|
         label = c.is_a?(Array) ? c.first : c
         value = c.is_a?(Array) ? c.last  : c
         html_options[:checked] = options.delete(:selected) unless options[:selected].blank?
 
+        input_ids << input_id = generate_html_id(input_name, value.to_s.gsub(/\s/, '_').gsub(/\W/, '').downcase)
         li_content = template.content_tag(:label,
           "#{self.radio_button(input_name, value, html_options)} #{label}",
-          :for => generate_html_id(input_name, value.to_s.gsub(/\s/, '_').gsub(/\W/, '').downcase)
+          :for => input_id
         )
 
         li_options = value_as_class ? { :class => value.to_s.downcase } : {}
         template.content_tag(:li, li_content, li_options)
       end
 
-      field_set_and_list_wrapping_for_method(method, options, list_item_content)
+      field_set_and_list_wrapping_for_method(method, options.merge(:label_for => input_ids.first), list_item_content)
     end
     alias :boolean_radio_input :radio_input
 
@@ -761,7 +815,6 @@ module Formtastic #:nodoc:
       date_or_datetime_input(method, options.merge(:discard_hour => true))
     end
 
-
     # Outputs a fieldset with a legend for the method label, and a ordered list (ol) of list
     # items (li), one for each fragment for the date (year, month, day, hour, min, sec).  Each li
     # contains a label (eg "Year") and a select box.  See date_or_datetime_input for a more
@@ -773,7 +826,6 @@ module Formtastic #:nodoc:
       date_or_datetime_input(method, options)
     end
 
-
     # Outputs a fieldset with a legend for the method label, and a ordered list (ol) of list
     # items (li), one for each fragment for the time (hour, minute, second).  Each li contains a label
     # (eg "Hour") and a select box.  See date_or_datetime_input for a more detailed output example.
@@ -784,7 +836,6 @@ module Formtastic #:nodoc:
       date_or_datetime_input(method, options.merge(:discard_year => true, :discard_month => true, :discard_day => true))
     end
 
-
     # <fieldset>
     #   <legend>Created At</legend>
     #   <ol>
@@ -819,7 +870,8 @@ module Formtastic #:nodoc:
     #
     def date_or_datetime_input(method, options)
       position = { :year => 1, :month => 2, :day => 3, :hour => 4, :minute => 5, :second => 6 }
-      i18n_date_order = I18n.translate(:'date.order').is_a?(Array) ? I18n.translate(:'date.order') : nil
+      i18n_date_order = ::I18n.t(:order, :scope => [:date])
+      i18n_date_order = nil unless i18n_date_order.is_a?(Array)
       inputs   = options.delete(:order) || i18n_date_order || [:year, :month, :day]
 
       time_inputs = [:hour, :minute]
@@ -831,30 +883,31 @@ module Formtastic #:nodoc:
       # Gets the datetime object. It can be a Fixnum, Date or Time, or nil.
       datetime     = @object ? @object.send(method) : nil
       html_options = options.delete(:input_html) || {}
+      input_ids    = []
 
       (inputs + time_inputs).each do |input|
-        html_id    = generate_html_id(method, "#{position[input]}i")
+        input_ids << input_id = generate_html_id(method, "#{position[input]}i")
+        
         field_name = "#{method}(#{position[input]}i)"
-        if options["discard_#{input}".intern]
+        if options[:"discard_#{input}"]
           break if time_inputs.include?(input)
           
-          hidden_value = datetime.respond_to?(input) ? datetime.send(input) : datetime
-          hidden_fields_capture << template.hidden_field_tag("#{@object_name}[#{field_name}]", (hidden_value || 1), :id => html_id)
+          hidden_value = datetime.respond_to?(input) ? datetime.send(input.to_sym) : datetime
+          hidden_fields_capture << template.hidden_field_tag("#{@object_name}[#{field_name}]", (hidden_value || 1), :id => input_id)
         else
           opts = set_options(options).merge(:prefix => @object_name, :field_name => field_name)
-          item_label_text = I18n.t(input.to_s, :default => input.to_s.humanize, :scope => [:datetime, :prompts])
+          item_label_text = ::I18n.t(input.to_s, :default => input.to_s.humanize, :scope => [:datetime, :prompts])
 
           list_items_capture << template.content_tag(:li,
-            template.content_tag(:label, item_label_text, :for => html_id) +
-            template.send("select_#{input}".intern, datetime, opts, html_options.merge(:id => html_id))
+            template.content_tag(:label, item_label_text, :for => input_id) <<
+            template.send(:"select_#{input}", datetime, opts, html_options.merge(:id => input_id))
           )
         end
       end
 
-      hidden_fields_capture + field_set_and_list_wrapping_for_method(method, options, list_items_capture)
+      hidden_fields_capture << field_set_and_list_wrapping_for_method(method, options.merge(:label_for => input_ids.first), list_items_capture)
     end
 
-
     # Outputs a fieldset containing a legend for the label text, and an ordered list (ol) of list
     # items, one for each possible choice in the belongs_to association.  Each li contains a
     # label and a check_box input.
@@ -868,7 +921,7 @@ module Formtastic #:nodoc:
     # Output:
     #
     #   <fieldset>
-    #     <legend><span>Authors</span></legend>
+    #     <legend class="label"><label>Authors</label></legend>
     #     <ol>
     #       <li>
     #         <input type="hidden" name="book[author_id][1]" value="">
@@ -927,26 +980,27 @@ module Formtastic #:nodoc:
       value_as_class  = options.delete(:value_as_class)
       unchecked_value = options.delete(:unchecked_value) || ''
       html_options    = { :name => "#{@object_name}[#{input_name}][]" }.merge(html_options)
+      input_ids       = []
 
       list_item_content = collection.map do |c|
         label = c.is_a?(Array) ? c.first : c
         value = c.is_a?(Array) ? c.last : c
 
-        html_options.merge!(:id => generate_html_id(input_name, value.to_s.gsub(/\s/, '_').gsub(/\W/, '').downcase))
- 
+        input_ids << input_id = generate_html_id(input_name, value.to_s.gsub(/\s/, '_').gsub(/\W/, '').downcase)
+        html_options.merge!(:id => input_id)
+
         li_content = template.content_tag(:label,
           "#{self.check_box(input_name, html_options, value, unchecked_value)} #{label}",
-          :for => html_options[:id]
+          :for => input_id
         )
 
         li_options = value_as_class ? { :class => value.to_s.downcase } : {}
         template.content_tag(:li, li_content, li_options)
       end
 
-      field_set_and_list_wrapping_for_method(method, options, list_item_content)
+      field_set_and_list_wrapping_for_method(method, options.merge(:label_for => input_ids.first), list_item_content)
     end
-    
-    
+
     # Outputs a country select input, wrapping around a regular country_select helper. 
     # Rails doesn't come with a country_select helper by default any more, so you'll need to install
     # the "official" plugin, or, if you wish, any other country_select plugin that behaves in the
@@ -967,10 +1021,9 @@ module Formtastic #:nodoc:
       html_options = options.delete(:input_html) || {}
       priority_countries = options.delete(:priority_countries) || @@priority_countries
 
-      self.label(method, options_for_label(options)) +
+      self.label(method, options_for_label(options)) <<
       self.country_select(method, priority_countries, set_options(options), html_options)
     end
-    
 
     # Outputs a label containing a checkbox and the label text. The label defaults
     # to the column name (method name) and can be altered with the :label option.
@@ -991,7 +1044,7 @@ module Formtastic #:nodoc:
 
     # Generates an input for the given method using the type supplied with :as.
     def inline_input_for(method, options)
-      send("#{options.delete(:as)}_input", method, options)
+      send(:"#{options.delete(:as)}_input", method, options)
     end
 
     # Generates hints for the given method using the text supplied in :hint.
@@ -1050,12 +1103,29 @@ module Formtastic #:nodoc:
     #
     #   f.inputs :name => 'Task #%i', :for => :tasks
     #
+    # or the shorter equivalent:
+    #
+    #   f.inputs 'Task #%i', :for => :tasks
+    #
     # And it will generate a fieldset for each task with legend 'Task #1', 'Task #2',
     # 'Task #3' and so on.
     #
-    def field_set_and_list_wrapping(html_options, contents='', &block) #:nodoc:
+    # Note: Special case for the inline inputs (non-block):
+    #   f.inputs "My little legend", :title, :body, :author   # Explicit legend string => "My little legend"
+    #   f.inputs :my_little_legend, :title, :body, :author    # Localized (118n) legend with I18n key => I18n.t(:my_little_legend, ...)
+    #   f.inputs :title, :body, :author                       # First argument is a column => (no legend)
+    #
+    def field_set_and_list_wrapping(*args, &block) #:nodoc:
+      contents = args.last.is_a?(::Hash) ? '' : args.pop.flatten
+      html_options = args.extract_options!
+
       html_options[:name] ||= html_options.delete(:title)
-      html_options[:name] = localized_string(html_options[:name], html_options[:name], :title) if html_options[:name].is_a?(Symbol)
+      if html_options[:name].blank?
+        valid_name_classes = [::String, ::Symbol]
+        valid_name_classes.delete(::Symbol) if !block_given? && (args.first.is_a?(::Symbol) && self.content_columns.include?(args.first))
+        html_options[:name] = args.shift if valid_name_classes.any? { |valid_name_class| args.first.is_a?(valid_name_class) }
+      end
+      html_options[:name] = localized_string(html_options[:name], html_options[:name], :title) if html_options[:name].is_a?(::Symbol)
 
       legend  = html_options.delete(:name).to_s
       legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
@@ -1072,7 +1142,7 @@ 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),
+        legend << template.content_tag(:ol, contents),
         html_options.except(:builder, :parent)
       )
 
@@ -1087,9 +1157,11 @@ module Formtastic #:nodoc:
       contents = contents.join if contents.respond_to?(:join)
 
       template.content_tag(:fieldset,
-        %{<legend>#{self.label(method, options_for_label(options).merge!(:as_span => true))}</legend>} +
-        template.content_tag(:ol, contents)
-      )
+          template.content_tag(:legend,
+              self.label(method, options_for_label(options).merge(:for => options.delete(:label_for))), :class => 'label'
+            ) <<
+          template.content_tag(:ol, contents)
+        )
     end
 
     # For methods that have a database column, take a best guess as to what the input method
@@ -1142,7 +1214,7 @@ module Formtastic #:nodoc:
       collection = find_raw_collection_for_column(column, options)
 
       # Return if we have an Array of strings, fixnums or arrays
-      return collection if collection.instance_of?(Array) &&
+      return collection if (collection.instance_of?(Array) || collection.instance_of?(Range)) &&
                            [Array, Fixnum, String, Symbol].include?(collection.first.class)
 
       label, value = detect_label_and_value_method!(collection, options)
@@ -1189,8 +1261,8 @@ module Formtastic #:nodoc:
     # is provided.
     #
     def create_boolean_collection(options)
-      options[:true] ||= I18n.t('yes', :default => 'Yes', :scope => [:formtastic])
-      options[:false] ||= I18n.t('no', :default => 'No', :scope => [:formtastic])
+      options[:true] ||= ::Formtastic::I18n.t(:yes)
+      options[:false] ||= ::Formtastic::I18n.t(:no)
       options[:value_as_class] = true unless options.key?(:value_as_class)
 
       [ [ options.delete(:true), true], [ options.delete(:false), false ] ]
@@ -1213,7 +1285,7 @@ module Formtastic #:nodoc:
         end
       else
         method
-      end
+      end.to_sym
     end
 
     # If an association method is passed in (f.input :author) try to find the
@@ -1301,7 +1373,7 @@ module Formtastic #:nodoc:
     #   'formtastic.labels.post.title'
     #   'formtastic.labels.title'
     # 
-    # NOTE: Generic, but only used for form input labels/hints.
+    # NOTE: Generic, but only used for form input titles/labels/hints/actions (titles = legends, actions = buttons).
     #
     def localized_string(key, value, type, options = {})
       key = value if value.is_a?(::Symbol)
@@ -1326,8 +1398,8 @@ module Formtastic #:nodoc:
           end
           defaults << ''
 
-          i18n_value = ::I18n.t(defaults.shift, options.merge(:default => defaults,
-                                :scope => :"formtastic.#{type.to_s.pluralize}"))
+          i18n_value = ::Formtastic::I18n.t(defaults.shift,
+            options.merge(:default => defaults,:scope => type.to_s.pluralize.to_sym))
           i18n_value.blank? ? nil : i18n_value
         end
       end
@@ -1341,14 +1413,12 @@ module Formtastic #:nodoc:
       end
     end
 
-    private
-
-      def set_include_blank(options)
-        unless options.key?(:include_blank) || options.key?(:prompt)
-          options[:include_blank] = @@include_blank_for_select_by_default
-        end
-        options
+    def set_include_blank(options)
+      unless options.key?(:include_blank) || options.key?(:prompt)
+        options[:include_blank] = @@include_blank_for_select_by_default
       end
+      options
+    end
 
   end
 
@@ -1385,7 +1455,7 @@ module Formtastic #:nodoc:
   #     ...
   #   <% end %>
   module SemanticFormHelper
-    @@builder = Formtastic::SemanticFormBuilder
+    @@builder = ::Formtastic::SemanticFormBuilder
     mattr_accessor :builder
     
     @@default_field_error_proc = nil

data/lib/locale/en.yml

@@ -1,7 +1,7 @@
 en:
   formtastic:
-    "yes": 'Yes'
-    "no": 'No'
+    :yes: 'Yes'
+    :no: 'No'
     create: 'Create'
     save: 'Save'
     submit: 'Submit'

data/spec/commit_button_spec.rb

@@ -46,12 +46,12 @@ describe 'SemanticFormBuilder#commit_button' do
   describe "its accesskey" do
   
     it 'should allow nil default' do
-      Formtastic::SemanticFormBuilder.default_commit_button_accesskey.should == nil
+      ::Formtastic::SemanticFormBuilder.default_commit_button_accesskey.should == nil
       output_buffer.should_not have_tag('li.commit input[@accesskey]')
     end
 
     it 'should use the default if set' do
-      Formtastic::SemanticFormBuilder.default_commit_button_accesskey = 's'
+      ::Formtastic::SemanticFormBuilder.default_commit_button_accesskey = 's'
       @new_post.stub!(:new_record?).and_return(false)
       semantic_form_for(@new_post) do |builder|
         concat(builder.commit_button('text', :button_html => {}))
@@ -60,7 +60,7 @@ describe 'SemanticFormBuilder#commit_button' do
     end
 
     it 'should use the value set in options over the default' do
-      Formtastic::SemanticFormBuilder.default_commit_button_accesskey = 's'
+      ::Formtastic::SemanticFormBuilder.default_commit_button_accesskey = 's'
       @new_post.stub!(:new_record?).and_return(false)
       semantic_form_for(@new_post) do |builder|
         concat(builder.commit_button('text', :accesskey => 'o'))
@@ -70,7 +70,7 @@ describe 'SemanticFormBuilder#commit_button' do
     end
 
     it 'should use the value set in button_html over options' do
-      Formtastic::SemanticFormBuilder.default_commit_button_accesskey = 's'
+      ::Formtastic::SemanticFormBuilder.default_commit_button_accesskey = 's'
       @new_post.stub!(:new_record?).and_return(false)
       semantic_form_for(@new_post) do |builder|
         concat(builder.commit_button('text', :accesskey => 'o', :button_html => {:accesskey => 't'}))
@@ -81,7 +81,7 @@ describe 'SemanticFormBuilder#commit_button' do
     end
 
     after do
-      Formtastic::SemanticFormBuilder.default_commit_button_accesskey = nil
+      ::Formtastic::SemanticFormBuilder.default_commit_button_accesskey = nil
     end
 
   end

data/spec/custom_builder_spec.rb

@@ -5,7 +5,7 @@ describe 'Formtastic::SemanticFormHelper.builder' do
 
   include FormtasticSpecHelper
   
-  class MyCustomFormBuilder < Formtastic::SemanticFormBuilder
+  class MyCustomFormBuilder < ::Formtastic::SemanticFormBuilder
     def awesome_input(method, options)
       self.text_field(method)
     end
@@ -17,28 +17,28 @@ describe 'Formtastic::SemanticFormHelper.builder' do
   end
   
   it 'is the Formtastic::SemanticFormBuilder by default' do
-    Formtastic::SemanticFormHelper.builder.should == Formtastic::SemanticFormBuilder
+    ::Formtastic::SemanticFormHelper.builder.should == ::Formtastic::SemanticFormBuilder
   end
   
   it 'can be configured to use your own custom form builder' do
     # Set it to a custom builder class
-    Formtastic::SemanticFormHelper.builder = MyCustomFormBuilder
-    Formtastic::SemanticFormHelper.builder.should == MyCustomFormBuilder
+    ::Formtastic::SemanticFormHelper.builder = MyCustomFormBuilder
+    ::Formtastic::SemanticFormHelper.builder.should == MyCustomFormBuilder
     
     # Reset it to the default
-    Formtastic::SemanticFormHelper.builder = Formtastic::SemanticFormBuilder
-    Formtastic::SemanticFormHelper.builder.should == Formtastic::SemanticFormBuilder
+    ::Formtastic::SemanticFormHelper.builder = ::Formtastic::SemanticFormBuilder
+    ::Formtastic::SemanticFormHelper.builder.should == ::Formtastic::SemanticFormBuilder
   end
   
   describe "when using a custom builder" do
     
     before do
       @new_post.stub!(:title)
-      Formtastic::SemanticFormHelper.builder = MyCustomFormBuilder
+      ::Formtastic::SemanticFormHelper.builder = MyCustomFormBuilder
     end
     
     after do
-      Formtastic::SemanticFormHelper.builder = Formtastic::SemanticFormBuilder
+      ::Formtastic::SemanticFormHelper.builder = ::Formtastic::SemanticFormBuilder
     end
     
     describe "semantic_form_for" do