dried_interaction 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f78458580c4604685a1e5e0115864894059552dce690536518d36f54aabfd08
-  data.tar.gz: 1b1e0e2ccfb7e71d0bde3f634895e2b01b8d0d4d1761212edd02dafb0073ee20
+  metadata.gz: fc03f8cdd296c8e6d4e02569d36c852230788f2e3fcdbfea27190e9dc7b4ceac
+  data.tar.gz: 43c97474d74f55612a51bb37b30e6a378b80d1a983d90662efb9fd74f04a67ab
 SHA512:
-  metadata.gz: 0c26753cd44cab35cd0b2d2500863ca5febbe0a4637e82419d3e041c7785aaedc6b351c336d96037ecc346d239cdc73739fbc2d3fe15334e48f7f7ed19f2c7cf
-  data.tar.gz: b03db178d0c805414d9a97faa50c407f9a75ec4d99ba36d9926a6b8fbeee19881972d6796e627db34ab1eab99bbdf881dd7686b49173cd60f4cadf92f9f440e9
+  metadata.gz: 174a2ad3439cb18b6e9e929ac2b838daa914d12dbb42c98360bf31bc5b66d79bba0e3fd01d883b73833e8c5ab43a6d431ea59ddf67155ca162ff15489409c76c
+  data.tar.gz: 24548abcd09e1b2ee14ca632eb559815fbdb4477982ac2ee890d7c72430bb7155e6cb038bc803976108e2c313a44e07778a29d622f812840a1ab5abd79b162ec

data/README.md

@@ -85,7 +85,7 @@ Available values: `strict` (By default) and `soft`
 ### Interactor calling
 
 ```rb
-PublishPost.new.call(user, params) do |interactor|
+PublishPost.new.call({ user: user, params: params }) do |interactor|
   interactor.success do |post|
     # handle success
   end
@@ -98,7 +98,7 @@ end
 
 When you use `soft` mode you can handle contract failure as divided failure case:
 ```rb
-  PublishPost.new.call(user, params) do |interactor|
+  PublishPost.new.call({ user: user, params: params }) do |interactor|
   interactor.success do |post|
     # handle success
   end

data/lib/dried_interaction/{class_methods.rb → dsl.rb}

@@ -2,17 +2,28 @@
 
 require 'dry/validation'
 require 'dry/schema'
+require 'dried_interaction/instance_methods'
 
 module DriedInteraction
-  module ClassMethods
+  module Dsl
     MODES = %i[strict soft].freeze
-    attr_accessor :contract_validator, :contract_mode
+    attr_accessor :contract_validator, :contract_mode, :for_method
 
     def contract(kind: :simple, mode: MODES.first, &block)
       @contract_mode = resolve_contract_mode(mode)
       @contract_validator = resolve_contract_validator(kind, &block)
     end
 
+    def soft_contract(args = {}, &block)
+      contract(args.merge(mode: :soft), &block)
+    end
+
+    def strict_contract(args = {}, &block)
+      contract(args.merge(mode: :strict))
+    end
+
+    private
+
     def resolve_contract_mode(mode)
       MODES.include?(mode.to_sym) ? mode.to_sym : (raise ArgumentError)
     end
@@ -23,6 +34,10 @@ module DriedInteraction
         Dry::Schema.Params(&block)
       when :extended
         Dry::Validation.Contract(&block)
+      when Dry::Schema::Params
+        kind.merge(Dry::Schema.Params(&block))
+      when Dry::Validation::Contract
+        kind.build(&block)
       else
         raise ArgumentError
       end

data/lib/dried_interaction/instance_methods.rb

@@ -9,15 +9,17 @@ module DriedInteraction
 
     def call(*args)
       interaction_contract_error('Call method allows only one argument') if args.size != 1
-
       arg = args.first
+
       contract = self.class.contract_validator
+      interaction_contract_error('Contract must be filled') if arg && !contract
+
       contract_params = fetch_contract_params(contract)
       check_result = check_params_presence_in_args(contract_params, arg.keys)
       return check_result if check_result&.failure?
 
       contract_result = contract.(arg)
-      return interaction_contract_error(contract_result.errors.messages) if contract_result.failure?
+      return interaction_contract_error(contract_result.errors) if contract_result.failure?
 
       super(arg)
     end
@@ -36,7 +38,7 @@ module DriedInteraction
     end
 
     def interaction_contract_error(msgs)
-      error = DriedInteractionError.new(class: self.class.to_s, errors: wrap_errors(msgs).join('; '))
+      error = DriedInteractionError.new(class: self.class.to_s, errors: msgs)
 
       case self.class.contract_mode
       when :strict
@@ -47,9 +49,5 @@ module DriedInteraction
         raise ArgumentError
       end
     end
-
-    def wrap_errors(msgs)
-      msgs.is_a?(Array) ? msgs : [msgs]
-    end
   end
 end

data/lib/dried_interaction/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DriedInteraction
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/dried_interaction.rb

@@ -5,12 +5,12 @@ require 'dry/matcher/result_matcher'
 require 'dry/monads'
 require 'dry-initializer'
 
-require 'dried_interaction/class_methods'
+require 'dried_interaction/dsl'
 require 'dried_interaction/instance_methods'
 
 module DriedInteraction
   def self.included(klass)
-    klass.extend(ClassMethods)
+    klass.extend(Dsl)
     klass.extend(Dry::Initializer)
 
     klass.prepend(InstanceMethods)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dried_interaction
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - gl-pv
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-06 00:00:00.000000000 Z
+date: 2023-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-initializer
@@ -142,7 +142,7 @@ files:
 - bin/setup
 - dried_interaction.gemspec
 - lib/dried_interaction.rb
-- lib/dried_interaction/class_methods.rb
+- lib/dried_interaction/dsl.rb
 - lib/dried_interaction/error.rb
 - lib/dried_interaction/instance_methods.rb
 - lib/dried_interaction/version.rb