yaso 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d9de791b4d45e8ea1cd2ffb6d75738f9d5eef8376261437b923d0795f81a5a2
-  data.tar.gz: 1d6234c4203c8cd9acdec73b5267ff16a45563caf67fd757f8fbed7fb2228d79
+  metadata.gz: 82a14582b1dadeb5c6103880c2ec7b3d7afe887ec9d8eb90601d77c02cfaf785
+  data.tar.gz: 94eab6547c4c0eaa87285bf09aa78534c33c06164fb98435dc7fe0b2f6d84d54
 SHA512:
-  metadata.gz: 8d8a4268ef7295d5eef6a6f8a45a73cc823f7d3322ad0c2cfea2f46a627f415af1c1974a8806318c290961ecd01bef29f4ad521e8d12f9f360c9f6a76d7426d9
-  data.tar.gz: 3b3e2a00818e075f555f47302033d6b6f292413291c4991e6d5e7831e58a95877a257dc0bb377b526736f516da5c71e58690b6e557e2805ac5a40e466e068bae
+  metadata.gz: 0104e325136a9952cff6309951c67915d015cf67897fcf257e73a51e335eb0d8e12bf87ecf2ec09bb5d326bf3c7622101f2b02a6c06deb75c16f511c91eff3a5
+  data.tar.gz: 04525a4314e1417f48f699e71d0b77ecf888ce44524e972fb2b811ddcfe9ef68f399c1771cf81031df6127d63287091e2b9fe36e3679cd0e6c26775554b7c3e7

data/.ruby-version

@@ -1 +1 @@
-3.1.2
+3.1.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yaso (1.3.0)
+    yaso (1.3.1)
 
 GEM
   remote: https://rubygems.org/
@@ -63,6 +63,7 @@ GEM
 
 PLATFORMS
   x86_64-darwin-21
+  x86_64-darwin-22
   x86_64-linux
 
 DEPENDENCIES

data/benchmark/Gemfile

@@ -3,6 +3,17 @@
 source 'https://rubygems.org'
 
 gem 'benchmark-ips', '~> 2.10.0'
+
+DRY_CONTAINER = {
+  '2.5' => '~> 0.7.2',
+  '2.6' => '~> 0.9.0'
+}.freeze
+gem 'dry-container', DRY_CONTAINER.fetch(RUBY_VERSION.match(/\A\d+\.\d+/)[0], '~> 0.11.0')
+DRY_TRANSACTION = {
+  '2.5' => '~> 0.13.2',
+  '2.6' => '~> 0.13.3'
+}.freeze
+gem 'dry-transaction', DRY_TRANSACTION.fetch(RUBY_VERSION.match(/\A\d+\.\d+/)[0], '~> 0.15.0')
 gem 'interactor', '~> 3.1.2'
 gem 'kalibera', '~> 0.1.2'
 gem 'simple_command', RUBY_VERSION.include?('2.5') ? '~> 0.2.0' : '~> 1.0.1'
@@ -11,4 +22,4 @@ gem 'yaso', path: '..'
 
 gem 'active_interaction', %w[2.5 2.6].any? { |version| RUBY_VERSION.include?(version) } ? '~> 4.1.0' : '~> 5.1.0'
 
-RUBY_VERSION.include?('2.5') || gem('decouplio', '~> 1.0.0alpha8')
+RUBY_VERSION.include?('2.5') || gem('decouplio', '~> 1.0.0rc')

data/benchmark/index.rb

@@ -9,6 +9,9 @@ require 'active_interaction'
 require 'trailblazer'
 require 'simple_command'
 require 'yaso'
+require 'dry/container'
+require 'dry/transaction'
+require 'dry/transaction/operation'
 
 require_relative 'shared/yaso_service'
 RUBY_VERSION.include?('2.5') || require_relative('shared/decouplio_service')
@@ -26,4 +29,5 @@ require_relative 'step/simple_command'
 require_relative 'step/interactor'
 require_relative 'step/active_interaction'
 require_relative 'step/trailblazer'
+require_relative 'step/dry_transaction'
 require_relative 'step/benchmark'

data/benchmark/step/benchmark.rb

@@ -13,6 +13,7 @@ Benchmark.ips do |x|
   x.report('Interactor') { InteractorStepsService.call }
   x.report('ActiveInteraction') { ActiveInteractionStepsService.run }
   x.report('Trailblazer') { TrailblazerStepsService.call }
+  x.report('DryTransaction') { DryTransactionStepsService.new.call({}) }
 
   x.compare!
 end
@@ -28,6 +29,7 @@ Benchmark.ips do |x|
   x.report('Interactor') { InteractorCallablesService.call }
   x.report('ActiveInteraction') { ActiveInteractionCallablesService.run }
   x.report('Trailblazer') { TrailblazerCallablesService.call }
+  x.report('DryTransaction') { DryTransactionCallablesService.new.call({}) }
 
   x.compare!
 end

data/benchmark/step/decouplio.rb

@@ -56,7 +56,7 @@ class DecouplioStepsService < DecouplioService
 end
 
 class DecouplioCallableStep
-  def self.call(ctx:, key:, value:, **)
+  def self.call(ctx, _, key:, value:, **)
     ctx[key] = value
   end
 end

data/benchmark/step/dry_transaction.rb

@@ -0,0 +1,113 @@
+# frozen_string_literal: true
+
+class DryTransactionStepsService
+  include Dry::Transaction
+
+  step :one
+  step :two
+  step :three
+  step :four
+  step :five
+  step :six
+  step :seven
+  step :eight
+  step :nine
+  step :ten
+
+  private
+
+  def one(ctx)
+    ctx[:one] = true
+    Success(ctx)
+  end
+
+  def two(ctx)
+    ctx[:two] = true
+    Success(ctx)
+  end
+
+  def three(ctx)
+    ctx[:three] = true
+    Success(ctx)
+  end
+
+  def four(ctx)
+    ctx[:four] = true
+    Success(ctx)
+  end
+
+  def five(ctx)
+    ctx[:five] = true
+    Success(ctx)
+  end
+
+  def six(ctx)
+    ctx[:six] = true
+    Success(ctx)
+  end
+
+  def seven(ctx)
+    ctx[:seven] = true
+    Success(ctx)
+  end
+
+  def eight(ctx)
+    ctx[:eight] = true
+    Success(ctx)
+  end
+
+  def nine(ctx)
+    ctx[:nine] = true
+    Success(ctx)
+  end
+
+  def ten(ctx)
+    ctx[:ten] = true
+    Success(ctx)
+  end
+end
+
+class DryTansactionCallable
+  include Dry::Transaction::Operation
+
+  def initialize(key)
+    @key = key
+  end
+
+  def call(ctx)
+    ctx[@key] = true
+    Success(ctx)
+  end
+end
+
+class DryTransactionContainer
+  extend Dry::Container::Mixin
+
+  namespace :callable do
+    register(:one) { DryTansactionCallable.new(:one) }
+    register(:two) { DryTansactionCallable.new(:two) }
+    register(:three) { DryTansactionCallable.new(:three) }
+    register(:four) { DryTansactionCallable.new(:four) }
+    register(:five) { DryTansactionCallable.new(:five) }
+    register(:six) { DryTansactionCallable.new(:six) }
+    register(:seven) { DryTansactionCallable.new(:seven) }
+    register(:eight) { DryTansactionCallable.new(:eight) }
+    register(:nine) { DryTansactionCallable.new(:nine) }
+    register(:ten) { DryTansactionCallable.new(:ten) }
+  end
+end
+
+class DryTransactionCallablesService
+  include Dry::Transaction(container: DryTransactionContainer)
+
+  step :one, with: :'callable.one'
+  step :two, with: :'callable.two'
+  step :three, with: :'callable.three'
+  step :four, with: :'callable.four'
+  step :five, with: :'callable.five'
+  step :six, with: :'callable.six'
+  step :seven, with: :'callable.seven'
+  step :eight, with: :'callable.eight'
+  step :nine, with: :'callable.nine'
+  step :ten, with: :'callable.ten'
+end

data/benchmark/step/trailblazer.rb

@@ -64,7 +64,7 @@ module TrailblazerMacro
       ctx[:"result.#{id}"] = Trailblazer::Operation::Result.new(false, {})
       false
     end
-    task = Trailblazer::Activity::TaskBuilder::Binary(step)
+    task = Trailblazer::Activity::Circuit::TaskAdapter.for_step(step)
     { task: task, id: id }
   end
   # rubocop:enable Naming/MethodName

data/docker-compose.yml

@@ -4,12 +4,6 @@ services:
     volumes:
       - .:/yaso
       - bundle:/bundle/cache
-    deploy:
-      resources:
-        limits:
-          cpus: '1.5'
-        reservations:
-          cpus: '1.5'
-            
-volumes: 
+
+volumes:
   bundle:

data/lib/yaso/logic/failure.rb

@@ -4,7 +4,8 @@ module Yaso
   module Logic
     class Failure < Base
       def call(context, instance)
-        [@invocable.call(context, instance) ? @next_step : @failure, false]
+        instance.success = false
+        @invocable.call(context, instance) ? @next_step : @failure
       end
     end
   end

data/lib/yaso/logic/pass.rb

@@ -4,7 +4,8 @@ module Yaso
   module Logic
     class Pass < Base
       def call(context, instance)
-        [@invocable.call(context, instance) ? @next_step : @failure, true]
+        instance.success = true
+        @invocable.call(context, instance) ? @next_step : @failure
       end
     end
   end

data/lib/yaso/logic/step.rb

@@ -4,7 +4,13 @@ module Yaso
   module Logic
     class Step < Base
       def call(context, instance)
-        @invocable.call(context, instance) ? [@next_step, true] : [@failure, false]
+        instance.success = true
+        if @invocable.call(context, instance)
+          @next_step
+        else
+          instance.success = false
+          @failure
+        end
       end
     end
   end

data/lib/yaso/logic/step_builder.rb

@@ -54,9 +54,7 @@ module Yaso
         wrapper_class.define_singleton_method(:call) do |context, instance|
           @entry ||= service_class.flow.call(service_class, steps)
           step = @entry
-          success = true
-          step, success = step.call(context, instance) while step
-          instance.success = success
+          step = step.call(context, instance) while step
           instance
         end
       end

data/lib/yaso/logic/switch.rb

@@ -4,8 +4,14 @@ module Yaso
   module Logic
     class Switch < Base
       def call(context, instance)
+        instance.success = true
         switch_case = @invocable.call(context, instance) || raise(UnhandledSwitchCaseError, instance.class)
-        Invocable.call(switch_case).last.call(context, instance) ? [@next_step, true] : [@failure, false]
+        if Invocable.call(switch_case).last.call(context, instance)
+          @next_step
+        else
+          instance.success = false
+          @failure
+        end
       end
     end
   end

data/lib/yaso/logic/wrap.rb

@@ -9,8 +9,14 @@ module Yaso
       end
 
       def call(context, instance)
+        instance.success = true
         result = @invocable.call(context, instance) { @wrapper.call(context, instance).success? }
-        result ? [@next_step, true] : [@failure, false]
+        if result
+          @next_step
+        else
+          instance.success = false
+          @failure
+        end
       end
     end
   end

data/lib/yaso/service.rb

@@ -40,9 +40,7 @@ module Yaso
         @entry ||= flow.call(self, steps)
         step = @entry
         instance = new(context)
-        success = true
-        step, success = step.call(context, instance) while step
-        instance.success = success
+        step = step.call(context, instance) while step
         instance
       end
 

data/lib/yaso/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Yaso
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaso
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Artem Shevchenko
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-19 00:00:00.000000000 Z
+date: 2022-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffaker
@@ -203,6 +203,7 @@ files:
 - benchmark/step/active_interaction.rb
 - benchmark/step/benchmark.rb
 - benchmark/step/decouplio.rb
+- benchmark/step/dry_transaction.rb
 - benchmark/step/interactor.rb
 - benchmark/step/pure.rb
 - benchmark/step/simple_command.rb
@@ -250,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Yet Another Service Object