formtastic 4.0.0 → 5.0.0

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
     module Base
@@ -43,7 +44,7 @@ module Formtastic
             # TODO there's no coverage for this case, not sure how to create a scenario for it
             builder.auto_index
           else
-            ""
+            +""
           end
         end
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
     module Base
@@ -6,7 +7,7 @@ module Formtastic
         include Formtastic::LocalizedString
         
         def label_html
-          render_label? ? builder.label(input_name, label_text, label_html_options) : "".html_safe
+          render_label? ? builder.label(input_name, label_text, label_html_options) : +"".html_safe
         end
         
         def label_html_options
@@ -49,4 +50,4 @@ module Formtastic
       end
     end
   end
-end
+end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
     module Base

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
     module Base

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
     module Base

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
     module Base

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
     module Base

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
     module Base
@@ -156,7 +157,7 @@ module Formtastic
         
         def fragment_label_html(fragment)
           text = fragment_label(fragment)
-          text.blank? ? "".html_safe : template.content_tag(:label, text, :for => fragment_id(fragment))
+          text.blank? ? +"".html_safe : template.content_tag(:label, text, :for => fragment_id(fragment))
         end
         
         def value
@@ -217,7 +218,7 @@ module Formtastic
               :class => "label"
             )
           else
-            "".html_safe
+            +"".html_safe
           end
         end
         
@@ -228,7 +229,7 @@ module Formtastic
         end
         
         def hidden_fragments
-          "".html_safe
+          +"".html_safe
         end
         
         def hidden_field_name(fragment)

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
     module Base
@@ -208,7 +209,7 @@ module Formtastic
         private
 
         # Loosely based on
-        # https://github.com/rails/rails/blob/5-2-stable/activemodel/lib/active_model/validations/numericality.rb#L54-L59
+        # https://github.com/rails/rails/blob/459e7cf62252558bbf65f582a230562ab1a76c5e/activemodel/lib/active_model/validations/numericality.rb#L65-L70
         def option_value(option, object)
           case option
           when Symbol

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
     module Base

data/lib/formtastic/inputs/base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
     module Base
@@ -21,7 +22,7 @@ module Formtastic
       # 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 in the next version", caller(6))
+          Deprecation.warn("The :#{old_option_name} option is deprecated in favour of :#{new_option_name} and will be removed from Formtastic in the next version", caller(6))
           options[new_option_name] = options.delete(old_option_name)
         end
       end
@@ -29,7 +30,7 @@ module Formtastic
       # Usefull for deprecating options.
       def warn_deprecated_option!(old_option_name, instructions)
         if options.key?(old_option_name)
-          ::ActiveSupport::Deprecation.warn("The :#{old_option_name} option is deprecated in favour of `#{instructions}`. :#{old_option_name} will be removed in the next version", caller(6))
+          Deprecation.warn("The :#{old_option_name} option is deprecated in favour of `#{instructions}`. :#{old_option_name} will be removed in the next version", caller(6))
         end
       end
 

data/lib/formtastic/inputs/boolean_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
     # Boolean inputs are used to render an input for a single checkbox, typically for attributes
@@ -59,7 +60,7 @@ module Formtastic
       end
 
       def label_text_with_embedded_checkbox
-        check_box_html << "" << label_text
+        check_box_html << +"" << label_text
       end
 
       def check_box_html

data/lib/formtastic/inputs/check_boxes_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
 
@@ -100,7 +101,7 @@ module Formtastic
 
       def hidden_field_for_all
         if hidden_fields_for_every?
-          ''
+          +''
         else
           options = {}
           options[:class] = [method.to_s.singularize, 'default'].join('_') if value_as_class?

data/lib/formtastic/inputs/color_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
 

data/lib/formtastic/inputs/country_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
     # Outputs a country select input, wrapping around a regular country_select helper.

data/lib/formtastic/inputs/datalist_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
     # Outputs a label and a text field, along with a datalist tag

data/lib/formtastic/inputs/date_picker_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
     

data/lib/formtastic/inputs/date_select_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
     # Outputs a series of select boxes for the fragments that make up a date (year, month, day).

data/lib/formtastic/inputs/datetime_picker_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
     

data/lib/formtastic/inputs/datetime_select_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
 

data/lib/formtastic/inputs/email_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
 

data/lib/formtastic/inputs/file_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
 

data/lib/formtastic/inputs/hidden_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
 
@@ -42,7 +43,7 @@ module Formtastic
       end
       
       def error_html
-        ""
+        +""
       end
       
       def errors?
@@ -50,7 +51,7 @@ module Formtastic
       end
       
       def hint_html
-        ""
+        +""
       end
       
       def hint?

data/lib/formtastic/inputs/number_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
 

data/lib/formtastic/inputs/password_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
 

data/lib/formtastic/inputs/phone_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
 

data/lib/formtastic/inputs/radio_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
 

data/lib/formtastic/inputs/range_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
     

data/lib/formtastic/inputs/search_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
 

data/lib/formtastic/inputs/select_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
     # A select input is used to render a `<select>` tag with a series of options to choose from.

data/lib/formtastic/inputs/string_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
 

data/lib/formtastic/inputs/text_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
 

data/lib/formtastic/inputs/time_picker_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
     

data/lib/formtastic/inputs/time_select_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
     # Outputs a series of select boxes for the fragments that make up a time (hour, minute, second).

data/lib/formtastic/inputs/time_zone_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
 

data/lib/formtastic/inputs/url_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
 

data/lib/formtastic/inputs.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
     extend ActiveSupport::Autoload

data/lib/formtastic/localized_string.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module LocalizedString
 

data/lib/formtastic/localizer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   # Implementation for looking up localized values within Formtastic using I18n, if no
   # explicit value (like the `:label` option) is set and I18n-lookups are enabled in the

data/lib/formtastic/namespaced_class_finder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   # This class implements class resolution in a namespace chain. It
   # is used both by Formtastic::Helpers::InputHelper and
@@ -32,6 +33,10 @@ module Formtastic
       defined?(Rails) && ::Rails.application && ::Rails.application.config.respond_to?(:eager_load) && ::Rails.application.config.eager_load
     end
 
+    def self.finder_method
+      @finder_method ||= use_const_defined? ? :find_with_const_defined : :find_by_trying
+    end
+
     # @param namespaces [Array<Module>]
     def initialize(namespaces)
       @namespaces = namespaces.flatten
@@ -66,14 +71,8 @@ module Formtastic
 
     private
 
-    if use_const_defined?
-      def finder(class_name) # @private
-        find_with_const_defined(class_name)
-      end
-    else
-      def finder(class_name) # @private
-        find_by_trying(class_name)
-      end
+    def finder(class_name) # @private
+      send(self.class.finder_method, class_name)
     end
 
     # Looks up the given class name in the configured namespaces in order,

data/lib/formtastic/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
-  VERSION = "4.0.0"
+  VERSION = "5.0.0"
 end

data/lib/formtastic.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 require 'formtastic/engine' if defined?(::Rails)
 
 module Formtastic

data/lib/generators/formtastic/form/form_generator.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Formtastic
   # Generates a Formtastic form partial based on an existing model. It will not overwrite existing
   # files without confirmation.

data/lib/generators/formtastic/input/input_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
 
   # Modify existing inputs, subclass them, or create your own from scratch.

data/lib/generators/formtastic/install/install_generator.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Formtastic
   # Copies a config initializer to config/initializers/formtastic.rb

data/lib/generators/templates/formtastic.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 # Set the default text field size when input is a string. Default is nil.
 # Formtastic::FormBuilder.default_text_field_size = 50

data/script/integration-template.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 gem 'formtastic', path: '..'
 gem 'bcrypt', '~> 3.1.7'
 gem 'rails-dom-testing', group: :test
@@ -14,8 +15,6 @@ elsif Rails.version >= '6.1'
     gsub_file 'Gemfile', /gem 'rails'.*/, "gem 'rails', '~> #{Rails.version}', github: 'rails/rails', branch: '6-1-stable'"
 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
@@ -40,7 +39,7 @@ end
 formtastic = -> do
   generate(:scaffold, 'user name:string password:digest')
   generate('formtastic:install')
-  generate('formtastic:form', 'user name password:password --force')
+  generate('formtastic:form', 'user name password --force')
 
   rails_command('db:migrate')
 

data/spec/action_class_finder_spec.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 require 'spec_helper'
 require 'formtastic/action_class_finder'
 

data/spec/actions/button_action_spec.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 require 'spec_helper'
 
 RSpec.describe 'ButtonAction', 'when submitting' do
@@ -6,16 +7,16 @@ RSpec.describe 'ButtonAction', 'when submitting' do
   include FormtasticSpecHelper
 
   before do
-    @output_buffer = ''
+    @output_buffer = ActionView::OutputBuffer.new ''
     mock_everything
-    
+
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.action(:submit, :as => :button))
     end)
   end
-  
+
   it 'should render a submit type of button' do
-    expect(output_buffer).to have_tag('li.action.button_action button[@type="submit"]')
+    expect(output_buffer.to_str).to have_tag('li.action.button_action button[@type="submit"]')
   end
 
 end
@@ -23,41 +24,41 @@ end
 RSpec.describe 'ButtonAction', 'when resetting' do
 
   include FormtasticSpecHelper
-  
+
   before do
-    @output_buffer = ''
+    @output_buffer = ActionView::OutputBuffer.new ''
     mock_everything
-    
+
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.action(:reset, :as => :button))
     end)
   end
-  
+
   it 'should render a reset type of button' do
-    expect(output_buffer).to have_tag('li.action.button_action button[@type="reset"]', :text => "Reset Post")
+    expect(output_buffer.to_str).to have_tag('li.action.button_action button[@type="reset"]', :text => "Reset Post")
   end
 
   it 'should not render a value attribute' do
-    expect(output_buffer).not_to have_tag('li.action.button_action button[@value]')
+    expect(output_buffer.to_str).not_to have_tag('li.action.button_action button[@value]')
   end
-  
+
 end
 
 RSpec.describe 'InputAction', 'when cancelling' do
 
   include FormtasticSpecHelper
-  
+
   before do
-    @output_buffer = ''
+    @output_buffer = ActionView::OutputBuffer.new ''
     mock_everything
   end
-  
+
   it 'should raise an error' do
-    expect { 
+    expect {
       concat(semantic_form_for(@new_post) do |builder|
         concat(builder.action(:cancel, :as => :button))
       end)
     }.to raise_error(Formtastic::UnsupportedMethodForAction)
   end
-  
+
 end