servactory 1.8.2 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a87d01c5389b8d6d538b2cd1befe0cd8fa51b0ea578eefb8c0c0b457957fa75
-  data.tar.gz: 4ff7989cf58492790ad7cfef807cd2a2f6befacefa9407a4fb04e3b4567e2d6f
+  metadata.gz: 0b5fa4f5c8c0a4ee8dfff54269c90deb49615e0395790a776b3c0b7dc7cced9e
+  data.tar.gz: 9cbbb49123e91308390b90b9e0ba3d49a7921ea9340bb4ac6383403420b97c3f
 SHA512:
-  metadata.gz: 2b880c2475447311de03023601adc91597b38ecd083d5e108e4df8869dd65137d2a4001066142234c609c69aecf279d211be2258f806d662fc43893e97fea978
-  data.tar.gz: 8efc74ceb569789340dad5b3e1d54cc996528fda101f6bbf9719b9c8f55fc70baf5674659116d27312cc271ec9a7e0764f4de4c9e8a26d674377c157cc1a3330
+  metadata.gz: e16ac59db1d6402d2c44fca9539eadf336c31ad8c29381c2482db52573f0e0864a1bfd9f920daab6f6e5668a886cf4615cf7803fc76d864972f49f21cb7333b9
+  data.tar.gz: b9321f6a95199ba298e644ad42cb8c4b54c3aebb16fe1472367428c45263c7845b7689c2031512a96425dcefaa80885ef2de65523b9557d4fe3723538bedfbc8

data/lib/servactory/context/callable.rb

@@ -3,64 +3,26 @@
 module Servactory
   module Context
     module Callable
-      def call!(arguments = {}) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-        @context_store = Store.new(self)
-
-        assign_data_with(arguments)
-
-        inputs_workbench.find_unnecessary!
-        inputs_workbench.check_rules!
-        outputs_workbench.find_conflicts_in!(
-          collection_of_internals: collection_of_internals
+      def call!(arguments = {})
+        context = send(:new)
+
+        context.send(
+          :_call!,
+          incoming_arguments: arguments,
+          collection_of_inputs: collection_of_inputs,
+          collection_of_internals: collection_of_internals,
+          collection_of_outputs: collection_of_outputs,
+          collection_of_stages: collection_of_stages
         )
 
-        inputs_workbench.validate!
-
-        methods_workbench.run!
-
-        Servactory::Result.success_for(
-          context: context_store.context,
-          collection_of_outputs: collection_of_outputs
-        )
+        Servactory::Result.success_for(context: context)
       end
 
-      def call(arguments = {}) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-        @context_store = Store.new(self)
-
-        assign_data_with(arguments)
-
-        inputs_workbench.find_unnecessary!
-        inputs_workbench.check_rules!
-        outputs_workbench.find_conflicts_in!(
-          collection_of_internals: collection_of_internals
-        )
-
-        inputs_workbench.validate!
-
-        methods_workbench.run!
-
-        Servactory::Result.success_for(
-          context: context_store.context,
-          collection_of_outputs: collection_of_outputs
-        )
+      def call(arguments = {})
+        call!(arguments)
       rescue Servactory.configuration.failure_class => e
         Servactory::Result.failure_for(exception: e)
       end
-
-      private
-
-      attr_reader :context_store
-
-      def assign_data_with(arguments)
-        inputs_workbench.assign(
-          context: context_store.context,
-          arguments: arguments
-        )
-
-        internals_workbench.assign(context: context_store.context)
-        outputs_workbench.assign(context: context_store.context)
-        methods_workbench.assign(context: context_store.context)
-      end
     end
   end
 end

data/lib/servactory/context/dsl.rb

@@ -5,7 +5,7 @@ module Servactory
     module DSL
       def self.included(base)
         base.extend(Callable)
-        base.prepend(Workspace)
+        base.include(Workspace)
       end
     end
   end

data/lib/servactory/context/workspace/inputs.rb

@@ -3,18 +3,11 @@
 module Servactory
   module Context
     module Workspace
-      # class Inputs
-      #   def initialize(**)
-      #     # NOTE: Look at the file `lib/servactory/inputs/tools/prepare.rb`
-      #   end
-      # end
-
       class Inputs
-        def initialize(context, workbench:)
+        def initialize(context:, incoming_arguments:, collection_of_inputs:)
           @context = context
-
-          @collection_of_inputs = workbench.collection
-          @incoming_arguments = workbench.incoming_arguments
+          @incoming_arguments = incoming_arguments
+          @collection_of_inputs = collection_of_inputs
         end
 
         def method_missing(name, *args, &block)

data/lib/servactory/context/workspace/internals.rb

@@ -4,9 +4,9 @@ module Servactory
   module Context
     module Workspace
       class Internals
-        def initialize(context, workbench:)
+        def initialize(context:, collection_of_internals:)
           @context = context
-          @collection_of_internals = workbench.collection
+          @collection_of_internals = collection_of_internals
         end
 
         def method_missing(name, *args, &block)
@@ -38,7 +38,7 @@ module Servactory
             value: value
           )
 
-          @context.instance_variable_set(:"@#{internal.name}", value)
+          @context.send(:assign_internal, internal.name, value)
         end
 
         def getter_with(name:, &block) # rubocop:disable Lint/UnusedMethodArgument
@@ -46,7 +46,7 @@ module Servactory
 
           return yield if internal.nil?
 
-          @context.instance_variable_get(:"@#{internal.name}")
+          @context.send(:fetch_internal, internal.name)
         end
       end
     end

data/lib/servactory/context/workspace/outputs.rb

@@ -4,9 +4,9 @@ module Servactory
   module Context
     module Workspace
       class Outputs
-        def initialize(context, workbench:)
+        def initialize(context:, collection_of_outputs:)
           @context = context
-          @collection_of_outputs = workbench.collection
+          @collection_of_outputs = collection_of_outputs
         end
 
         def method_missing(name, *args, &block)
@@ -38,7 +38,7 @@ module Servactory
             value: value
           )
 
-          @context.instance_variable_set(:"@#{output.name}", value)
+          @context.send(:assign_output, output.name, value)
         end
 
         def getter_with(name:, &block) # rubocop:disable Lint/UnusedMethodArgument
@@ -46,7 +46,7 @@ module Servactory
 
           return yield if output.nil?
 
-          @context.instance_variable_get(:"@#{output.name}")
+          @context.send(:fetch_output, output.name)
         end
       end
     end

data/lib/servactory/context/workspace.rb

@@ -4,22 +4,30 @@ module Servactory
   module Context
     module Workspace
       def inputs
-        @inputs ||= Inputs.new(self, workbench: self.class.send(:inputs_workbench))
+        @inputs ||= Inputs.new(
+          context: self,
+          incoming_arguments: incoming_arguments,
+          collection_of_inputs: collection_of_inputs
+        )
       end
       alias inp inputs
 
       def internals
-        @internals ||= Internals.new(self, workbench: self.class.send(:internals_workbench))
+        @internals ||= Internals.new(
+          context: self,
+          collection_of_internals: collection_of_internals
+        )
       end
       alias int internals
 
       def outputs
-        @outputs ||= Outputs.new(self, workbench: self.class.send(:outputs_workbench))
+        @outputs ||= Outputs.new(
+          context: self,
+          collection_of_outputs: collection_of_outputs
+        )
       end
       alias out outputs
 
-      protected
-
       def fail_input!(input_name, message:)
         raise Servactory.configuration.input_error_class.new(
           input_name: input_name,
@@ -30,6 +38,62 @@ module Servactory
       def fail!(message:, meta: nil)
         raise Servactory.configuration.failure_class.new(message: message, meta: meta)
       end
+
+      private
+
+      attr_reader :incoming_arguments,
+                  :collection_of_inputs,
+                  :collection_of_internals,
+                  :collection_of_outputs
+
+      def _call!(
+        incoming_arguments:,
+        collection_of_inputs:,
+        collection_of_internals:,
+        collection_of_outputs:,
+        collection_of_stages:
+      )
+        call!(
+          incoming_arguments: incoming_arguments,
+          collection_of_inputs: collection_of_inputs,
+          collection_of_internals: collection_of_internals,
+          collection_of_outputs: collection_of_outputs,
+          collection_of_stages: collection_of_stages
+        )
+      end
+
+      def call!(
+        incoming_arguments:,
+        collection_of_inputs:,
+        collection_of_internals:,
+        collection_of_outputs:,
+        **
+      )
+        @incoming_arguments = incoming_arguments
+        @collection_of_inputs = collection_of_inputs
+        @collection_of_internals = collection_of_internals
+        @collection_of_outputs = collection_of_outputs
+      end
+
+      def service_storage
+        @service_storage ||= { internals: {}, outputs: {} }
+      end
+
+      def assign_internal(key, value)
+        service_storage[:internals].merge!({ key => value })
+      end
+
+      def fetch_internal(key)
+        service_storage.fetch(:internals).fetch(key)
+      end
+
+      def assign_output(key, value)
+        service_storage[:outputs].merge!({ key => value })
+      end
+
+      def fetch_output(key)
+        service_storage.fetch(:outputs).fetch(key)
+      end
     end
   end
 end

data/lib/servactory/inputs/dsl.rb

@@ -5,6 +5,7 @@ module Servactory
     module DSL
       def self.included(base)
         base.extend(ClassMethods)
+        base.include(Workspace)
       end
 
       module ClassMethods
@@ -27,10 +28,6 @@ module Servactory
         def collection_of_inputs
           @collection_of_inputs ||= Collection.new
         end
-
-        def inputs_workbench
-          @inputs_workbench ||= Workbench.work_with(collection_of_inputs)
-        end
       end
     end
   end

data/lib/servactory/inputs/workspace.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Inputs
+    module Workspace
+      def call!(incoming_arguments:, collection_of_inputs:, **)
+        super
+
+        Tools::FindUnnecessary.validate!(self, incoming_arguments, collection_of_inputs)
+        Tools::Rules.validate!(self, collection_of_inputs)
+        Servactory::Inputs::Tools::Validation.validate!(self, incoming_arguments, collection_of_inputs)
+      end
+    end
+  end
+end

data/lib/servactory/internals/dsl.rb

@@ -23,10 +23,6 @@ module Servactory
         def collection_of_internals
           @collection_of_internals ||= Collection.new
         end
-
-        def internals_workbench
-          @internals_workbench ||= Workbench.work_with(collection_of_internals)
-        end
       end
     end
   end

data/lib/servactory/methods/dsl.rb

@@ -5,6 +5,7 @@ module Servactory
     module DSL
       def self.included(base)
         base.extend(ClassMethods)
+        base.include(Workspace)
       end
 
       module ClassMethods
@@ -47,15 +48,15 @@ module Servactory
         def make(name, position: nil, **options)
           position = position.presence || next_position
 
-          @current_stage = @current_stage.presence || Stage.new(position: position)
+          current_stage = @current_stage.presence || Stage.new(position: position)
 
-          @current_stage.methods << Method.new(
+          current_stage.methods << Method.new(
             name,
             position: position,
             **options
           )
 
-          collection_of_stages << @current_stage
+          collection_of_stages << current_stage
         end
 
         def method_missing(name, *args, &block)
@@ -100,10 +101,6 @@ module Servactory
         def collection_of_stages
           @collection_of_stages ||= StageCollection.new
         end
-
-        def methods_workbench
-          @methods_workbench ||= Workbench.work_with(collection_of_stages)
-        end
       end
     end
   end

data/lib/servactory/methods/tools/runner.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Methods
+    module Tools
+      class Runner
+        def self.run!(...)
+          new(...).run!
+        end
+
+        def initialize(context, collection_of_stages)
+          @context = context
+          @collection_of_stages = collection_of_stages
+        end
+
+        def run!
+          return try_to_use_call if @collection_of_stages.empty?
+
+          @collection_of_stages.sorted_by_position.each do |stage|
+            call_stage(stage)
+          end
+        end
+
+        private
+
+        def try_to_use_call
+          @context.try(:send, :call)
+        end
+
+        def call_stage(stage)
+          return if unnecessary_for_stage?(stage)
+
+          wrapper = stage.wrapper
+          rollback = stage.rollback
+          methods = stage.methods.sorted_by_position
+
+          if wrapper.is_a?(Proc)
+            call_wrapper_with_methods(wrapper, rollback, methods)
+          else
+            call_methods(methods)
+          end
+        end
+
+        def call_wrapper_with_methods(wrapper, rollback, methods)
+          wrapper.call(methods: -> { call_methods(methods) })
+        rescue StandardError => e
+          @context.send(rollback, e) if rollback.present?
+        end
+
+        def call_methods(methods)
+          methods.each do |method|
+            next if unnecessary_for_make?(method)
+
+            @context.send(method.name)
+          end
+        end
+
+        def unnecessary_for_stage?(stage)
+          condition = stage.condition
+          # is_condition_opposite = stage.is_condition_opposite
+
+          result = prepare_condition_for(condition) # rubocop:disable Style/RedundantAssignment
+
+          # is_condition_opposite ? !result : result
+          result
+        end
+
+        def unnecessary_for_make?(make_method)
+          condition = make_method.condition
+          is_condition_opposite = make_method.is_condition_opposite
+
+          result = prepare_condition_for(condition)
+
+          is_condition_opposite ? !result : result
+        end
+
+        def prepare_condition_for(condition)
+          return false if condition.nil?
+          return !Servactory::Utils.true?(condition) unless condition.is_a?(Proc)
+
+          !condition.call(context: @context)
+        end
+      end
+    end
+  end
+end

data/lib/servactory/methods/workspace.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Methods
+    module Workspace
+      def call!(collection_of_stages:, **)
+        super
+
+        Servactory::Methods::Tools::Runner.run!(self, collection_of_stages)
+      end
+    end
+  end
+end

data/lib/servactory/outputs/dsl.rb

@@ -5,6 +5,7 @@ module Servactory
     module DSL
       def self.included(base)
         base.extend(ClassMethods)
+        base.include(Workspace)
       end
 
       module ClassMethods
@@ -23,10 +24,6 @@ module Servactory
         def collection_of_outputs
           @collection_of_outputs ||= Collection.new
         end
-
-        def outputs_workbench
-          @outputs_workbench ||= Workbench.work_with(collection_of_outputs)
-        end
       end
     end
   end

data/lib/servactory/outputs/workspace.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Outputs
+    module Workspace
+      def call!(collection_of_internals:, collection_of_outputs:, **)
+        super
+
+        Tools::Conflicts.validate!(self, collection_of_outputs, collection_of_internals)
+      end
+    end
+  end
+end

data/lib/servactory/result.rb

@@ -10,24 +10,11 @@ module Servactory
       new(...).send(:as_failure)
     end
 
-    def initialize(context: nil, collection_of_outputs: nil, exception: nil)
+    def initialize(context: nil, exception: nil)
       @context = context
-      @collection_of_outputs = collection_of_outputs
       @exception = exception
     end
 
-    def method_missing(name, *args, &block)
-      output = @collection_of_outputs&.find_by(name: name)
-
-      return super if output.nil?
-
-      output_value_for(output)
-    end
-
-    def respond_to_missing?(name, *)
-      @collection_of_outputs&.names&.include?(name) || super
-    end
-
     def inspect
       "#<#{self.class.name} #{draw_result}>"
     end
@@ -38,6 +25,10 @@ module Servactory
       define_singleton_method(:success?) { true }
       define_singleton_method(:failure?) { false }
 
+      @context.send(:service_storage).fetch(:outputs).each_pair do |key, value|
+        define_singleton_method(key) { value }
+      end
+
       self
     end
 
@@ -51,13 +42,9 @@ module Servactory
     end
 
     def draw_result
-      @collection_of_outputs&.map do |output|
-        "@#{output.name}=#{output_value_for(output).inspect}"
-      end&.join(", ")
-    end
-
-    def output_value_for(output)
-      @context.instance_variable_get(:"@#{output.name}")
+      methods(false).sort.map do |method_name|
+        "@#{method_name}=#{send(method_name)}"
+      end.join(", ")
     end
   end
 end

data/lib/servactory/version.rb

@@ -4,7 +4,7 @@ module Servactory
   module VERSION
     MAJOR = 1
     MINOR = 8
-    PATCH = 2
+    PATCH = 3
 
     STRING = [MAJOR, MINOR, PATCH].join(".")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
 platform: ruby
 authors:
 - Anton Sokolov
@@ -195,7 +195,6 @@ files:
 - lib/servactory/configuration/setup.rb
 - lib/servactory/context/callable.rb
 - lib/servactory/context/dsl.rb
-- lib/servactory/context/store.rb
 - lib/servactory/context/workspace.rb
 - lib/servactory/context/workspace/inputs.rb
 - lib/servactory/context/workspace/internals.rb
@@ -227,13 +226,12 @@ files:
 - lib/servactory/inputs/validations/must.rb
 - lib/servactory/inputs/validations/required.rb
 - lib/servactory/inputs/validations/type.rb
-- lib/servactory/inputs/workbench.rb
+- lib/servactory/inputs/workspace.rb
 - lib/servactory/internals/collection.rb
 - lib/servactory/internals/dsl.rb
 - lib/servactory/internals/internal.rb
 - lib/servactory/internals/validations/base.rb
 - lib/servactory/internals/validations/type.rb
-- lib/servactory/internals/workbench.rb
 - lib/servactory/methods/aliases_for_make/collection.rb
 - lib/servactory/methods/dsl.rb
 - lib/servactory/methods/method.rb
@@ -241,14 +239,15 @@ files:
 - lib/servactory/methods/shortcuts_for_make/collection.rb
 - lib/servactory/methods/stage.rb
 - lib/servactory/methods/stage_collection.rb
-- lib/servactory/methods/workbench.rb
+- lib/servactory/methods/tools/runner.rb
+- lib/servactory/methods/workspace.rb
 - lib/servactory/outputs/collection.rb
 - lib/servactory/outputs/dsl.rb
 - lib/servactory/outputs/output.rb
 - lib/servactory/outputs/tools/conflicts.rb
 - lib/servactory/outputs/validations/base.rb
 - lib/servactory/outputs/validations/type.rb
-- lib/servactory/outputs/workbench.rb
+- lib/servactory/outputs/workspace.rb
 - lib/servactory/result.rb
 - lib/servactory/test_kit/fake_type.rb
 - lib/servactory/test_kit/result.rb

data/lib/servactory/context/store.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Context
-    class Store
-      attr_reader :context
-
-      def initialize(service_class)
-        @context = service_class.send(:new)
-      end
-    end
-  end
-end

data/lib/servactory/inputs/workbench.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Inputs
-    class Workbench
-      attr_reader :collection,
-                  :incoming_arguments
-
-      def self.work_with(...)
-        new(...)
-      end
-
-      def initialize(collection)
-        @collection = collection
-      end
-
-      def assign(context:, arguments:)
-        @context = context
-        @incoming_arguments = arguments
-      end
-
-      def find_unnecessary!
-        Tools::FindUnnecessary.validate!(context, @incoming_arguments, collection)
-      end
-
-      def check_rules!
-        Tools::Rules.validate!(context, collection)
-      end
-
-      def validate!
-        Tools::Validation.validate!(context, @incoming_arguments, collection)
-      end
-
-      private
-
-      attr_reader :context
-    end
-  end
-end

data/lib/servactory/internals/workbench.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Internals
-    class Workbench
-      attr_reader :collection
-
-      def self.work_with(...)
-        new(...)
-      end
-
-      def initialize(collection)
-        @collection = collection
-      end
-
-      def assign(context:)
-        @context = context
-      end
-
-      private
-
-      attr_reader :context
-    end
-  end
-end

data/lib/servactory/methods/workbench.rb

@@ -1,90 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Methods
-    class Workbench
-      def self.work_with(...)
-        new(...)
-      end
-
-      def initialize(collection_of_stages)
-        @collection_of_stages = collection_of_stages
-      end
-
-      def assign(context:)
-        @context = context
-      end
-
-      def run!
-        return try_to_use_call if collection_of_stages.empty?
-
-        collection_of_stages.sorted_by_position.each do |stage|
-          call_stage(stage)
-        end
-      end
-
-      private
-
-      attr_reader :context,
-                  :collection_of_stages
-
-      def try_to_use_call
-        context.try(:send, :call)
-      end
-
-      def call_stage(stage)
-        return if unnecessary_for_stage?(stage)
-
-        wrapper = stage.wrapper
-        rollback = stage.rollback
-        methods = stage.methods.sorted_by_position
-
-        if wrapper.is_a?(Proc)
-          call_wrapper_with_methods(wrapper, rollback, methods)
-        else
-          call_methods(methods)
-        end
-      end
-
-      def call_wrapper_with_methods(wrapper, rollback, methods)
-        wrapper.call(methods: -> { call_methods(methods) })
-      rescue StandardError => e
-        context.send(rollback, e) if rollback.present?
-      end
-
-      def call_methods(methods)
-        methods.each do |make_method|
-          next if unnecessary_for_make?(make_method)
-
-          context.send(make_method.name)
-        end
-      end
-
-      def unnecessary_for_stage?(stage)
-        condition = stage.condition
-        # is_condition_opposite = stage.is_condition_opposite
-
-        result = prepare_condition_for(condition) # rubocop:disable Style/RedundantAssignment
-
-        # is_condition_opposite ? !result : result
-        result
-      end
-
-      def unnecessary_for_make?(make_method)
-        condition = make_method.condition
-        is_condition_opposite = make_method.is_condition_opposite
-
-        result = prepare_condition_for(condition)
-
-        is_condition_opposite ? !result : result
-      end
-
-      def prepare_condition_for(condition)
-        return false if condition.nil?
-        return !Servactory::Utils.true?(condition) unless condition.is_a?(Proc)
-
-        !condition.call(context: context)
-      end
-    end
-  end
-end

data/lib/servactory/outputs/workbench.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Outputs
-    class Workbench
-      attr_reader :collection
-
-      def self.work_with(...)
-        new(...)
-      end
-
-      def initialize(collection)
-        @collection = collection
-      end
-
-      def assign(context:)
-        @context = context
-      end
-
-      def find_conflicts_in!(collection_of_internals:)
-        Tools::Conflicts.validate!(context, collection, collection_of_internals)
-      end
-
-      private
-
-      attr_reader :context
-    end
-  end
-end