servactory 2.7.0 → 2.9.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0392bf65a7bdc8c133d517c581655e2a29ce4665d8a2c9dcde7eec7e1a6d1cc
-  data.tar.gz: 5f57c9201660ae628fb471f1bef146acb2face2aad22f10b02a0a1e2b1f9fd55
+  metadata.gz: ca75399cdb14c4dc3b28703e9c3b2baf353f0612d8414de865f780a69dc56e74
+  data.tar.gz: 74c08748d40a6233942c5c4b0b34f7b0ccb0a63776468d98ea08fda660b826fd
 SHA512:
-  metadata.gz: f6741ccebe3ddb1f8a7b6c2908a92b5b6a3f4af00d188c5e1d2f54f663d5758ebc3956c5a0ca2efa97fed0fe97187e594557083a0cd6ca2372487430c6ca005e
-  data.tar.gz: e2374b66d0d8b6b3c49b07f66bc7532034957ff3985e4a776686f6c90329e2d30ed7b5f85834f12ef272a204c484689b8b6480a933256b8ec64fb274a69d58e4
+  metadata.gz: f48fd065703fde42c80f14dae2045ea1af0c31d66c5eece2ccd4cb94358c089d7ca4e59417588a6f40dbd77376786377ad4ef90285f4d6a545925d5ecc0f0f8e
+  data.tar.gz: c495107855b7a1939717457638e7171ef1deb9f979426dbdc5084c84ecc78b87bc38688a71df458a9afc5ee5befe7141c78122f7f071af00c5120ef15a0480a7

data/lib/servactory/configuration/factory.rb

@@ -2,41 +2,11 @@
 
 module Servactory
   module Configuration
-    class Factory # rubocop:disable Metrics/ClassLength
+    class Factory
       def initialize(config)
         @config = config
       end
 
-      # DEPRECATED: These configs must be deleted after release 2.4.
-      def input_error_class(input_error_class)
-        Kernel.warn "DEPRECATION WARNING: " \
-                    "Configuration `input_error_class` is deprecated; " \
-                    "use `internal_exception_class` instead. " \
-                    "It will be removed in one of the next releases."
-
-        input_exception_class(input_error_class)
-      end
-
-      # DEPRECATED: These configs must be deleted after release 2.4.
-      def internal_error_class(internal_error_class)
-        Kernel.warn "DEPRECATION WARNING: " \
-                    "Configuration `internal_error_class` is deprecated; " \
-                    "use `internal_exception_class` instead. " \
-                    "It will be removed in one of the next releases."
-
-        internal_exception_class(internal_error_class)
-      end
-
-      # DEPRECATED: These configs must be deleted after release 2.4.
-      def output_error_class(output_error_class)
-        Kernel.warn "DEPRECATION WARNING: " \
-                    "Configuration `output_error_class` is deprecated; " \
-                    "use `output_exception_class` instead. " \
-                    "It will be removed in one of the next releases."
-
-        output_exception_class(output_error_class)
-      end
-
       def input_exception_class(input_exception_class)
         return @config.input_exception_class = input_exception_class if subclass_of_exception?(input_exception_class)
 

data/lib/servactory/context/callable.rb

@@ -6,7 +6,7 @@ module Servactory
       def call!(arguments = {})
         context = send(:new)
 
-        _call!(context, **arguments)
+        _call!(context, arguments)
 
         config.result_class.success_for(context:)
       rescue config.success_class => e
@@ -16,7 +16,7 @@ module Servactory
       def call(arguments = {})
         context = send(:new)
 
-        _call!(context, **arguments)
+        _call!(context, arguments)
 
         config.result_class.success_for(context:)
       rescue config.success_class => e
@@ -27,10 +27,12 @@ module Servactory
 
       private
 
-      def _call!(context, **arguments)
+      def _call!(context, incoming_arguments)
+        incoming_arguments = Servactory::Utils.adapt(incoming_arguments)
+
         context.send(
           :_call!,
-          incoming_arguments: arguments.symbolize_keys,
+          incoming_arguments:,
           collection_of_inputs:,
           collection_of_internals:,
           collection_of_outputs:,

data/lib/servactory/result.rb

@@ -27,6 +27,9 @@ module Servactory
 
     ############################################################################
 
+    STATE_PREDICATE_NAMES = %i[success? failure?].freeze
+    private_constant :STATE_PREDICATE_NAMES
+
     def self.success_for(context:)
       new(context:).send(:as_success)
     end
@@ -40,6 +43,14 @@ module Servactory
       @exception = exception
     end
 
+    def to_h
+      filtered = methods(false).filter do |key|
+        !key.in?(STATE_PREDICATE_NAMES) && !key.to_s.end_with?("?")
+      end
+
+      filtered.to_h { |key| [key, public_send(key)] }.compact
+    end
+
     def inspect
       "#<#{self.class.name} #{draw_result}>"
     end

data/lib/servactory/test_kit/rspec/matchers/have_service_input_matchers/valid_with_matcher.rb

@@ -13,7 +13,7 @@ module Servactory
               @attribute_type = attribute_type
               @attribute_type_plural = attribute_type.to_s.pluralize.to_sym
               @attribute_name = attribute_name
-              @attributes = attributes
+              @attributes = attributes.is_a?(FalseClass) ? attributes : Servactory::Utils.adapt(attributes)
 
               @attribute_data = described_class.info.public_send(attribute_type_plural).fetch(attribute_name)
 

data/lib/servactory/utils.rb

@@ -2,7 +2,15 @@
 
 module Servactory
   module Utils
-    module_function
+    extend self
+
+    def adapt(data)
+      if defined?(Datory::Base) && data.is_a?(Datory::Base)
+        data = Servactory::Utils.send(:instance_variables_to_hash_from, data)
+      end
+
+      data.symbolize_keys
+    end
 
     def fetch_hash_with_desired_attribute(attribute)
       return { input: attribute.class::Actor.new(attribute) } if really_input?(attribute)
@@ -97,5 +105,24 @@ module Servactory
         class_or_name
       end
     end
+
+    private
+
+    def instance_variables_to_hash_from(data) # rubocop:disable Metrics/MethodLength
+      data.instance_variables.to_h do |key|
+        value = data.instance_variable_get(key)
+
+        value =
+          if value.is_a?(Set) || value.is_a?(Array)
+            value.map { |item| instance_variables_to_hash_from(item) }
+          elsif value.is_a?(Datory::Base)
+            instance_variables_to_hash_from(value)
+          else
+            value
+          end
+
+        [key.to_s.delete_prefix("@"), value]
+      end
+    end
   end
 end

data/lib/servactory/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.9.0.rc1
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-13 00:00:00.000000000 Z
+date: 2024-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -86,6 +86,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.31'
+- !ruby/object:Gem::Dependency
+  name: datory
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -271,10 +285,6 @@ files:
 - lib/servactory/context/workspace/outputs.rb
 - lib/servactory/dsl.rb
 - lib/servactory/engine.rb
-- lib/servactory/errors/failure.rb
-- lib/servactory/errors/input_error.rb
-- lib/servactory/errors/internal_error.rb
-- lib/servactory/errors/output_error.rb
 - lib/servactory/exceptions/base.rb
 - lib/servactory/exceptions/failure.rb
 - lib/servactory/exceptions/input.rb

data/lib/servactory/errors/failure.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Errors
-    # DEPRECATED: This class will be deleted after release 2.4.
-    class Failure < Servactory::Exceptions::Base
-      attr_reader :type,
-                  :message,
-                  :meta
-
-      def initialize(type: :base, message:, meta: nil) # rubocop:disable Style/KeywordParametersOrder
-        @type = type
-        @message = message
-        @meta = meta
-
-        super(message)
-      end
-    end
-  end
-end

data/lib/servactory/errors/input_error.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Errors
-    # DEPRECATED: This class will be deleted after release 2.4.
-    class InputError < Servactory::Exceptions::Base
-      attr_reader :message,
-                  :input_name,
-                  :meta
-
-      def initialize(message:, input_name: nil, meta: nil)
-        @message = message
-        @input_name = input_name&.to_sym
-        @meta = meta
-
-        super(message)
-      end
-    end
-  end
-end

data/lib/servactory/errors/internal_error.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Errors
-    # DEPRECATED: This class will be deleted after release 2.4.
-    class InternalError < Servactory::Exceptions::Base
-      attr_reader :message,
-                  :internal_name,
-                  :meta
-
-      def initialize(message:, internal_name: nil, meta: nil)
-        @message = message
-        @internal_name = internal_name&.to_sym
-        @meta = meta
-
-        super(message)
-      end
-    end
-  end
-end

data/lib/servactory/errors/output_error.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Errors
-    # DEPRECATED: This class will be deleted after release 2.4.
-    class OutputError < Servactory::Exceptions::Base
-      attr_reader :message,
-                  :output_name,
-                  :meta
-
-      def initialize(message:, output_name: nil, meta: nil)
-        @message = message
-        @output_name = output_name&.to_sym
-        @meta = meta
-
-        super(message)
-      end
-    end
-  end
-end