formtastic 3.1.5 → 4.0.0.rc1

data/Rakefile

@@ -1,6 +1,5 @@
 # encoding: utf-8
 require 'bundler/setup'
-require 'appraisal'
 require 'yard'
 require 'rspec/core/rake_task'
 
@@ -13,6 +12,26 @@ else
   task :default => :spec
 end
 
+desc 'Run the default task over all gemfiles.'
+task :appraisal do
+  for_all_gemfiles("exec", "rake")
+end
+
+namespace :appraisal do
+  desc 'Run `bundle install` over all gemfiles.'
+  task :install do
+    for_all_gemfiles("install")
+  end
+end
+
+def for_all_gemfiles(*args)
+  Dir.glob("gemfiles/*/Gemfile").sort.each do |gemfile|
+    Bundler.with_original_env do
+      sh({ "APPRAISAL_INITIALIZED" => "true", "BUNDLE_GEMFILE" => gemfile }, "bundle", *args)
+    end
+  end
+end
+
 desc 'Generate documentation for the formtastic plugin.'
 YARD::Rake::YardocTask.new(:yard) do |t|
 

data/app/assets/stylesheets/formtastic.css

@@ -223,7 +223,7 @@ This stylesheet forms part of the Formtastic Rails Plugin
 /* BOOLEAN LABELS
 --------------------------------------------------------------------------------------------------*/
 .formtastic .boolean label {
-  padding-left:25%;
+  margin-left:25%;
   display:block;
 }
 

data/bin/appraisal

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+if [ "$1" = "" ]
+then
+  bundle exec rake appraisal
+else
+  bundle exec rake "appraisal:$1"
+fi

data/formtastic.gemspec

@@ -15,28 +15,22 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = []
   s.require_paths = ["lib"]
 
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = ["README.md"]
 
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.4.0'
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.rubygems_version = %q{1.3.6}
 
-  s.add_dependency(%q<actionpack>, [">= 3.2.13"])
+  s.add_dependency(%q<actionpack>, [">= 5.2.0"])
 
-  s.add_development_dependency(%q<nokogiri>)
-  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<rspec-rails>, ["~> 3.4"])
+  s.add_development_dependency(%q<rspec-dom-testing>, [">= 0.1.0"])
+  s.add_development_dependency(%q<yard>, ["~> 0.9.20"])
   s.add_development_dependency(%q<ammeter>, ["~> 1.1.3"])
-  s.add_development_dependency(%q<appraisal>, ["~> 2.1"])
-  s.add_development_dependency(%q<rake>, ["< 12"])
-  s.add_development_dependency(%q<activemodel>, [">= 3.2.13"])
+  s.add_development_dependency(%q<rake>)
+  s.add_development_dependency(%q<sqlite3>, ["~> 1.4"])
 end

data/gemfiles/rails_5.2/Gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 5.2.0"
+
+gemspec path: "../.."

data/gemfiles/rails_6.0/Gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.2"
+
+gemspec path: "../.."

data/gemfiles/rails_edge/Gemfile

@@ -0,0 +1,13 @@
+source "https://rubygems.org"
+
+gem "rails", git: "https://github.com/rails/rails.git"
+gem "rack", git: "https://github.com/rack/rack.git"
+gem "i18n", git: "https://github.com/svenfuchs/i18n.git"
+gem "arel", git: "https://github.com/rails/arel.git"
+gem "rspec-rails", git: "https://github.com/rspec/rspec-rails.git"
+gem "rspec-mocks", git: "https://github.com/rspec/rspec-mocks.git"
+gem "rspec-support", git: "https://github.com/rspec/rspec-support.git"
+gem "rspec-core", git: "https://github.com/rspec/rspec-core.git"
+gem "rspec-expectations", git: "https://github.com/rspec/rspec-expectations.git"
+
+gemspec path: "../.."

data/lib/formtastic.rb

@@ -4,26 +4,20 @@ require 'formtastic/engine' if defined?(::Rails)
 module Formtastic
   extend ActiveSupport::Autoload
 
-  autoload :FormBuilder
   autoload :Helpers
   autoload :HtmlAttributes
-  autoload :I18n
-  autoload :Inputs
-  autoload :Actions
   autoload :LocalizedString
   autoload :Localizer
-  autoload :Util
   autoload :NamespacedClassFinder
   autoload :InputClassFinder
   autoload :ActionClassFinder
   autoload :Deprecation
 
-  # @private
-  mattr_accessor :deprecation
-  self.deprecation = Formtastic::Deprecation.new('4.0', 'Formtastic')
-
-  if defined?(::Rails) && Util.deprecated_version_of_rails?
-    deprecation.warn("Support for Rails < #{Util.minimum_version_of_rails} will be dropped")
+  eager_autoload do
+    autoload :I18n
+    autoload :FormBuilder
+    autoload :Inputs
+    autoload :Actions
   end
 
   # @public

data/lib/formtastic/actions.rb

@@ -4,8 +4,11 @@ module Formtastic
 
     autoload :Base
     autoload :Buttonish
-    autoload :InputAction
-    autoload :LinkAction
-    autoload :ButtonAction
+
+    eager_autoload do
+      autoload :InputAction
+      autoload :LinkAction
+      autoload :ButtonAction
+    end
   end
 end

data/lib/formtastic/deprecation.rb

@@ -1,42 +1,5 @@
 require 'active_support/deprecation'
 
 module Formtastic
-  if ActiveSupport::Deprecation.respond_to?(:new)
-    Deprecation = ActiveSupport::Deprecation
-  else
-    require 'forwardable'
-
-    # @private
-    # @todo remove this branch and file when support for rails 3.2 is dropped
-    class Deprecation
-      mattr_accessor :deprecation
-      self.deprecation = ActiveSupport::Deprecation.dup
-
-      extend Forwardable
-      methods = deprecation.methods - deprecation.class.methods
-      def_delegators :deprecation, *methods
-
-      def initialize(version, _library)
-        deprecation.silenced = false
-        deprecation.deprecation_horizon = version
-      end
-
-      def deprecation_warning(deprecated_method_name, message = nil, caller_backtrace = nil)
-        caller_backtrace ||= caller(2)
-
-        deprecated_method_warning(deprecated_method_name, message).tap do |msg|
-          warn(msg, caller_backtrace)
-        end
-      end
-
-      def deprecated_method_warning(method_name, message = nil)
-        warning = "#{method_name} is deprecated and will be removed from Formtastic #{deprecation_horizon}"
-        case message
-          when Symbol then "#{warning} (use #{message} instead)"
-          when String then "#{warning} (#{message})"
-          else warning
-        end
-      end
-    end
-  end
+  Deprecation = ActiveSupport::Deprecation
 end

data/lib/formtastic/engine.rb

@@ -7,5 +7,7 @@ module Formtastic
         include Formtastic::Helpers::FormHelper
       end
     end
+
+    config.eager_load_namespaces << Formtastic
   end
-end
+end

data/lib/formtastic/form_builder.rb

@@ -21,7 +21,7 @@ module Formtastic
     configure :default_text_area_width
     configure :all_fields_required_by_default, true
     configure :include_blank_for_select_by_default, true
-    configure :required_string, proc { Formtastic::Util.html_safe(%{<abbr title="#{Formtastic::I18n.t(:required)}">*</abbr>}) }
+    configure :required_string, proc { %{<abbr title="#{Formtastic::I18n.t(:required)}">*</abbr>}.html_safe }
     configure :optional_string, ''
     configure :inline_errors, :sentence
     configure :label_str_method, :humanize
@@ -42,14 +42,10 @@ module Formtastic
     configure :perform_browser_validations, false
     # Check {Formtastic::InputClassFinder} to see how are inputs resolved.
     configure :input_namespaces, [::Object, ::Formtastic::Inputs]
-    # @todo enable this as default in 4.0 and remove it from configuration generator template
-    # Will be {Formtastic::InputClassFinder} by default in 4.0.
-    configure :input_class_finder #, Formtastic::InputClassFinder
+    configure :input_class_finder, Formtastic::InputClassFinder
     # Check {Formtastic::ActionClassFinder} to see how are inputs resolved.
     configure :action_namespaces, [::Object, ::Formtastic::Actions]
-    # @todo enable this as default in 4.0 and remove it from configuration generator template
-    # Will be {Formtastic::ActionClassFinder} by default in 4.0.
-    configure :action_class_finder#, Formtastic::ActionClassFinder
+    configure :action_class_finder, Formtastic::ActionClassFinder
 
     configure :skipped_columns, [:created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
     configure :priority_time_zones, []
@@ -68,8 +64,8 @@ module Formtastic
 
     # This is a wrapper around Rails' `ActionView::Helpers::FormBuilder#fields_for`, originally
     # provided to ensure that the `:builder` from `semantic_form_for` was passed down into
-    # the nested `fields_for`. Rails 3 no longer requires us to do this, so this method is
-    # provided purely for backwards compatibility and DSL consistency.
+    # the nested `fields_for`. Our supported versions of Rails no longer require us to do this,
+    # so this method is provided purely for backwards compatibility and DSL consistency.
     #
     # When constructing a `fields_for` form fragment *outside* of `semantic_form_for`, please use
     # `Formtastic::Helpers::FormHelper#semantic_fields_for`.
@@ -95,23 +91,11 @@ module Formtastic
     #
     # @todo is there a way to test the params structure of the Rails helper we wrap to ensure forward compatibility?
     def semantic_fields_for(record_or_name_or_array, *args, &block)
-      # Add a :parent_builder to the args so that nested translations can be possible in Rails 3
-      options = args.extract_options!
-      options[:parent_builder] ||= self
-
-      # Wrap the Rails helper
-      fields_for(record_or_name_or_array, *(args << options), &block)
+      fields_for(record_or_name_or_array, *args, &block)
     end
 
-    def initialize(object_name, object, template, options, block=nil)
-      # rails 3 supported passing in the block parameter to FormBuilder
-      # rails 4.0 deprecated the block parameter and does nothing with it
-      # rails 4.1 removes the parameter completely
-      if Util.rails3? || Util.rails4_0?
-        super
-      else # Must be rails4_1 or greater
-        super object_name, object, template, options
-      end
+    def initialize(object_name, object, template, options)
+      super
 
       if respond_to?('multipart=') && options.is_a?(Hash) && options[:html]
         self.multipart = options[:html][:multipart]

data/lib/formtastic/helpers/action_helper.rb

@@ -2,9 +2,6 @@
 module Formtastic
   module Helpers
     module ActionHelper
-      ACTION_CLASS_DEPRECATION = 'configure Formtastic::FormBuilder.action_class_finder instead (upgrade guide on wiki: http://bit.ly/1F9QtKc )'.freeze
-      private_constant(:ACTION_CLASS_DEPRECATION)
-
       # Renders an action for the form (such as a subit/reset button, or a cancel link).
       #
       # Each action is wrapped in an `<li class="action">` tag with other classes added based on the
@@ -82,7 +79,7 @@ module Formtastic
         options = options.dup # Allow options to be shared without being tainted by Formtastic
         options[:as] ||= default_action_type(method, options)
 
-        klass = action_class(options[:as])
+        klass = namespaced_action_class(options[:as])
 
         klass.new(self, template, @object, @object_name, method, options).to_html
       end
@@ -113,50 +110,6 @@ module Formtastic
       rescue Formtastic::ActionClassFinder::NotFoundError => e
         raise Formtastic::UnknownActionError, "Unable to find action #{e.message}"
       end
-
-      # @api private
-      # @deprecated Use {#namespaced_action_class} instead.
-      def action_class(as)
-        return namespaced_action_class(as) if action_class_finder
-
-        action_class_deprecation_warning(__method__)
-
-        @input_classes_cache ||= {}
-        @input_classes_cache[as] ||= begin
-          begin
-            begin
-              custom_action_class_name(as).constantize
-            rescue NameError
-              standard_action_class_name(as).constantize
-            end
-          rescue NameError
-            raise Formtastic::UnknownActionError, "Unable to find action #{as}"
-          end
-        end
-      end
-
-      # @api private
-      # @deprecated Use {Formtastic::ActionClassFinder#class_name} instead.
-      # :as => :button # => ButtonAction
-      def custom_action_class_name(as)
-        action_class_deprecation_warning(__method__)
-        "#{as.to_s.camelize}Action"
-      end
-
-      # @api private
-      # @deprecated Use {Formtastic::ActionClassFinder#class_name} instead.
-      # :as => :button # => Formtastic::Actions::ButtonAction
-      def standard_action_class_name(as)
-        action_class_deprecation_warning(__method__)
-        "Formtastic::Actions::#{as.to_s.camelize}Action"
-      end
-
-      private
-
-      def action_class_deprecation_warning(method)
-        @action_class_deprecation_warned ||=
-            Formtastic.deprecation.deprecation_warning(method, ACTION_CLASS_DEPRECATION, caller(2))
-      end
     end
   end
 end

data/lib/formtastic/helpers/errors_helper.rb

@@ -52,7 +52,7 @@ module Formtastic
         return nil if full_errors.blank?
         html_options[:class] ||= "errors"
         template.content_tag(:ul, html_options) do
-          Formtastic::Util.html_safe(full_errors.map { |error| template.content_tag(:li, Formtastic::Util.html_safe(error)) }.join)
+          full_errors.map { |error| template.content_tag(:li, error) }.join.html_safe
         end
       end
       
@@ -78,4 +78,4 @@ module Formtastic
       end
     end
   end
-end
+end

data/lib/formtastic/helpers/fieldset_wrapper.rb

@@ -33,12 +33,15 @@ module Formtastic
           end
         end
 
+        # Work-around for empty contents block
+        contents ||= ""
+
         # 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)),
+          legend.html_safe << template.content_tag(:ol, contents.html_safe),
           html_options.except(:builder, :parent, :name)
         )
 
@@ -47,8 +50,9 @@ 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.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?
+       	# only applying if String includes '%i' avoids argument error when $DEBUG is true
+        legend %= parent_child_index(html_options[:parent]) if html_options[:parent] && legend.include?('%i')
+        legend  = template.content_tag(:legend, template.content_tag(:span, legend.html_safe)) unless legend.blank?
         legend
       end
 

data/lib/formtastic/helpers/input_helper.rb

@@ -36,9 +36,6 @@ 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
@@ -237,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
@@ -286,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.
@@ -300,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
 
@@ -335,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