blood_contracts-core 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85f39b273547e389e3938ab33f8182857ef7c0d8f573e5664cb877c40c4d991a
-  data.tar.gz: a8e6d07a8311096fdb4a83d7c30a510807b6713a29ad620b4e0e174c09448346
+  metadata.gz: 51f95387de14e2c9ceea2d10fbb5260d3e6718ebce3e0a41d9754bd3b1bbe99c
+  data.tar.gz: 93d8a80f9e28f1b9e625f5ed522704e4f2c56cb7d76f4b313661d9a1fe46a5c9
 SHA512:
-  metadata.gz: 726747a300fa76dab9a86ac8efe2f79aae54bfadee6c12989a377833754cf5f912d585b214c23370e4b6bf75eecba05684b5f816ac6eb66a3b208505935ccf9d
-  data.tar.gz: dd2d045b398fc3d8a82da25226a2b9f8cddc92e9b451111aa20b8c5ca4e44706d197d0b2eef665e776ef8d4d004ac57409d2c3c260bd650b624bb4da2ce9884d
+  metadata.gz: 28c699654881ec643f3418378ba91602f153076b2825ab73e23d77c354f08dea226c64d3f986a586d8094dd60787508772c81f481be04a3928f215ec33b2a71d
+  data.tar.gz: e766de77fc878b6e8db5cac215f0921acf43e8b68af5b6ff499734aaff246cda74ce3d63da1c1f9af1d6a861be781811776c746798b2e7e87fad651fc6d736c9

data/examples/tariff_contract.rb

@@ -4,20 +4,23 @@ require 'blood_contracts/core'
 require "pry"
 
 module Types
-  class JSON < BC::Refined
-    def match
-      super do
-        begin
-          context[:parsed] = ::JSON.parse(unpack_refined(@value))
-          self
-        rescue StandardError => error
-          failure(error)
-        end
-      end
+  class ExceptionCaught < BC::ContractFailure; end
+  class Base < BC::Refined
+    def exception(ex, context: @context)
+      ExceptionCaught.new({ exception: ex }, context: context)
+    end
+  end
+
+  class JSON < Base
+    def _match
+      context[:parsed] = ::JSON.parse(unpack_refined(@value))
+      self
+    rescue StandardError => error
+      exception(error)
     end
 
-    def unpack
-      super { |match| match.context[:parsed] }
+    def _unpack(match)
+      match.context[:parsed]
     end
   end
 end
@@ -34,21 +37,14 @@ module RussianPost
   end
 
   class InputValidationFailure < BC::ContractFailure; end
-  class ExceptionCaught < BC::ContractFailure; end
-
-  class BaseType < BC::Refined
-    def exception(ex, context: @context)
-      ExceptionCaught.new({ exception: ex }, context: context)
-    end
-  end
 
-  class DomesticParcel < BaseType
+  class DomesticParcel < Types::Base
     self.failure_klass = InputValidationFailure
 
     alias :parcel :value
     def _match
       return failure(key: :undef_weight, field: :weight) unless parcel.weight
-      return self if domestic?
+      return if domestic?
       failure(non_domestic_error)
     rescue StandardError => error
       exception(error)
@@ -84,7 +80,7 @@ module RussianPost
     end
   end
 
-  class InternationalParcel < BaseType
+  class InternationalParcel < Types::Base
     self.failure_klass = InputValidationFailure
 
     alias :parcel :value
@@ -125,17 +121,13 @@ module RussianPost
     end
   end
 
-  class RecoverableInputError < BC::Refined
+  class RecoverableInputError < Types::Base
     alias :parsed_response :value
-    def match
-      super do
-        begin
-          next self if [error_code, error_message].all?
-          failure(not_a_recoverable_error)
-        rescue StandardError => error
-          failure(error)
-        end
-      end
+    def _match
+      return if [error_code, error_message].all?
+      failure(key: :not_a_recoverable_error)
+    rescue StandardError => error
+      exception(error)
     end
 
     def error_message
@@ -145,26 +137,18 @@ module RussianPost
 
     private
 
-    def not_a_recoverable_error
-      { key: :not_a_recoverable_error }
-    end
-
     def error_code
       parsed_response.values_at("code", "error-code").compact.first
     end
   end
 
-  class OtherError < BC::Refined
+  class OtherError < Types::Base
     alias :parsed_response :value
-    def match
-      super do
-        begin
-          next failure({key: :not_a_known_error}) if error_code.nil?
-          self
-        rescue StandardError => error
-          failure(error)
-        end
-      end
+    def _match
+      return failure(key: :not_a_known_error) if error_code.nil?
+      self
+    rescue StandardError => error
+      exception(error)
     end
 
     private
@@ -174,18 +158,14 @@ module RussianPost
     end
   end
 
-  class DomesticTariff < BC::Refined
+  class DomesticTariff < Types::Base
     alias :parsed_response :value
-    def match
-      super do
-        begin
-          next self if is_a_domestic_tariff?
-          context[:raw_response] = parsed_response
-          failure({key: :not_a_domestic_tariff})
-        rescue StandardError => error
-          failure(error)
-        end
-      end
+    def _match
+      return if is_a_domestic_tariff?
+      context[:raw_response] = parsed_response
+      failure(key: :not_a_domestic_tariff)
+    rescue StandardError => error
+      exception(error)
     end
 
     def cost
@@ -207,18 +187,14 @@ module RussianPost
     end
   end
 
-  class InternationalTariff < BC::Refined
+  class InternationalTariff < Types::Base
     alias :parsed_response :value
-    def match
-      super do
-        begin
-          next self if is_an_international_tariff?
-          context[:raw_response] = parsed_response
-          failure({key: :not_an_international_tariff})
-        rescue StandardError => error
-          failure(error)
-        end
-      end
+    def _match
+      return if is_an_international_tariff?
+      context[:raw_response] = parsed_response
+      failure(key: :not_an_international_tariff)
+    rescue StandardError => error
+      exception(error)
     end
 
     def cost
@@ -245,9 +221,9 @@ module RussianPost
   KnownError = RecoverableInputError | OtherError
 
   DomesticResponse =
-    (Types::JSON > (DomesticTariff | KnownError)).set(names: %i(parsed mapped))
+    (Types::JSON.and_then(DomesticTariff | KnownError)).set(names: %i(parsed mapped))
   InternationalResponse =
-    (Types::JSON > (InternationalTariff | KnownError)).set(names: %i(parsed mapped))
+    (Types::JSON.and_then(InternationalTariff | KnownError)).set(names: %i(parsed mapped))
 
   TariffRequestContract = ::BC::Contract.new(
     DomesticParcel      => DomesticResponse,
@@ -263,7 +239,7 @@ end
 
 def match_response(response)
   case response
-  when RussianPost::ExceptionCaught
+  when Types::ExceptionCaught
     puts "Honeybadger.notify #{response.errors_h[:exception]}"
   when RussianPost::InputValidationFailure
     # работаем с тарифом
@@ -321,6 +297,7 @@ PARCELS = [
 RESPONSES = [
   '{"total-cost": 10000, "delivery-till": "2019-12-12"}',
   '{"total-rate": 100000, "total-vat": 1800}',
+  '{"total-rate": "some", "total-vat": "text"}',
   '{"code": 1010, "desc": "Too long address"}',
   '{"error-code": 2020, "error-details": ["Too heavy parcel"]}',
 ]

data/lib/blood_contracts/core/pipe.rb

@@ -59,6 +59,10 @@ module BloodContracts
         end
       end
 
+      def errors
+        match.errors
+      end
+
       private def step_name(index)
         self.class.names[index] || index
       end

data/lib/blood_contracts/core/refined.rb

@@ -51,8 +51,8 @@ module BloodContracts
 
       def match
         return @match if defined? @match
-        return @match = yield if block_given?
-        return @match = _match if respond_to?(:_match)
+        return @match = (yield || self) if block_given?
+        return @match = (_match || self) if respond_to?(:_match)
         self
       end
       alias :call :match

data/lib/blood_contracts/core/sum.rb

@@ -50,6 +50,10 @@ module BloodContracts
         end
       end
 
+      def errors
+        match.errors
+      end
+
       def inspect
         "#<sum #{self.class.name} is #{self.class.sum_of.to_a.join(' or ')} (value=#{@value})>"
       end

data/lib/blood_contracts/core/version.rb

@@ -1,5 +1,5 @@
 module BloodContracts
   module Core
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blood_contracts-core
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Sergey Dolganov