formtastic 5.0.0 → 6.0.0.alpha

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'rubygems'
 require 'bundler/setup'
@@ -365,6 +364,7 @@ module FormtasticSpecHelper
     end
 
     allow(@new_post).to receive(:title)
+    allow(@new_post).to receive(:status)
     allow(@new_post).to receive(:email)
     allow(@new_post).to receive(:url)
     allow(@new_post).to receive(:phone)
@@ -390,6 +390,7 @@ module FormtasticSpecHelper
     allow(@new_post).to receive(:document).and_return(@mock_file)
     allow(@new_post).to receive(:column_for_attribute).with(:meta_description).and_return(double('column', :type => :string, :limit => 255))
     allow(@new_post).to receive(:column_for_attribute).with(:title).and_return(double('column', :type => :string, :limit => 50))
+    allow(@new_post).to receive(:column_for_attribute).with(:status).and_return(double('column', :type => :integer, :limit => 1))
     allow(@new_post).to receive(:column_for_attribute).with(:body).and_return(double('column', :type => :text))
     allow(@new_post).to receive(:column_for_attribute).with(:published).and_return(double('column', :type => :boolean))
     allow(@new_post).to receive(:column_for_attribute).with(:publish_at).and_return(double('column', :type => :date))

data/spec/support/custom_macros.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module CustomMacros
@@ -171,13 +170,22 @@ module CustomMacros
       end
     end
 
-    def it_should_have_maxlength_matching_column_limit
+    def it_should_have_maxlength_matching_string_column_limit
       it 'should have a maxlength matching column limit' do
+        expect(@new_post.column_for_attribute(:title).type).to eq(:string)
         expect(@new_post.column_for_attribute(:title).limit).to eq(50)
         expect(output_buffer.to_str).to have_tag("form li input[@maxlength='50']")
       end
     end
 
+    def it_should_have_maxlength_matching_integer_column_limit
+      it 'should have a maxlength matching column limit' do
+        expect(@new_post.column_for_attribute(:status).type).to eq(:integer)
+        expect(@new_post.column_for_attribute(:status).limit).to eq(1)
+        expect(output_buffer.to_str).to have_tag("form li input[@maxlength='3']")
+      end
+    end
+
     def it_should_use_column_size_for_columns_shorter_than_default_text_field_size(as)
       it 'should use the column size for columns shorter than default_text_field_size' do
         column_limit_shorted_than_default = 1
@@ -406,7 +414,7 @@ module CustomMacros
 
         describe 'and the :collection is an OrderedHash of strings' do
           before do
-            @categories = ActiveSupport::OrderedHash.new('General' => 'gen', 'Design' => 'des','Development' => 'dev')
+            @categories = ActiveSupport::OrderedHash['General' => 'gen', 'Design' => 'des','Development' => 'dev']
           end
 
           it "should use the key as the label text and the hash value as the value attribute for each #{countable}" do

data/spec/support/specialized_class_finder_shared_example.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 #
 RSpec.shared_examples 'Specialized Class Finder' do

data/spec/support/test_environment.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 require 'rspec/core'
 
@@ -39,6 +38,7 @@ module FormtasticTest
     config.active_support.deprecation = :stderr
     config.secret_key_base = "secret"
     config.eager_load = false
+    config.active_support.to_time_preserves_timezone = :zone
   end
 end
 FormtasticTest::Application.initialize!

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: formtastic
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 6.0.0.alpha
 platform: ruby
 authors:
 - Justin French
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-23 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,84 +15,98 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.2.0
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-dom-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.12.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.12.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.20
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.20
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +125,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
 description: A Rails form builder plugin/gem with semantically rich and accessible
   markup
 email:
@@ -132,27 +145,25 @@ extra_rdoc_files:
 - README.md
 files:
 - ".gitattributes"
+- ".github/workflows/integration.yaml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".yardopts"
+- Appraisals
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README.md
 - RELEASE_PROCESS
 - Rakefile
-- app/assets/stylesheets/formtastic.css
-- app/assets/stylesheets/formtastic_ie6.css
-- app/assets/stylesheets/formtastic_ie7.css
 - bin/appraisal
 - formtastic.gemspec
-- gemfiles/rails_6.0/Gemfile
-- gemfiles/rails_6.1/Gemfile
-- gemfiles/rails_7.0/Gemfile
-- gemfiles/rails_7.1/Gemfile
-- gemfiles/rails_edge/Gemfile
+- gemfiles/rails_72.gemfile
+- gemfiles/rails_80.gemfile
+- gemfiles/rails_81.gemfile
+- gemfiles/rails_edge.gemfile
 - lib/formtastic.rb
 - lib/formtastic/action_class_finder.rb
 - lib/formtastic/actions.rb
@@ -162,7 +173,6 @@ files:
 - lib/formtastic/actions/input_action.rb
 - lib/formtastic/actions/link_action.rb
 - lib/formtastic/deprecation.rb
-- lib/formtastic/engine.rb
 - lib/formtastic/form_builder.rb
 - lib/formtastic/helpers.rb
 - lib/formtastic/helpers/action_helper.rb
@@ -180,6 +190,7 @@ files:
 - lib/formtastic/input_class_finder.rb
 - lib/formtastic/inputs.rb
 - lib/formtastic/inputs/base.rb
+- lib/formtastic/inputs/base/aria.rb
 - lib/formtastic/inputs/base/associations.rb
 - lib/formtastic/inputs/base/choices.rb
 - lib/formtastic/inputs/base/collections.rb
@@ -230,9 +241,11 @@ files:
 - lib/generators/formtastic/form/form_generator.rb
 - lib/generators/formtastic/input/input_generator.rb
 - lib/generators/formtastic/install/install_generator.rb
+- lib/generators/formtastic/stylesheets/stylesheets_generator.rb
 - lib/generators/templates/_form.html.erb
 - lib/generators/templates/_form.html.haml
 - lib/generators/templates/_form.html.slim
+- lib/generators/templates/formtastic.css
 - lib/generators/templates/formtastic.rb
 - lib/generators/templates/input.rb
 - lib/locale/en.yml
@@ -253,6 +266,7 @@ files:
 - spec/generators/formtastic/form/form_generator_spec.rb
 - spec/generators/formtastic/input/input_generator_spec.rb
 - spec/generators/formtastic/install/install_generator_spec.rb
+- spec/generators/formtastic/stylesheets/stylesheets_generator_spec.rb
 - spec/helpers/action_helper_spec.rb
 - spec/helpers/actions_helper_spec.rb
 - spec/helpers/form_helper_spec.rb
@@ -309,7 +323,6 @@ homepage: http://github.com/formtastic/formtastic
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -318,15 +331,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.11
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 3.6.8
 specification_version: 4
 summary: A Rails form builder plugin/gem with semantically rich and accessible markup
 test_files:
@@ -342,6 +354,7 @@ test_files:
 - spec/generators/formtastic/form/form_generator_spec.rb
 - spec/generators/formtastic/input/input_generator_spec.rb
 - spec/generators/formtastic/install/install_generator_spec.rb
+- spec/generators/formtastic/stylesheets/stylesheets_generator_spec.rb
 - spec/helpers/action_helper_spec.rb
 - spec/helpers/actions_helper_spec.rb
 - spec/helpers/form_helper_spec.rb

data/Gemfile.lock

@@ -1,140 +0,0 @@
-PATH
-  remote: .
-  specs:
-    formtastic (4.0.0)
-      actionpack (>= 6.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    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.2)
-      rails-html-sanitizer (~> 1.6)
-    actionview (7.1.1)
-      activesupport (= 7.1.1)
-      builder (~> 3.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)
-    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.2.2)
-    connection_pool (2.4.1)
-    crass (1.0.6)
-    diff-lcs (1.5.0)
-    drb (2.1.1)
-      ruby2_keywords
-    erubi (1.12.0)
-    i18n (1.14.1)
-      concurrent-ruby (~> 1.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.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)
-    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.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.12.3)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
-      diff-lcs (>= 1.2.0, < 2.0)
-      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)
-    webrick (1.8.1)
-    yard (0.9.34)
-    zeitwerk (2.6.12)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  ammeter (~> 1.1.3)
-  formtastic!
-  rake
-  rspec-dom-testing (>= 0.1.0)
-  rspec-mocks (~> 3.12.2)
-  rspec-rails (>= 4.0)
-  sqlite3 (~> 1.4)
-  yard (~> 0.9.20)
-
-BUNDLED WITH
-   2.3.18

data/app/assets/stylesheets/formtastic_ie6.css

@@ -1,33 +0,0 @@
-/* additional stylesheets only for IE6, if you wish to support it */
-
-/* legend labels apper to have a left margin or padding I couldn't get rid of cleanly in main stylesheet */
-.formtastic .input fieldset legend.label {
-  margin-left:-7px;
-}
-
-/* checkbox and radio inputs appear to have a margin around them that I couldn't remove in main stylesheet */
-.formtastic .choice label input,
-.formtastic .boolean label input {
-  position:relative;
-  left:-1px;
-  size:15px;
-  margin-left:0;
-  margin-right:0;
-}
-
-/* inline hints and errors appear a few pixel too far over to the left */
-.formtastic .inline-hints,
-.formtastic .inline-errors {
-  padding-left:3px;
-}
-
-/* fragment (eg year, month, day) appear a few pixels too far to the left*/
-.formtastic .fragment {
-  padding-left:3px;
-}
-
-.formtastic .buttons,
-.formtastic .inputs,
-.formtastic .input {
-  zoom:1;
-}

data/app/assets/stylesheets/formtastic_ie7.css

@@ -1,23 +0,0 @@
-/* additional stylesheets only for IE7, if you wish to support it */
-
-/* legend labels apper to have a left margin or padding I couldn't get rid of cleanly in main stylesheet */
-.formtastic .input fieldset legend.label {
-  margin-left:-7px;
-}
-
-/* checkbox and radio inputs appear to have a margin around them that I couldn't remove in main stylesheet */
-.formtastic .choice label input,
-.formtastic .boolean label input {
-  position:relative;
-  left:-4px;
-  right:-4px;
-  size:15px;
-  margin-left:0;
-  margin-right:0;
-}
-
-.formtastic .buttons,
-.formtastic .inputs,
-.formtastic .input {
-  zoom:1;
-}

data/gemfiles/rails_6.0/Gemfile

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

data/gemfiles/rails_6.1/Gemfile

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

data/gemfiles/rails_7.0/Gemfile

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

data/gemfiles/rails_7.1/Gemfile

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

data/gemfiles/rails_edge/Gemfile

@@ -1,13 +0,0 @@
-source "https://rubygems.org"
-
-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"
-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/engine.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-module Formtastic
-  # Required for formtastic.css to be discoverable in the asset pipeline
-  # @private
-  class Engine < ::Rails::Engine
-    initializer 'formtastic.initialize' do
-      ActiveSupport.on_load(:action_view) do
-        include Formtastic::Helpers::FormHelper
-      end
-    end
-
-    config.eager_load_namespaces << Formtastic
-  end
-end