yaso 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb519a1032563c51304fc6d3d456317966964555f0e93f3589197c3d1b215aeb
-  data.tar.gz: d2959131be6cfad72331c0104419e031f8d6cbf4b42ec2b559c318acc41f5756
+  metadata.gz: dc341196c82939bab32058aa44ca8e1d3d26e24c473209c8ff1630d61021f6c1
+  data.tar.gz: cfb11b62003746dc95d675a6ecb417eff5c8801fce2d09322ae1788e46e1ab5d
 SHA512:
-  metadata.gz: 5afe8940444e11435fd6d263a42beeaafa782cbb21956d7d74e45883a09d2de3a23bf2c2883ef0c562a2c06de8366921b90f022dc23ef7def9903fb5ba2a78b2
-  data.tar.gz: 2305191823546b18b088289c738d5b1e2a6c0f7b2152e826271aee66a444c8d6ab7e605639eac43ee38b8682b6272f80611d3270ad631d212d3ccc8237aca08c
+  metadata.gz: bd5e52ec455c904965c4269b95fc21d2bc922a184463362e3cac8edc55591a776eaee4684148c82b98c6e4ab68fc18e3754e660d157d8313c9ff27442c8c82d8
+  data.tar.gz: aa81e5d37fe4c851c7463dd5ba81651b08f05a647ca384bd44ca8e15b92088560c0741efb01f3a262d275ddbdf003908b6ee898f3a1a8ef9bd964f7b76b68059

data/.rubocop.yml

@@ -1,30 +1,23 @@
-require:
-  - rubocop-rspec
-  - rubocop-performance
-
-AllCops:
-  TargetRubyVersion: 2.5
-  SuggestExtensions: false
-  NewCops: enable
-  Exclude:
-    - vendor/bundle/**/*
-    - benchmark/vendor/bundle/**/*
+inherit_mode:
+  merge:
+    - Exclude
 
-Gemspec/RequiredRubyVersion:
-  Enabled: false
+require:
+  - standard
 
-Layout/LineLength:
-  Max: 120
+plugins:
+  - standard-custom
+  - standard-performance
+  - rubocop-performance
+  - rubocop-rspec
 
-Style/Documentation:
-  Enabled: false
+inherit_gem:
+  standard: config/base.yml
+  standard-performance: config/base.yml
+  standard-custom: config/base.yml
 
-Metrics/BlockLength:
-  Exclude:
-    - '*.gemspec'
-  IgnoredMethods:
-    - describe
-    - context
+inherit_from: []
 
-RSpec/LetSetup:
-  Enabled: false
+AllCops:
+  NewCops: enable
+  SuggestExtensions: false

data/.ruby-version

@@ -1 +1 @@
-3.1.3
+3.4.7

data/.simplecov

@@ -1,8 +1,6 @@
-# frozen_string_literal: true
-
 SimpleCov.start do
   enable_coverage :branch
 
-  add_filter 'spec'
-  add_filter 'benchmark'
+  add_filter "spec"
+  add_filter "benchmark"
 end

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.4.7

data/Gemfile

@@ -1,5 +1,23 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
+
+version_parts = RUBY_VERSION.split(".")
+minor_version_path = version_parts[..1].join("_")
+
+if File.exist?("gemfiles/ruby_#{minor_version_path}/Gemfile")
+  eval_gemfile "gemfiles/ruby_#{minor_version_path}/Gemfile"
+else
+  eval_gemfile "gemfiles/ruby_#{version_parts[0]}/Gemfile"
+end
+
+group :development, :test do
+  gem "lefthook", "~> 2.0.4"
+  gem "pry", "~> 0.15.2"
+  gem "rake", "~> 13.3.1"
+end
+
+group :test do
+  gem "rspec", "~> 3.13.2"
+  gem "simplecov", "~> 0.22.0"
+end

data/README.md

@@ -1,7 +1,7 @@
 # Yaso
-[![Ruby](https://github.com/Ar2emis/yaso/actions/workflows/main.yml/badge.svg?branch=master)](https://github.com/Ar2emis/yaso/actions/workflows/main.yml) ![gem](https://img.shields.io/gem/v/yaso) [![GitHub license](https://img.shields.io/github/license/Ar2emis/yaso)](https://github.com/Ar2emis/yaso/blob/master/LICENSE.txt)
+[![Ruby](https://github.com/ar2em1s/yaso/actions/workflows/main.yml/badge.svg?branch=master)](https://github.com/ar2em1s/yaso/actions/workflows/main.yml) ![gem](https://img.shields.io/gem/v/yaso) [![GitHub license](https://img.shields.io/github/license/ar2em1s/yaso)](https://github.com/ar2em1s/yaso/blob/master/LICENSE.txt)
 
-That's my (Yet Another) ServiceObject pattern implementation. I made it fast ([the fastest of this kind actually](https://github.com/Ar2emis/yaso/wiki/Benchmarks); [simple_command](https://github.com/nebulab/simple_command), you got me this time) and simple to use (I hope). I was inspired by those alternatives and I hope this will encourage them to be even better:
+That's my (Yet Another) ServiceObject pattern implementation. I made it fast ([benchmarks](https://github.com/ar2em1s/yaso/wiki/Benchmarks)) and simple to use (I hope). I was inspired by those alternatives and I hope this will encourage them to be even better:
 - [Trailblazer](https://github.com/trailblazer/trailblazer)
 - [Decouplio](https://github.com/differencialx/decouplio)
 
@@ -10,28 +10,32 @@ That's my (Yet Another) ServiceObject pattern implementation. I made it fast ([t
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'yaso'
+gem "yaso"
 ```
 
 And then execute:
 
-    $ bundle install
+```bash
+bundle install
+```
 
 Or install it yourself as:
 
-    $ gem install yaso
+```bash
+gem install yaso
+```
 
 ## Usage
 
-All the information you can find in the gem [wiki](https://github.com/Ar2emis/yaso/wiki).
+All the information you can find in the gem [wiki](https://github.com/ar2em1s/yaso/wiki).
 
 ## Development
 
-I don't think that someone would like to help me developing the gem but if so just fork a repository, do your dark business, open a pull request and assign me as a reviewer. 
+I don't think that someone would like to help me developing the gem but if so just fork a repository, do your dark business, open a pull request and assign me as a reviewer.
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/Ar2emis/yaso.
+Bug reports and pull requests are welcome on GitHub at https://github.com/ar2em1s/yaso.
 
 ## License
 

data/Rakefile

@@ -1,11 +1,9 @@
-# frozen_string_literal: true
-
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-require 'rubocop/rake_task'
+require "rubocop/rake_task"
 
 RuboCop::RakeTask.new
 

data/benchmark/Gemfile

@@ -1,25 +1,16 @@
-# frozen_string_literal: true
+source "https://rubygems.org"
 
-source 'https://rubygems.org'
+eval_gemfile "gemfiles/ruby_#{RUBY_VERSION[0]}/Gemfile"
 
-gem 'benchmark-ips', '~> 2.10.0'
+gem "benchmark-ips", "~> 2.14.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'
-gem 'trailblazer', '~> 2.1.0'
-gem 'yaso', path: '..'
+gem "dry-container", "~> 0.11.0"
+gem "interactor", "~> 3.2.0"
+gem "kalibera", "~> 0.1.2"
+gem "simple_command", "~> 1.0.1"
+gem "simple_logic_step", "~> 0.1.0"
+gem "trailblazer", "~> 2.1.3"
+gem "active_interaction", "~> 5.5.0"
+gem "decouplio", "~> 1.0.0rc"
 
-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.0rc')
+gem "yaso", path: ".."

data/benchmark/gemfiles/ruby_2/Gemfile

@@ -0,0 +1 @@
+gem "dry-transaction", "~> 0.15.0"

data/benchmark/gemfiles/ruby_3/Gemfile

@@ -0,0 +1 @@
+gem "dry-transaction", "~> 0.16.0"

data/benchmark/index.rb

@@ -1,33 +1,34 @@
-# frozen_string_literal: true
+require "bundler/setup"
 
-require 'bundler/setup'
+require "benchmark/ips"
+require "decouplio"
+require "interactor"
+require "active_interaction"
+require "trailblazer"
+require "simple_command"
+require "simple_logic_step"
+require "yaso"
+require "dry/container"
+require "dry/transaction"
+require "dry/transaction/operation"
 
-require 'benchmark/ips'
-RUBY_VERSION.include?('2.5') || require('decouplio')
-require 'interactor'
-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"
+require_relative "shared/decouplio_service"
+require_relative "shared/pure_service"
+require_relative "shared/simple_command_service"
+require_relative "shared/simple_logic_step_service"
+require_relative "shared/interactor_service"
+require_relative "shared/active_interaction_service"
+require_relative "shared/trailblazer_service"
+require_relative "shared/callable_step"
 
-require_relative 'shared/yaso_service'
-RUBY_VERSION.include?('2.5') || require_relative('shared/decouplio_service')
-require_relative 'shared/pure_service'
-require_relative 'shared/simple_command_service'
-require_relative 'shared/interactor_service'
-require_relative 'shared/active_interaction_service'
-require_relative 'shared/trailblazer_service'
-require_relative 'shared/callable_step'
-
-require_relative 'step/yaso'
-RUBY_VERSION.include?('2.5') || require_relative('step/decouplio')
-require_relative 'step/pure'
-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'
+require_relative "step/yaso"
+require_relative "step/decouplio"
+require_relative "step/pure"
+require_relative "step/simple_command"
+require_relative "step/simple_logic_step"
+require_relative "step/interactor"
+require_relative "step/active_interaction"
+require_relative "step/trailblazer"
+require_relative "step/dry_transaction"
+require_relative "step/benchmark"

data/benchmark/shared/active_interaction_service.rb

@@ -1,4 +1,2 @@
-# frozen_string_literal: true
-
 class ActiveInteractionService < ActiveInteraction::Base
 end

data/benchmark/shared/callable_step.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class CallableStep
   def self.call(ctx, key:, value:, **)
     ctx[key] = value

data/benchmark/shared/decouplio_service.rb

@@ -1,4 +1,2 @@
-# frozen_string_literal: true
-
 class DecouplioService < Decouplio::Action
 end

data/benchmark/shared/interactor_service.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class InteractorService
   include Interactor
 end

data/benchmark/shared/pure_service.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class PureService
   attr_reader :ctx
 

data/benchmark/shared/simple_command_service.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class SimpleCommandService
   prepend SimpleCommand
 

data/benchmark/shared/simple_logic_step_service.rb

@@ -0,0 +1,2 @@
+class SimpleLogicStepService < SimpleLogicStep::Service
+end

data/benchmark/shared/trailblazer_service.rb

@@ -1,4 +1,2 @@
-# frozen_string_literal: true
-
 class TrailblazerService < Trailblazer::Operation
 end

data/benchmark/shared/yaso_service.rb

@@ -1,4 +1,2 @@
-# frozen_string_literal: true
-
 class YasoService < Yaso::Service
 end

data/benchmark/step/active_interaction.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class ActiveInteractionStepsService < ActiveInteractionService
   hash :ctx, default: {}
 

data/benchmark/step/benchmark.rb

@@ -1,35 +1,36 @@
-# frozen_string_literal: true
+puts "Ruby: #{RUBY_DESCRIPTION}"
+puts "Step Benchmark"
 
-puts 'Step Benchmark'
-
-puts 'Services with 10 simple steps'
+puts "Services with 10 simple steps"
 Benchmark.ips do |x|
   x.config(stats: :bootstrap, confidence: 95)
 
-  x.report('Pure Service') { PureStepsService.call }
-  x.report('SimpleCommand') { SimpleCommandStepsService.call }
-  x.report('Yaso') { YasoStepsService.call }
-  x.report('Decouplio') { DecouplioStepsService.call } unless RUBY_VERSION.include?('2.5')
-  x.report('Interactor') { InteractorStepsService.call }
-  x.report('ActiveInteraction') { ActiveInteractionStepsService.run }
-  x.report('Trailblazer') { TrailblazerStepsService.call }
-  x.report('DryTransaction') { DryTransactionStepsService.new.call({}) }
+  x.report("Pure Service") { PureStepsService.call }
+  x.report("SimpleCommand") { SimpleCommandStepsService.call }
+  x.report("SimpleLogicStep") { SimpleLogicStepStepsService.call }
+  x.report("Yaso") { YasoStepsService.call }
+  x.report("Decouplio") { DecouplioStepsService.call }
+  x.report("Interactor") { InteractorStepsService.call }
+  x.report("ActiveInteraction") { ActiveInteractionStepsService.run }
+  x.report("Trailblazer") { TrailblazerStepsService.call }
+  x.report("DryTransaction") { DryTransactionStepsService.new.call({}) }
 
   x.compare!
 end
 
-puts 'Services with 10 callable steps'
+puts "Services with 10 callable steps"
 Benchmark.ips do |x|
   x.config(stats: :bootstrap, confidence: 95)
 
-  x.report('Pure Service') { PureCallablesService.call }
-  x.report('SimpleCommand') { SimpleCommandCallablesService.call }
-  x.report('Yaso') { YasoCallablesService.call }
-  x.report('Decouplio') { DecouplioCallablesService.call } unless RUBY_VERSION.include?('2.5')
-  x.report('Interactor') { InteractorCallablesService.call }
-  x.report('ActiveInteraction') { ActiveInteractionCallablesService.run }
-  x.report('Trailblazer') { TrailblazerCallablesService.call }
-  x.report('DryTransaction') { DryTransactionCallablesService.new.call({}) }
+  x.report("Pure Service") { PureCallablesService.call }
+  x.report("SimpleCommand") { SimpleCommandCallablesService.call }
+  x.report("SimpleLogicStep") { SimpleLogicStepCallablesService.call }
+  x.report("Yaso") { YasoCallablesService.call }
+  x.report("Decouplio") { DecouplioCallablesService.call }
+  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

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class DecouplioStepsService < DecouplioService
   logic do
     step :one
@@ -56,7 +54,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

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class DryTransactionStepsService
   include Dry::Transaction
 
@@ -100,14 +98,14 @@ 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'
+  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/interactor.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class InteractorStepsService < InteractorService
   def call
     one
@@ -63,13 +61,13 @@ end
 
 class InteractorCallablesService < InteractorOrganizer
   organize InteractorCallableStep,
-           InteractorCallableStep,
-           InteractorCallableStep,
-           InteractorCallableStep,
-           InteractorCallableStep,
-           InteractorCallableStep,
-           InteractorCallableStep,
-           InteractorCallableStep,
-           InteractorCallableStep,
-           InteractorCallableStep
+    InteractorCallableStep,
+    InteractorCallableStep,
+    InteractorCallableStep,
+    InteractorCallableStep,
+    InteractorCallableStep,
+    InteractorCallableStep,
+    InteractorCallableStep,
+    InteractorCallableStep,
+    InteractorCallableStep
 end

data/benchmark/step/pure.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class PureStepsService < PureService
   def call
     one

data/benchmark/step/simple_command.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class SimpleCommandStepsService < SimpleCommandService
   # rubocop:disable Metrics/MethodLength
   def call

data/benchmark/step/simple_logic_step.rb

@@ -0,0 +1,71 @@
+class SimpleLogicStepStepsService < SimpleLogicStepService
+  def process
+    one
+    two
+    three
+    four
+    five
+    six
+    seven
+    eight
+    nine
+    ten
+  end
+
+  def one
+    ctx[:one] = true
+  end
+
+  def two
+    ctx[:two] = true
+  end
+
+  def three
+    ctx[:three] = true
+  end
+
+  def four
+    ctx[:four] = true
+  end
+
+  def five
+    ctx[:five] = true
+  end
+
+  def six
+    ctx[:six] = true
+  end
+
+  def seven
+    ctx[:seven] = true
+  end
+
+  def eight
+    ctx[:eight] = true
+  end
+
+  def nine
+    ctx[:nine] = true
+  end
+
+  def ten
+    ctx[:ten] = true
+  end
+end
+
+class SimpleLogicStepCallablesService < SimpleLogicStepService
+  # rubocop:disable Metrics/AbcSize
+  def process
+    CallableStep.call(ctx, key: :one, value: true)
+    CallableStep.call(ctx, key: :two, value: true)
+    CallableStep.call(ctx, key: :three, value: true)
+    CallableStep.call(ctx, key: :four, value: true)
+    CallableStep.call(ctx, key: :five, value: true)
+    CallableStep.call(ctx, key: :six, value: true)
+    CallableStep.call(ctx, key: :seven, value: true)
+    CallableStep.call(ctx, key: :eight, value: true)
+    CallableStep.call(ctx, key: :nine, value: true)
+    CallableStep.call(ctx, key: :ten, value: true)
+  end
+  # rubocop:enable Metrics/AbcSize
+end

data/benchmark/step/trailblazer.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class TrailblazerStepsService < TrailblazerService
   step :one
   step :two
@@ -65,7 +63,7 @@ module TrailblazerMacro
       false
     end
     task = Trailblazer::Activity::Circuit::TaskAdapter.for_step(step)
-    { task: task, id: id }
+    {task: task, id: id}
   end
   # rubocop:enable Naming/MethodName
 end

data/benchmark/step/yaso.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class YasoStepsService < YasoService
   step :one
   step :two

data/docker-compose.yml

@@ -4,6 +4,8 @@ services:
     volumes:
       - .:/yaso
       - bundle:/bundle/cache
+    environment:
+      RUBYOPT: "${RUBYOPT:-}"
 
 volumes:
   bundle:

data/gemfiles/ruby_2/Gemfile

@@ -0,0 +1,8 @@
+group :development, :test do
+  gem "standard", "~> 1.37.0"
+  gem "rubocop-rspec", "~> 3.4.0"
+end
+
+group :test do
+  gem "ffaker", "~> 2.21.0"
+end

data/gemfiles/ruby_3/Gemfile

@@ -0,0 +1,8 @@
+group :development, :test do
+  gem "standard", "~> 1.51.1"
+  gem "rubocop-rspec", "~> 3.7.0"
+end
+
+group :test do
+  gem "ffaker", "~> 2.25.0"
+end

data/gemfiles/ruby_3_0/Gemfile

@@ -0,0 +1,8 @@
+group :development, :test do
+  gem "standard", "~> 1.51.1"
+  gem "rubocop-rspec", "~> 3.7.0"
+end
+
+group :test do
+  gem "ffaker", "~> 2.24.0"
+end

data/lib/yaso/errors.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Yaso
   class Error < StandardError; end