active_interaction-extras 1.0.1 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a71a37d918c487996272cfff3fab64da2241f0f071a659ff5f9cac97f76bf869
-  data.tar.gz: 15bc8f3f20329df47325103a6c5971848d0c5c22eca399a0be2e28ba0c6abc52
+  metadata.gz: e7c9ab1b398885ce07d041afd0698600f69ac5813434822945c5e1247e81e9a5
+  data.tar.gz: b8e73b105796596890f5518823c430c02e402c5d5aa4be353617b7bddae65182
 SHA512:
-  metadata.gz: 940a9e9195a01433b060227d3ff02450ac2b620972cf493f3760f9977b5106c071241aef5b5d9c1cef35d39937cfdae8efc2d81c508f4f68b6fe6d5b8ac5cd44
-  data.tar.gz: d4358a521172fbca3c27be32b41bd5ba4c9cb0df79a5f1b3a2d5539b39f7d04ea5ee73a2abaeab5585529c71701821db2de599a253aaa7ce0ee93f1d808381b4
+  metadata.gz: f983de2973a1aae555f1576ec2eca88de323a714e8a0e778b2be96a15b29486cc0dfe0f03219ccb800b3354421c9dc138fd50324f992e7b415bd20b634360b54
+  data.tar.gz: 64b07f5287072bf90156987a0ec823b73341dc021e2b224c98f40dacbfa80240bd71b83d141323168a33e125fedb73d7547d7a919e0b3e4b7d603cd37743dc49

data/CHANGELOG.md

@@ -4,6 +4,19 @@ 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
+
+## [1.0.2] - 2021-07-07
+
+- Requires active_interaction v4.0.2 or higher
+- Fixed `run_in_transaction!` to rollback when interaction finished with errors
+
 ## [1.0.1] - 2021-05-13
 
 - Fix `run_in_transaction` in ruby 3 [#8](https://github.com/antulik/active_interaction-extras/pull/8)

data/README.md

@@ -390,7 +390,8 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Credits
 
-ActiveInteraction::Extras is brought to you by [Anton Katunin](https://github.com/antulik) and was originally built at [CarNextDoor](https://www.carnextdoor.com.au/).
+* ActiveInteraction::Extras is brought to you by [Anton Katunin](https://github.com/antulik) and was originally built at [CarNextDoor](https://www.carnextdoor.com.au/).
+* Further improvements to this gem brought to you by [Anton Katunin](https://github.com/antulik) once again and the [Split Payments team](https://github.com/splitpayments/split).
 
 ## Code of Conduct
 

data/active_interaction-extras.gemspec

@@ -24,10 +24,16 @@ 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"
-  spec.add_dependency "rails", ">= 6.0"
+  spec.add_dependency "active_interaction", ">= 4.0.2"
+  spec.add_dependency "activemodel", ">= 6.0"
+  spec.add_dependency "activesupport", ">= 6.0"
+
   spec.add_development_dependency "bundler", "~> 2.2"
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.7"
   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/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,3 +1,5 @@
+require "active_support/core_ext/object/with_options"
+
 module ActiveInteraction::Extras::ModelFields
   extend ActiveSupport::Concern
 
@@ -46,6 +48,10 @@ module ActiveInteraction::Extras::ModelFields
     alias file custom_filter_attribute
     alias boolean custom_filter_attribute
     alias array custom_filter_attribute
+    alias record custom_filter_attribute
+
+    alias anything custom_filter_attribute
+    alias uuid custom_filter_attribute
   end
 
   # checks if value was given to the service and the value is different from
@@ -64,7 +70,7 @@ module ActiveInteraction::Extras::ModelFields
   end
 
   # overwritten to pre-populate model fields
-  def populate_filters(_inputs)
+  def populate_filters_and_inputs(_inputs)
     super.tap do
       self.class.filters.each do |name, filter|
         next if given?(name)

data/lib/active_interaction/extras/strong_params.rb

@@ -1,7 +1,7 @@
 module ActiveInteraction::Extras::StrongParams
   extend ActiveSupport::Concern
 
-  def process_inputs(inputs)
+  def initialize(inputs = {})
     # 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)
 

data/lib/active_interaction/extras/transaction.rb

@@ -9,6 +9,7 @@ module ActiveInteraction::Extras::Transaction
     set_callback :execute, :around, ->(_interaction, block) {
       ActiveRecord::Base.transaction(**run_in_transaction_options) do
         block.call
+        raise ActiveRecord::Rollback if _interaction.errors.any?
       end
     }, if: :run_in_transaction_options
   end

data/lib/active_interaction/extras/version.rb

@@ -1,5 +1,5 @@
 module ActiveInteraction
   module Extras
-    VERSION = "1.0.1"
+    VERSION = "1.0.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction-extras
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.4
 platform: ruby
 authors:
 - Anton Katunin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-13 00:00:00.000000000 Z
+date: 2022-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_interaction
@@ -16,16 +16,30 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 4.0.2
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,6 +108,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  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: activerecord
+  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: 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