servactory 2.10.0 → 2.12.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a2fbc5b445408bf8ff257cb28100af77be2fc232fd6dc267ab876fd0cc6544e
-  data.tar.gz: ecfcab785c9322110e0d463c8934e26927c681e1e1005123303a2df7e0d7f941
+  metadata.gz: 42d8f2391ba24198b46219e80408d7bf1d304faca0dfd5a99e89ac841d246fe4
+  data.tar.gz: 93748b84e352a85641a18e2f50f7fbc1668c7d037a613b95f8ed47fe02fce079
 SHA512:
-  metadata.gz: bf777f5c7a876a61d74f656e78c013d8a6b3477c86b51e4fa45d31776a23d63a02c2b5930ef65b30c6cd8f59e8bcd46988b27d43597af255315b5feb126ef92b
-  data.tar.gz: eda54241a6625164bcb6407ec3605840edd6dd06905e7679277e617c2b46b29ed084d9445f3cf9ed84a60ab3a2e8552f8cfd93f5f9ec591a87e783f0b7f28da2
+  metadata.gz: 45895d6e4182f0ccdb4fd0c37e030232d809d8fb14d6117f793c5abac5292ceb172d5cd1aeb1fc48cb3cbda70e0ce4ba08a8752744f4776f431136b2c7b1dc8e
+  data.tar.gz: 97e972f65d377eec5eb1224d54c440e7cca90c66a32fd2fd398e87c482f355110fbc39453cfdca799b45e59af259bf5e393c039181e23f59ecb41bbfe5d478aa

data/lib/servactory/context/callable.rb

@@ -28,8 +28,6 @@ module Servactory
       private
 
       def _call!(context, incoming_arguments)
-        incoming_arguments = Servactory::Utils.adapt(incoming_arguments)
-
         context.send(
           :_call!,
           incoming_arguments:,

data/lib/servactory/context/warehouse/base.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Context
+    module Warehouse
+      class Base
+        def initialize(arguments = {})
+          @arguments = arguments
+        end
+
+        # def fetch!(name)
+        #   @arguments.fetch(name)
+        # end
+
+        def fetch(name, default_value)
+          @arguments.fetch(name, default_value)
+        end
+
+        def assign(key, value)
+          @arguments[key] = value
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Context
+    module Warehouse
+      class Inputs < Base
+        def initialize(context, arguments = {})
+          @context = context
+
+          super(arguments)
+        end
+
+        def names
+          @arguments.keys
+        end
+
+        def merge!(arguments)
+          @arguments.merge!(arguments)
+        end
+
+        ##########################################################################
+
+        def method_missing(name, *_args)
+          input_name = @context.class.config.predicate_methods_enabled? ? name.to_s.chomp("?").to_sym : name
+
+          input_value = @arguments.fetch(input_name) { raise_error_for(input_name) }
+
+          if name.to_s.end_with?("?") && @context.class.config.predicate_methods_enabled?
+            Servactory::Utils.query_attribute(input_value)
+          else
+            input_value
+          end
+        end
+
+        def respond_to_missing?(name, *)
+          @arguments.fetch(name) { raise_error_for(name) }
+        end
+
+        ##########################################################################
+
+        def raise_error_for(input_name)
+          message_text = @context.send(:servactory_service_info).translate(
+            "inputs.undefined.for_fetch",
+            input_name:
+          )
+
+          raise @context.class.config.input_exception_class.new(
+            context: @context,
+            message: message_text,
+            input_name:
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Context
+    module Warehouse
+      class Internals < Base
+      end
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Context
+    module Warehouse
+      class Outputs < Base
+        extend Forwardable
+        def_delegators :@arguments, :each_pair
+      end
+    end
+  end
+end

data/lib/servactory/context/warehouse/setup.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Context
+    module Warehouse
+      class Setup
+        def initialize(context)
+          @context = context
+        end
+
+        def assign_inputs(arguments)
+          context_data[:inputs].merge!(arguments)
+        end
+
+        def fetch_input(name)
+          inputs.fetch(name, nil)
+        end
+
+        def assign_internal(name, value)
+          assign_attribute(:internals, name, value)
+        end
+
+        def fetch_internal(name)
+          internals.fetch(name, nil)
+        end
+
+        def assign_output(name, value)
+          assign_attribute(:outputs, name, value)
+        end
+
+        def fetch_output(name)
+          outputs.fetch(name, nil)
+        end
+
+        def inputs
+          @inputs ||= context_data.fetch(:inputs)
+        end
+
+        def internals
+          @internals ||= context_data.fetch(:internals)
+        end
+
+        def outputs
+          @outputs ||= context_data.fetch(:outputs)
+        end
+
+        private
+
+        def assign_attribute(section, name, value)
+          context_data[section].assign(name, value)
+        end
+
+        def context_data
+          @context_data ||= state.fetch(context_id)
+        end
+
+        def state
+          {
+            context_id => {
+              inputs: Servactory::Context::Warehouse::Inputs.new(@context),
+              internals: Servactory::Context::Warehouse::Internals.new,
+              outputs: Servactory::Context::Warehouse::Outputs.new
+            }
+          }
+        end
+
+        def context_id
+          @context_id ||= "context_#{@context.object_id}"
+        end
+      end
+    end
+  end
+end

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

@@ -7,9 +7,8 @@ module Servactory
         RESERVED_ATTRIBUTES = %i[type required default].freeze
         private_constant :RESERVED_ATTRIBUTES
 
-        def initialize(context:, incoming_arguments:, collection_of_inputs:)
+        def initialize(context:, collection_of_inputs:)
           @context = context
-          @incoming_arguments = incoming_arguments
           @collection_of_inputs = collection_of_inputs
         end
 
@@ -41,7 +40,7 @@ module Servactory
 
         private
 
-        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize,  Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Lint/UnusedMethodArgument
+        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Lint/UnusedMethodArgument
         def fetch_with(name:, &block)
           input_name = @context.class.config.predicate_methods_enabled? ? name.to_s.chomp("?").to_sym : name
 
@@ -49,7 +48,7 @@ module Servactory
 
           return yield if input.nil?
 
-          input_value = @incoming_arguments.fetch(input.name, nil)
+          input_value = @context.send(:servactory_service_warehouse).fetch_input(input.name)
           input_value = input.default if input.optional? && input_value.blank?
 
           if input.hash_mode? && (tmp_schema = input.schema.fetch(:is)).present?
@@ -65,7 +64,7 @@ module Servactory
             input_value
           end
         end
-        # rubocop:enable Metrics/MethodLength, Metrics/AbcSize,  Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Lint/UnusedMethodArgument
+        # rubocop:enable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Lint/UnusedMethodArgument
 
         def prepare_hash_values_inside(object:, schema:) # rubocop:disable Metrics/MethodLength
           return object unless object.respond_to?(:fetch)

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

@@ -50,7 +50,7 @@ module Servactory
             value:
           )
 
-          @context.send(:servactory_service_store).assign_internal(internal.name, value)
+          @context.send(:servactory_service_warehouse).assign_internal(internal.name, value)
         end
 
         def fetch_with(name:, &block) # rubocop:disable Metrics/AbcSize, Lint/UnusedMethodArgument
@@ -59,7 +59,7 @@ module Servactory
 
           return yield if internal.nil?
 
-          internal_value = @context.send(:servactory_service_store).fetch_internal(internal.name)
+          internal_value = @context.send(:servactory_service_warehouse).fetch_internal(internal.name)
 
           if name.to_s.end_with?("?") && @context.class.config.predicate_methods_enabled?
             Servactory::Utils.query_attribute(internal_value)

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

@@ -50,7 +50,7 @@ module Servactory
             value:
           )
 
-          @context.send(:servactory_service_store).assign_output(output.name, value)
+          @context.send(:servactory_service_warehouse).assign_output(output.name, value)
         end
 
         def fetch_with(name:, &block) # rubocop:disable Metrics/AbcSize, Lint/UnusedMethodArgument
@@ -59,7 +59,7 @@ module Servactory
 
           return yield if output.nil?
 
-          output_value = @context.send(:servactory_service_store).fetch_output(output.name)
+          output_value = @context.send(:servactory_service_warehouse).fetch_output(output.name)
 
           if name.to_s.end_with?("?") && @context.class.config.predicate_methods_enabled?
             Servactory::Utils.query_attribute(output_value)

data/lib/servactory/context/workspace.rb

@@ -23,7 +23,6 @@ module Servactory
       def inputs
         @inputs ||= Inputs.new(
           context: self,
-          incoming_arguments:,
           collection_of_inputs:
         )
       end
@@ -83,8 +82,7 @@ module Servactory
 
       private
 
-      attr_reader :incoming_arguments,
-                  :collection_of_inputs,
+      attr_reader :collection_of_inputs,
                   :collection_of_internals,
                   :collection_of_outputs
 
@@ -105,13 +103,11 @@ module Servactory
       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
@@ -130,8 +126,8 @@ module Servactory
         @servactory_service_info ||= self.class::Actor.new(self)
       end
 
-      def servactory_service_store
-        @servactory_service_store ||= Store.new(self)
+      def servactory_service_warehouse
+        @servactory_service_warehouse ||= Warehouse::Setup.new(self)
       end
     end
   end

data/lib/servactory/inputs/tools/unnecessary.rb

@@ -8,9 +8,8 @@ module Servactory
           new(...).find!
         end
 
-        def initialize(context, incoming_arguments, collection_of_inputs)
+        def initialize(context, collection_of_inputs)
           @context = context
-          @incoming_arguments = incoming_arguments
           @collection_of_inputs = collection_of_inputs
         end
 
@@ -31,7 +30,9 @@ module Servactory
         private
 
         def unnecessary_attributes
-          @unnecessary_attributes ||= @incoming_arguments.keys - @collection_of_inputs.names
+          @unnecessary_attributes ||=
+            @context.send(:servactory_service_warehouse).inputs.names -
+            @collection_of_inputs.names
         end
       end
     end

data/lib/servactory/inputs/tools/validation.rb

@@ -8,9 +8,8 @@ module Servactory
           new(...).validate!
         end
 
-        def initialize(context, incoming_arguments, collection_of_inputs)
+        def initialize(context, collection_of_inputs)
           @context = context
-          @incoming_arguments = incoming_arguments
           @collection_of_inputs = collection_of_inputs
         end
 
@@ -52,7 +51,7 @@ module Servactory
           validation_class.check(
             context: @context,
             attribute: input,
-            value: @incoming_arguments.fetch(input.name, nil),
+            value: @context.send(:servactory_service_warehouse).fetch_input(input.name),
             check_key:,
             check_options:
           )

data/lib/servactory/inputs/tools/warehouse.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Inputs
+    module Tools
+      class Warehouse
+        def self.assign(...)
+          new(...).assign
+        end
+
+        def initialize(context, incoming_arguments)
+          @context = context
+          @incoming_arguments = incoming_arguments
+        end
+
+        def assign
+          @context.send(:servactory_service_warehouse).assign_inputs(adapted_arguments)
+        end
+
+        private
+
+        def adapted_arguments
+          Servactory::Utils.adapt(@incoming_arguments)
+        end
+      end
+    end
+  end
+end

data/lib/servactory/inputs/workspace.rb

@@ -5,12 +5,14 @@ module Servactory
     module Workspace
       private
 
-      def call!(incoming_arguments:, collection_of_inputs:, **)
+      def call!(incoming_arguments:, **)
         super
 
-        Tools::Unnecessary.find!(self, incoming_arguments, collection_of_inputs)
+        Tools::Warehouse.assign(self, incoming_arguments)
+
+        Tools::Unnecessary.find!(self, collection_of_inputs)
         Tools::Rules.check!(self, collection_of_inputs)
-        Tools::Validation.validate!(self, incoming_arguments, collection_of_inputs)
+        Tools::Validation.validate!(self, collection_of_inputs)
       end
     end
   end

data/lib/servactory/maintenance/attributes/option.rb

@@ -108,12 +108,12 @@ module Servactory
           return if @define_methods.blank?
 
           @define_methods_template ||= @define_methods.map do |define_method|
-            <<-RUBY
-              def #{define_method.name}
-                #{define_method.content.call(option: @body)}
+            <<-RUBY.squish
+              def #{define_method.name};
+                #{define_method.content.call(option: @body)};
               end
             RUBY
-          end.join("\n")
+          end.join("; ")
         end
       end
     end

data/lib/servactory/result.rb

@@ -116,7 +116,7 @@ module Servactory
 
     def outputs
       @outputs ||= Outputs.new(
-        outputs: @context.send(:servactory_service_store).outputs,
+        outputs: @context.send(:servactory_service_warehouse).outputs,
         predicate_methods_enabled: if @context.is_a?(Servactory::TestKit::Result)
                                      true
                                    else

data/lib/servactory/test_kit/result.rb

@@ -17,7 +17,7 @@ module Servactory
 
       def initialize(attributes = {})
         attributes.each_pair do |name, value|
-          servactory_service_store.assign_output(name, value)
+          servactory_service_warehouse.assign_output(name, value)
         end
       end
 
@@ -25,8 +25,8 @@ module Servactory
 
       private
 
-      def servactory_service_store
-        @servactory_service_store ||= Servactory::Context::Store.new(self)
+      def servactory_service_warehouse
+        @servactory_service_warehouse ||= Servactory::Context::Warehouse::Setup.new(self)
       end
     end
   end

data/lib/servactory/version.rb

@@ -3,9 +3,9 @@
 module Servactory
   module VERSION
     MAJOR = 2
-    MINOR = 10
+    MINOR = 12
     PATCH = 0
-    PRE = nil
+    PRE = "rc1"
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")
   end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.12.0.rc1
 platform: ruby
 authors:
 - Anton Sokolov
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-20 00:00:00.000000000 Z
+date: 2025-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -190,14 +189,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: steep
   requirement: !ruby/object:Gem::Requirement
@@ -250,7 +249,11 @@ files:
 - lib/servactory/configuration/setup.rb
 - lib/servactory/context/callable.rb
 - lib/servactory/context/dsl.rb
-- lib/servactory/context/store.rb
+- lib/servactory/context/warehouse/base.rb
+- lib/servactory/context/warehouse/inputs.rb
+- lib/servactory/context/warehouse/internals.rb
+- lib/servactory/context/warehouse/outputs.rb
+- lib/servactory/context/warehouse/setup.rb
 - lib/servactory/context/workspace.rb
 - lib/servactory/context/workspace/inputs.rb
 - lib/servactory/context/workspace/internals.rb
@@ -271,6 +274,7 @@ files:
 - lib/servactory/inputs/tools/rules.rb
 - lib/servactory/inputs/tools/unnecessary.rb
 - lib/servactory/inputs/tools/validation.rb
+- lib/servactory/inputs/tools/warehouse.rb
 - lib/servactory/inputs/translator/required.rb
 - lib/servactory/inputs/validations/base.rb
 - lib/servactory/inputs/validations/errors.rb
@@ -334,7 +338,6 @@ metadata:
   bug_tracker_uri: https://github.com/servactory/servactory/issues
   changelog_uri: https://github.com/servactory/servactory/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -349,8 +352,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A set of tools for building reliable services of any complexity
 test_files: []

data/lib/servactory/context/store.rb

@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Context
-    class Store
-      def initialize(context)
-        @context = context
-      end
-
-      def fetch_internal(name)
-        internals.fetch(name, nil)
-      end
-
-      def assign_internal(name, value)
-        assign_attribute(:internals, name, value)
-      end
-
-      def fetch_output(name)
-        outputs.fetch(name, nil)
-      end
-
-      def assign_output(name, value)
-        assign_attribute(:outputs, name, value)
-      end
-
-      def outputs
-        @outputs ||= context_data.fetch(:outputs)
-      end
-
-      private
-
-      def assign_attribute(section, name, value)
-        context_data[section].merge!({ name => value })
-      end
-
-      def internals
-        @internals ||= context_data.fetch(:internals)
-      end
-
-      def context_data
-        @context_data ||= state.fetch(context_id)
-      end
-
-      def state
-        {
-          context_id => {
-            internals: {},
-            outputs: {}
-          }
-        }
-      end
-
-      def context_id
-        @context_id ||= "context_#{@context.object_id}"
-      end
-    end
-  end
-end