BaseForm not inheritance from Hash (#34)

corp-gp · Jul 9, 2024 · 2749691 · 2749691
1 parent fa247d2
commit 2749691
Show file tree

Hide file tree

Showing 11 changed files with 221 additions and 170 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,9 +15,8 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - 2.7.4
           - 3.1.3
-
+          - 3.3.3
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -8,3 +8,10 @@ Gp/OptArgParameters:
 Style/SingleLineMethods:
   Exclude:
     - lib/active_dry_form/builder.rb
+
+Style/StringLiterals:
+  EnforcedStyle: single_quotes
+
+AllCops:
+  NewCops: enable
+  TargetRubyVersion: 2.7
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,18 +1,21 @@
 GIT
   remote: https://github.com/corp-gp/rubocop-gp.git
-  revision: ec4886fc41208b58a7055aaa37ae4a4ced7edfa4
+  revision: e5bd900ce4b10077cf8f4ae88a5a6e32e7861b65
   specs:
-    rubocop-gp (0.0.3)
+    rubocop-gp (0.0.4)
       rubocop
+      rubocop-capybara
+      rubocop-factory_bot
       rubocop-performance
       rubocop-rails
       rubocop-rspec
+      rubocop-rspec_rails
 
 GIT
   remote: https://github.com/dry-rb/dry-schema.git
-  revision: 8de4754d2506dbbca54dcff197e48976d7564420
+  revision: ced2c60aef958eb7f9b2fa0057540249f1ec4e20
   specs:
-    dry-schema (1.13.1)
+    dry-schema (1.13.4)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 1.0, >= 1.0.1)
       dry-core (~> 1.0, < 2)
@@ -34,41 +37,54 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.4.3)
-      actionview (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-      rack (~> 2.0, >= 2.2.0)
+    actionpack (7.1.3.4)
+      actionview (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      nokogiri (>= 1.8.5)
+      racc
+      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 (7.0.4.3)
-      activesupport (= 7.0.4.3)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actionview (7.1.3.4)
+      activesupport (= 7.1.3.4)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (7.0.4.3)
-      activesupport (= 7.0.4.3)
-    activerecord (7.0.4.3)
-      activemodel (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-    activesupport (7.0.4.3)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activemodel (7.1.3.4)
+      activesupport (= 7.1.3.4)
+    activerecord (7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      timeout (>= 0.4.0)
+    activesupport (7.1.3.4)
+      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)
     ast (2.4.2)
-    builder (3.2.4)
-    concurrent-ruby (1.2.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
+    builder (3.3.0)
+    concurrent-ruby (1.3.3)
+    connection_pool (2.4.1)
     crass (1.0.6)
-    diff-lcs (1.5.0)
-    dry-configurable (1.0.1)
+    diff-lcs (1.5.1)
+    drb (2.2.1)
+    dry-configurable (1.2.0)
       dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
-    dry-core (1.0.0)
+    dry-core (1.0.1)
       concurrent-ruby (~> 1.0)
       zeitwerk (~> 2.6)
-    dry-inflector (1.0.0)
+    dry-inflector (1.1.0)
     dry-initializer (3.1.1)
     dry-logic (1.5.0)
       concurrent-ruby (~> 1.0)
@@ -78,7 +94,8 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
-    dry-types (1.7.1)
+    dry-types (1.7.2)
+      bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0)
       dry-inflector (~> 1.0)
@@ -90,75 +107,94 @@ GEM
       dry-initializer (~> 3.0)
       dry-schema (>= 1.12, < 2)
       zeitwerk (~> 2.6)
-    erubi (1.12.0)
-    i18n (1.12.0)
+    erubi (1.13.0)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
-    loofah (2.20.0)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    loofah (2.22.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    minitest (5.18.0)
-    nokogiri (1.14.3-arm64-darwin)
+      nokogiri (>= 1.12.0)
+    minitest (5.24.1)
+    mutex_m (0.2.0)
+    nokogiri (1.16.6-arm64-darwin)
       racc (~> 1.4)
-    parallel (1.23.0)
-    parser (3.2.2.0)
+    nokogiri (1.16.6-x86_64-linux)
+      racc (~> 1.4)
+    parallel (1.25.1)
+    parser (3.3.3.0)
       ast (~> 2.4.1)
-    racc (1.6.2)
-    rack (2.2.6.4)
+      racc
+    racc (1.8.0)
+    rack (3.1.6)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.8.0)
-    rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rake (13.2.1)
+    regexp_parser (2.9.2)
+    rexml (3.3.1)
+      strscan
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.50.2)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.64.1)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.28.0)
-      parser (>= 3.2.1.0)
-    rubocop-capybara (2.17.1)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
-    rubocop-performance (1.17.1)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.19.1)
+    rubocop-factory_bot (2.26.1)
+      rubocop (~> 1.61)
+    rubocop-performance (1.21.1)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rails (2.25.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
-    rubocop-rspec (2.20.0)
-      rubocop (~> 1.33)
-      rubocop-capybara (~> 2.17)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rspec (3.0.2)
+      rubocop (~> 1.61)
+    rubocop-rspec_rails (2.30.0)
+      rubocop (~> 1.61)
+      rubocop-rspec (~> 3, >= 3.0.1)
     ruby-progressbar (1.13.0)
-    sqlite3 (1.6.2-arm64-darwin)
+    sqlite3 (1.7.3-arm64-darwin)
+    sqlite3 (1.7.3-x86_64-linux)
+    strscan (3.1.0)
+    timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
-    zeitwerk (2.6.7)
+    unicode-display_width (2.5.0)
+    zeitwerk (2.6.16)
 
 PLATFORMS
   arm64-darwin-21

diff --git a/README.md b/README.md
@@ -215,7 +215,7 @@ class NestedDryForm < Form
       required(:price).filled(:integer)
       optional(:description).maybe(:string)
       optional(:upload_attachments).maybe(:array)
-      optional(:bookmarks).array(Dry.Types::Instance(BookmarkForm))
+      optional(:bookmarks).array(Dry.Types.Constructor(BookmarkForm) { |params| BookmarkForm.new(params: params) })
     end
   end
 
@@ -232,7 +232,7 @@ class NestedDryForm < Form
 end
 ```
 
-As you noticed in the above example, we use the construction `Dry.Types::Instance(BookmarkForm)`,
+As you noticed in the above example, we use the construction `Dry.Types.Constructor(BookmarkForm) { |params| BookmarkForm.new(params: params) }`,
 what it is `dry types` you can find out [here](https://dry-rb.org/gems/dry-types)
 
 

diff --git a/active_dry_form.gemspec b/active_dry_form.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description = 'Form validation for Rails with Dry-Validation'
   spec.homepage = 'https://github.com/corp-gp/active_dry_form'
   spec.license = 'MIT'
-  spec.required_ruby_version = '>= 2.5.0'
+  spec.required_ruby_version = '>= 2.7.0'
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,9 +15,8 @@ jobs: @@
           fail-fast: false
           matrix:
             ruby:
-              - 2.7.4
               - 3.1.3
+              - 3.3.3
         steps:
         - uses: actions/checkout@v2
         - name: Set up Ruby
@@ Expand Down @@