formtastic 4.0.0.rc1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d4e6d380c2d708ed43fd63f5558416c1ef53aa6a208ba9b74ce613419683501
-  data.tar.gz: caf570aee5672261b10094658ab5dcfd56f944f456b288eedebeb1a58d53caf1
+  metadata.gz: cb44ea01df970135604cdddd0ac7b762ea56077f915810c4c8fe6be3487cafa3
+  data.tar.gz: 18630a8282b76e40d0c6e9faad19f99112dfd9e22ba22e7b025d8730ebf26ace
 SHA512:
-  metadata.gz: e575fe3d770692adfcac597cf9719ab459c157dd09738090eeb9ca5c23abc49ecce78df9a51a3781b55fb5b0f4e50f3f3273af70a8674346a7e059f1485523b8
-  data.tar.gz: 2363a8a9a9ce3b1a981df647d511db68e4fd71073e2a3b4aaa6f0023ae59ae4d402e05a2fc9454d228ca6fd659c3d6e3eceb0e9fbc3df9fb25026006956bef87
+  metadata.gz: 73a3ad17e91765150e4e15e03d3031f5b9efd975a09bbb21c7f404709b7d2462e9cf16c708beaf2745b783def3a631ca1b3bd47278d79c16012d79ba1f549fc0
+  data.tar.gz: d418a7e65f928dedfd36627c3ece7c4fe7e371984500ddc4bcb6c5929087264541476c469be6520270000a0e8348bc2cd41415e94d46c86da2e48021bf54d4be

data/.github/workflows/test.yml

@@ -0,0 +1,61 @@
+name: test
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+        gemfile:
+          - gemfiles/rails_5.2/Gemfile
+          - gemfiles/rails_6.0/Gemfile
+          - gemfiles/rails_6.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
+            gemfile: gemfiles/rails_edge/Gemfile
+
+          - ruby: 3.0.0
+            gemfile: gemfiles/rails_5.2/Gemfile
+
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 11
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Run tests
+        run: |
+          bundle exec rake spec
+          script/integration.sh
+        continue-on-error: ${{ matrix.gemfile == 'gemfiles/rails_edge/Gemfile' }}

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-## master
+## master / 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)
@@ -11,6 +11,9 @@
   * Allow symbols for numericality options (#1258)
   * Support for rubies under 2.4.0 has been dropped (#1292)
   * Support for Rails under 5.2.0 has been dropped (#1293)
+  * Support for Rails 6.0 has been added (#1300)
+  * Support for Rails 6.1 has been added (#1324)
+  * Support for Ruby 3 has been added (#1323)
 
 ## 3.1.2
 
@@ -43,7 +46,7 @@
 ---
 
 See 3.0-stable branch for 3.0.x changes
-https://github.com/justinfrench/formtastic/blob/3.0-stable/CHANGELOG
+https://github.com/formtastic/formtastic/blob/3.0-stable/CHANGELOG
 
 See 2.3-stable branch for 2.3.x and earlier releases
-https://github.com/justinfrench/formtastic/blob/2.3-stable/CHANGELOG
+https://github.com/formtastic/formtastic/blob/2.3-stable/CHANGELOG

data/Gemfile.lock

@@ -1,50 +1,52 @@
 PATH
   remote: .
   specs:
-    formtastic (3.2.0.pre)
+    formtastic (4.0.0.rc1)
       actionpack (>= 5.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.0.3.2)
-      actionview (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.1)
+      actionview (= 6.1.1)
+      activesupport (= 6.1.1)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.3.2)
-      activesupport (= 6.0.3.2)
+    actionview (6.1.1)
+      activesupport (= 6.1.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.0.3.2)
+    activesupport (6.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     ammeter (1.1.4)
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec-rails (>= 2.2)
     builder (3.2.4)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.8)
     crass (1.0.6)
     diff-lcs (1.3)
-    erubi (1.9.0)
-    i18n (1.8.3)
+    erubi (1.10.0)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
-    loofah (2.6.0)
+    loofah (2.9.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
+    mini_portile2 (2.5.0)
+    minitest (5.14.3)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    racc (1.5.2)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -53,13 +55,13 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
+    railties (6.1.1)
+      actionpack (= 6.1.1)
+      activesupport (= 6.1.1)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
-    rake (13.0.1)
+      thor (~> 1.0)
+    rake (13.0.3)
     rspec-core (3.9.2)
       rspec-support (~> 3.9.3)
     rspec-dom-testing (0.1.0)
@@ -81,12 +83,11 @@ GEM
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
     sqlite3 (1.4.2)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
+    thor (1.1.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     yard (0.9.25)
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2010 Justin French
+Copyright (c) 2008-2021
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,23 +1,22 @@
 # Formtastic
 
-[![Build Status](https://travis-ci.org/justinfrench/formtastic.svg?branch=master)](https://travis-ci.org/justinfrench/formtastic)
+[![Build Status](https://github.com/formtastic/formtastic/workflows/test/badge.svg)](https://github.com/formtastic/formtastic/actions)
 [![Inline docs](https://inch-ci.org/github/justinfrench/formtastic.svg?branch=master)](https://inch-ci.org/github/justinfrench/formtastic)
-[![Code Climate](https://codeclimate.com/github/justinfrench/formtastic/badges/gpa.svg)](https://codeclimate.com/github/justinfrench/formtastic)
+[![Code Climate](https://codeclimate.com/github/formtastic/formtastic/badges/gpa.svg)](https://codeclimate.com/github/formtastic/formtastic)
 [![Gem Version](https://badge.fury.io/rb/formtastic.svg)](https://badge.fury.io/rb/formtastic)
 
 Formtastic is a Rails FormBuilder DSL (with some other goodies) to make it far easier to create beautiful, semantically rich, syntactically awesome, readily stylable and wonderfully accessible HTML forms in your Rails applications.
 
 ## Documentation & Support
 
-* [Documentation is available on rdoc.info](https://rdoc.info/projects/justinfrench/formtastic)
-* [We track issues & bugs on GitHub](https://github.com/justinfrench/formtastic/issues)
-* [We have a wiki on GitHub](https://github.com/justinfrench/formtastic/wiki)
+* [Documentation is available on rdoc.info](https://rdoc.info/projects/formtastic/formtastic)
+* [We track issues & bugs on GitHub](https://github.com/formtastic/formtastic/issues)
+* [We have a wiki on GitHub](https://github.com/formtastic/formtastic/wiki)
 * [StackOverflow can help](https://stackoverflow.com/questions/tagged/formtastic)
-* [Follow @formtastic on Twitter for news & updates](https://twitter.com/formtastic)
 
 ## Compatibility
 
-* Formtastic 4 will require Rails 5.2 and Ruby 2.4 minimum
+* Formtastic 4 requires Rails 5.2 and Ruby 2.5 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!
@@ -89,7 +88,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', '~> 3.0'
+  gem 'formtastic', '~> 4.0'
 ```
 
 Run the installation generator:
@@ -622,7 +621,7 @@ There are none other than Rails itself, but...
 
 Formtastic was created by [Justin French](https://www.justinfrench.com) with contributions from around 180 awesome developers. Run `git shortlog -n -s` to see the awesome.
 
-The project is hosted on Github: [https://github.com/justinfrench/formtastic](https://github.com/justinfrench/formtastic), where your contributions, forkings, comments, issues and feedback are greatly welcomed.
+The project is hosted on Github: [https://github.com/formtastic/formtastic](https://github.com/formtastic/formtastic), where your contributions, forkings, comments, issues and feedback are greatly welcomed.
 
-Copyright (c) 2007-2016 Justin French, released under the MIT license.
+Copyright (c) 2007-2021, released under the MIT license.
 

data/RELEASE_PROCESS

@@ -1,4 +1,6 @@
-# edit version.rb
+# review and edit CHANGELOG
+# review & edit README
+# edit lib/formtastic/version.rb
 git ci -am "version bump"                  # commit changes
 git tag X.X.X                              # tag the new version in the code base too
 gem build formtastic.gemspec               # build the gem

data/formtastic.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = [%q{Justin French}]
   s.email       = [%q{justin@indent.com.au}]
-  s.homepage    = %q{http://github.com/justinfrench/formtastic}
+  s.homepage    = %q{http://github.com/formtastic/formtastic}
   s.summary     = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.description = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.license     = 'MIT'

data/gemfiles/rails_6.1/Gemfile

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

data/lib/formtastic/helpers/inputs_helper.rb

@@ -353,7 +353,7 @@ module Formtastic
       # 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)
+          @object.class.reflect_on_all_associations(:belongs_to).map{ |reflection| reflection.foreign_key.to_sym }
         else
           []
         end

data/lib/formtastic/version.rb

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

data/lib/generators/templates/formtastic.rb

@@ -91,7 +91,7 @@
 
 # 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 https://github.com/justinfrench/formtastic/wiki/Custom-Class-Finders
+# See https://github.com/formtastic/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
@@ -100,7 +100,7 @@
 
 # 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 https://github.com/justinfrench/formtastic/wiki/Custom-Class-Finders
+# See https://github.com/formtastic/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

data/sample/basic_inputs.html

@@ -36,7 +36,7 @@
         <li class="input url stringish optional" id="gem_url_input">
           <label class="label" for="gem_url">URL</label>
           <input id="gem_url" name="gem[url]" type="url">
-          <p class="inline-hints">Example: https://github.com/justinfrench/formtastic</p>
+          <p class="inline-hints">Example: https://github.com/formtastic/formtastic</p>
         </li>
 
         <li class="input password stringish required" id="gem_password_input">

data/script/integration-template.rb

@@ -1,14 +1,17 @@
 gem 'formtastic', path: '..'
 gem 'bcrypt', '~> 3.1.7'
 gem 'rails-dom-testing', group: :test
+gem 'rexml', '~> 3.2' # to compensate for missing dependency in selenium-webdriver
 
-# to speed up travis install, reuse the bundle path
+# to speed up bundle install, reuse the bundle path
 def bundle_path
-  File.expand_path ENV.fetch('BUNDLE_PATH', 'vendor/bundle'), ENV['TRAVIS_BUILD_DIR']
+  File.expand_path ENV.fetch('BUNDLE_PATH', 'vendor/bundle')
 end
 
-if Rails.version >= '6.1'
+if Rails.version >= '6.2'
     gsub_file 'Gemfile', /gem 'rails'.*/, "gem 'rails', '~> #{Rails.version}', github: 'rails/rails'"
+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'
@@ -19,7 +22,7 @@ end
 ruby_version = "ruby '#{RUBY_VERSION}'"
 gsub_file 'Gemfile', /ruby '\d+.\d+.\d+'/, ruby_version
 
-if File.directory?(bundle_path) && bundle_install?
+if bundle_install?
   def run_bundle
     previous_bundle_path = bundle_path
 

data/spec/builder/custom_builder_spec.rb

@@ -70,7 +70,7 @@ RSpec.describe 'Formtastic::Helpers::FormHelper.builder' do
         end
       end
 
-      # See: https://github.com/justinfrench/formtastic/issues/657
+      # See: https://github.com/formtastic/formtastic/issues/657
       it "should not conflict with navigasmic" do
         allow_any_instance_of(self.class).to receive(:builder).and_return('navigasmic')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formtastic
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc1
+  version: 4.0.0
 platform: ruby
 authors:
 - Justin French
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-21 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -118,12 +118,11 @@ extra_rdoc_files:
 - README.md
 files:
 - ".gitattributes"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
-- DEPRECATIONS
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
@@ -137,6 +136,7 @@ files:
 - formtastic.gemspec
 - gemfiles/rails_5.2/Gemfile
 - gemfiles/rails_6.0/Gemfile
+- gemfiles/rails_6.1/Gemfile
 - gemfiles/rails_edge/Gemfile
 - lib/formtastic.rb
 - lib/formtastic/action_class_finder.rb
@@ -290,7 +290,7 @@ files:
 - spec/support/shared_examples.rb
 - spec/support/specialized_class_finder_shared_example.rb
 - spec/support/test_environment.rb
-homepage: http://github.com/justinfrench/formtastic
+homepage: http://github.com/formtastic/formtastic
 licenses:
 - MIT
 metadata: {}

data/.travis.yml

@@ -1,34 +0,0 @@
-cache:
-  - bundler
-  - directories:
-    - gemfiles/rails_52/vendor/bundle
-    - gemfiles/rails_60/vendor/bundle
-    - gemfiles/rails_edge/vendor/bundle
-dist: bionic
-language: ruby
-node_js: 11
-rvm:
-  - 2.4.9
-  - 2.5.7
-  - 2.6.5
-  - 2.7.0
-gemfile:
-  - gemfiles/rails_5.2/Gemfile
-  - gemfiles/rails_6.0/Gemfile
-  - gemfiles/rails_edge/Gemfile
-before_install:
-  - gem install bundler
-  - export BUNDLE_PATH=$(dirname $(readlink -f $BUNDLE_GEMFILE))/vendor/bundle
-before_cache:
-  - rm -f ${BUNDLE_PATH}/**/extensions/**/{gem_make.out,mkmf.log}
-script:
-  - bundle exec rake spec
-  - script/integration.sh
-matrix:
-  exclude:
-    - rvm: 2.4.9
-      gemfile: gemfiles/rails_6.0/Gemfile
-    - rvm: 2.4.9
-      gemfile: gemfiles/rails_edge/Gemfile
-  allow_failures:
-    - gemfile: gemfiles/rails_edge/Gemfile

data/DEPRECATIONS

@@ -1,52 +0,0 @@
-This document is for tracking deprecations and removals of 
-Formtastic features and compatibilities.
-
-v4.0 (planned)
-
-* Remove support for Rails < 5.2
-* Remove support for country_select 1.x syntax (they want to remove it in 3.0)
-* Remove support for input_class, custom_input_class_name, standard_input_class_name, action_class, custom_action_class_name, standard_action_class_name
-
-v3.1 (master)
-
-* Deprecate support for Rails < 4.1
-* Deprecate :member_value option
-* Deprecate :member_label option
-* Deprecate internal custom input class finder methods (input_class, custom_input_class_name, standard_input_class_name)
-* Deprecate internal custom action class finder methods (action_class, custom_action_class_name, standard_action_class_name)
-
-v3.0
-
-* Remove support for Ruby version < 1.9.3
-* Remove support for Rails version < 3.2.13
-* Remove deprecated option :value (#1025)
-* Remove deprecated option :hint_class (#1025)
-* Remove deprecated option :error_class (#1025)
-* Remove deprecated option :group_by (#1025)
-* Remove deprecated option :group_label (#1025)
-* Remove deprecated option :find_options (#1025)
-* Deprecate support for Rails < 4.0.4
-
-v2.3
-
-* Remove deprecated date, time and datetime inputs
-* Deprecate :error_class option
-* Deprecate support for Rails < 3.2.13
-
-v2.2
-
-* Remove deprecated buttons DSL, ButtonHelper and commit_button helper
-* Deprecate :value option
-* Deprecate :hint_class option
-* Deprecate :error_class option
-* Deprecate :group_by and :group_label options
-* Deprecate :find_options option
-
-v2.1
-
-* Remove the previously deprecated :label_method, :value_method & :group_label_method options
-* Remove the previously deprecated :as => :numeric
-* Remove the previously deprecated inline_errors_for and related methods
-* Remove the previously deprecated SemanticFormHelper and SemanticFormBuilder
-* Deprecate the Buttons DSL (f.buttons, f.commit_button) in favor of the new Actions DSL — see above
-