u-case 3.0.0.rc4 → 3.0.0.rc5

data/lib/micro/case.rb

@@ -18,10 +18,25 @@ module Micro
 
     include Micro::Attributes.without(:strict_initialize)
 
-    def self.call(options = {})
+    def self.call(options = Kind::Empty::HASH)
       new(options).__call__
     end
 
+    def self.then(use_case = nil, &block)
+      can_yield_self = respond_to?(:yield_self)
+
+      if block
+        raise Error::InvalidInvocationOfTheThenMethod if use_case
+        raise NotImplementedError if !can_yield_self
+
+        yield_self(&block)
+      else
+        return yield_self if !use_case && can_yield_self
+
+        self.call.then(use_case)
+      end
+    end
+
     def self.to_proc
       Proc.new { |arg| call(arg) }
     end
@@ -85,7 +100,7 @@ module Micro
       @__flow = __flow_builder__.build(args)
     end
 
-    FLOW_STEP = 'Flow_Step'.freeze
+    FLOW_STEP = 'Self'.freeze
 
     private_constant :FLOW_STEP
 
@@ -196,11 +211,7 @@ module Micro
       private_constant :MapFailureType
   end
 
-  def self.case?(arg)
-    (arg.is_a?(Class) && arg < Case) || arg.is_a?(Case)
-  end
-
   def self.case_or_flow?(arg)
-    case?(arg) || arg.is_a?(Cases::Flow)
+    (arg.is_a?(Class) && arg < Case) || arg.is_a?(Cases::Flow)
   end
 end

data/lib/micro/case/result.rb

@@ -30,6 +30,18 @@ module Micro
         data.values_at(*keys)
       end
 
+      def key?(key)
+        data.key?(key)
+      end
+
+      def value?(value)
+        data.value?(value)
+      end
+
+      def slice(*keys)
+        Utils.slice_hash(data, keys)
+      end
+
       def success?
         @success
       end
@@ -83,14 +95,17 @@ module Micro
             return failure? ? self : __call_proc(use_case, expected: 'then(-> {})'.freeze)
           end
 
-          # TODO: Test the then method with a Micro::Cases.{flow,safe_flow}() instance.
           raise Error::InvalidInvocationOfTheThenMethod unless ::Micro.case_or_flow?(use_case)
 
           return self if failure?
 
           input = attributes.is_a?(Hash) ? self.data.merge(attributes) : self.data
 
-          use_case.__call_and_set_transition__(self, input)
+          if use_case.is_a?(::Micro::Cases::Flow)
+            use_case.call!(input: input, result: self)
+          else
+            use_case.__call_and_set_transition__(self, input)
+          end
         end
       end
 
@@ -117,7 +132,7 @@ module Micro
 
       def __set__(is_success, data, type, use_case)
         raise Error::InvalidResultType unless type.is_a?(Symbol)
-        raise Error::InvalidUseCase unless ::Micro.case?(use_case)
+        raise Error::InvalidUseCase unless use_case.is_a?(::Micro::Case)
 
         @success, @type, @use_case = is_success, type, use_case
 

data/lib/micro/case/utils.rb

@@ -14,6 +14,13 @@ module Micro
           end
         end
       end
+      def self.slice_hash(hash, keys)
+        if Kind::Of::Hash(hash).respond_to?(:slice)
+          hash.slice(*keys)
+        else
+          hash.select { |key, _value| keys.include?(key) }
+        end
+      end
     end
   end
 end

data/lib/micro/case/version.rb

@@ -2,6 +2,6 @@
 
 module Micro
   class Case
-    VERSION = '3.0.0.rc4'.freeze
+    VERSION = '3.0.0.rc5'.freeze
   end
 end

data/lib/micro/cases/flow.rb

@@ -29,48 +29,42 @@ module Micro
         @next_use_cases = use_cases[1..-1]
       end
 
-      def call(arg = {})
-        memo = arg.is_a?(Hash) ? arg.dup : {}
+      def call!(input:, result:)
+        memo = input.is_a?(Hash) ? input.dup : Kind::Empty::HASH
 
-        first_result = __first_use_case_result(arg)
+        first_result = @first_use_case.__call_and_set_transition__(result, input)
 
         return first_result if @next_use_cases.empty?
 
         __next_use_cases_result(first_result, memo)
       end
 
+      def call(input = Kind::Empty::HASH)
+        call!(input: input, result: Case::Result.new)
+      end
+
       alias __call__ call
 
       def to_proc
         Proc.new { |arg| call(arg) }
       end
 
-      private
-
-        def __is_a_result?(arg)
-          arg.is_a?(Case::Result)
-        end
-
-        def __call_arg(arg)
-          output = arg.__call__
+      def then(use_case = nil, &block)
+        can_yield_self = respond_to?(:yield_self)
 
-          __is_a_result?(output) ? output.value : output
-        end
+        if block
+          raise Error::InvalidInvocationOfTheThenMethod if use_case
+          raise NotImplementedError if !can_yield_self
 
-        def __first_use_case_input(arg)
-          return __call_arg(arg) if ::Micro.case_or_flow?(arg)
-          return arg.value if __is_a_result?(arg)
+          yield_self(&block)
+        else
+          return yield_self if !use_case && can_yield_self
 
-          arg
+          self.call.then(use_case)
         end
+      end
 
-        def __first_use_case_result(arg)
-          input = __first_use_case_input(arg)
-
-          result = Case::Result.new
-
-          @first_use_case.__call_and_set_transition__(result, input)
-        end
+      private
 
         def __next_use_case_result(use_case, result, input)
           use_case.__new__(result, input).__call__

data/u-case.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Rodrigo Serradura']
   spec.email         = ['rodrigo.serradura@gmail.com']
 
-  spec.summary       = %q{Create simple and powerful use cases as objects.}
-  spec.description   = %q{Create simple and powerful use cases as objects.}
+  spec.summary       = %q{Create simple and powerful use cases as Ruby objects.}
+  spec.description   = %q{Create simple and powerful use cases as Ruby objects.}
   spec.homepage      = 'https://github.com/serradura/u-case'
   spec.license       = 'MIT'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: u-case
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc4
+  version: 3.0.0.rc5
 platform: ruby
 authors:
 - Rodrigo Serradura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-02 00:00:00.000000000 Z
+date: 2020-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kind
@@ -72,7 +72,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-description: Create simple and powerful use cases as objects.
+description: Create simple and powerful use cases as Ruby objects.
 email:
 - rodrigo.serradura@gmail.com
 executables: []
@@ -87,6 +87,7 @@ files:
 - Gemfile
 - LICENSE.txt
 - README.md
+- README.pt-BR.md
 - Rakefile
 - bin/console
 - bin/setup
@@ -128,5 +129,5 @@ requirements: []
 rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
-summary: Create simple and powerful use cases as objects.
+summary: Create simple and powerful use cases as Ruby objects.
 test_files: []