formtastic 4.0.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb44ea01df970135604cdddd0ac7b762ea56077f915810c4c8fe6be3487cafa3
-  data.tar.gz: 18630a8282b76e40d0c6e9faad19f99112dfd9e22ba22e7b025d8730ebf26ace
+  metadata.gz: 70272678a1b436280de8d89add80583ca886cac153f6d4e43be93e6a641c344f
+  data.tar.gz: d2549407b0a3c5d21e7afe24cfd21bd008c9ca957bd06cf2d59fb7b3101fa042
 SHA512:
-  metadata.gz: 73a3ad17e91765150e4e15e03d3031f5b9efd975a09bbb21c7f404709b7d2462e9cf16c708beaf2745b783def3a631ca1b3bd47278d79c16012d79ba1f549fc0
-  data.tar.gz: d418a7e65f928dedfd36627c3ece7c4fe7e371984500ddc4bcb6c5929087264541476c469be6520270000a0e8348bc2cd41415e94d46c86da2e48021bf54d4be
+  metadata.gz: 4164b15cb0dc3eb5d2d90f257977d59b8459a1708f4520ba6ff1708eaf9dd898f2713d9f59945c1d50c2b481e2175c0e3d7af6259c9f1e715a836aac0dd0e53b
+  data.tar.gz: e93800c9ca16ea4afb445f5a95cb56e1dd0224f06654ef8af7b13dba8ddb4c520e09c4b49c760d10a7e71d6f381f9b6fb91bbe61e26e1cab83823c7e2dc827de

data/.github/workflows/test.yml

@@ -5,6 +5,11 @@ on:
   pull_request:
 
 jobs:
+  ci:
+    runs-on: ubuntu-latest
+    needs: test
+    steps:
+      - uses: actions/checkout@v2
   test:
     runs-on: ubuntu-20.04
 
@@ -13,31 +18,25 @@ jobs:
 
       matrix:
         gemfile:
-          - gemfiles/rails_5.2/Gemfile
           - gemfiles/rails_6.0/Gemfile
           - gemfiles/rails_6.1/Gemfile
+          - gemfiles/rails_7.0/Gemfile
+          - gemfiles/rails_7.1/Gemfile
           - gemfiles/rails_edge/Gemfile
 
         ruby:
-          - 2.4.10
-          - 2.5.8
           - 2.6.6
           - 2.7.2
           - 3.0.0
 
         exclude:
-          - ruby: 2.4.10
-            gemfile: gemfiles/rails_6.0/Gemfile
-
-          - ruby: 2.4.10
-            gemfile: gemfiles/rails_6.1/Gemfile
-
-          - ruby: 2.4.10
+          - ruby: 2.6.6
+            gemfile: gemfiles/rails_7.0/Gemfile
+          - ruby: 2.6.6
+            gemfile: gemfiles/rails_7.1/Gemfile
+          - ruby: 2.6.6
             gemfile: gemfiles/rails_edge/Gemfile
 
-          - ruby: 3.0.0
-            gemfile: gemfiles/rails_5.2/Gemfile
-
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
 
@@ -53,6 +52,7 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
+          bundler: latest
 
       - name: Run tests
         run: |

data/CHANGELOG.md

@@ -1,4 +1,13 @@
-## master / 4.0.0
+## 5.0.0
+ * Added support for Rails 7.1 ([#1371](https://github.com/formtastic/formtastic/pull/1371))
+ * Removed support for Rails < 6.0.0 ([#1354](https://github.com/formtastic/formtastic/pull/1354))
+ * Removed support for Rubies < 2.6.0 ([#1332](https://github.com/formtastic/formtastic/pull/1332), [#1355](https://github.com/formtastic/formtastic.git/pull/1355))
+ * Added support for scopes in relations ([#1343](https://github.com/formtastic/formtastic/pull/1343))
+ * Fixed I18n lookup for enum values in nested select fields ([#1342](https://github.com/formtastic/formtastic/pull/1342))
+ * Fixed faster input class lookup ([#1336](https://github.com/formtastic/formtastic/pull/1336))
+ * Use frozen_string_literal internally ([#1339](https://github.com/formtastic/formtastic/pull/1339))
+
+## 4.0.0
   * Fixed default_columns_for_object when object has non-standard foreign keys (#1241)
   * Fixed missing constants in production (#911)
   * Removed support for Rails 3 and 4.0 (#1108)

data/Gemfile.lock

@@ -1,93 +1,127 @@
 PATH
   remote: .
   specs:
-    formtastic (4.0.0.rc1)
-      actionpack (>= 5.2.0)
+    formtastic (4.0.0)
+      actionpack (>= 6.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.1.1)
-      actionview (= 6.1.1)
-      activesupport (= 6.1.1)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.1.1)
+      actionview (= 7.1.1)
+      activesupport (= 7.1.1)
+      nokogiri (>= 1.8.5)
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.1.1)
-      activesupport (= 6.1.1)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actionview (7.1.1)
+      activesupport (= 7.1.1)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.1.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activesupport (7.1.1)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    ammeter (1.1.4)
+    ammeter (1.1.5)
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec-rails (>= 2.2)
+    base64 (0.1.1)
+    bigdecimal (3.1.4)
     builder (3.2.4)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
     crass (1.0.6)
-    diff-lcs (1.3)
-    erubi (1.10.0)
-    i18n (1.8.7)
+    diff-lcs (1.5.0)
+    drb (2.1.1)
+      ruby2_keywords
+    erubi (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    loofah (2.9.0)
+    io-console (0.6.0)
+    irb (1.8.1)
+      rdoc
+      reline (>= 0.3.8)
+    loofah (2.21.4)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    method_source (1.0.0)
-    mini_portile2 (2.5.0)
-    minitest (5.14.3)
-    nokogiri (1.11.1)
-      mini_portile2 (~> 2.5.0)
+      nokogiri (>= 1.12.0)
+    mini_portile2 (2.8.4)
+    minitest (5.20.0)
+    mutex_m (0.1.2)
+    nokogiri (1.15.4)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    racc (1.5.2)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    psych (5.1.1)
+      stringio
+    racc (1.7.1)
+    rack (3.0.8)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (6.1.1)
-      actionpack (= 6.1.1)
-      activesupport (= 6.1.1)
-      method_source
-      rake (>= 0.8.7)
-      thor (~> 1.0)
-    rake (13.0.3)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (7.1.1)
+      actionpack (= 7.1.1)
+      activesupport (= 7.1.1)
+      irb
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
+    rake (13.0.6)
+    rdoc (6.5.0)
+      psych (>= 4.0.0)
+    reline (0.3.9)
+      io-console (~> 0.5)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
     rspec-dom-testing (0.1.0)
       rails-dom-testing (>= 1.0, < 3)
       rspec-expectations (~> 3.0)
-    rspec-expectations (3.9.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-rails (3.9.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    sqlite3 (1.4.2)
-    thor (1.1.0)
-    tzinfo (2.0.4)
+      rspec-support (~> 3.12.0)
+    rspec-rails (6.0.3)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
+      rspec-core (~> 3.12)
+      rspec-expectations (~> 3.12)
+      rspec-mocks (~> 3.12)
+      rspec-support (~> 3.12)
+    rspec-support (3.12.1)
+    ruby2_keywords (0.0.5)
+    sqlite3 (1.6.7)
+      mini_portile2 (~> 2.8.0)
+    stringio (3.0.8)
+    thor (1.2.2)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    yard (0.9.25)
-    zeitwerk (2.4.2)
+    webrick (1.8.1)
+    yard (0.9.34)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   ruby
@@ -97,9 +131,10 @@ DEPENDENCIES
   formtastic!
   rake
   rspec-dom-testing (>= 0.1.0)
-  rspec-rails (~> 3.4)
+  rspec-mocks (~> 3.12.2)
+  rspec-rails (>= 4.0)
   sqlite3 (~> 1.4)
   yard (~> 0.9.20)
 
 BUNDLED WITH
-   2.1.4
+   2.3.18

data/README.md

@@ -16,7 +16,8 @@ Formtastic is a Rails FormBuilder DSL (with some other goodies) to make it far e
 
 ## Compatibility
 
-* Formtastic 4 requires Rails 5.2 and Ruby 2.5 minimum
+* Formtastic 5 requires Rails 6.0 and Ruby 2.6 minimum
+* Formtastic 4 requires Rails 5.2 and Ruby 2.4 minimum
 * Formtastic 3 requires Rails 3.2.13 minimum
 * Formtastic 2 requires Rails 3
 * Formtastic, much like Rails, is very ActiveRecord-centric. Many are successfully using other ActiveModel-like ORMs and objects (DataMapper, MongoMapper, Mongoid, Authlogic, Devise...) but we're not guaranteeing full compatibility at this stage. Patches are welcome!
@@ -88,7 +89,7 @@ I also wrote the accompanying HTML output I expected, favoring something very si
 Simply add Formtastic to your Gemfile and bundle it up:
 
 ```ruby
-  gem 'formtastic', '~> 4.0'
+  gem 'formtastic', '~> 5.0'
 ```
 
 Run the installation generator:
@@ -570,6 +571,10 @@ To create your own new types of inputs based on existing inputs, the process is
     def input_html_options
       super.merge(:class => "flexible-text-area")
     end
+
+    def options
+      super.merge(hint: 'This is a flexible text area')
+    end
   end
 ```
 

data/formtastic.gemspec

@@ -21,14 +21,16 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = ["README.md"]
 
-  s.required_ruby_version = '>= 2.4.0'
+  s.required_ruby_version = '>= 2.6.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>, [">= 5.2.0"])
+  s.add_dependency(%q<actionpack>, [">= 6.0.0"])
 
-  s.add_development_dependency(%q<rspec-rails>, ["~> 3.4"])
+  s.add_development_dependency(%q<rspec-rails>, [">= 4.0"])
   s.add_development_dependency(%q<rspec-dom-testing>, [">= 0.1.0"])
+  s.add_development_dependency(%q<rspec-mocks>, ["~> 3.12.2"])
+
   s.add_development_dependency(%q<yard>, ["~> 0.9.20"])
   s.add_development_dependency(%q<ammeter>, ["~> 1.1.3"])
   s.add_development_dependency(%q<rake>)

data/gemfiles/{rails_5.2 → rails_7.0}/Gemfile

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

data/gemfiles/rails_7.1/Gemfile

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

data/gemfiles/rails_edge/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "rails", git: "https://github.com/rails/rails.git"
+gem "rails", git: "https://github.com/rails/rails.git", branch: "main"
 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"

data/lib/formtastic/action_class_finder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
 
   # Uses the {NamespacedClassFinder} to look up action class names.

data/lib/formtastic/actions/base.rb

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

data/lib/formtastic/actions/button_action.rb

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

data/lib/formtastic/actions/buttonish.rb

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

data/lib/formtastic/actions/input_action.rb

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

data/lib/formtastic/actions/link_action.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Actions
   # Outputs a link wrapped in the standard `<li>` wrapper. This the default for `:cancel` actions.

data/lib/formtastic/actions.rb

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

data/lib/formtastic/deprecation.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 require 'active_support/deprecation'
 
 module Formtastic
-  Deprecation = ActiveSupport::Deprecation
+  Deprecation = ActiveSupport::Deprecation.new("5.0.0", "Formtastic")
 end

data/lib/formtastic/engine.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   # Required for formtastic.css to be discoverable in the asset pipeline
   # @private

data/lib/formtastic/form_builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   class FormBuilder < ActionView::Helpers::FormBuilder
 

data/lib/formtastic/helpers/action_helper.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 module Formtastic
   module Helpers
     module ActionHelper

data/lib/formtastic/helpers/actions_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Helpers
     # ActionsHelper encapsulates the responsibilties of the {#actions} DSL for acting on 

data/lib/formtastic/helpers/enum.rb

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

data/lib/formtastic/helpers/errors_helper.rb

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

data/lib/formtastic/helpers/fieldset_wrapper.rb

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

data/lib/formtastic/helpers/file_column_detection.rb

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

data/lib/formtastic/helpers/form_helper.rb

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

data/lib/formtastic/helpers/input_helper.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 module Formtastic
   module Helpers
 
@@ -310,10 +311,7 @@ module Formtastic
           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
+            @object.column_for_attribute(method)
           else nil
         end
       end

data/lib/formtastic/helpers/inputs_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Helpers
 
@@ -377,7 +378,7 @@ module Formtastic
         args << options.merge!(:parent => { :builder => self, :for => options[:for] })
 
         fields_for_block = if block_given?
-          raise ArgumentError, 'You gave :for option with a block to inputs method, ' <<
+          raise ArgumentError, 'You gave :for option with a block to inputs method, ' +
                                'but the block does not accept any argument.' if block.arity <= 0
           lambda do |f|
             contents = f.inputs(*args) do

data/lib/formtastic/helpers/reflection.rb

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

data/lib/formtastic/helpers.rb

@@ -1,6 +1,6 @@
+# frozen_string_literal: true
 module Formtastic
   module Helpers
-    autoload :ButtonsHelper, 'formtastic/helpers/buttons_helper'
     autoload :ActionHelper, 'formtastic/helpers/action_helper'
     autoload :ActionsHelper, 'formtastic/helpers/actions_helper'
     autoload :ErrorsHelper, 'formtastic/helpers/errors_helper'

data/lib/formtastic/html_attributes.rb

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

data/lib/formtastic/i18n.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 module Formtastic
   # @private

data/lib/formtastic/input_class_finder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
 
   # Uses the {Formtastic::NamespacedClassFinder} to look up input class names.

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

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

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
     module Base
@@ -92,7 +93,7 @@ module Formtastic
               label_html_options.merge(:class => "label")
             )
           else
-            "".html_safe
+            +"".html_safe
           end
         end
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
     module Base
@@ -78,6 +79,8 @@ module Formtastic
                     ) if reflection.options[:polymorphic] == true
             end
 
+            return reflection.klass.merge(reflection.scope) if reflection.scope
+
             conditions_from_reflection = (reflection.respond_to?(:options) && reflection.options[:conditions]) || {}
             conditions_from_reflection = conditions_from_reflection.call if conditions_from_reflection.is_a?(Proc)
 
@@ -114,7 +117,7 @@ module Formtastic
 
             enum_options_hash = object.defined_enums[method_name]
             enum_options_hash.map do |name, value|
-              key = "activerecord.attributes.#{object_name}.#{method_name.pluralize}.#{name}"
+              key = "activerecord.attributes.#{object.model_name.i18n_key}.#{method_name.pluralize}.#{name}"
               label = ::I18n.translate(key, :default => name.humanize)
               [label, name]
             end

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

@@ -1,21 +1,19 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
     module Base
       module Database
-        
+
         def column
           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
+            object.column_for_attribute(method)
           end
         end
-        
+
         def column?
           !column.nil?
         end
-        
+
       end
     end
   end

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

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

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

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 module Formtastic
   module Inputs
     module Base
       module Errors
         
         def error_html
-          errors? ? send(:"error_#{builder.inline_errors}_html") : ""
+          errors? ? send(:"error_#{builder.inline_errors}_html") : +""
         end
         
         def error_sentence_html
@@ -27,7 +28,7 @@ module Formtastic
         end
         
         def error_none_html
-          ""
+          +""
         end
         
         def errors?

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

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

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

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