yaso 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 293839b577b5832d54938e07a07729d49ddd74fd226f0077076fe6f4986340ae
-  data.tar.gz: 72d9d2bde9edbc0050f1473e3efc33a9c81952fe78906eaeb35acbba2ccc80bf
+  metadata.gz: 1d9de791b4d45e8ea1cd2ffb6d75738f9d5eef8376261437b923d0795f81a5a2
+  data.tar.gz: 1d6234c4203c8cd9acdec73b5267ff16a45563caf67fd757f8fbed7fb2228d79
 SHA512:
-  metadata.gz: a54b6acc15d5d8e71b25a4273ce87816ae58a1e63bd815e4cf338d671b5b71b3378016c076d9db44122e7612619e69e06c60e63cf7afd388b0de7509ad42ac0f
-  data.tar.gz: 55a031ce994ac21ed04e659d70b2871cae67ed64d088799e26663b1d5e2ac5f76593d0ea4d0e3e181ff72b63fed7aa626abf67b063eed696be4418e74930e9e8
+  metadata.gz: 8d8a4268ef7295d5eef6a6f8a45a73cc823f7d3322ad0c2cfea2f46a627f415af1c1974a8806318c290961ecd01bef29f4ad521e8d12f9f360c9f6a76d7426d9
+  data.tar.gz: 3b3e2a00818e075f555f47302033d6b6f292413291c4991e6d5e7831e58a95877a257dc0bb377b526736f516da5c71e58690b6e557e2805ac5a40e466e068bae

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yaso (1.2.0)
+    yaso (1.3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -14,7 +14,7 @@ GEM
     lefthook (1.0.5)
     method_source (1.0.0)
     parallel (1.22.1)
-    parser (3.1.2.0)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
@@ -29,13 +29,13 @@ GEM
       rspec-mocks (~> 3.11.0)
     rspec-core (3.11.0)
       rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec-expectations (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
+    rspec-support (3.11.1)
     rubocop (1.28.2)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
@@ -59,7 +59,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    unicode-display_width (2.2.0)
+    unicode-display_width (2.3.0)
 
 PLATFORMS
   x86_64-darwin-21

data/README.md

@@ -1,8 +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)
 
-That's my (Yet Another) ServiceObject pattern implementation. I made it fast ([the fastest actually](https://github.com/Ar2emis/yaso/wiki/Benchmarks)) and simple to use.
-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 ([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:
 - [Trailblazer](https://github.com/trailblazer/trailblazer)
 - [Decouplio](https://github.com/differencialx/decouplio)
 
@@ -28,7 +27,7 @@ All the information you can find in the gem [wiki](https://github.com/Ar2emis/ya
 
 ## Development
 
-I don't think that someone would like to help me developing the gem but if so just fork a new branch from the master, 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
 

data/benchmark/Gemfile

@@ -7,6 +7,7 @@ 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 'active_interaction', %w[2.5 2.6].any? { |version| RUBY_VERSION.include?(version) } ? '~> 4.1.0' : '~> 5.1.0'
 

data/benchmark/index.rb

@@ -2,14 +2,13 @@
 
 require 'bundler/setup'
 
-require_relative '../lib/yaso'
-
 require 'benchmark/ips'
 RUBY_VERSION.include?('2.5') || require('decouplio')
 require 'interactor'
 require 'active_interaction'
 require 'trailblazer'
 require 'simple_command'
+require 'yaso'
 
 require_relative 'shared/yaso_service'
 RUBY_VERSION.include?('2.5') || require_relative('shared/decouplio_service')

data/docker/Dockerfile

@@ -0,0 +1,7 @@
+ARG VERSION=latest
+
+FROM ruby:${VERSION}
+
+ENTRYPOINT [ "/yaso/docker/entrypoint.sh" ]
+
+WORKDIR /yaso/benchmark

data/docker/entrypoint.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+if [[ `bundle -v` =~ "Bundler version 2" ]]; then
+  bundle config set --local path '/bundle/cache'
+  bundle config set --local without 'development'
+else
+  bundle config --local path '/bundle/cache'
+  bundle config --local without 'development'
+fi
+
+bundle
+
+ruby index.rb
+
+rm Gemfile.lock

data/docker-compose.yml

@@ -0,0 +1,15 @@
+services:
+  benchmark:
+    build: docker
+    volumes:
+      - .:/yaso
+      - bundle:/bundle/cache
+    deploy:
+      resources:
+        limits:
+          cpus: '1.5'
+        reservations:
+          cpus: '1.5'
+            
+volumes: 
+  bundle:

data/lib/yaso/invocable.rb

@@ -7,12 +7,12 @@ module Yaso
     YASO = :yaso
 
     class << self
-      def call(object, options: {}, **)
+      def call(object, options: {}, with_block: false, **)
         type = object_type(object)
         invocable = case type
-                    when YASO then proc { |context, _| object.call(context.clone).success? }
-                    when CALLABLE then proc { |context, _, &block| object.call(context, **options, &block) }
-                    else method_invocable(object)
+                    when YASO then proc { |context| object.call(context).success? }
+                    when CALLABLE then callable_invocable(object, options, with_block: with_block)
+                    else method_invocable(object, with_block: with_block)
                     end
         [type, invocable]
       end
@@ -25,11 +25,25 @@ module Yaso
         object < ::Yaso::Service ? Invocable::YASO : Invocable::CALLABLE
       end
 
-      def method_invocable(object)
+      def callable_invocable(object, options, with_block:)
+        return proc { |context, &block| object.call(context, **options, &block) } if with_block
+
+        proc { |context| object.call(context, **options) }
+      end
+
+      def method_invocable(object, with_block:)
+        if with_block
+          return instance_eval <<-RUBY, __FILE__, __LINE__ + 1
+            proc { |context, instance, &block|               # proc { |context, instance, &block|
+              instance.#{object}(context, **context, &block) #   instance.<method_name>(context, **context, &block)
+            }                                                # }
+          RUBY
+        end
+
         instance_eval <<-RUBY, __FILE__, __LINE__ + 1
-          proc { |context, instance, &block|                    # proc { |context, instance, &block|
-            instance.#{object}(context, **context.data, &block) #   instance.<method_name>(context, **context.data, &block)
-          }                                                     # }
+          proc { |context, instance|               # proc { |context, instance|
+            instance.#{object}(context, **context) #   instance.<method_name>(context, **context)
+          }                                        # }
         RUBY
       end
     end

data/lib/yaso/logic/failure.rb

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

data/lib/yaso/logic/pass.rb

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

data/lib/yaso/logic/step.rb

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

data/lib/yaso/logic/step_builder.rb

@@ -16,8 +16,8 @@ module Yaso
       end
 
       def call(object:, category:, block:, **opts)
-        invocable_type, invocable = Invocable.call(object, **opts)
         logic_class = CATEGORIES[category]
+        invocable_type, invocable = Invocable.call(object, with_block: logic_class == Wrap, **opts)
         if invocable_type == Invocable::METHOD
           opts[:name] = logic_class == Switch ? build_switch(object, **opts, &block) : build_method(object, &block)
         end
@@ -51,14 +51,13 @@ module Yaso
       end
 
       def build_wrapper_methods(wrapper_class, service_class)
-        wrapper_class.define_singleton_method(:flow) do
-          service_class.flow
-        end
         wrapper_class.define_singleton_method(:call) do |context, instance|
-          @entry ||= flow.call(service_class, steps)
+          @entry ||= service_class.flow.call(service_class, steps)
           step = @entry
-          step = step.call(context, instance) while step
-          context
+          success = true
+          step, success = step.call(context, instance) while step
+          instance.success = success
+          instance
         end
       end
     end

data/lib/yaso/logic/switch.rb

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

data/lib/yaso/logic/wrap.rb

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

data/lib/yaso/service.rb

@@ -4,14 +4,46 @@ module Yaso
   class Service
     extend Stepable
 
+    attr_writer :success
+
+    def initialize(context)
+      @context = context
+      @success = true
+    end
+
+    def [](key)
+      @context[key]
+    end
+
+    def []=(key, value)
+      @context[key] = value
+    end
+
+    def success?
+      @success
+    end
+
+    def failure?
+      !@success
+    end
+
+    def to_h
+      @context.dup
+    end
+
+    def inspect
+      "Result:#{self.class} successful: #{@success}, context: #{@context}"
+    end
+
     class << self
       def call(context = {})
-        context = context.is_a?(Context) ? context : Context.new(context)
         @entry ||= flow.call(self, steps)
         step = @entry
-        instance = new
-        step = step.call(context, instance) while step
-        context
+        instance = new(context)
+        success = true
+        step, success = step.call(context, instance) while step
+        instance.success = success
+        instance
       end
 
       def flow(name = nil)

data/lib/yaso/version.rb

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

data/lib/yaso.rb

@@ -2,7 +2,6 @@
 
 require_relative 'yaso/version'
 require_relative 'yaso/errors'
-require_relative 'yaso/context'
 require_relative 'yaso/invocable'
 require_relative 'yaso/stepable'
 require_relative 'yaso/logic'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaso
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Artem Shevchenko
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-27 00:00:00.000000000 Z
+date: 2022-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffaker
@@ -208,9 +208,11 @@ files:
 - benchmark/step/simple_command.rb
 - benchmark/step/trailblazer.rb
 - benchmark/step/yaso.rb
+- docker-compose.yml
+- docker/Dockerfile
+- docker/entrypoint.sh
 - lefthook.yml
 - lib/yaso.rb
-- lib/yaso/context.rb
 - lib/yaso/errors.rb
 - lib/yaso/invocable.rb
 - lib/yaso/logic.rb

data/lib/yaso/context.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module Yaso
-  class Context
-    attr_writer :success
-    attr_reader :data
-
-    def initialize(kwargs)
-      @success = true
-      @data = kwargs
-    end
-
-    def [](key)
-      @data[key]
-    end
-
-    def []=(key, value)
-      @data[key] = value
-    end
-
-    def to_h
-      @data.dup
-    end
-
-    def success?
-      @success
-    end
-
-    def failure?
-      !@success
-    end
-  end
-end