u-case 4.1.0 → 4.3.0

data/lib/micro/case/result/wrapper.rb

@@ -4,38 +4,43 @@ module Micro
   class Case
     class Result
       class Wrapper
-        def initialize(result)
-          @__is_unknown = true
+        attr_reader :output
 
+        def initialize(result)
           @result = result
+          @output = ::Kind::Undefined
+
+          @__is_unknown = true
         end
 
         def failure(type = nil)
-          return if @result.success?
+          return if @result.success? || !undefined_output?
 
-          if result_type?(type)
-            @__is_unknown = false
-
-            yield(@result)
-          end
+          set_output(yield(@result)) if result_type?(type)
         end
 
         def success(type = nil)
-          return if @result.failure?
+          return if @result.failure? || !undefined_output?
 
-          if result_type?(type)
-            @__is_unknown = false
-
-            yield(@result)
-          end
+          set_output(yield(@result)) if result_type?(type)
         end
 
         def unknown
-          return yield(@result) if @__is_unknown
+          @output = yield(@result) if @__is_unknown && undefined_output?
         end
 
         private
 
+          def set_output(value)
+            @__is_unknown = false
+
+            @output = value
+          end
+
+          def undefined_output?
+            ::Kind::Undefined == @output
+          end
+
           def result_type?(type)
             type.nil? || @result.type == type
           end

data/lib/micro/case/utils.rb

@@ -1,36 +1,32 @@
 # frozen_string_literal: true
 
-module Micro
-  class Case
-    module Utils
+module Micro::Case::Utils
 
-      module Hashes
-        def self.respond_to?(hash, method)
-          Kind.of(Hash, hash).respond_to?(method)
-        end
-
-        def self.symbolize_keys(hash)
-          return hash.transform_keys { |key| key.to_sym rescue key } if respond_to?(hash, :transform_keys)
+  module Hashes
+    def self.respond_to?(hash, method)
+      Kind::Hash[hash].respond_to?(method)
+    end
 
-          hash.each_with_object({}) do |(k, v), memo|
-            key = k.to_sym rescue k
-            memo[key] = v
-          end
-        end
+    def self.symbolize_keys(hash)
+      return hash.transform_keys { |key| key.to_sym rescue key } if respond_to?(hash, :transform_keys)
 
-        def self.stringify_keys(hash)
-          return hash.transform_keys(&:to_s) if respond_to?(hash, :transform_keys)
+      hash.each_with_object({}) do |(k, v), memo|
+        key = k.to_sym rescue k
+        memo[key] = v
+      end
+    end
 
-          hash.each_with_object({}) { |(k, v), memo| memo[k.to_s] = v }
-        end
+    def self.stringify_keys(hash)
+      return hash.transform_keys(&:to_s) if respond_to?(hash, :transform_keys)
 
-        def self.slice(hash, keys)
-          return hash.slice(*keys) if respond_to?(hash, :slice)
+      hash.each_with_object({}) { |(k, v), memo| memo[k.to_s] = v }
+    end
 
-          hash.select { |key, _value| keys.include?(key) }
-        end
-      end
+    def self.slice(hash, keys)
+      return hash.slice(*keys) if respond_to?(hash, :slice)
 
+      hash.select { |key, _value| keys.include?(key) }
     end
   end
+
 end

data/lib/micro/case/version.rb

@@ -2,6 +2,6 @@
 
 module Micro
   class Case
-    VERSION = '4.1.0'.freeze
+    VERSION = '4.3.0'.freeze
   end
 end

data/lib/micro/cases/flow.rb

@@ -23,7 +23,7 @@ module Micro
       end
 
       def inspect
-        '<(%s) use_cases=%s>' % [self.class, @use_cases]
+        '#<(%s) use_cases=%s>' % [self.class, @use_cases]
       end
 
       def call!(input:, result:)
@@ -39,7 +39,11 @@ module Micro
 
         return result unless block_given?
 
-        yield ::Micro::Case::Result::Wrapper.new(result)
+        result_wrapper = ::Micro::Case::Result::Wrapper.new(result)
+
+        yield(result_wrapper)
+
+        result_wrapper.output
       end
 
       alias __call__ call

data/lib/micro/cases/map.rb

@@ -5,7 +5,7 @@ module Micro
     class Map
       IsAUseCaseOrFlowWithDefaults = -> arg { arg.is_a?(Array) && Micro.case_or_flow?(arg[0]) && arg[1].is_a?(Hash) }
       IsAUseCaseOrFlow = -> arg { Micro.case_or_flow?(arg) || IsAUseCaseOrFlowWithDefaults[arg] }
-      HasValidArgs = -> (args) { Kind.of(Array, args).all?(&IsAUseCaseOrFlow) }
+      HasValidArgs = -> (args) { Kind::Array[args].all?(&IsAUseCaseOrFlow) }
 
       attr_reader :use_cases
 
@@ -28,7 +28,7 @@ module Micro
       end
 
       def call(arg = {})
-        hash = Kind.of(Hash, arg)
+        hash = Kind::Hash[arg]
 
         use_cases.map(&GetUseCaseResult[hash])
       end

data/u-case.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.2.0'
 
-  spec.add_runtime_dependency 'kind', '>= 3.0', '< 5.0'
-  spec.add_runtime_dependency 'u-attributes', '~> 2.0'
+  spec.add_runtime_dependency 'kind', '>= 4.0', '< 6.0'
+  spec.add_runtime_dependency 'u-attributes', '>= 2.7', '< 3.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '~> 13.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: u-case
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.3.0
 platform: ruby
 authors:
 - Rodrigo Serradura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-14 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kind
@@ -16,34 +16,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: u-attributes
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement