formtastic 3.1.5 → 4.0.0.rc1

data/lib/formtastic/helpers/inputs_helper.rb

@@ -215,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 %>
@@ -310,7 +310,7 @@ module Formtastic
       def default_columns_for_object
         cols  = association_columns(:belongs_to)
         cols += content_columns
-        cols -= Formtastic::FormBuilder.skipped_columns
+        cols -= skipped_columns
         cols.compact
       end
 
@@ -350,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(&:foreign_key)
+        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

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/collections.rb

@@ -84,11 +84,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
-              reflection.klass.where(where_conditions)
-            end
+            reflection.klass.where(where_conditions)
           end
         end
 

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

@@ -9,21 +9,21 @@ module Formtastic
         
         def error_sentence_html
           error_class = builder.default_inline_error_class
-          template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.html_safe), :class => error_class)
+          template.content_tag(:p, errors.to_sentence, :class => error_class)
         end
                 
         def error_list_html
           error_class = builder.default_error_list_class
           list_elements = []
           errors.each do |error|
-            list_elements << template.content_tag(:li, Formtastic::Util.html_safe(error.html_safe))
+            list_elements << template.content_tag(:li, error.html_safe)
           end
-          template.content_tag(:ul, Formtastic::Util.html_safe(list_elements.join("\n")), :class => error_class)
+          template.content_tag(:ul, list_elements.join("\n").html_safe, :class => error_class)
         end
         
         def error_first_html
           error_class = builder.default_inline_error_class
-          template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => error_class)
+          template.content_tag(:p, errors.first.untaint.html_safe, :class => error_class)
         end
         
         def error_none_html

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

@@ -7,7 +7,7 @@ module Formtastic
           if hint?
             template.content_tag(
               :p, 
-              Formtastic::Util.html_safe(hint_text), 
+              hint_text.html_safe, 
               :class => builder.default_hint_class
             )
           end

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

@@ -85,6 +85,9 @@ module Formtastic
       #   <%= f.input :publish_at, :as => :time_select, :include_blank => true %>
       #   <%= f.input :publish_at, :as => :time_select, :include_blank => false %>
       #
+      # @example Provide a value for the field via selected
+      #   <%= f.input :publish_at, :as => :datetime_select, :selected => DateTime.new(2018, 10, 4, 12, 00)
+      #
       # @todo Document i18n
       # @todo Check what other Rails options are supported (`start_year`, `end_year`, `use_month_numbers`, `use_short_month`, `add_month_numbers`, `prompt`), write tests for them, and otherwise support them
       # @todo Could we take the rendering from Rails' helpers and inject better HTML in and around it rather than re-inventing the whee?
@@ -157,6 +160,7 @@ module Formtastic
         end
         
         def value
+          return input_options[:selected] if options.key?(:selected)
           object.send(method) if object && object.respond_to?(method)
         end
         
@@ -238,4 +242,4 @@ module Formtastic
       end
     end
   end
-end
+end

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

@@ -73,13 +73,11 @@ module Formtastic
             raise IndeterminableMinimumAttributeError if validation.options[:greater_than] && column? && [:float, :decimal].include?(column.type)
 
             if validation.options[:greater_than_or_equal_to]
-              return (validation.options[:greater_than_or_equal_to].call(object)) if validation.options[:greater_than_or_equal_to].kind_of?(Proc)
-              return (validation.options[:greater_than_or_equal_to])
+              return option_value(validation.options[:greater_than_or_equal_to], object)
             end
 
             if validation.options[:greater_than]
-              return (validation.options[:greater_than].call(object) + 1) if validation.options[:greater_than].kind_of?(Proc)
-              return (validation.options[:greater_than] + 1)
+              return option_value(validation.options[:greater_than], object) + 1
             end
           end
         end
@@ -94,13 +92,11 @@ module Formtastic
             raise IndeterminableMaximumAttributeError if validation.options[:less_than] && column? && [:float, :decimal].include?(column.type)
 
             if validation.options[:less_than_or_equal_to]
-              return (validation.options[:less_than_or_equal_to].call(object)) if validation.options[:less_than_or_equal_to].kind_of?(Proc)
-              return (validation.options[:less_than_or_equal_to])
+              return option_value(validation.options[:less_than_or_equal_to], object)
             end
 
             if validation.options[:less_than]
-              return ((validation.options[:less_than].call(object)) - 1) if validation.options[:less_than].kind_of?(Proc)
-              return (validation.options[:less_than] - 1)
+              return option_value(validation.options[:less_than], object) - 1
             end
           end
         end
@@ -208,8 +204,22 @@ module Formtastic
         def readonly_from_options?
           options[:input_html] && options[:input_html][:readonly]
         end
+
+        private
+
+        # Loosely based on
+        # https://github.com/rails/rails/blob/5-2-stable/activemodel/lib/active_model/validations/numericality.rb#L54-L59
+        def option_value(option, object)
+          case option
+          when Symbol
+            object.send(option)
+          when Proc
+            option.call(object)
+          else
+            option
+          end
+        end
       end
     end
   end
 end
-

data/lib/formtastic/inputs/check_boxes_input.rb

@@ -99,7 +99,7 @@ module Formtastic
       end
 
       def hidden_field_for_all
-        if hidden_fields?
+        if hidden_fields_for_every?
           ''
         else
           options = {}
@@ -109,7 +109,7 @@ module Formtastic
         end
       end
 
-      def hidden_fields?
+      def hidden_fields_for_every?
         options[:hidden_fields]
       end
 
@@ -170,7 +170,7 @@ module Formtastic
       protected
 
       def checkbox_input(choice)
-        if hidden_fields?
+        if hidden_fields_for_every?
           check_box_with_hidden_input(choice)
         else
           check_box_without_hidden_input(choice)

data/lib/formtastic/inputs/color_input.rb

@@ -31,7 +31,6 @@ module Formtastic
       include Base::Placeholder
       
       def to_html
-        raise "The :color input requires the color_field form helper, which is only available in Rails 4+" unless builder.respond_to?(:color_field)
         input_wrapping do
           label_html <<
           builder.color_field(method, input_html_options)

data/lib/formtastic/inputs/select_input.rb

@@ -196,7 +196,7 @@ module Formtastic
       def extra_input_html_options
         {
           :multiple => multiple?,
-          :name => (multiple? && Rails::VERSION::MAJOR >= 3) ? input_html_options_name_multiple : input_html_options_name
+          :name => multiple? ? input_html_options_name_multiple : input_html_options_name
         }
         
         

data/lib/formtastic/localizer.rb

@@ -101,7 +101,7 @@ module Formtastic
             # This is effectively what Rails label helper does for i18n lookup
             options[:scope] = [:helpers, type]
             options[:default] = defaults
-            i18n_value = ::I18n.t(default_key, options)
+            i18n_value = ::I18n.t(default_key, **options)
           end
 
           # save the result to the cache
@@ -115,16 +115,14 @@ module Formtastic
     protected
 
     def normalize_model_name(name)
-      if !name =~ /\[/ && builder.respond_to?(:parent_builder) && builder.parent_builder.object_name
-        # Rails 3.1 nested builder case
-        [builder.parent_builder.object_name.to_s, name]
-      elsif name =~ /(.+)\[(.+)\]/
-        # Rails 3 (and 3.1?) nested builder case with :post rather than @post
+      if name =~ /(.+)\[(.+)\]/
+        # Nested builder case with :post rather than @post
+        # TODO: check if this is no longer required with a minimum of Rails 4.1
         [$1, $2]
       elsif builder.respond_to?(:options) && builder.options.key?(:as)
         [builder.options[:as].to_s]
       elsif builder.respond_to?(:options) && builder.options.key?(:parent_builder)
-        # Rails 3.0 nested builder work-around case, where :parent_builder is provided by f.semantic_form_for
+        # Rails 3.0+ nested builder work-around case, where :parent_builder is provided by f.semantic_form_for
         [builder.options[:parent_builder].object_name.to_s, name]
       else
         # Non-nested case

data/lib/formtastic/version.rb

@@ -1,3 +1,3 @@
 module Formtastic
-  VERSION = "3.1.5"
+  VERSION = "4.0.0.rc1"
 end

data/lib/generators/templates/formtastic.rb

@@ -91,9 +91,8 @@
 
 # By creating custom input class finder, you can change how input classes  are looked up.
 # For example you can make it to search for TextInputFilter instead of TextInput.
-# See # TODO: add link # for more information
-# NOTE: this behavior will be default from Formtastic 4.0
-Formtastic::FormBuilder.input_class_finder = Formtastic::InputClassFinder
+# See https://github.com/justinfrench/formtastic/wiki/Custom-Class-Finders
+# Formtastic::FormBuilder.input_class_finder = Formtastic::InputClassFinder
 
 # Define custom namespaces in which to look up your Input classes. Default is
 # to look up in the global scope and in Formtastic::Inputs.
@@ -101,9 +100,8 @@ Formtastic::FormBuilder.input_class_finder = Formtastic::InputClassFinder
 
 # By creating custom action class finder, you can change how action classes are looked up.
 # For example you can make it to search for MyButtonAction instead of ButtonAction.
-# See # TODO: add link # for more information
-# NOTE: this behavior will be default from Formtastic 4.0
-Formtastic::FormBuilder.action_class_finder = Formtastic::ActionClassFinder
+# See https://github.com/justinfrench/formtastic/wiki/Custom-Class-Finders
+# Formtastic::FormBuilder.action_class_finder = Formtastic::ActionClassFinder
 
 # Define custom namespaces in which to look up your Action classes. Default is
 # to look up in the global scope and in Formtastic::Actions.

data/script/integration-template.rb

@@ -0,0 +1,71 @@
+gem 'formtastic', path: '..'
+gem 'bcrypt', '~> 3.1.7'
+gem 'rails-dom-testing', group: :test
+
+# to speed up travis install, reuse the bundle path
+def bundle_path
+  File.expand_path ENV.fetch('BUNDLE_PATH', 'vendor/bundle'), ENV['TRAVIS_BUILD_DIR']
+end
+
+if Rails.version >= '6.1'
+    gsub_file 'Gemfile', /gem 'rails'.*/, "gem 'rails', '~> #{Rails.version}', github: 'rails/rails'"
+elsif Rails.version >= '6.0'
+    gsub_file 'Gemfile', /gem 'rails'.*/, "gem 'rails', '~> #{Rails.version}', github: 'rails/rails', branch: '6-0-stable'"
+elsif Rails.version >= '5.2'
+    gsub_file 'Gemfile', /gem 'rails'.*/, "gem 'rails', '~> #{Rails.version}', github: 'rails/rails', branch: '5-2-stable'"
+end
+
+### Ensure Dummy App's Ruby version matches the current environments Ruby Version
+ruby_version = "ruby '#{RUBY_VERSION}'"
+gsub_file 'Gemfile', /ruby '\d+.\d+.\d+'/, ruby_version
+
+if File.directory?(bundle_path) && bundle_install?
+  def run_bundle
+    previous_bundle_path = bundle_path
+
+    require "bundler"
+    Bundler.with_clean_env do
+      system("bundle install --jobs=3 --retry=3 --path=#{previous_bundle_path}")
+    end
+  end
+end
+
+in_root do
+  ENV['BUNDLE_GEMFILE'] = File.expand_path('Gemfile')
+end
+
+formtastic = -> do
+  generate(:scaffold, 'user name:string password:digest')
+  generate('formtastic:install')
+  generate('formtastic:form', 'user name password:password --force')
+
+  rails_command('db:migrate')
+
+  in_root do
+    inject_into_class 'app/models/user.rb', 'User', "  has_secure_password\n"
+    inject_into_file 'app/assets/stylesheets/application.css', " *= require formtastic\n", before: ' *= require_self'
+    inject_into_class 'test/controllers/users_controller_test.rb', 'UsersControllerTest', <<-RUBY
+
+    test "should show form" do
+      get edit_user_path(@user)
+
+      assert_select 'form' do
+        assert_select 'li.input.string' do
+          assert_select 'input#user_name[type=text]'
+        end
+        assert_select 'li.input.password' do
+          assert_select 'input#user_password[type=password]'
+        end
+
+        assert_select 'fieldset.actions' do
+          assert_select 'li.action.input_action' do
+            assert_select 'input[type=submit]'
+          end
+        end
+      end
+    end # test "should show form"
+    RUBY
+  end
+end
+
+after_bundle(&formtastic)

data/script/integration.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env sh
+
+set -e
+set -o verbose
+
+test_app=dummy
+
+rm -rf ${test_app}
+
+bundle exec rails new ${test_app} \
+  --template=$(dirname "$0")/integration-template.rb \
+  --skip-bootsnap \
+  --skip-javascript \
+  --skip-spring \
+  --skip-turbolinks
+
+cd ${test_app} && export BUNDLE_GEMFILE=Gemfile
+
+bundle exec rake test