blood_contracts-core 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0eafc70e494dca609f476b8d8d910d34d7be58c1699bec33f139b1c6ba85b69
-  data.tar.gz: 6ef7c133021e3422c7e56a97e7e71e156cdb97cad8be67ce4da014013b302cf9
+  metadata.gz: 15d2c1262b54f96eb2eb15b4e342927fd45448781c0fca59a3ac76ace95a2409
+  data.tar.gz: d47507f3401dc9c956d4a1922693eab12a207bb3a3f67ea7b5de398b5e2d0246
 SHA512:
-  metadata.gz: dd33b8390228963b54931953499796365b6056a289856f9e9a7d4a8a864f907a899c30af7d22f0feae141d01391409fc4c3f32917a8c12c5ba3ca27991b2da3e
-  data.tar.gz: dd16faf2a2b9d28a1bdcdce86e3203a28b856e8b739e91639be7bbde8f0beadf7745bb390c0740af210e4d2e156d86d74ada387511cd3ed077828f23fe384ac6
+  metadata.gz: 6872bfc993b273b5d05713aa81f29c0a456cad1e8ebbbcd716055d04e15354c89c2fe7aba5d1a9bb2abbb165b82fc00e161b26c9437550e7a29581cba3ba62c7
+  data.tar.gz: a8ebbd47519ef4bb94e343e01bd9fcbefae0a3f05a140a6218c2848b340da8bd51537fadc61339bf248dda5b0478bb3a88f5d3fd98e63f06f390c80788508436

data/lib/blood_contracts/core/pipe.rb

@@ -4,10 +4,10 @@ module BloodContracts
       class << self
         attr_reader :steps, :names, :finalized
 
-        def new(*args)
-          return super(*args) if finalized
-          if args.last.is_a?(Hash)
-            names = args.pop.delete(:names)
+        def new(*args, **kwargs)
+          return super(*args, **kwargs) if finalized
+          unless kwargs.empty?
+            names = kwargs.delete(:names)
           end
           names ||= []
 
@@ -38,17 +38,21 @@ module BloodContracts
         attr_writer :names
       end
 
+      def initialize(*)
+        super
+        @context[:types] = @context[:types].to_a
+      end
+
       def match
         super do
           index = 0
           self.class.steps.reduce(value) do |next_value, step|
             unpacked_value = unpack_refined(next_value)
-            match = step.match(unpacked_value)
+            match = step.match(unpacked_value, context: @context)
 
-            share_context_with(match) do |context|
-              context[:steps][step_name(index)] = unpacked_value
-              index += 1
-            end
+            @context[:steps][step_name(index)] = unpacked_value
+            types << match.class.name unless current_type.eql?(match.class.name)
+            index += 1
 
             break match if match.invalid?
             if block_given? && index < self.class.steps.size
@@ -63,6 +67,14 @@ module BloodContracts
         match.errors
       end
 
+      private def types
+        context[:types]
+      end
+
+      private def current_type
+        context[:types].last
+      end
+
       private def step_name(index)
         self.class.names[index] || index
       end

data/lib/blood_contracts/core/refined.rb

@@ -13,11 +13,11 @@ module BloodContracts
         end
         alias :> :and_then
 
-        def match(*args)
+        def match(*args, **kwargs)
           if block_given?
-            new(*args).match { |*subargs| yield(*subargs) }
+            new(*args, **kwargs).match { |*subargs| yield(*subargs) }
           else
-            new(*args).match
+            new(*args, **kwargs).match
           end
         end
         alias :call :match
@@ -70,7 +70,7 @@ module BloodContracts
         unpack_refined @value
       end
 
-      def failure(error = nil, errors: @errors, context: @context, **kwargs)
+      def failure(error = nil, errors: @errors, **kwargs)
         error ||= kwargs unless kwargs.empty?
         errors << error if error
         self.class.failure_klass.new(

data/lib/blood_contracts/core/sum.rb

@@ -7,7 +7,7 @@ module BloodContracts
         attr_reader :sum_of, :finalized
 
         def new(*args)
-          return super if finalized
+          return super(*args) if finalized
 
           new_sum = args.reduce([]) { |acc, type| type.respond_to?(:sum_of) ? acc + type.sum_of.to_a : acc << type  }
 

data/lib/blood_contracts/core/version.rb

@@ -1,5 +1,5 @@
 module BloodContracts
   module Core
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blood_contracts-core
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Sergey Dolganov
 autorequire: 
 bindir: bin/
 cert_chain: []
-date: 2019-05-18 00:00:00.000000000 Z
+date: 2019-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler