yaso 1.3.2 → 1.4.0

data/lib/yaso/{logic → flows}/classic.rb

@@ -1,7 +1,5 @@
-# frozen_string_literal: true
-
 module Yaso
-  module Logic
+  module Flows
     class Classic
       def self.call(klass, steps)
         new(klass, steps).call
@@ -14,7 +12,7 @@ module Yaso
       end
 
       def call
-        logicals.each_with_index { |step, i| step.is_a?(Failure) ? link_failure(step, i) : link_step(step, i) }
+        logicals.each_with_index { |step, i| step.is_a?(Steps::Failure) ? link_failure(step, i) : link_step(step, i) }
         logicals.first
       end
 
@@ -25,9 +23,9 @@ module Yaso
       end
 
       def link_step(step, index)
-        next_step = logicals[index.next..-1].detect { |next_node| !next_node.is_a?(Failure) }
+        next_step = logicals[index.next..].detect { |next_node| !next_node.is_a?(Steps::Failure) }
         step.add_next_step(step.on_success ? find_step(step.on_success) : next_step)
-        step.add_failure(next_step) if step.is_a?(Pass)
+        step.add_failure(next_step) if step.is_a?(Steps::Pass)
         step.add_failure(find_step(step.on_failure)) if step.on_failure
       end
 
@@ -39,8 +37,8 @@ module Yaso
 
       def link_previous_steps(failure, index)
         logicals[0...index].reverse_each do |previous_step|
-          previous_step.add_failure(failure) unless previous_step.on_failure || previous_step.is_a?(Pass)
-          next unless previous_step.is_a?(Failure)
+          previous_step.add_failure(failure) unless previous_step.on_failure || previous_step.is_a?(Steps::Pass)
+          next unless previous_step.is_a?(Steps::Failure)
 
           previous_step.add_next_step(failure) unless previous_step.on_success
           break

data/lib/yaso/{logic → flows}/rollback.rb

@@ -1,11 +1,9 @@
-# frozen_string_literal: true
-
 module Yaso
-  module Logic
+  module Flows
     class Rollback < Classic
       def call
         super
-        logicals.detect { |step| !step.is_a?(Failure) }
+        logicals.detect { |step| !step.is_a?(Steps::Failure) }
       end
 
       private
@@ -13,9 +11,9 @@ module Yaso
       def link_step(step, index)
         next_success = step.on_success ? find_step(step.on_success) : next_step(index)
         next_failure = if step.on_failure then find_step(step.on_failure)
-                       else
-                         step.is_a?(Pass) ? next_success : previous_failure(index)
-                       end
+        else
+          step.is_a?(Steps::Pass) ? next_success : previous_failure(index)
+        end
 
         step.add_next_step(next_success)
         step.add_failure(next_failure)
@@ -29,11 +27,11 @@ module Yaso
       end
 
       def next_step(index)
-        logicals[index.next..-1].detect { |next_node| !next_node.is_a?(Failure) }
+        logicals[index.next..].detect { |next_node| !next_node.is_a?(Steps::Failure) }
       end
 
       def previous_failure(index)
-        logicals[0...index].reverse_each.detect { |previous_step| previous_step.is_a?(Failure) }
+        logicals[0...index].reverse_each.detect { |previous_step| previous_step.is_a?(Steps::Failure) }
       end
     end
   end

data/lib/yaso/flows.rb

@@ -0,0 +1,11 @@
+require_relative "flows/classic"
+require_relative "flows/rollback"
+
+module Yaso
+  module Flows
+    MAP = {
+      classic: Classic,
+      rollback: Rollback
+    }
+  end
+end

data/lib/yaso/invocable.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Yaso
   class Invocable
     METHOD = :method
@@ -10,10 +8,10 @@ module Yaso
       def call(object, options: {}, with_block: false, **)
         type = object_type(object)
         invocable = case type
-                    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
+        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
 
@@ -22,7 +20,7 @@ module Yaso
       def object_type(object)
         return Invocable::METHOD unless object.is_a?(Class)
 
-        object < ::Yaso::Service ? Invocable::YASO : Invocable::CALLABLE
+        (object < ::Yaso::Service) ? Invocable::YASO : Invocable::CALLABLE
       end
 
       def callable_invocable(object, options, with_block:)
@@ -32,14 +30,18 @@ module Yaso
       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
+        with_block ? method_invocable_with_block(object) : method_invocable_without_block(object)
+      end
+
+      def method_invocable_with_block(object)
+        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
 
+      def method_invocable_without_block(object)
         instance_eval <<-RUBY, __FILE__, __LINE__ + 1
           proc { |context, instance|               # proc { |context, instance|
             instance.#{object}(context, **context) #   instance.<method_name>(context, **context)

data/lib/yaso/service.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Yaso
   class Service
     extend Stepable
@@ -45,10 +43,10 @@ module Yaso
       end
 
       def flow(name = nil)
-        @flow ||= Logic::FLOWS[:classic] if self == Yaso::Service
+        @flow ||= Flows::MAP[:classic] if self == Yaso::Service
         return @flow || Yaso::Service.flow if name.nil?
 
-        @flow = Logic::FLOWS[name] || raise(UnknownFlowError.new(self, name))
+        @flow = Flows::MAP[name] || raise(UnknownFlowError.new(self, name))
       end
     end
   end

data/lib/yaso/step_builder.rb

@@ -0,0 +1,63 @@
+module Yaso
+  class StepBuilder
+    CATEGORIES = {
+      step: Steps::Step,
+      pass: Steps::Pass,
+      failure: Steps::Failure,
+      wrap: Steps::Wrap,
+      switch: Steps::Switch
+    }.freeze
+
+    def initialize(klass)
+      @klass = klass
+    end
+
+    def call(object:, category:, block:, **opts)
+      logic_class = CATEGORIES[category]
+      invocable_type, invocable = Invocable.call(object, with_block: logic_class == Steps::Wrap, **opts)
+      if invocable_type == Invocable::METHOD
+        opts[:name] = if logic_class == Steps::Switch
+          build_switch(object, **opts, &block)
+        else
+          build_method(object, &block)
+        end
+      end
+      opts[:wrapper] = build_wrapper(&block) if logic_class == Steps::Wrap
+      logic_class.new(invocable: invocable, **opts)
+    end
+
+    private
+
+    def build_switch(object, options:, **, &block)
+      if block.nil?
+        key = options[:key]
+        cases = options[:cases]
+        block = ->(ctx, **) { cases[ctx[key]] }
+      end
+      build_method(object, &block)
+    end
+
+    def build_method(name, &block)
+      return name if @klass.method_defined?(name)
+      raise StepIsNotImplementedError.new(@klass, name) unless block
+
+      @klass.define_method(name, &block)
+    end
+
+    def build_wrapper(&block)
+      wrapper_class = Class.new { extend Stepable }
+      build_wrapper_methods(wrapper_class, @klass)
+      wrapper_class.instance_exec(&block)
+      wrapper_class
+    end
+
+    def build_wrapper_methods(wrapper_class, service_class)
+      wrapper_class.define_singleton_method(:call) do |context, instance|
+        @entry ||= service_class.flow.call(service_class, steps)
+        step = @entry
+        step = step.call(context, instance) while step
+        instance
+      end
+    end
+  end
+end

data/lib/yaso/stepable.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Yaso
   module Stepable
     def steps
@@ -16,7 +14,7 @@ module Yaso
     end
 
     def failure(object, **options, &block)
-      raise InvalidFirstStepError, :failure if flow == Logic::Classic && steps.empty?
+      raise InvalidFirstStepError, :failure if flow == Flows::Classic && steps.empty?
 
       steps << {
         object: object, category: :failure, fast: options.delete(:fast), on_success: options.delete(:on_success),

data/lib/yaso/{logic → steps}/base.rb

@@ -1,7 +1,5 @@
-# frozen_string_literal: true
-
 module Yaso
-  module Logic
+  module Steps
     class Base
       attr_reader :name, :on_success, :on_failure
 

data/lib/yaso/{logic → steps}/failure.rb

@@ -1,7 +1,5 @@
-# frozen_string_literal: true
-
 module Yaso
-  module Logic
+  module Steps
     class Failure < Base
       def call(context, instance)
         instance.success = false

data/lib/yaso/{logic → steps}/pass.rb

@@ -1,7 +1,5 @@
-# frozen_string_literal: true
-
 module Yaso
-  module Logic
+  module Steps
     class Pass < Base
       def call(context, instance)
         instance.success = true

data/lib/yaso/{logic → steps}/step.rb

@@ -1,7 +1,5 @@
-# frozen_string_literal: true
-
 module Yaso
-  module Logic
+  module Steps
     class Step < Base
       def call(context, instance)
         instance.success = true

data/lib/yaso/{logic → steps}/switch.rb

@@ -1,7 +1,5 @@
-# frozen_string_literal: true
-
 module Yaso
-  module Logic
+  module Steps
     class Switch < Base
       def call(context, instance)
         instance.success = true

data/lib/yaso/{logic → steps}/wrap.rb

@@ -1,7 +1,5 @@
-# frozen_string_literal: true
-
 module Yaso
-  module Logic
+  module Steps
     class Wrap < Base
       def initialize(wrapper:, **options)
         super(**options)

data/lib/yaso/steps.rb

@@ -0,0 +1,11 @@
+require_relative "steps/base"
+require_relative "steps/step"
+require_relative "steps/pass"
+require_relative "steps/failure"
+require_relative "steps/wrap"
+require_relative "steps/switch"
+
+module Yaso
+  module Steps
+  end
+end

data/lib/yaso/version.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Yaso
-  VERSION = '1.3.2'
+  VERSION = "1.4.0"
 end

data/lib/yaso.rb

@@ -1,10 +1,10 @@
-# frozen_string_literal: true
-
-require_relative 'yaso/version'
-require_relative 'yaso/errors'
-require_relative 'yaso/invocable'
-require_relative 'yaso/stepable'
-require_relative 'yaso/logic'
-require_relative 'yaso/service'
+require_relative "yaso/version"
+require_relative "yaso/errors"
+require_relative "yaso/invocable"
+require_relative "yaso/stepable"
+require_relative "yaso/steps"
+require_relative "yaso/step_builder"
+require_relative "yaso/flows"
+require_relative "yaso/service"
 
 module Yaso; end

metadata

@@ -1,179 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaso
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
-- Artem Shevchenko
-autorequire:
+- ar2em1s
 bindir: bin
 cert_chain: []
-date: 2023-04-06 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: ffaker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.21.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.21.0
-- !ruby/object:Gem::Dependency
-  name: lefthook
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.5
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.14.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.14.1
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 13.0.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 13.0.6
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.11.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.11.0
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.29.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.28.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.29.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.28.2
-- !ruby/object:Gem::Dependency
-  name: rubocop-ast
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.18.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.17.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.18.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.17.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.14.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.13.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.14.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.13.3
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.11.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.10.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.11.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.10.0
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.21.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.21.2
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies: []
 description: One more Service Object pattern implementation
 email:
 - artemsheva0510@gmail.com
@@ -185,12 +20,14 @@ files:
 - ".rubocop.yml"
 - ".ruby-version"
 - ".simplecov"
+- ".tool-versions"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - benchmark/Gemfile
+- benchmark/gemfiles/ruby_2/Gemfile
+- benchmark/gemfiles/ruby_3/Gemfile
 - benchmark/index.rb
 - benchmark/shared/active_interaction_service.rb
 - benchmark/shared/callable_step.rb
@@ -198,6 +35,7 @@ files:
 - benchmark/shared/interactor_service.rb
 - benchmark/shared/pure_service.rb
 - benchmark/shared/simple_command_service.rb
+- benchmark/shared/simple_logic_step_service.rb
 - benchmark/shared/trailblazer_service.rb
 - benchmark/shared/yaso_service.rb
 - benchmark/step/active_interaction.rb
@@ -207,36 +45,40 @@ files:
 - benchmark/step/interactor.rb
 - benchmark/step/pure.rb
 - benchmark/step/simple_command.rb
+- benchmark/step/simple_logic_step.rb
 - benchmark/step/trailblazer.rb
 - benchmark/step/yaso.rb
 - docker-compose.yml
 - docker/Dockerfile
 - docker/entrypoint.sh
+- gemfiles/ruby_2/Gemfile
+- gemfiles/ruby_3/Gemfile
+- gemfiles/ruby_3_0/Gemfile
 - lefthook.yml
 - lib/yaso.rb
 - lib/yaso/errors.rb
+- lib/yaso/flows.rb
+- lib/yaso/flows/classic.rb
+- lib/yaso/flows/rollback.rb
 - lib/yaso/invocable.rb
-- lib/yaso/logic.rb
-- lib/yaso/logic/base.rb
-- lib/yaso/logic/classic.rb
-- lib/yaso/logic/failure.rb
-- lib/yaso/logic/pass.rb
-- lib/yaso/logic/rollback.rb
-- lib/yaso/logic/step.rb
-- lib/yaso/logic/step_builder.rb
-- lib/yaso/logic/switch.rb
-- lib/yaso/logic/wrap.rb
 - lib/yaso/service.rb
+- lib/yaso/step_builder.rb
 - lib/yaso/stepable.rb
+- lib/yaso/steps.rb
+- lib/yaso/steps/base.rb
+- lib/yaso/steps/failure.rb
+- lib/yaso/steps/pass.rb
+- lib/yaso/steps/step.rb
+- lib/yaso/steps/switch.rb
+- lib/yaso/steps/wrap.rb
 - lib/yaso/version.rb
-homepage: https://github.com/Ar2emis/yaso
+homepage: https://github.com/ar2em1s/yaso
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/Ar2emis/yaso
-  source_code_uri: https://github.com/Ar2emis/yaso
+  homepage_uri: https://github.com/ar2em1s/yaso
+  source_code_uri: https://github.com/ar2em1s/yaso
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -244,15 +86,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Yet Another Service Object
 test_files: []