servactory 2.8.0 → 2.9.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fd2afd31c63b79469991b78c2c30728aa2d268eeaf9deac3ea0e72c06db6614
-  data.tar.gz: e11af49a2bc836b3f265c4dc48957106550b905c05682cb837099ed53a62c24a
+  metadata.gz: ca75399cdb14c4dc3b28703e9c3b2baf353f0612d8414de865f780a69dc56e74
+  data.tar.gz: 74c08748d40a6233942c5c4b0b34f7b0ccb0a63776468d98ea08fda660b826fd
 SHA512:
-  metadata.gz: 7d22e4e63465bcc22943d6eb90085081ba299ea571cea5393fabc22dae15d434e05b51f78f7fd26d27d93d3775419d89c24a47c492c2a8808565e5a8d6f0bfc4
-  data.tar.gz: cb529f9e8c66ef9de222ae4a66b0884635f1dda2435020a67d024c61686f6ffa1434e80b773e71a66c84776e55e305240bbc4e26c5cd4cfc22b5483500b8bff7
+  metadata.gz: f48fd065703fde42c80f14dae2045ea1af0c31d66c5eece2ccd4cb94358c089d7ca4e59417588a6f40dbd77376786377ad4ef90285f4d6a545925d5ecc0f0f8e
+  data.tar.gz: c495107855b7a1939717457638e7171ef1deb9f979426dbdc5084c84ecc78b87bc38688a71df458a9afc5ee5befe7141c78122f7f071af00c5120ef15a0480a7

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/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 = 8
+    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.8.0
+  version: 2.9.0.rc1
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-28 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