active_interaction-extras 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3637e9bc034e39019c7a5273730c9c66e39257fcb7006f8cb153318c2345acf
-  data.tar.gz: 51d7d883e0cfab7d0eae0f15b764f2b9e3f0868372cc4329fe47785014669e98
+  metadata.gz: 355913c4e3805b1373112d39fe9e686d6f1ae8b1cd7f2bca289443fd0cd37f63
+  data.tar.gz: f0e1a1611ca60b7199db6e18dc8152aa36fa76dde81cacfba1a6290a143ae544
 SHA512:
-  metadata.gz: 798047a1473aec22f030540ee4af4f7d074c7372cde93b9ceedcec996cc368d88c2e48743f7a0868da2029549f1e155c70037be36e252e7b5877caf64268bbbb
-  data.tar.gz: 38890669f04e15239b5ace15841dbb39e2a048eb9881ce127d80ad5b33126396417b5be918d8bef7a8b5a67bb1973fde82e2378baa0ce8b8dc00973d44546558
+  metadata.gz: 256a1e71cd64571c76418ab9a4688d827ca2f98d589610af9445ea084ef018646a28ad095b32df776163530a6c544c85d9a22e9732aaa8de85829d47c841306f
+  data.tar.gz: 38cea9d7580d1c9966b9f4b70168e10cd8f7f8548605d040f4ded80ee70040032f6e9bbca9c6ed1b22f2896ed9056192a7df003eac1e6dd299a5cfcbeafbfffe

data/.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0']
+        ruby-version: ['2.7', '3.0', '3.1', '3.2']
 
     steps:
     - uses: actions/checkout@v2
@@ -27,7 +27,7 @@ jobs:
     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
     # change this to (see https://github.com/ruby/setup-ruby#versioning):
     # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically

data/.gitignore

@@ -7,3 +7,4 @@
 /spec/reports/
 /tmp/
 Gemfile.lock
+.ruby-version

data/CHANGELOG.md

@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [1.0.4] - 2022-06-08
+
+- Improve halt's robustness (https://github.com/antulik/active_interaction-extras/pull/13)
+
 ## [1.0.3] - 2021-07-11
 
 - Loosen the gem requirements

data/active_interaction-extras.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
     "changelog_uri" => "https://github.com/antulik/active_interaction-extras/blob/master/CHANGELOG.md",
   }
 
+  spec.required_ruby_version = '>= 2.7'
+
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
@@ -24,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "active_interaction", ">= 4.0.2"
+  spec.add_dependency "active_interaction", ">= 5.0", "< 6.0"
   spec.add_dependency "activemodel", ">= 6.0"
   spec.add_dependency "activesupport", ">= 6.0"
 
@@ -34,4 +36,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "activerecord"
+  spec.add_development_dependency "activejob"
+  spec.add_development_dependency "actionpack"
 end

data/lib/active_interaction/extras/filter_extensions/object_classes.rb

@@ -29,6 +29,8 @@ module ActiveInteraction::Extras::FilterExtensions::ObjectClasses
 
   def matches?(value)
     if polymorphic?
+      return false if value == nil
+
       class_list.any? { |klass| value.class <= klass }
     else
       super

data/lib/active_interaction/extras/filters/anything_filter.rb

@@ -3,7 +3,14 @@
 class ActiveInteraction::Extras::Filters::AnythingFilter < ActiveInteraction::Filter
   register :anything
 
-  def matches?(_object)
-    true
+  def matches?(value)
+    if value == nil && default?
+      # as per v5 there is no way to know if value of `nil` is given by caller or
+      # is a default value when it's missing. We want to maintain standard default
+      # behaviour when value is `nil`. Returning `false` will trigger default value
+      false
+    else
+      true
+    end
   end
 end

data/lib/active_interaction/extras/filters/uuid_filter.rb

@@ -10,6 +10,11 @@ class ActiveInteraction::Extras::Filters::UUIDFilter < ActiveInteraction::String
   end
 
   def convert(value)
-    super&.presence
+    value, error = super
+    if error
+      [value, error]
+    else
+      [value&.presence, nil]
+    end
   end
 end

data/lib/active_interaction/extras/halt.rb

@@ -1,16 +1,19 @@
 module ActiveInteraction::Extras::Halt
   extend ActiveSupport::Concern
 
+  THROW_OBJECT = Object.new.freeze
+  private_constant :THROW_OBJECT
+
   included do
     set_callback :execute, :around, lambda { |_interaction, block|
-      catch :strict_error do
+      catch THROW_OBJECT do
         block.call
       end
     }
   end
 
   def halt!
-    throw :strict_error, errors
+    throw THROW_OBJECT, errors
   end
 
   def halt_if_errors!

data/lib/active_interaction/extras/model_fields.rb

@@ -1,10 +1,14 @@
+require "active_support/core_ext/object/with_options"
+
 module ActiveInteraction::Extras::ModelFields
   extend ActiveSupport::Concern
 
   # returns hash of all model fields and their values
   def model_fields(model_name)
     fields = self.class.model_field_cache[model_name]
-    inputs.slice(*fields)
+    fields.to_h do |field|
+      [field, public_send(field)]
+    end
   end
 
   # returns hash of only changed model fields and their values
@@ -17,7 +21,7 @@ module ActiveInteraction::Extras::ModelFields
   # returns hash of only given model fields and their values
   def given_model_fields(model_name)
     model_fields(model_name).select do |field, _value|
-      given?(field)
+      inputs.given?(field)
     end
   end
 
@@ -63,22 +67,23 @@ module ActiveInteraction::Extras::ModelFields
         value_changed = send(model_field).send(field) != send(field)
       end
 
-      given?(field) && value_changed
+      inputs.given?(field) && value_changed
     end
   end
 
   # overwritten to pre-populate model fields
-  def populate_filters_and_inputs(_inputs)
-    super.tap do
-      self.class.filters.each do |name, filter|
-        next if given?(name)
+  def initialize(...)
+    super
 
-        model_field = self.class.model_field_cache_inverse[name]
-        next if model_field.nil?
+    self.class.filters.each do |name, filter|
+      next if inputs.given?(name)
 
-        value = public_send(model_field)&.public_send(name)
-        public_send("#{name}=", filter.clean(value, self))
-      end
+      model_field = self.class.model_field_cache_inverse[name]
+      next if model_field.nil?
+
+      value = public_send(model_field)&.public_send(name)
+      input = filter.process(value, self)
+      public_send("#{name}=", input.value)
     end
   end
 

data/lib/active_interaction/extras/strong_params.rb

@@ -5,6 +5,8 @@ module ActiveInteraction::Extras::StrongParams
     # TODO: whitelist :params and :form_params, so they could not be used as filters
     return super if self.class.filters.key?(:params) || self.class.filters.key?(:form_params)
 
+    return super if %i[fetch key? merge].any? { |m| !inputs.respond_to?(m) }
+
     if inputs.key?(:params) && inputs.key?(:form_params)
       raise ArgumentError, 'Both options :params and :form_params are given. ' \
       'One or none are accepted.'

data/lib/active_interaction/extras/version.rb

@@ -1,5 +1,5 @@
 module ActiveInteraction
   module Extras
-    VERSION = "1.0.3"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction-extras
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Anton Katunin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-11 00:00:00.000000000 Z
+date: 2023-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_interaction
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +142,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activejob
+  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: actionpack
+  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'
 description: Extensions for active_interaction gem
 email:
 - antulik@gmail.com
@@ -188,14 +222,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Extensions for active_interaction gem