active_dry_form 1.4.3 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd6511ceaf0f29fd549604fdb2bb4cfc20645e1bf90a0e8da1ad23d19443a4a7
-  data.tar.gz: 8e50db038d79fdff447649670e591aa439133c276f143c5c43d628c4452b7693
+  metadata.gz: f2b46a8269802eeb6b10b264a398d92d51897a1b5ddac8f3f52a06b6ca3b47b6
+  data.tar.gz: 0526caf682091f26d7d9883ea2aa659c326a993a4198ba26df8c97a73193a295
 SHA512:
-  metadata.gz: cd2e02fd098f56e69504ecdf5a0977e7459c355ebff47360de20bedc5e93619df55988cc4e48b998fbf0c354a011065e907ef280e04b3f86e61df47b272649c0
-  data.tar.gz: 1f32a33f0f41b9d16d9ccd4bda7c851b6b32a8276a5058fbc339cc2fe3427d94a65228aeb380ec9518646c6171312d0d21c1b6d4f6d58128e18c0f869688ec8f
+  metadata.gz: 252957c5e2724661dd02ed64c546dd745a5133b08ecc0087ea3beda3f37339eb4f9ccf537ca8810f685fd1c7fe0181aadf5d3a95a4cfa47acf2c3b2c3ec44acc
+  data.tar.gz: daf080ded69f3a74717dc3918c9f9585292e096fcbd858b47782b14472440257df8dc05eaf9d749fac93bf9c172015ceefdbd6c7297c48e7f71eef474d877e8e

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/corp-gp/rubocop-gp.git
-  revision: e5bd900ce4b10077cf8f4ae88a5a6e32e7861b65
+  revision: e3d33016bb3b9945ce9d8d22e77825a223de1a5c
   specs:
     rubocop-gp (0.0.4)
       rubocop
@@ -27,7 +27,7 @@ GIT
 PATH
   remote: .
   specs:
-    active_dry_form (1.4.1)
+    active_dry_form (1.5.0)
       actionpack
       activerecord
       dry-configurable
@@ -69,15 +69,15 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    ast (2.4.2)
-    base64 (0.2.0)
-    bigdecimal (3.1.8)
+    ast (2.4.3)
+    base64 (0.3.0)
+    bigdecimal (3.3.1)
     builder (3.3.0)
-    concurrent-ruby (1.3.3)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.6)
+    connection_pool (2.5.5)
     crass (1.0.6)
     diff-lcs (1.5.1)
-    drb (2.2.1)
+    drb (2.2.3)
     dry-configurable (1.2.0)
       dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
@@ -108,25 +108,27 @@ GEM
       dry-schema (>= 1.12, < 2)
       zeitwerk (~> 2.6)
     erubi (1.13.0)
-    i18n (1.14.5)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
-    json (2.7.2)
-    language_server-protocol (3.17.0.3)
+    json (2.19.7)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    minitest (5.24.1)
-    mutex_m (0.2.0)
+    minitest (5.27.0)
+    mutex_m (0.3.0)
     nokogiri (1.16.6-arm64-darwin)
       racc (~> 1.4)
     nokogiri (1.16.6-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.25.1)
-    parser (3.3.3.0)
+    parallel (1.28.0)
+    parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
-    racc (1.8.0)
-    rack (3.1.6)
+    prism (1.9.0)
+    racc (1.8.1)
+    rack (3.2.6)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -140,9 +142,7 @@ GEM
       nokogiri (~> 1.14)
     rainbow (3.1.1)
     rake (13.2.1)
-    regexp_parser (2.9.2)
-    rexml (3.3.1)
-      strscan
+    regexp_parser (2.12.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -156,44 +156,52 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.64.1)
+    rubocop (1.86.2)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
-      parallel (~> 1.10)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (>= 1.10)
       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.31.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
-      parser (>= 3.3.1.0)
-    rubocop-capybara (2.21.0)
-      rubocop (~> 1.41)
-    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)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.49.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.7)
+    rubocop-capybara (2.23.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.81)
+    rubocop-factory_bot (2.28.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-performance (1.26.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
+    rubocop-rails (2.35.3)
       activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
-      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)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+    rubocop-rspec (3.9.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.81)
+    rubocop-rspec_rails (2.32.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+      rubocop-rspec (~> 3.5)
     ruby-progressbar (1.13.0)
     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.5.0)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
     zeitwerk (2.6.16)
 
 PLATFORMS

data/README.md

@@ -44,7 +44,7 @@ form.update # Failure(:invalid_form)
 
 
 
-Methods `form.update` and `form.create` return [Result monad](https://dry-rb.org/gems/dry-monads/1.3/result/)
+Methods `form.update` and `form.create` return [Result monad](https://dry-rb.org/gems/dry-monads/1.3/result/). Actions must explicitly return `Success` or `Failure`; any other return value raises `ActiveDryForm::Form::ResultError`.
 
 ```ruby
 # app/forms/product_form.rb
@@ -73,6 +73,46 @@ class ProductForm < Form
 end
 ```
 
+Actions also handle `Dry::Monads::UnwrapError` raised by `value!` (including service methods such as `call!`). The action returns the original `Failure` and sets `form.base_errors` to `Array.wrap(result.failure).map(&:to_s)`. Other exceptions propagate normally.
+
+```ruby
+class CaptchaValidateService
+  extend Dry::Monads[:result]
+
+  def self.call(token:, ip:, hostname:)
+    return Failure('Captcha token is missing') if token.blank?
+
+    verified = CaptchaClient.verify(token:, ip:, hostname:)
+    return Failure('Invalid captcha') unless verified
+
+    Success()
+  end
+
+  def self.call!(**params)
+    # value! unwraps Success and returns its value.
+    # For Failure, it raises Dry::Monads::UnwrapError with the original monad in receiver.
+    call(**params).value!
+  end
+end
+
+class UserForm < Form
+  fields :user do
+    params do
+      required(:email).filled(:string)
+    end
+  end
+
+  action def create(token:, ip:, hostname:)
+    # If verification returns Failure('Invalid captcha'), call! raises Dry::Monads::UnwrapError.
+    # The action wrapper catches it, returns the original Failure, and sets
+    # form.base_errors to ['Invalid captcha'], skipping user creation.
+    # Other exceptions, including those from CaptchaClient.verify, propagate to the caller.
+    CaptchaValidateService.call!(token:, ip:, hostname:)
+    Success(User.create!(data))
+  end
+end
+```
+
 In your controller
 
 ```ruby

data/active_dry_form.gemspec

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require_relative 'lib/active_dry_form/version'
+
+Gem::Specification.new do |spec|
+  spec.name = 'active_dry_form'
+  spec.version = ActiveDryForm::VERSION
+  spec.authors = ['Ermolaev Andrey']
+  spec.email = ['andruhafirst@yandex.ru']
+
+  spec.summary = 'Form validation for Rails with Dry-Validation'
+  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 = '>= 3.1.0'
+
+  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = 'https://github.com/corp-gp/active_dry_form'
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files =
+    Dir.chdir(File.expand_path(__dir__)) do
+      `git ls-files -z`.split("\x0").reject do |f|
+        (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
+      end
+    end
+  spec.bindir = 'exe'
+  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+
+  # Uncomment to register a new dependency of your gem
+  # spec.add_dependency "example-gem", "~> 1.0"
+
+  # For more information and examples about making a new gem, checkout our
+  # guide at: https://bundler.io/guides/creating_gem.html
+  #
+  #
+  spec.add_dependency 'actionpack'
+  spec.add_dependency 'activerecord'
+  spec.add_dependency 'dry-configurable'
+  spec.add_dependency 'dry-monads'
+  spec.add_dependency 'dry-validation'
+
+  spec.metadata['rubygems_mfa_required'] = 'true'
+end

data/lib/active_dry_form/builder.rb

@@ -57,7 +57,7 @@ module ActiveDryForm
       @template.content_tag(:div, class: ActiveDryForm.config.css_classes.base_error) do
         @template.content_tag(:ul) do
           # внутри ошибки может быть html
-          @object.base_errors.map { @template.content_tag(:li, _1.html_safe) }.join.html_safe
+          @object.base_errors.map { @template.content_tag(:li, _1.to_s.html_safe) }.join.html_safe
         end
       end
     end

data/lib/active_dry_form/form.rb

@@ -27,11 +27,16 @@ module ActiveDryForm
           validate
           return Failure(:invalid_form) unless valid?
 
-          result = __#{method}(...)
+          result =
+            begin
+              __#{method}(...)
+            rescue ::Dry::Monads::UnwrapError => e
+              e.receiver
+            end
 
           case result
           when ::Dry::Monads::Result::Failure
-            @base_errors = Array.wrap(result.failure)
+            @base_errors = Array.wrap(result.failure).map(&:to_s)
           when ::Dry::Monads::Result::Success
           else
             raise ResultError, 'method `#{method}` must return `monad`'

data/lib/active_dry_form/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveDryForm
 
-  VERSION = '1.4.3'
+  VERSION = '1.5.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_dry_form
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
 platform: ruby
 authors:
 - Ermolaev Andrey
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-29 00:00:00.000000000 Z
+date: 2026-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -96,6 +96,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- active_dry_form.gemspec
 - bin/console
 - bin/setup
 - config/locales/dry_validation.ru.yml