formtastic 3.1.3 → 3.1.4

data/formtastic.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.rdoc_options = ["--charset=UTF-8"]
-  s.extra_rdoc_files = ["README.textile"]
+  s.extra_rdoc_files = ["README.md"]
 
   s.required_ruby_version = '>= 1.9.3'
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
@@ -28,14 +28,14 @@ Gem::Specification.new do |s|
   s.add_dependency(%q<actionpack>, [">= 3.2.13"])
 
   s.add_development_dependency(%q<nokogiri>)
-  s.add_development_dependency(%q<rspec-rails>, ["~> 2.14"])
+  s.add_development_dependency(%q<rspec-rails>, ["~> 3.3.2"])
   s.add_development_dependency(%q<rspec_tag_matchers>, ["~> 1.0"])
   s.add_development_dependency(%q<hpricot>, ["~> 0.8.3"])
   s.add_development_dependency(%q<RedCloth>, ["~> 4.2"]) # for YARD Textile formatting
   s.add_development_dependency(%q<yard>, ["~> 0.8"])
   s.add_development_dependency(%q<colored>, ["~> 1.2"])
   s.add_development_dependency(%q<tzinfo>)
-  s.add_development_dependency(%q<ammeter>, ["1.1.1"])
+  s.add_development_dependency(%q<ammeter>, ["~> 1.1.3"])
   s.add_development_dependency(%q<appraisal>, ["~> 1.0"])
   s.add_development_dependency(%q<rake>)
   s.add_development_dependency(%q<activemodel>, [">= 3.2.13"])

data/gemfiles/rails_3.2.gemfile

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 3.2.0"
+gem "test-unit-minitest", :platform => [:ruby_22, :ruby_23]
 
 gemspec :path => "../"

data/gemfiles/rails_edge.gemfile

@@ -6,5 +6,10 @@ gem "rails", :git => "git://github.com/rails/rails.git"
 gem "rack", :github => "rack/rack"
 gem "i18n", :github => "svenfuchs/i18n"
 gem "arel", :github => "rails/arel"
+gem "rspec-rails", :github => "rspec/rspec-rails"
+gem "rspec-mocks", :github => "rspec/rspec-mocks"
+gem "rspec-support", :github => "rspec/rspec-support"
+gem "rspec-core", :github => "rspec/rspec-core"
+gem "rspec-expectations", :github => "rspec/rspec-expectations"
 
 gemspec :path => "../"

data/lib/formtastic.rb

@@ -42,4 +42,8 @@ module Formtastic
   class UnsupportedMethodForAction < ArgumentError
   end
 
+  # @private
+  class UnsupportedEnumCollection < NameError
+  end
+
 end

data/lib/formtastic/form_builder.rb

@@ -51,6 +51,9 @@ module Formtastic
     # Will be {Formtastic::ActionClassFinder} by default in 4.0.
     configure :action_class_finder#, Formtastic::ActionClassFinder
 
+    configure :skipped_columns, [:created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
+    configure :priority_time_zones, []
+
     attr_reader :template
 
     attr_reader :auto_index

data/lib/formtastic/helpers.rb

@@ -9,8 +9,8 @@ module Formtastic
     autoload :FormHelper, 'formtastic/helpers/form_helper'
     autoload :InputHelper, 'formtastic/helpers/input_helper'
     autoload :InputsHelper, 'formtastic/helpers/inputs_helper'
-    autoload :LabelHelper, 'formtastic/helpers/label_helper'
     autoload :Reflection, 'formtastic/helpers/reflection'
+    autoload :Enum, 'formtastic/helpers/enum'
   end
 end
 

data/lib/formtastic/helpers/enum.rb

@@ -0,0 +1,13 @@
+module Formtastic
+  module Helpers
+    # @private
+    module Enum
+      # Returns the enum (if defined) for the given method
+      def enum_for(method) # @private
+        if @object.respond_to?(:defined_enums)
+          @object.defined_enums[method.to_s]
+        end
+      end
+    end
+  end
+end

data/lib/formtastic/helpers/fieldset_wrapper.rb

@@ -22,7 +22,7 @@ module Formtastic
       #   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) # @private
-        contents = args.last.is_a?(::Hash) ? '' : args.pop.flatten
+        contents = args[-1].is_a?(::Hash) ? '' : args.pop.flatten
         html_options = args.extract_options!
 
         if block_given?
@@ -47,7 +47,7 @@ module Formtastic
 
       def field_set_legend(html_options)
         legend  = (html_options[:name] || '').to_s
-        legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
+        legend %= parent_child_index(html_options[:parent]) if html_options[:parent] && legend.include?('%i') # only applying if String includes '%i' avoids argument error when $DEBUG is true
         legend  = template.content_tag(:legend, template.content_tag(:span, Formtastic::Util.html_safe(legend))) unless legend.blank?
         legend
       end
@@ -57,20 +57,20 @@ module Formtastic
       def parent_child_index(parent) # @private
         # Could be {"post[authors_attributes]"=>0} or { :authors => 0 }
         duck = parent[:builder].instance_variable_get('@nested_child_index')
-        
+
         # Could be symbol for the association, or a model (or an array of either, I think? TODO)
         child = parent[:for]
         # Pull a sybol or model out of Array (TODO: check if there's an Array)
         child = child.first if child.respond_to?(:first)
         # If it's an object, get a symbol from the class name
         child = child.class.name.underscore.to_sym unless child.is_a?(Symbol)
-        
+
         key = "#{parent[:builder].object_name}[#{child}_attributes]"
 
-        # TODO: One of the tests produces a scenario where duck is "0" and the test looks for a "1" 
+        # TODO: One of the tests produces a scenario where duck is "0" and the test looks for a "1"
         # in the legend, so if we have a number, return it with a +1 until we can verify this scenario.
         return duck + 1 if duck.is_a?(Fixnum)
-        
+
         # First try to extract key from duck Hash, then try child
         (duck[key] || duck[child]).to_i + 1
       end

data/lib/formtastic/helpers/form_helper.rb

@@ -163,7 +163,7 @@ module Formtastic
         class_names << @@default_form_class
         model_class_name = case record_or_name_or_array
           when String, Symbol then record_or_name_or_array.to_s                                  # :post => "post"
-          when Array then options[:as] || singularizer.call(record_or_name_or_array.last.class)  # [@post, @comment] # => "comment"
+          when Array then options[:as] || singularizer.call(record_or_name_or_array[-1].class)  # [@post, @comment] # => "comment"
           else options[:as] || singularizer.call(record_or_name_or_array.class)                  # @post => "post"
         end
         class_names << @@default_form_model_class_proc.call(model_class_name)

data/lib/formtastic/helpers/input_helper.rb

@@ -40,6 +40,7 @@ module Formtastic
       private_constant(:INPUT_CLASS_DEPRECATION)
 
       include Formtastic::Helpers::Reflection
+      include Formtastic::Helpers::Enum
       include Formtastic::Helpers::FileColumnDetection
 
       # Returns a chunk of HTML markup for a given `method` on the form object, wrapped in
@@ -134,6 +135,7 @@ module Formtastic
       #
       # @option options :input_html [Hash]
       #   Override or add to the HTML attributes to be passed down to the `<input>` tag
+      #   (If you use attr_readonly method in your model, formtastic will automatically set those attributes's input readonly)
       #
       # @option options :wrapper_html [Hash]
       #   Override or add to the HTML attributes to be passed down to the wrapping `<li>` tag
@@ -259,7 +261,8 @@ module Formtastic
           return :file    if is_file?(method, options)
         end
 
-        if column = column_for(method)
+        column = column_for(method)
+        if column && column.type
           # Special cases where the column type doesn't map to an input method.
           case column.type
           when :string
@@ -273,6 +276,7 @@ module Formtastic
             return :color     if method.to_s =~ /color/
           when :integer
             return :select    if reflection_for(method)
+            return :select    if enum_for(method)
             return :number
           when :float, :decimal
             return :number

data/lib/formtastic/helpers/inputs_helper.rb

@@ -47,10 +47,6 @@ module Formtastic
       include Formtastic::Helpers::FieldsetWrapper
       include Formtastic::LocalizedString
 
-      # Which columns to skip when automatically rendering a form without any fields specified.
-      SKIPPED_COLUMNS = [:created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
-
-
       # {#inputs} creates an input fieldset and ol tag wrapping for use around a set of inputs.  It can be
       # called either with a block (in which you can do the usual Rails form stuff, HTML, ERB, etc),
       # or with a list of fields (accepting all default arguments and options). These two examples
@@ -136,7 +132,7 @@ module Formtastic
       #       <% end %>
       #     <% end %>
       #
-      # {#inputs} also provides a DSL similar to `fields_for` / `semantic_fields_for` to reduce the 
+      # {#inputs} also provides a DSL similar to `fields_for` / `semantic_fields_for` to reduce the
       # lines of code a little:
       #
       #     <% semantic_form_for @user do |f| %>
@@ -162,7 +158,7 @@ module Formtastic
       # All options except `:name`, `:title` and `:for` will be passed down to the fieldset as HTML
       # attributes (id, class, style, etc).
       #
-      # When nesting `inputs()` inside another `inputs()` block, the nested content will 
+      # When nesting `inputs()` inside another `inputs()` block, the nested content will
       # automatically be wrapped in an `<li>` tag to preserve the HTML validity (a `<fieldset>`
       # cannot be a direct descendant of an `<ol>`.
       #
@@ -183,12 +179,12 @@ module Formtastic
       #   <% end %>
       #
       # @example Quick form: Skip one or more fields
-      #   <%= f.inputs, :except => [:featured, :something_for_admin_only] %>
-      #   <%= f.inputs, :except => :featured %>
+      #   <%= f.inputs :except => [:featured, :something_for_admin_only] %>
+      #   <%= f.inputs :except => :featured %>
       #
       # @example Short hand: Render inputs for a named set of attributes and simple associations on the model, with all default arguments and options
       #   <% semantic_form_for @post do |form| %>
-      #     <%= f.inputs, :title, :body, :user, :categories %>
+      #     <%= f.inputs :title, :body, :user, :categories %>
       #   <% end %>
       #
       # @example Block: Render inputs for attributes and simple associations with full control over arguments and options
@@ -283,7 +279,7 @@ module Formtastic
       def inputs(*args, &block)
         wrap_it = @already_in_an_inputs_block ? true : false
         @already_in_an_inputs_block = true
-        
+
         title = field_set_title_from_args(*args)
         html_options = args.extract_options!
         html_options[:class] ||= "inputs"
@@ -303,21 +299,21 @@ module Formtastic
             field_set_and_list_wrapping(*((args << html_options) << contents))
           end
         end
-        
+
         out = template.content_tag(:li, out, :class => "input") if wrap_it
         @already_in_an_inputs_block = wrap_it
         out
       end
 
       protected
-      
+
       def default_columns_for_object
         cols  = association_columns(:belongs_to)
         cols += content_columns
-        cols -= SKIPPED_COLUMNS
+        cols -= Formtastic::FormBuilder.skipped_columns
         cols.compact
       end
-      
+
       def fieldset_contents_from_column_list(columns)
         columns.collect do |method|
           if @object
@@ -328,13 +324,13 @@ module Formtastic
             elsif @object.class.respond_to?(:associations)
               if (@object.class.associations[method.to_sym] && @object.class.associations[method.to_sym].options[:polymorphic] == true)
                 raise PolymorphicInputWithoutCollectionError.new("Please provide a collection for :#{method} input (you'll need to use block form syntax). Inputs for polymorphic associations can only be used when an explicit :collection is provided.")
-              end            
-            end            
+              end
+            end
           end
           input(method.to_sym)
         end
       end
-      
+
       # Collects association columns (relation columns) for the current form object class. Skips
       # polymorphic associations because we can't guess which class to use for an automatically
       # generated input.
@@ -343,7 +339,7 @@ module Formtastic
           @object.class.reflections.collect do |name, association_reflection|
             if by_associations.present?
               if by_associations.include?(association_reflection.macro) && association_reflection.options[:polymorphic] != true
-                name 
+                name
               end
             else
               name
@@ -377,10 +373,10 @@ module Formtastic
           lambda do |f|
             contents = f.inputs(*args) do
               if block.arity == 1  # for backwards compatibility with REE & Ruby 1.8.x
-                block.call(f)
+                yield(f)
               else
                 index = parent_child_index(options[:parent]) if options[:parent]
-                block.call(f, index)
+                yield(f, index)
               end
             end
             template.concat(contents)

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

@@ -64,7 +64,7 @@ module Formtastic
         end
 
         def custom_choice_html_options(choice)
-          (choice.is_a?(Array) && choice.size > 2) ? choice.last : {}
+          (choice.is_a?(Array) && choice.size > 2) ? choice[-1] : {}
         end
 
         def choice_html_safe_value(choice)

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

@@ -12,7 +12,7 @@ module Formtastic
         end
 
         def value_method
-          @value_method ||= (value_method_from_options || label_and_value_method.last)
+          @value_method ||= (value_method_from_options || label_and_value_method[-1])
         end
 
         def value_method_from_options
@@ -24,7 +24,7 @@ module Formtastic
         end
 
         def label_and_value_method_from_collection(_collection)
-          sample = _collection.first || _collection.last
+          sample = _collection.first || _collection[-1]
 
           case sample
           when Array
@@ -43,7 +43,7 @@ module Formtastic
         end
 
         def raw_collection
-          @raw_collection ||= (collection_from_options || collection_from_association || collection_for_boolean)
+          @raw_collection ||= (collection_from_options || collection_from_enum || collection_from_association || collection_for_boolean)
         end
 
         def collection
@@ -83,7 +83,7 @@ module Formtastic
 
             scope_conditions = conditions_from_reflection.empty? ? nil : {:conditions => conditions_from_reflection}
             where_conditions = (scope_conditions && scope_conditions[:conditions]) || {}
-            
+
             if Util.rails3?
               reflection.klass.scoped(scope_conditions).where({}) # where is uneccessary, but keeps the stubbing simpler while we support rails3
             else
@@ -92,6 +92,43 @@ module Formtastic
           end
         end
 
+        # Assuming the following model:
+        #
+        # class Post < ActiveRecord::Base
+        #   enum :status => [ :active, :archived ]
+        # end
+        #
+        # We would end up with a collection like this:
+        #
+        # [["Active", "active"], ["Archived", "archived"]
+        #
+        # The first element in each array uses String#humanize, but I18n
+        # translations are available too. Set them with the following structure.
+        #
+        # en:
+        #   activerecord:
+        #     attributes:
+        #       post:
+        #         statuses:
+        #           active: Custom Active Label Here
+        #           archived: Custom Archived Label Here
+        def collection_from_enum
+          if collection_from_enum?
+            method_name = method.to_s
+
+            enum_options_hash = object.defined_enums[method_name]
+            enum_options_hash.map do |name, value|
+              key = "activerecord.attributes.#{object_name}.#{method_name.pluralize}.#{name}"
+              label = ::I18n.translate(key, :default => name.humanize)
+              [label, name]
+            end
+          end
+        end
+
+        def collection_from_enum?
+          object.respond_to?(:defined_enums) && object.defined_enums.has_key?(method.to_s)
+        end
+
         def collection_for_boolean
           true_text = options[:true] || Formtastic::I18n.t(:yes)
           false_text = options[:false] || Formtastic::I18n.t(:no)

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

@@ -2,7 +2,7 @@ module Formtastic
   module Inputs
     module Base
       module Html
-        
+
         # Defines how the instance of an input should be rendered to a HTML string.
         #
         # @abstract Implement this method in your input class to describe how the input should render itself.
@@ -17,15 +17,16 @@ module Formtastic
         def to_html
           raise NotImplementedError
         end
-        
+
         def input_html_options
-          { 
+          {
             :id => dom_id,
             :required => required_attribute?,
-            :autofocus => autofocus?
+            :autofocus => autofocus?,
+            :readonly => readonly?
           }.merge(options[:input_html] || {})
         end
-        
+
         def dom_id
           [
             builder.dom_id_namespace,
@@ -34,7 +35,7 @@ module Formtastic
             association_primary_key || sanitized_method_name
           ].reject { |x| x.blank? }.join('_')
         end
-        
+
         def dom_index
           if builder.options.has_key?(:index)
             builder.options[:index]

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

@@ -4,9 +4,9 @@ module Formtastic
       module Naming
 
         def as
-          self.class.name.split("::").last.underscore.gsub(/_input$/, '')
+          self.class.name.split("::")[-1].underscore.gsub(/_input$/, '')
         end
-        
+
         def sanitized_object_name
           object_name.to_s.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
         end
@@ -18,7 +18,7 @@ module Formtastic
         def attributized_method_name
           method.to_s.gsub(/_id$/, '').to_sym
         end
-        
+
         def humanized_method_name
           if builder.label_str_method != :humanize
             # Special case where label_str_method should trump the human_attribute_name
@@ -39,4 +39,4 @@ module Formtastic
       end
     end
   end
-end
+end

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

@@ -2,15 +2,14 @@ module Formtastic
   module Inputs
     module Base
       module Options
-        
+
         def input_options
           options.except(*formtastic_options)
         end
-        
+
         def formtastic_options
           [:priority_countries, :priority_zones, :member_label, :member_value, :collection, :required, :label, :as, :hint, :input_html, :value_as_class, :class]
         end
-      
       end
     end
   end