formtastic 3.1.2 → 4.0.0

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

@@ -36,10 +36,8 @@ module Formtastic
     # @see Formtastic::Helpers::InputsHelper#inputs
     # @see Formtastic::Helpers::FormHelper#semantic_form_for
     module InputHelper
-      INPUT_CLASS_DEPRECATION = 'configure Formtastic::FormBuilder.input_class_finder instead (upgrade guide on wiki: http://bit.ly/1F9QtKc )'.freeze
-      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 +132,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
@@ -235,7 +234,7 @@ module Formtastic
         options = options.dup # Allow options to be shared without being tainted by Formtastic
         options[:as] ||= default_input_type(method, options)
 
-        klass = input_class(options[:as])
+        klass = namespaced_input_class(options[:as])
 
         klass.new(self, template, @object, @object_name, method, options).to_html
       end
@@ -259,7 +258,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 +273,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
@@ -282,6 +283,10 @@ module Formtastic
             return :time_select
           when :date
             return :date_select
+          when :hstore, :json, :jsonb
+            return :text
+          when :citext, :inet
+            return :string
           end
 
           # Try look for hints in options hash. Quite common senario: Enum keys stored as string in the database.
@@ -296,12 +301,20 @@ module Formtastic
       end
 
       # Get a column object for a specified attribute method - if possible.
+      # @return [ActiveModel::Type::Value, #type] in case of rails 5 attributes api
+      # @return [ActiveRecord::ConnectionAdapters::Column] in case of rails 4
       def column_for(method) # @private
-        if @object.respond_to?(:column_for_attribute)
-          # Remove deprecation wrapper & review after Rails 5.0 ships
-          ActiveSupport::Deprecation.silence do
-            @object.column_for_attribute(method)
-          end
+        case
+          when @object.class.respond_to?(:type_for_attribute)
+            @object.class.type_for_attribute(method.to_s)
+          when @object.class.respond_to?(:column_for_attribute)
+            @object.class.column_for_attribute(method)
+          when @object.respond_to?(:column_for_attribute)
+            # Remove deprecation wrapper & review after Rails 5.0 ships
+            ActiveSupport::Deprecation.silence do
+              @object.column_for_attribute(method)
+            end
+          else nil
         end
       end
 
@@ -331,73 +344,6 @@ module Formtastic
       rescue Formtastic::InputClassFinder::NotFoundError
         raise Formtastic::UnknownInputError, "Unable to find input #{$!.message}"
       end
-
-      # @api private
-      # @deprecated Use {#namespaced_input_class} instead.
-      def input_class(as)
-        return namespaced_input_class(as) if input_class_finder
-
-        input_class_deprecation_warning(__method__)
-
-        @input_classes_cache ||= {}
-        @input_classes_cache[as] ||= begin
-          config = Rails.application.config
-          use_const_defined = config.respond_to?(:eager_load) ? config.eager_load : config.cache_classes
-          use_const_defined ? input_class_with_const_defined(as) : input_class_by_trying(as)
-        end
-      end
-
-      # @api private
-      # @deprecated Use {InputClassFinder#find} instead.
-      # prevent exceptions in production environment for better performance
-      def input_class_with_const_defined(as)
-        input_class_name = custom_input_class_name(as)
-
-        if ::Object.const_defined?(input_class_name)
-          input_class_name.constantize
-        elsif Formtastic::Inputs.const_defined?(input_class_name)
-          standard_input_class_name(as).constantize
-        else
-          raise Formtastic::UnknownInputError, "Unable to find input class #{input_class_name}"
-        end
-      end
-
-      # @api private
-      # @deprecated Use {InputClassFinder#find} instead.
-      # use auto-loading in development environment
-      def input_class_by_trying(as)
-        begin
-          custom_input_class_name(as).constantize
-        rescue NameError
-          standard_input_class_name(as).constantize
-        end
-      rescue NameError
-        raise Formtastic::UnknownInputError, "Unable to find input class for #{as}"
-      end
-
-      # @api private
-      # @deprecated Use {InputClassFinder#class_name} instead.
-      # :as => :string # => StringInput
-      def custom_input_class_name(as)
-        input_class_deprecation_warning(__method__)
-        "#{as.to_s.camelize}Input"
-      end
-
-      # @api private
-      # @deprecated Use {InputClassFinder#class_name} instead.
-      # :as => :string # => {Formtastic::Inputs::StringInput}
-      def standard_input_class_name(as)
-        input_class_deprecation_warning(__method__)
-        "Formtastic::Inputs::#{as.to_s.camelize}Input"
-      end
-
-      private
-
-      def input_class_deprecation_warning(method)
-        @input_class_deprecation_warned ||=
-            Formtastic.deprecation.deprecation_warning(method, INPUT_CLASS_DEPRECATION, caller(2))
-      end
-
     end
   end
 end

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
@@ -219,7 +215,7 @@ module Formtastic
       #       <%= f.input :title ... %>
       #       <%= f.input :body ... %>
       #     <% end %>
-      #     <%= f.inputs do :name => 'Advanced options:' do %>
+      #     <%= f.inputs :name => 'Advanced options:' do %>
       #       <%= f.input :user ... %>
       #       <%= f.input :categories ... %>
       #     <% end %>
@@ -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 -= 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
@@ -354,12 +350,21 @@ module Formtastic
         end
       end
 
+      # Collects all foreign key columns
+      def foreign_key_columns # @private
+        if @object.present? && @object.class.respond_to?(:reflect_on_all_associations)
+          @object.class.reflect_on_all_associations(:belongs_to).map{ |reflection| reflection.foreign_key.to_sym }
+        else
+          []
+        end
+      end
+
       # Collects content columns (non-relation columns) for the current form object class.
       def content_columns # @private
         # 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
+        klass.content_columns.collect { |c| c.name.to_sym }.compact - foreign_key_columns
       end
 
       # Deals with :for option when it's supplied to inputs methods. Additional
@@ -377,10 +382,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/i18n.rb

@@ -23,7 +23,7 @@ module Formtastic
         options = args.extract_options!
         options.reverse_merge!(:default => DEFAULT_VALUES[key])
         options[:scope] = [DEFAULT_SCOPE, options[:scope]].flatten.compact
-        ::I18n.translate(key, *(args << options))
+        ::I18n.translate(key, *args, **options)
       end
       alias :t :translate
 

data/lib/formtastic/inputs.rb

@@ -4,36 +4,39 @@ module Formtastic
 
     autoload :Base
     autoload :Basic
-    autoload :BooleanInput
-    autoload :CheckBoxesInput
-    autoload :ColorInput
-    autoload :CountryInput
-    autoload :DatalistInput
-    autoload :DateInput
-    autoload :DatePickerInput
-    autoload :DatetimePickerInput
-    autoload :DateSelectInput
-    autoload :DatetimeInput
-    autoload :DatetimeSelectInput
-    autoload :EmailInput
-    autoload :FileInput
-    autoload :HiddenInput
-    autoload :NumberInput
-    autoload :NumericInput
-    autoload :PasswordInput
-    autoload :PhoneInput
-    autoload :RadioInput
-    autoload :RangeInput
-    autoload :SearchInput
-    autoload :SelectInput
-    autoload :StringInput
-    autoload :TextInput
-    autoload :TimeInput
-    autoload :TimePickerInput
-    autoload :TimeSelectInput
-    autoload :TimeZoneInput
     autoload :Timeish
-    autoload :UrlInput
+
+    eager_autoload do
+      autoload :BooleanInput
+      autoload :CheckBoxesInput
+      autoload :ColorInput
+      autoload :CountryInput
+      autoload :DatalistInput
+      autoload :DateInput
+      autoload :DatePickerInput
+      autoload :DatetimePickerInput
+      autoload :DateSelectInput
+      autoload :DatetimeInput
+      autoload :DatetimeSelectInput
+      autoload :EmailInput
+      autoload :FileInput
+      autoload :HiddenInput
+      autoload :NumberInput
+      autoload :NumericInput
+      autoload :PasswordInput
+      autoload :PhoneInput
+      autoload :RadioInput
+      autoload :RangeInput
+      autoload :SearchInput
+      autoload :SelectInput
+      autoload :StringInput
+      autoload :TextInput
+      autoload :TimeInput
+      autoload :TimePickerInput
+      autoload :TimeSelectInput
+      autoload :TimeZoneInput
+      autoload :UrlInput
+    end
   end
 end
 

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,16 +43,16 @@ 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
           # Return if we have a plain string
           return raw_collection if raw_collection.is_a?(String)
 
-          # Return if we have an Array of strings, fixnums or arrays
+          # Return if we have an Array of strings, integers or arrays
           return raw_collection if (raw_collection.instance_of?(Array) || raw_collection.instance_of?(Range)) &&
-                               [Array, Fixnum, String].include?(raw_collection.first.class) &&
+                               ([Array, String].include?(raw_collection.first.class) || raw_collection.first.is_a?(Integer)) &&
                                !(options.include?(:member_label) || options.include?(:member_value))
 
           raw_collection.map { |o| [send_or_call(label_method, o), send_or_call(value_method, o)] }
@@ -83,15 +83,48 @@ 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
-              reflection.klass.where(where_conditions)
+
+            reflection.klass.where(where_conditions)
+          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)