servactory 2.9.2 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc774d1b1a59ffb653f33406b18ca938a8429f12181f75971bf06f42e4b9981f
-  data.tar.gz: c4b1e02b91511de91587dd656de85a5bfc219b39dac99c99c9e80cb2d175a01a
+  metadata.gz: a14d75bf3c1035ecffff36644b509241bdea300d28b56aa91e15e933c9184cb1
+  data.tar.gz: 062d490213f603fa45571b4217f3a8f8a892e92fdfd348e6702b2c71246d9480
 SHA512:
-  metadata.gz: 375ea6b23a62c0da8900fb34fb98cb56f9f3d0027f7233201bb1b1e90821358b7ce4434a011b4f748816893e3b9f78baa89a8d48e1c9533944e3e3047d70b825
-  data.tar.gz: 6780416158ae4f77ff61688bcabd3a83df4ab9374d49409bbd98d3b311fe693a89dd022db6340feb5bb4c27c373429c2238f915b5305a2a25bdbd4936b50f515
+  metadata.gz: 95b646ef01984996b9a9607e2a01a6adb324e76d0b637a78f4de73105840a3c17af27b20ca2286805161f5eb134da3b9b616d8ec7de6b5fc86bcc7847e265bfc
+  data.tar.gz: 61e57e674dbd46d934da1cbbe63b8574cd890913ca9ae63082529e627140105d724ba3e1a761c73a081eac7cb94169752dfd424cd7b9a17c3629910937e8917e

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

@@ -41,10 +41,19 @@ module Servactory
           end
         end
 
-        def call_wrapper_with_methods(wrapper, rollback, methods)
+        def call_wrapper_with_methods(wrapper, rollback, methods) # rubocop:disable Metrics/MethodLength
           wrapper.call(methods: -> { call_methods(methods) }, context: @context)
         rescue StandardError => e
-          @context.send(rollback, e) if rollback.present?
+          if rollback.present?
+            @context.send(rollback, e)
+          else
+            @context.fail!(
+              message: e.message,
+              meta: {
+                original_exception: e
+              }
+            )
+          end
         end
 
         def call_methods(methods)

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/store.rb

@@ -7,22 +7,38 @@ module Servactory
         @context = context
       end
 
-      def fetch_internal(name)
-        internals.fetch(name, nil)
+      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_output(name)
-        outputs.fetch(name, nil)
+      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
@@ -33,10 +49,6 @@ module Servactory
         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
@@ -44,6 +56,7 @@ module Servactory
       def state
         {
           context_id => {
+            inputs: {},
             internals: {},
             outputs: {}
           }

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
 
@@ -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_store).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?

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

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Inputs
+    module Tools
+      class Store
+        def self.assign(...)
+          new(...).assign
+        end
+
+        def initialize(context, incoming_arguments)
+          @context = context
+          @incoming_arguments = incoming_arguments
+        end
+
+        def assign
+          @context.send(:servactory_service_store).assign_inputs(adapted_arguments)
+        end
+
+        private
+
+        def adapted_arguments
+          Servactory::Utils.adapt(@incoming_arguments)
+        end
+      end
+    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_store).inputs.keys -
+            @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_store).fetch_input(input.name),
             check_key:,
             check_options:
           )

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::Store.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/test_kit/rspec/matchers.rb

@@ -151,14 +151,14 @@ module Servactory
                   MESSAGE
                 end
 
-                expected_value = actual.public_send(key)
+                received_value = actual.public_send(key)
                 next if actual.public_send(key) == value
 
                 break <<~MESSAGE
                   Incorrect result value for #{key}:
 
-                    expected #{expected_value.inspect}
-                         got #{value.inspect}
+                    expected #{value.inspect}
+                         got #{received_value.inspect}
                 MESSAGE
               end
             end

data/lib/servactory/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 2.9.2
+  version: 2.11.0
 platform: ruby
 authors:
 - Anton Sokolov
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-09 00:00:00.000000000 Z
+date: 2025-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -269,6 +268,7 @@ files:
 - lib/servactory/inputs/dsl.rb
 - lib/servactory/inputs/input.rb
 - lib/servactory/inputs/tools/rules.rb
+- lib/servactory/inputs/tools/store.rb
 - lib/servactory/inputs/tools/unnecessary.rb
 - lib/servactory/inputs/tools/validation.rb
 - lib/servactory/inputs/translator/required.rb
@@ -334,7 +334,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 +348,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A set of tools for building reliable services of any complexity
 test_files: []