yaso 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 303afa88aa6e5fbe4a133816cabd2fb072b3c0c69e9325f3213329e2838722fe
-  data.tar.gz: 68c158407e5c0443091ca1378b0c99ac24da9a2abc7072398e8eae9f81dffc93
+  metadata.gz: e562bf748ebc163661813eed594c0abdecc4bf2027f68cb3cfb389464066fd82
+  data.tar.gz: 4fd59f39375881b4c9b04442405318a82f58792a7d759edfef302cc25b2b3107
 SHA512:
-  metadata.gz: 47b055c354a17ba2c0c21ed306c97da120b1d3b2511245c6e9a074e4ecd6126f6ae1325ab6f5f492f93deb7ddfedc9f07e40e149d20d04b49c8c700fc505665e
-  data.tar.gz: 25fb9bc3037fd49e2b48f466098d0299f4bcaa569b320d76dbf351dbc2cb8e665c50c82bb06411223a5dbd327bc2191f24575c8a744037457bc5c07e64f36ad8
+  metadata.gz: bb6e535a13645a6831364324459a76808affb02715d6f6f173d3e913058befa03bd7af75828bdf627e54d8daccf060e7d0fae693dda4b65c224573c0afb0a7a5
+  data.tar.gz: '0987332c9e58733298f8b7c5c164222d91835492afb2107fb7bffbfaaeeec2b3234d2f34fdf57b6b0fcc7055b95669a42b803449f351f4c8d243a00147ca4a9d'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yaso (1.0.0)
+    yaso (1.1.0)
 
 GEM
   remote: https://rubygems.org/

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)
 
-That's my (Yet Another) ServiceObject pattern implementation. I tried to make it fast (the fastest actually) and simple to use.
+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:
 - [Trailblazer](https://github.com/trailblazer/trailblazer)
 - [Decouplio](https://github.com/differencialx/decouplio)

data/benchmark/step/benchmark.rb

@@ -7,11 +7,11 @@ Benchmark.ips do |x|
   x.config(stats: :bootstrap, confidence: 95)
 
   x.report('Pure Service') { PureStepsService.call }
-  x.report('Decouplio Service') { DecouplioStepsService.call } unless RUBY_VERSION.include?('2.5')
-  x.report('Yaso Service') { YasoStepsService.call }
-  x.report('Interactor Service') { InteractorStepsService.call }
-  x.report('ActiveInteraction Service') { ActiveInteractionStepsService.run }
-  x.report('Trailblazer Service') { TrailblazerStepsService.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.compare!
 end
@@ -21,11 +21,11 @@ Benchmark.ips do |x|
   x.config(stats: :bootstrap, confidence: 95)
 
   x.report('Pure Service') { PureCallablesService.call }
-  x.report('Decouplio Service') { DecouplioCallablesService.call } unless RUBY_VERSION.include?('2.5')
-  x.report('Yaso Service') { YasoCallablesService.call }
-  x.report('Interactor Service') { InteractorCallablesService.call }
-  x.report('ActiveInteraction Service') { ActiveInteractionCallablesService.run }
-  x.report('Trailblazer Service') { TrailblazerCallablesService.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.compare!
 end

data/lib/yaso/context.rb

@@ -3,6 +3,7 @@
 module Yaso
   class Context
     attr_writer :success
+    attr_reader :data
 
     def initialize(kwargs)
       @success = true
@@ -21,10 +22,6 @@ module Yaso
       @data.dup
     end
 
-    def to_h!
-      @data
-    end
-
     def success?
       @success
     end

data/lib/yaso/invokable.rb

@@ -10,9 +10,9 @@ module Yaso
       def call(object, options: {}, **)
         type = object_type(object)
         invokable = case type
-                    when YASO then ->(context, _) { object.call(context.clone).success? }
-                    when CALLABLE then ->(context, _, &block) { object.call(context, **options, &block) }
-                    else ->(context, instance, &block) { instance.send(object, context, **context.to_h!, &block) }
+                    when YASO then proc { |context, _| object.call(context.clone).success? }
+                    when CALLABLE then proc { |context, _, &block| object.call(context, **options, &block) }
+                    else method_invokable(object)
                     end
         [type, invokable]
       end
@@ -24,6 +24,14 @@ module Yaso
 
         object < ::Yaso::Service ? Invokable::YASO : Invokable::CALLABLE
       end
+
+      def method_invokable(object)
+        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)
+          }                                                     # }
+        RUBY
+      end
     end
   end
 end

data/lib/yaso/logic/step_builder.rb

@@ -37,11 +37,10 @@ module Yaso
       end
 
       def build_method(name, &block)
-        return name if @klass.method_defined?(name) || @klass.private_method_defined?(name)
+        return name if @klass.method_defined?(name)
         raise StepIsNotImplementedError.new(@klass, name) unless block
 
         @klass.define_method(name, &block)
-        @klass.instance_eval { private name }
       end
 
       def build_wrapper(&block)
@@ -53,10 +52,7 @@ module Yaso
 
       def build_wrapper_call(wrapper_class, service_class)
         wrapper_class.define_singleton_method(:call) do |context, instance|
-          unless @entry
-            @entry = Logic::Classic.call(service_class, steps)
-            clear_steps!
-          end
+          @entry ||= Logic::Classic.call(service_class, steps)
           step = @entry
           step = step.call(context, instance) while step
           context

data/lib/yaso/service.rb

@@ -6,10 +6,7 @@ module Yaso
 
     def self.call(context = {})
       context = context.is_a?(Context) ? context : Context.new(context)
-      unless @entry
-        @entry = Logic::Classic.call(self, steps)
-        clear_steps!
-      end
+      @entry ||= Logic::Classic.call(self, steps)
       step = @entry
       instance = new
       step = step.call(context, instance) while step

data/lib/yaso/stepable.rb

@@ -6,10 +6,6 @@ module Yaso
       @steps ||= []
     end
 
-    def clear_steps!
-      remove_instance_variable(:@steps)
-    end
-
     %i[step pass failure wrap switch].each do |category|
       define_method(category) do |object, options = {}, &block|
         raise InvalidFirstStepError, category if category == :failure && steps.empty?

data/lib/yaso/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaso
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Artem Shevchenko
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-20 00:00:00.000000000 Z
+date: 2022-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffaker