active_interaction-extras 0.2.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b830f72fb06c46cac4007920afe65a33c92d2548
-  data.tar.gz: b954fa1ea9e8280a485b52da36c3f8379b2cb67e
+SHA256:
+  metadata.gz: a71a37d918c487996272cfff3fab64da2241f0f071a659ff5f9cac97f76bf869
+  data.tar.gz: 15bc8f3f20329df47325103a6c5971848d0c5c22eca399a0be2e28ba0c6abc52
 SHA512:
-  metadata.gz: 63ee6666b6b0b757f5724a3613ae38883bbb995941a32faf8627b1342b6c0114219a3efb09d1a5936d1db6d003708786b22126645aecd87c7ab633019f10195e
-  data.tar.gz: '0413834b86cd0f6fbcf135dd0bc3d9afb4b5d086973005008ad7b6db43f51680e70e897d8e71e90776573c53be3ea4153847fead72d9abefda823b03f34cdb3b'
+  metadata.gz: 940a9e9195a01433b060227d3ff02450ac2b620972cf493f3760f9977b5106c071241aef5b5d9c1cef35d39937cfdae8efc2d81c508f4f68b6fe6d5b8ac5cd44
+  data.tar.gz: d4358a521172fbca3c27be32b41bd5ba4c9cb0df79a5f1b3a2d5539b39f7d04ea5ee73a2abaeab5585529c71701821db2de599a253aaa7ce0ee93f1d808381b4

data/.github/workflows/ci.yml

@@ -0,0 +1,35 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Tests
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # 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
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/CHANGELOG.md

@@ -0,0 +1,24 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [Unreleased]
+
+## [1.0.1] - 2021-05-13
+
+- Fix `run_in_transaction` in ruby 3 [#8](https://github.com/antulik/active_interaction-extras/pull/8)
+
+## [1.0.0] - 2021-05-12
+
+- Requires active_interaction v4
+- New filters: `anything` and `uuid`
+- New filter extensions
+    - object: support for multiple classes 
+    - hash: disable auto strip when no keys are listed
+- New extension: 
+    - filter alias
+- Changed `transaction` extension
+    - It requires new transaction by default
+    - Include order is important now
+- Removed `active_interaction-active_job` gem dependency
+- Added changelog

data/README.md

@@ -1,26 +1,115 @@
 # ActiveInteraction::Extras
 
+[![Gem Version](https://badge.fury.io/rb/active_interaction-extras.svg)](https://badge.fury.io/rb/active_interaction-extras) ![CI build](https://github.com/antulik/active_interaction-extras/actions/workflows/ci.yml/badge.svg)
+
 This gem contains the collection of useful extensions to [active_interaction](https://github.com/AaronLasseigne/active_interaction) gem.
 
+- [Installation](#installation)
+- [Basic Usage](#basic-usage)
+- [Filters](#filters)
+    - [Anything](#anything)
+    - [UUID](#uuid)
+- [Filter Extensions](#filter-extensions)
+    - [Hash: auto strip](#hash-auto-strip)
+    - [Object: multiple classes](#object-multiple-classes)
+- [Extensions](#extensions)
+  - [Filter alias](#filter-alias)
+  - [Halt](#halt)
+  - [ModelFields](#modelfields)
+  - [RunCallback](#runcallback)
+  - [StrongParams](#strongparams)
+  - [Transaction](#transaction)
+- [Jobs](#jobs)
+  - [ActiveJob](#activejob)
+  - [Sidekiq](#sidekiq)
+- [RSpec](#rspec)
+
 ## Installation
 
 ```ruby
 gem 'active_interaction-extras'
 ```
 
-## Usage
-
-### All
+## Basic Usage
 
 ```ruby
+# app/services/application_interaction.rb
 class ApplicationInteraction < ActiveInteraction::Base
   include ActiveInteraction::Extras::All
-  # same as
-  # include ActiveInteraction::Extras::Halt
-  # include ActiveInteraction::Extras::ModelFields
-  # include ActiveInteraction::Extras::RunCallback
-  # include ActiveInteraction::Extras::StrongParams
-  # include ActiveInteraction::Extras::Transaction
+end
+```
+
+## Filters
+
+These new filters are added automatically when gem is loaded.
+
+### Anything
+
+Anything filter accepts as you guest it - anything.
+
+```ruby
+class Service < ActiveInteraction::Base
+  anything :model
+end
+```
+
+### UUID
+
+```ruby
+class Service < ActiveInteraction::Base
+  uuid :id
+end
+```
+
+## Filter Extensions
+
+You can load all filter extensions with:
+
+```ruby
+# config/initializers/active_interaction.rb
+require 'active_interaction/extras/filter_extensions'
+```
+
+### Hash: auto strip
+
+This small extensions allows to accept full hashes without explicit `strip` option.
+
+```ruby
+class Service < ActiveInteraction::Base
+  hash :options_a, strip: false # (Before) Accept all keys
+  
+  hash :options_b # (After) Accept all keys
+  
+  hash :options_c do # (Before and After) Accept only specified keys
+    string :name
+  end
+end
+```
+
+### Object: multiple classes
+
+This extension allows using `object` filter with multiple classes.
+
+```ruby
+class Service < ActiveInteraction::Base
+  object :user, class: [User, AdminUser]
+end
+```
+
+
+## Extensions
+
+### Filter Alias
+
+```ruby
+class Service < ActiveInteraction::Base
+  include ActiveInteraction::Extras::FilterAlias
+  
+  hash :params, as: :user_attributes
+
+  def execute
+    user_attributes == params # => true
+  end
 end
 ```
 
@@ -50,7 +139,7 @@ end
 class UserForm < ActiveInteraction::Base
   include ActiveInteraction::Extras::ModelFields
 
-  interface :user
+  anything :user
 
   model_fields(:user) do
     string :first_name
@@ -96,7 +185,6 @@ end
 
 ### StrongParams
 
-
 ```ruby
 class UpdateUserForm < ActiveInteraction::Base
   include ActiveInteraction::Extras::StrongParams
@@ -120,6 +208,14 @@ form_params = ActionController::Parameters.new(
 )
 
 Service.run(params: form_params)
+
+# OR
+form_params = ActionController::Parameters.new(
+  first_name: 'Allowed',
+  last_name: 'Not allowed',
+)
+
+Service.run(form_params: form_params)
 ```
 
 ### Transaction
@@ -141,6 +237,10 @@ UpdateUserForm.run
 Comment.count # => 0
 ```
 
+## Jobs
+
+You no longer need to create a separate Job class for the each interaction. This Job extension automatically converts interactions to background jobs. By convention each interaction will have a nested `Job` class which will be inherited from the parent interaction `Job` class (e.g. `ApplicationInteraction::Job`). 
+
 ### ActiveJob
 
 ```ruby
@@ -161,10 +261,15 @@ class DoubleService < ApplicationInteraction
 end
 
 DoubleService.delay.run(x: 2) # queues to run in background
+DoubleService.delay(queue: 'low_priority', wait: 1.minute).run(x: 2)
 ```
 
+In ActiveJob mode `delay` method accepts anything ActiveJob `set` [method](https://edgeapi.rubyonrails.org/classes/ActiveJob/Core/ClassMethods.html#method-i-set) does. (`wait`, `wait_until`, `queue`, `priority`)
+
 ### Sidekiq
 
+You can use sidekiq directly if you need more control. Sidekiq integration comes with default GlobalID support.
+
 ```ruby
 class ApplicationInteraction < ActiveInteraction::Base
   include ActiveInteraction::Extras::Sidekiq
@@ -177,7 +282,7 @@ end
 
 class DoubleService < ApplicationInteraction
   job do
-    sidekiq_options retry: 1
+    sidekiq_options retry: 1 # configure sidekiq options
   end
 
   integer :x
@@ -188,9 +293,53 @@ class DoubleService < ApplicationInteraction
 end
 
 DoubleService.delay.run(x: 2) # queues to run in background
+DoubleService.delay(queue: 'low_priority', wait: 1.minute).run(x: 2)
 ```
 
-### Rspec
+In Sidekiq mode `delay` method accepts anything sidekiq `set` [method](https://github.com/mperham/sidekiq/wiki/Advanced-Options#workers) does (`queue`, `retry`, `backtrace`, etc). Plus two additional `wait` and `wait_until`.
+
+```ruby
+# Advance usage: retry based on given params
+class DoubleService < ApplicationInteraction
+  job do
+    sidekiq_options(retry: ->(job) {
+      params = deserialize_active_job_args(job)
+      params[:x]
+    })
+  end
+
+  integer :x
+
+  def execute
+    x + x
+  end
+end
+```
+
+```ruby
+# Advance usage: Rescue the job but not service
+class DoubleService < ApplicationInteraction
+  job do
+    def perform(*args)
+      super
+    rescue StandardError => e
+      params = deserialize_active_job_args(args)
+      params[:x]
+    end
+  end
+
+  integer :x
+
+  def execute
+    raise
+  end
+end
+
+DoubleService.run # => RuntimeError
+DoubleService.delay.perform_now(x: 2) # => returns 2
+```
+
+## Rspec
 
 ```ruby
 class SomeService < ActiveInteraction::Base
@@ -219,7 +368,7 @@ RSpec.describe SomeService do
 
     # expect_to_run / expect_not_to_run / expect_to_not_run
     # expect_to_execute
-    # expect_to_delay_run / expect_to_not_run_delayed
+    # expect_to_delay_run / expect_not_to_run_delayed / expect_to_not_run_delayed
     # expect_to_delay_execute
   end
 end
@@ -239,6 +388,10 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/antuli
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
 
+## 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/).
+
 ## Code of Conduct
 
 Everyone interacting in the ActiveInteraction::Extras project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/antulik/active_interaction-extras/blob/master/CODE_OF_CONDUCT.md).

data/Rakefile

@@ -1,2 +1,10 @@
 require "bundler/gem_tasks"
-task :default => :spec
+
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+
+  task :default => :spec
+rescue LoadError
+  # no rspec available
+end

data/active_interaction-extras.gemspec

@@ -9,10 +9,13 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Anton Katunin"]
   spec.email         = ["antulik@gmail.com"]
 
-  spec.summary       = %q{Extension for active_interaction gem}
-  spec.description   = %q{Extension for active_interaction gem}
-  spec.homepage      = "https://github.com/antulik/xxxx"
+  spec.summary       = %q{Extensions for active_interaction gem}
+  spec.description   = %q{Extensions for active_interaction gem}
+  spec.homepage      = "https://github.com/antulik/active_interaction-extras"
   spec.license       = "MIT"
+  spec.metadata    = {
+    "changelog_uri" => "https://github.com/antulik/active_interaction-extras/blob/master/CHANGELOG.md",
+  }
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -21,11 +24,10 @@ 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", ">= 3.0.0"
-  spec.add_dependency "active_interaction-active_job", ">= 0"
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_dependency "active_interaction", ">= 4"
+  spec.add_dependency "rails", ">= 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 "rails", ">= 4.0"
   spec.add_development_dependency "pry"
 end

data/lib/active_interaction/extras.rb

@@ -5,14 +5,40 @@ require 'active_interaction'
 
 module ActiveInteraction
   module Extras
+    module Filters
+    end
+
+    module FilterExtensions
+    end
+
+    module Jobs
+      autoload(:Core, "active_interaction/extras/jobs/core")
+    end
 
-    autoload(:ActiveJob, "active_interaction/extras/active_job")
     autoload(:All, "active_interaction/extras/all")
+
+    autoload(:FilterAlias, "active_interaction/extras/filter_alias")
     autoload(:Halt, "active_interaction/extras/halt")
     autoload(:ModelFields, "active_interaction/extras/model_fields")
-    autoload(:Rspec, "active_interaction/extras/rspec")
     autoload(:RunCallback, "active_interaction/extras/run_callback")
     autoload(:StrongParams, "active_interaction/extras/strong_params")
     autoload(:Transaction, "active_interaction/extras/transaction")
+
+    autoload(:TimezoneSupport, "active_interaction/extras/timezone_support")
+    autoload(:Rspec, "active_interaction/extras/rspec")
+
+    autoload(:ActiveJob, "active_interaction/extras/active_job")
+    autoload(:Sidekiq, "active_interaction/extras/sidekiq")
   end
 end
+
+require 'active_interaction/extras/filters/anything_filter'
+require 'active_interaction/extras/filters/uuid_filter'
+
+I18n.load_path.unshift(
+  *Dir.glob(
+    File.expand_path(
+      File.join(%w[extras locale *.yml]), File.dirname(__FILE__)
+    )
+  )
+)

data/lib/active_interaction/extras/active_job.rb

@@ -1,13 +1,35 @@
-require 'active_interaction/active_job'
+require 'active_job'
 
 module ActiveInteraction::Extras::ActiveJob
   extend ActiveSupport::Concern
 
-  include ActiveInteraction::ActiveJob::Core
+  include ActiveInteraction::Extras::Jobs::Core
+
+  class_methods do
+    def configured_job_class
+      ConfiguredJob
+    end
+  end
 
   module Perform
     extend ActiveSupport::Concern
 
-    include  ActiveInteraction::ActiveJob::JobHelper
+    def perform(*args)
+      if self.class.respond_to?(:module_parent)
+        self.class.module_parent.run!(*args)
+      else
+        self.class.parent.run!(*args)
+      end
+    end
+  end
+
+  class ConfiguredJob < ::ActiveJob::ConfiguredJob
+    def run(*args)
+      perform_later(*args)
+    end
+
+    def run!(*args)
+      perform_later(*args)
+    end
   end
 end

data/lib/active_interaction/extras/all.rb

@@ -1,9 +1,12 @@
 module ActiveInteraction::Extras::All
   extend ActiveSupport::Concern
 
+  # order dependant, include first so around callback includes other modules
+  include ActiveInteraction::Extras::Transaction
+
+  include ActiveInteraction::Extras::FilterAlias
   include ActiveInteraction::Extras::Halt
   include ActiveInteraction::Extras::ModelFields
   include ActiveInteraction::Extras::RunCallback
   include ActiveInteraction::Extras::StrongParams
-  include ActiveInteraction::Extras::Transaction
 end

data/lib/active_interaction/extras/filter_alias.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# Add :as option, which is a read alias to filter
+#   hash :params, as: :account_attributes
+#
+module ActiveInteraction::Extras::FilterAlias
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def initialize_filter(filter)
+      super.tap do
+        if filter.options[:as]
+          alias_method filter.options[:as], filter.name
+        end
+      end
+    end
+  end
+end

data/lib/active_interaction/extras/filter_extensions.rb

@@ -0,0 +1,2 @@
+require 'active_interaction/extras/filter_extensions/hash_auto_strip'
+require 'active_interaction/extras/filter_extensions/object_classes'

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+# If hash specified without structure automatically accept full hash
+#
+# @example Accept all keys
+#   hash :options
+#
+# @example Accept only specified keys
+#   hash :options do
+#     string :name
+#   end
+#
+# @example Accept all keys
+#   hash :options, strip: false do
+#     string :name
+#   end
+#
+module ActiveInteraction::Extras::FilterExtensions::HashAutoStrip
+  def initialize(*)
+    super
+    options[:strip] = false if !block_given? && !options.key?(:strip)
+  end
+end
+
+ActiveInteraction::HashFilter.prepend(ActiveInteraction::Extras::FilterExtensions::HashAutoStrip)

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

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+# Add support for polymorphic objects
+#   object :account, class: [Account, AnyoneAccount]
+#
+module ActiveInteraction::Extras::FilterExtensions::ObjectClasses
+  def class_list
+    class_names.map do |klass_name|
+      case klass_name
+      when Class
+        klass_name
+      else
+        begin
+          Object.const_get(klass_name.to_s.camelize)
+        rescue NameError
+          raise ActiveInteraction::InvalidNameError, "class #{klass_name.inspect} does not exist"
+        end
+      end
+    end
+  end
+
+  def klass
+    if polymorphic?
+      class_list.first
+    else
+      super
+    end
+  end
+
+  def matches?(value)
+    if polymorphic?
+      class_list.any? { |klass| value.class <= klass }
+    else
+      super
+    end
+  end
+
+  def class_names
+    options.fetch(:class, name)
+  end
+
+  def polymorphic?
+    class_names.is_a? Array
+  end
+end
+
+ActiveInteraction::ObjectFilter.prepend(ActiveInteraction::Extras::FilterExtensions::ObjectClasses)

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# Implementation inspired by
+# https://github.com/AaronLasseigne/active_interaction/blob/c9d5608c3b8aab23d463f99c832b2ac5139911de/lib/active_interaction/filters/abstract_date_time_filter.rb#L42
+module ActiveInteraction::Extras::FilterExtensions::TimezoneSupport
+  def convert_string(value)
+    if time_with_zone?
+      Time.zone.parse(value) ||
+        raise(ArgumentError, "no time information in #{value.inspect}")
+    else
+      super
+    end
+  end
+end
+
+ActiveInteraction::TimeFilter.include(ActiveInteraction::Extras::FilterExtensions::TimezoneSupport)

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

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class ActiveInteraction::Extras::Filters::AnythingFilter < ActiveInteraction::Filter
+  register :anything
+
+  def matches?(_object)
+    true
+  end
+end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class ActiveInteraction::Extras::Filters::UUIDFilter < ActiveInteraction::StringFilter
+  register :uuid
+
+  REGEX = /^[0-9A-F]{8}-[0-9A-F]{4}-[4][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i.freeze
+
+  def matches?(value)
+    super && REGEX.match?(value)
+  end
+
+  def convert(value)
+    super&.presence
+  end
+end

data/lib/active_interaction/extras/jobs/core.rb

@@ -0,0 +1,32 @@
+module ActiveInteraction::Extras::Jobs::Core
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def define_job_class(klass)
+      unless const_defined?(:Job, false)
+        const_set(:Job, Class.new(klass))
+      end
+    end
+
+    def job(&block)
+      job_class.class_exec(&block)
+    end
+
+    def job_class
+      const_get(:Job, false)
+    end
+
+    def inherited(subclass)
+      super
+      subclass.define_job_class(job_class)
+    end
+
+    def delay(options = {})
+      configured_job_class.new(job_class, options)
+    end
+
+    def configured_job_class
+      raise NotImplementedError
+    end
+  end
+end

data/lib/active_interaction/extras/locale/en.yml

@@ -0,0 +1,5 @@
+en:
+  active_interaction:
+    types:
+      uuid: UUID
+      anything: anything

data/lib/active_interaction/extras/rspec.rb

@@ -67,6 +67,8 @@ module ActiveInteraction::Extras::Rspec
     expect(klass).to_not receive(:delay).with(*with)
   end
 
+  alias expect_not_to_run_delayed expect_to_not_run_delayed
+
   # see expect_to_run
   #
   # additional params

data/lib/active_interaction/extras/sidekiq.rb

@@ -1,13 +1,71 @@
-require 'active_interaction/active_job'
+require 'active_job'
 
 module ActiveInteraction::Extras::Sidekiq
   extend ActiveSupport::Concern
 
-  include ActiveInteraction::ActiveJob::Sidekiq::Core
+  include ActiveInteraction::Extras::Jobs::Core
+
+  class_methods do
+    def configured_job_class
+      ConfiguredJob
+    end
+  end
 
   module Perform
     extend ActiveSupport::Concern
 
-    include  ActiveInteraction::ActiveJob::Sidekiq::JobHelper
+    class_methods do
+      def deserialize_active_job_args(serialized_job)
+        ActiveJob::Arguments.deserialize(serialized_job['args']).first&.with_indifferent_access || {}
+      end
+
+      def perform_later(*args)
+        ConfiguredJob.new(self).perform_later(*args)
+      end
+    end
+
+    def perform(*args)
+      # support for sidekiq encrypted params
+      if args.length > 1 && args[0].nil?
+        args.shift
+      end
+
+      args = ActiveJob::Arguments.deserialize(args)
+      if self.class.respond_to?(:module_parent)
+        self.class.module_parent.run!(*args)
+      else
+        self.class.parent.run!(*args)
+      end
+    end
+
+    def deserialize_active_job_args(job_arguments)
+      ActiveJob::Arguments.deserialize(job_arguments).first&.with_indifferent_access || {}
+    end
+  end
+
+  class ConfiguredJob < ::ActiveJob::ConfiguredJob
+    def perform_now(*args)
+      @job_class.run!(*args)
+    end
+
+    def perform_later(*args)
+      args = ActiveJob::Arguments.serialize(args)
+      scope = @job_class.set(@options.except(:wait, :wait_until))
+
+      if @job_class.sidekiq_options['encrypt']
+        args.prepend(nil)
+      end
+
+      if @options[:wait]
+        scope.perform_in @options[:wait], *args
+      elsif @options[:wait_until]
+        scope.perform_at @options[:wait_until], *args
+      else
+        scope.perform_async *args
+      end
+    end
+
+    alias_method :run!, :perform_later
+    alias_method :run, :perform_later
   end
 end

data/lib/active_interaction/extras/transaction.rb

@@ -1,32 +1,26 @@
+# Add transaction wrapper
+#   run_in_transaction!
+#   skip_run_in_transaction!
 module ActiveInteraction::Extras::Transaction
   extend ActiveSupport::Concern
 
-  def run_in_transaction!
-    result_or_errors = nil
-    ActiveRecord::Base.transaction do
-      result_or_errors = yield
-
-      # check by class because
-      # errors added by compose method are merged after execute,
-      # so we need to check return type ourselves
-      #
-      # see ActiveInteraction::Runnable#run
-      if result_or_errors.is_a?(ActiveInteraction::Errors) && result_or_errors.any?
-        raise ActiveRecord::Rollback
+  included do
+    class_attribute :run_in_transaction_options
+    set_callback :execute, :around, ->(_interaction, block) {
+      ActiveRecord::Base.transaction(**run_in_transaction_options) do
+        block.call
       end
-
-      raise ActiveRecord::Rollback if errors.any?
-    end
-    result_or_errors
+    }, if: :run_in_transaction_options
   end
 
   class_methods do
-    def run_in_transaction!
-      set_callback :execute, :around, :run_in_transaction!, prepend: true
+    # https://pragtob.wordpress.com/2017/12/12/surprises-with-nested-transactions-rollbacks-and-activerecord/
+    def run_in_transaction!(requires_new: true)
+      self.run_in_transaction_options = {requires_new: requires_new}
     end
 
     def skip_run_in_transaction!
-      skip_callback :execute, :around, :run_in_transaction!
+      self.run_in_transaction_options = nil
     end
   end
 end

data/lib/active_interaction/extras/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction-extras
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Anton Katunin
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-05-25 00:00:00.000000000 Z
+date: 2021-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_interaction
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: active_interaction-active_job
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -108,15 +94,17 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Extension for active_interaction gem
+description: Extensions for active_interaction gem
 email:
 - antulik@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -128,7 +116,16 @@ files:
 - lib/active_interaction/extras.rb
 - lib/active_interaction/extras/active_job.rb
 - lib/active_interaction/extras/all.rb
+- lib/active_interaction/extras/filter_alias.rb
+- lib/active_interaction/extras/filter_extensions.rb
+- lib/active_interaction/extras/filter_extensions/hash_auto_strip.rb
+- lib/active_interaction/extras/filter_extensions/object_classes.rb
+- lib/active_interaction/extras/filter_extensions/timezone_support.rb
+- lib/active_interaction/extras/filters/anything_filter.rb
+- lib/active_interaction/extras/filters/uuid_filter.rb
 - lib/active_interaction/extras/halt.rb
+- lib/active_interaction/extras/jobs/core.rb
+- lib/active_interaction/extras/locale/en.yml
 - lib/active_interaction/extras/model_fields.rb
 - lib/active_interaction/extras/rspec.rb
 - lib/active_interaction/extras/run_callback.rb
@@ -136,11 +133,12 @@ files:
 - lib/active_interaction/extras/strong_params.rb
 - lib/active_interaction/extras/transaction.rb
 - lib/active_interaction/extras/version.rb
-homepage: https://github.com/antulik/xxxx
+homepage: https://github.com/antulik/active_interaction-extras
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  changelog_uri: https://github.com/antulik/active_interaction-extras/blob/master/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -155,9 +153,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
-summary: Extension for active_interaction gem
+summary: Extensions for active_interaction gem
 test_files: []