formtastic 2.0.2 → 2.1.0.beta1

data/lib/formtastic/helpers/errors_helper.rb

@@ -56,62 +56,8 @@ module Formtastic
         end
       end
       
-      # Generates error messages for the given method, used for displaying errors right near the
-      # field for data entry. Uses the `:inline_errors` config to determin the right presentation,
-      # which may be an ordered list, a paragraph sentence containing all errors, or a paragraph
-      # containing just the first error. If configred to `:none`, no error is shown.
-      #
-      # See the `:inline_errors` config documentation for more details.
-      #
-      # This method is mostly used internally, but can be used in your forms when creating your own
-      # custom inputs, so it's been made public and aliased to `errors_on`.
-      #
-      # @example
-      #   <%= semantic_form_for @post do |f| %>
-      #     <li class='my-custom-text-input'>
-      #       <%= f.label(:body) %>
-      #       <%= f.text_field(:body) %>
-      #       <%= f.errors_on(:body) %>
-      #     </li>
-      #   <% end %>
-      #
-      # @deprecated See the README for the currently supported approach to custom inputs.
-      def inline_errors_for(method, options = {})
-        ActiveSupport::Deprecation.warn('inline_errors_for and errors_on are deprecated and will be removed on or after version 2.1', caller)
-        if render_inline_errors?
-          errors = error_keys(method, options).map{|x| @object.errors[x] }.flatten.compact.uniq
-          send(:"error_#{inline_errors}", [*errors], options) if errors.any?
-        else
-          nil
-        end
-      end
-      alias :errors_on :inline_errors_for
-      
-
       protected
       
-      # @deprecated This should be removed with inline_errors_for in 2.1
-      def error_sentence(errors, options = {})
-        error_class = options[:error_class] || default_inline_error_class
-        template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.untaint), :class => error_class)
-      end
-      
-      # @deprecated This should be removed with inline_errors_for in 2.1
-      def error_list(errors, options = {})
-        error_class = options[:error_class] || default_error_list_class
-        list_elements = []
-        errors.each do |error|
-          list_elements <<  template.content_tag(:li, Formtastic::Util.html_safe(error.untaint))
-        end
-        template.content_tag(:ul, Formtastic::Util.html_safe(list_elements.join("\n")), :class => error_class)
-      end
-      
-      # @deprecated This should be removed with inline_errors_for in 2.1
-      def error_first(errors, options = {})
-        error_class = options[:error_class] || default_inline_error_class
-        template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => error_class)
-      end
-
       def error_keys(method, options)
         @methods_for_error ||= {}
         @methods_for_error[method] ||= begin

data/lib/formtastic/helpers/fieldset_wrapper.rb

@@ -25,10 +25,6 @@ module Formtastic
         contents = args.last.is_a?(::Hash) ? '' : args.pop.flatten
         html_options = args.extract_options!
 
-        legend  = (html_options[:name] || '').to_s
-        legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
-        legend  = template.content_tag(:legend, template.content_tag(:span, Formtastic::Util.html_safe(legend))) unless legend.blank?
-
         if block_given?
           contents = if template.respond_to?(:is_haml?) && template.is_haml?
             template.capture_haml(&block)
@@ -39,6 +35,8 @@ module Formtastic
 
         # Ruby 1.9: String#to_s behavior changed, need to make an explicit join.
         contents = contents.join if contents.respond_to?(:join)
+
+        legend = field_set_legend(html_options)
         fieldset = template.content_tag(:fieldset,
           Formtastic::Util.html_safe(legend) << template.content_tag(:ol, Formtastic::Util.html_safe(contents)),
           html_options.except(:builder, :parent, :name)
@@ -47,6 +45,13 @@ module Formtastic
         fieldset
       end
 
+      def field_set_legend(html_options)
+        legend  = (html_options[:name] || '').to_s
+        legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
+        legend  = template.content_tag(:legend, template.content_tag(:span, Formtastic::Util.html_safe(legend))) unless legend.blank?
+        legend
+      end
+
       # Gets the nested_child_index value from the parent builder. It returns a hash with each
       # association that the parent builds.
       def parent_child_index(parent) #:nodoc:
@@ -72,4 +77,4 @@ module Formtastic
 
     end
   end
-end
+end

data/lib/formtastic/helpers/form_helper.rb

@@ -144,7 +144,7 @@ module Formtastic
         options[:builder] ||= @@builder
         options[:html] ||= {}
         options[:html][:novalidate] = !@@builder.perform_browser_validations unless options[:html].key?(:novalidate)
-        @@builder.custom_namespace = options[:namespace].to_s
+        @@builder.custom_namespace = options.delete(:namespace).to_s
 
         singularizer = defined?(ActiveModel::Naming.singular) ? ActiveModel::Naming.method(:singular) : ActionController::RecordIdentifier.method(:singular_class_name)
 
@@ -169,7 +169,7 @@ module Formtastic
       def semantic_fields_for(record_name, record_object = nil, options = {}, &block)
         options, record_object = record_object, nil if record_object.is_a?(Hash) && record_object.extractable_options?
         options[:builder] ||= @@builder
-        @@builder.custom_namespace = options[:namespace].to_s # TODO needed?
+        @@builder.custom_namespace = options.delete(:namespace).to_s # TODO needed?
 
         with_custom_field_error_proc do
           self.fields_for(record_name, record_object, options, &block)

data/lib/formtastic/helpers/input_helper.rb

@@ -140,15 +140,9 @@ module Formtastic
       # @option options :member_label [Symbol, Proc, Method]
       #   Override the method called on each object in the `:collection` for use as the `<label>` content (`:check_boxes` & `:radio` inputs) or `<option>` content (`:select` inputs)
       #
-      # @option options :label_method [Symbol, Proc, Method]
-      #   Deprecated, renamed to :member_label
-      #
       # @option options :member_value [Symbol, Proc, Method]
       #   Override the method called on each object in the `:collection` for use as the `value` attribute in the `<input>` (`:check_boxes` & `:radio` inputs) or `<option>` (`:select` inputs)
       #
-      # @option options :value_method [Symbol, Proc, Method]
-      #   Deprecated, renamed to :member_value
-      #
       # @option options :hint_class [String]
       #   Override the `class` attribute applied to the `<p>` tag used when a `:hint` is rendered for an input
       #
@@ -164,9 +158,6 @@ module Formtastic
       # @option options :find_options [Symbol]
       #   TODO will probably be deprecated
       #
-      # @option options :group_label_method [Symbol]
-      #   Deprecated, use `:group_label`
-      #
       # @option options :group_label [Symbol]
       #   TODO will probably be deprecated
       #
@@ -177,7 +168,7 @@ module Formtastic
       #   Specify the text in the first ('blank') `:select` input `<option>` to prompt a user to make a selection (implicitly sets `:include_blank` to `true`)
       #
       # @todo Can we kill `:hint_class` & `:error_class`? What's the use case for input-by-input? Shift to config or burn!
-      # @todo Can we kill `:group_by` & `:group_label`/`:group_label_method`? Should be done with :collection => grouped_options_for_select(...)
+      # @todo Can we kill `:group_by` & `:group_label`? Should be done with :collection => grouped_options_for_select(...)
       # @todo Can we kill `:find_options`? Should be done with MyModel.some_scope.where(...).order(...).whatever_scope
       # @todo Can we kill `:label`, `:hint` & `:prompt`? All strings could be shifted to i18n!
       #

data/lib/formtastic/helpers/inputs_helper.rb

@@ -300,7 +300,7 @@ module Formtastic
         end
         
         out = template.content_tag(:li, out, :class => "input") if wrap_it
-        @already_in_an_inputs_block = false
+        @already_in_an_inputs_block = wrap_it
         out
       end
 
@@ -351,7 +351,10 @@ module Formtastic
 
       # Collects content columns (non-relation columns) for the current form object class.
       def content_columns #:nodoc:
-        model_name.constantize.content_columns.collect { |c| c.name.to_sym }.compact rescue []
+        # TODO: NameError is raised by Inflector.constantize. Consider checking if it exists instead.
+        begin klass = model_name.constantize; rescue NameError; return [] end
+        return [] unless klass.respond_to?(:content_columns)
+        klass.content_columns.collect { |c| c.name.to_sym }.compact
       end
 
       # Deals with :for option when it's supplied to inputs methods. Additional
@@ -397,4 +400,4 @@ module Formtastic
 
     end
   end
-end
+end

data/lib/formtastic/i18n.rb

@@ -8,10 +8,11 @@ module Formtastic
     DEFAULT_VALUES = YAML.load_file(File.expand_path("../../locale/en.yml", __FILE__))["en"]["formtastic"].freeze
     SCOPES = [
         '%{model}.%{nested_model}.%{action}.%{attribute}',
-        '%{model}.%{action}.%{attribute}',
         '%{model}.%{nested_model}.%{attribute}',
-        '%{model}.%{attribute}',
+        '%{nested_model}.%{action}.%{attribute}',
         '%{nested_model}.%{attribute}',
+        '%{model}.%{action}.%{attribute}',
+        '%{model}.%{attribute}',
         '%{attribute}'
       ]
 

data/lib/formtastic/inputs/base.rb

@@ -12,11 +12,12 @@ module Formtastic
         @method = method
         @options = options.dup
         
-        warn_and_correct_option!(:label_method, :member_label)
-        warn_and_correct_option!(:value_method, :member_value)
-        warn_and_correct_option!(:group_label_method, :group_label)
+        removed_option!(:label_method)
+        removed_option!(:value_method)
+        removed_option!(:group_label_method)
       end
       
+      # Usefull for deprecating options.
       def warn_and_correct_option!(old_option_name, new_option_name)
         if options.key?(old_option_name)
           ::ActiveSupport::Deprecation.warn("The :#{old_option_name} option is deprecated in favour of :#{new_option_name} and will be removed from Formtastic after 2.0")
@@ -24,6 +25,11 @@ module Formtastic
         end
       end
       
+      # Usefull for raising an error on previously supported option.
+      def removed_option!(old_option_name)
+        raise ArgumentError, ":#{old_option_name} is no longer available" if options.key?(old_option_name)
+      end
+      
       extend ActiveSupport::Autoload
       
       autoload :Associations
@@ -37,7 +43,9 @@ module Formtastic
       autoload :Html
       autoload :Labelling
       autoload :Naming
+      autoload :Numeric
       autoload :Options
+      autoload :Placeholder
       autoload :Stringish
       autoload :Timeish
       autoload :Validations

data/lib/formtastic/inputs/base/choices.rb

@@ -44,7 +44,11 @@ module Formtastic
         end
 
         def choice_label(choice)
-          choice.is_a?(Array) ? choice.first : choice
+          if choice.is_a?(Array)
+            choice.first
+          else
+            choice
+          end.to_s
         end
 
         def choice_value(choice)
@@ -71,6 +75,7 @@ module Formtastic
           [
             builder.custom_namespace,
             sanitized_object_name,
+            builder.options[:index],
             association_primary_key || method,
             choice_html_safe_value(choice)
           ].compact.reject { |i| i.blank? }.join("_")

data/lib/formtastic/inputs/base/collections.rb

@@ -4,14 +4,26 @@ module Formtastic
       module Collections
 
         def label_method
-          label_and_value_method(raw_collection).first
+          @label_method ||= (label_method_from_options || label_and_value_method.first)
+        end
+
+        def label_method_from_options
+          options[:member_label]
         end
 
         def value_method
-          label_and_value_method(raw_collection).last
+          @value_method ||= (value_method_from_options || label_and_value_method.last)
+        end
+
+        def value_method_from_options
+          options[:member_value]
         end
 
-        def label_and_value_method(_collection, grouped=false)
+        def label_and_value_method
+          @label_and_value_method ||= label_and_value_method_from_collection(raw_collection)
+        end
+
+        def label_and_value_method_from_collection(_collection)
           sample = _collection.first || _collection.last
 
           case sample
@@ -19,13 +31,13 @@ module Formtastic
             label, value = :first, :last
           when Integer
             label, value = :to_s, :to_i
-          when String, NilClass
+          when Symbol, String, NilClass
             label, value = :to_s, :to_s
           end
 
           # Order of preference: user supplied method, class defaults, auto-detect
-          label = (grouped ? options[:grouped_label_method] : options[:member_label]) || label || builder.collection_label_methods.find { |m| sample.respond_to?(m) }
-          value = (grouped ? options[:grouped_value_method] : options[:member_value]) || value || builder.collection_value_methods.find { |m| sample.respond_to?(m) }
+          label ||= builder.collection_label_methods.find { |m| sample.respond_to?(m) }
+          value ||= builder.collection_value_methods.find { |m| sample.respond_to?(m) }
 
           [label, value]
         end
@@ -40,7 +52,7 @@ module Formtastic
 
           # Return if we have an Array of strings, fixnums or arrays
           return raw_collection if (raw_collection.instance_of?(Array) || raw_collection.instance_of?(Range)) &&
-                               [Array, Fixnum, String, Symbol].include?(raw_collection.first.class) &&
+                               [Array, Fixnum, String].include?(raw_collection.first.class) &&
                                !(options.include?(:member_label) || options.include?(:member_value))
 
           raw_collection.map { |o| [send_or_call(label_method, o), send_or_call(value_method, o)] }
@@ -48,24 +60,35 @@ module Formtastic
 
         def collection_from_options
           items = options[:collection]
-          items = items.to_a if items.is_a?(Hash)
-          items
+          case items
+          when Hash
+            items.to_a
+          when Range
+            items.to_a.collect{ |c| [c.to_s, c] }
+          else
+            items
+          end
         end
 
         def collection_from_association
           if reflection
-            raise PolymorphicInputWithoutCollectionError.new("A collection must be supplied for #{method} input. Collections cannot be guessed for polymorphic associations.") if reflection.options && reflection.options[:polymorphic] == true
+            if reflection.respond_to?(:options)
+              raise PolymorphicInputWithoutCollectionError.new(
+                        "A collection must be supplied for #{method} input. Collections cannot be guessed for polymorphic associations."
+                    ) if reflection.options[:polymorphic] == true
+            end
 
             find_options_from_options = options[:find_options] || {}
             conditions_from_options = find_options_from_options[:conditions] || {}
-            conditions_from_reflection = reflection.options && reflection.options[:conditions] || {}
+            conditions_from_reflection = (reflection.respond_to?(:options) && reflection.options[:conditions]) || {}
             conditions_from_reflection = conditions_from_reflection.call if conditions_from_reflection.is_a?(Proc)
 
+            scope_conditions = conditions_from_reflection.empty? ? nil : {:conditions => conditions_from_reflection}
             if conditions_from_options.any?
-              reflection.klass.scoped(:conditions => conditions_from_reflection).where(conditions_from_options)
+              reflection.klass.scoped(scope_conditions).where(conditions_from_options)
             else
               find_options_from_options.merge!(:include => group_by) if self.respond_to?(:group_by) && group_by
-              reflection.klass.scoped(:conditions => conditions_from_reflection).where(find_options_from_options)
+              reflection.klass.scoped(scope_conditions).where(find_options_from_options)
             end
           end
         end

data/lib/formtastic/inputs/base/grouped_collections.rb

@@ -20,7 +20,7 @@ module Formtastic
         end
       
         def group_label_method_from_grouped_collection
-          label_and_value_method(raw_grouped_collection, true).first
+          label_and_value_method_from_collection(raw_grouped_collection).first
         end
       
         def group_association

data/lib/formtastic/inputs/base/numeric.rb

@@ -0,0 +1,50 @@
+module Formtastic
+  module Inputs
+    module Base
+      module Numeric
+        def input_html_options
+          defaults = super
+
+          # override rails default size - not valid on numeric inputs
+          #@todo document/spec
+          defaults[:size] = nil
+          
+          if in_option
+            defaults[:min] = in_option.to_a.min
+            defaults[:max] = in_option.to_a.max
+          else
+            defaults[:min]  ||= min_option
+            defaults[:max]  ||= max_option
+          end
+          defaults[:step] ||= step_option
+          defaults
+        end
+        
+        def step_option
+          return options[:step] if options.key?(:step)
+          validation_step
+        end
+        
+        def min_option
+          return options[:min] if options.key?(:min)
+          validation_min
+        end
+        
+        def max_option
+          return options[:max] if options.key?(:max)
+          validation_max
+        end
+        
+        def in_option
+          options[:in]
+        end
+        
+        def wrapper_html_options
+          new_class = [super[:class], "numeric", "stringish"].compact.join(" ")
+          super.merge(:class => new_class)
+        end
+        
+      end
+    end
+  end
+end

data/lib/formtastic/inputs/base/options.rb

@@ -8,7 +8,7 @@ module Formtastic
         end
         
         def formtastic_options
-          [:priority_countries, :priority_zones, :value_method, :label_method, :member_label, :member_value, :collection, :required, :label, :as, :hint, :input_html, :label_html, :value_as_class, :find_options, :class]
+          [:priority_countries, :priority_zones, :member_label, :member_value, :collection, :required, :label, :as, :hint, :input_html, :label_html, :value_as_class, :find_options, :class]
         end
       
       end

data/lib/formtastic/inputs/base/placeholder.rb

@@ -0,0 +1,17 @@
+module Formtastic
+  module Inputs
+    module Base
+      module Placeholder
+        
+        def input_html_options
+          {:placeholder => placeholder_text}.merge(super)
+        end
+        
+        def placeholder_text
+          localized_string(method, options[:placeholder], :placeholder)
+        end
+        
+      end
+    end
+  end
+end

data/lib/formtastic/inputs/base/stringish.rb

@@ -2,7 +2,7 @@ module Formtastic
   module Inputs
     module Base
       module Stringish
-        
+      
         # @abstract Override this method in your input class to describe how the input should render itself.
         def to_html
           input_wrapping do
@@ -15,15 +15,10 @@ module Formtastic
         def input_html_options
           {
             :maxlength => options[:input_html].try(:[], :maxlength) || limit,
-            :size => builder.default_text_field_size,
-            :placeholder => placeholder_text
+            :size => builder.default_text_field_size
           }.merge(super)
         end
         
-        def placeholder_text
-          localized_string(method, options[:placeholder], :placeholder)
-        end
-        
         def wrapper_html_options
           new_class = [super[:class], "stringish"].compact.join(" ")
           super.merge(:class => new_class)