blood_contracts-core 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a95e70463f9422ef654272494ae21d3b2440f6df9f2ec93fce292d1760bf8a5
-  data.tar.gz: 38cae2fd0e55b1e4a32fbbafa455659add37c78ed6c03c1f250166d426bff362
+  metadata.gz: cf9fc4121fbf8d1f0b7ccbef5feea8337bddaffe58035359a0eb8ff0617337c9
+  data.tar.gz: e697e1e0c1ef8fd849a243e083b45a1dc0ea18a9998feb3fd63c4d709b220b12
 SHA512:
-  metadata.gz: ee8f1b8795c6906757a188e9714869420c31bdab2b77a43ef8ca299a31c9e95269c4d254e63f1cd6f425ad50fccd6d6568c7f0ace662e1c29eb1e28a8e7671b3
-  data.tar.gz: c7e613e87f3c9038094c15f0f0eda3bee294b69d55998ceed794d9c918065d7faff6a77bdb23760ae36e8ebc3b581de74fa26cc5b2dae34fc7deb9125c661355
+  metadata.gz: 12cad0640c0a2eab92e5189ff7a658bf0e93b055e0ef4fac15e16c3d6083a9e4463673d1be916a73b9e32b626c7c2e98d0f4e0af34164081296c0a7114284fea
+  data.tar.gz: 251436c1bbef4e1736140f0dd01625ede3ab08f689ad0af0f91ad1e32a6dd7758720ba8a5e11cefed729915bf3c98fac8692c34f8613eb9bd60d7f6983876a34

data/CHANGELOG.md

@@ -5,7 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## master
+## [0.4.3] - [2019-08-30]
+
+Features/Fixes:
+- Changed the way we treat context in Sum and Tuple. Each validation of those aggregations now uses its own context.
+  In other word, each validation path has its own context, which will not be corrupted in parallel validaions.
+  If validation succeded we return the only valid context, otherwise if we failed on Tuple or Sum we return set of
+  contexts, to inspect why did validation fail.
+
+## [0.4.2] - [2019-08-29]
 
 Features:
 

data/blood_contracts-core.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "blood_contracts-core"
-  gem.version       = "0.4.2"
+  gem.version       = "0.4.3"
   gem.authors       = ["Sergey Dolganov (sclinede)"]
   gem.email         = ["sclinede@evilmartians.com"]
 

data/lib/blood_contracts/core.rb

@@ -8,6 +8,7 @@ module BloodContracts
     require_relative "./core/pipe.rb"
     require_relative "./core/contract.rb"
     require_relative "./core/sum.rb"
+    require_relative "./core/sum_contract_failure.rb"
     require_relative "./core/tuple.rb"
     require_relative "./core/tuple_contract_failure.rb"
 

data/lib/blood_contracts/core/contract_failure.rb

@@ -13,6 +13,17 @@ module BloodContracts::Core
       @context[:errors] = (@context[:errors].to_a << @value.to_h)
     end
 
+    # Merge errors with the errors of another ContractFailure
+    #
+    # @param contract_failure [ContractFailure] other errors container which to
+    #   merge with
+    # @return [ContractFailure]
+    #
+    def merge!(contract_failure)
+      @context[:errors] = @context[:errors].to_a + contract_failure.errors
+      self
+    end
+
     # List of errors per type after the data matching process
     #
     # @return [Array<Hash<BC::Refined, String>>]

data/lib/blood_contracts/core/refined.rb

@@ -41,7 +41,7 @@ module BloodContracts::Core
 
       # Override of case equality operator, to handle Tuple correctly
       def ===(object)
-        return object.to_ary.any?(self) if object.is_a?(Tuple)
+        return object.attributes.values.any?(self) if object.is_a?(Tuple)
         super
       end
 

data/lib/blood_contracts/core/sum.rb

@@ -63,6 +63,15 @@ module BloodContracts::Core
         return super if name
         "Sum(#{sum_of.map(&:inspect).join(',')})"
       end
+
+      # Inheritance handler:
+      # - adds current sum_of to child
+      # - sets default value for failure_klass
+      def inherited(new_klass)
+        new_klass.instance_variable_set(:@sum_of, sum_of)
+        new_klass.failure_klass ||= SumContractFailure
+        super
+      end
     end
 
     # The type which is the result of data matching process
@@ -72,13 +81,13 @@ module BloodContracts::Core
     #
     def match
       @or_matches = self.class.sum_of.map do |type|
-        type.match(@value, context: @context)
+        type.match(@value, context: @context.dup)
       end
 
       if (match = @or_matches.find(&:valid?))
         match
       else
-        failure(:no_matches)
+        @or_matches.dup.unshift(failure).reduce(:merge!)
       end
     end
 
@@ -90,6 +99,16 @@ module BloodContracts::Core
       @context[:errors]
     end
 
+    # Helper to build a ContractFailure with shared context
+    #
+    # @return [ContractFailure]
+    #
+    private def failure(*)
+      sum_context = @or_matches.map(&:context)
+      @context[:sum_failure_contexts] = sum_context
+      self.class.failure_klass.new(context: @context)
+    end
+
     # @private
     private def inspect
       "#<sum #{self.class.name} is #{self.class.sum_of.to_a.join(' or ')}"\

data/lib/blood_contracts/core/tuple.rb

@@ -143,10 +143,12 @@ module BloodContracts::Core
     def match
       @matches = attributes_enumerator.map do |(type, value), index|
         attribute_name = self.class.names[index]
-        attributes.store(attribute_name, type.match(value, context: @context))
+        attributes.store(
+          attribute_name, type.match(value, context: @context.dup)
+        )
       end
-      return if @matches.find(&:invalid?).nil?
-      failure(:invalid_tuple)
+      return if (failures = @matches.select(&:invalid?)).empty?
+      failures.unshift(failure).reduce(:merge!)
     end
 
     # Turns match into array of unpacked values
@@ -190,6 +192,14 @@ module BloodContracts::Core
       {}
     end
 
+    # Helper to build a ContractFailure with shared context
+    #
+    # @return [ContractFailure]
+    #
+    private def failure(*)
+      self.class.failure_klass.new(context: @context)
+    end
+
     # @private
     private def parse_values_from_context(context)
       return if context.empty?

data/lib/blood_contracts/core/tuple_contract_failure.rb

@@ -17,6 +17,14 @@ module BloodContracts::Core
       attributes.select { |_name, type| type.invalid? }
     end
 
+    # Contexts for subset of attributes which are invalid
+    #
+    # @return [Hash<String, ContractFailure>]
+    #
+    def attribute_contexts
+      attribute_errors.transform_values!(&:context)
+    end
+
     # Unpacked matching errors in form of a hash per attribute
     #
     # @return [Hash<String, ContractFailure>]

data/spec/blood_contracts/core_spec.rb

@@ -108,12 +108,8 @@ RSpec.describe BloodContracts::Core do
     context "when login is valid" do
       context "when login is email" do
         let(:login) { "admin@example.com" }
-        let(:errors) { [{ Test::Phone => ["Not a phone"] }] }
         let(:validation_context) do
           hash_including(
-            phone: login,
-            clean_phone: login,
-            errors: errors,
             email: login
           )
         end
@@ -129,13 +125,10 @@ RSpec.describe BloodContracts::Core do
       context "when login is phone" do
         let(:login) { "8(800) 200 - 11 - 00" }
         let(:cleaned_phone) { "88002001100" }
-        let(:errors) { [{ Test::Email => ["Not an email"] }] }
         let(:validation_context) do
           hash_including(
             phone: login,
-            clean_phone: cleaned_phone,
-            errors: errors,
-            email: login
+            clean_phone: cleaned_phone
           )
         end
 
@@ -153,15 +146,13 @@ RSpec.describe BloodContracts::Core do
       let(:errors) do
         [
           { Test::Email => ["Not an email"] },
-          { Test::Phone => ["Not a phone"] },
-          { Test::Login => [:no_matches] }
+          { Test::Phone => ["Not a phone"] }
         ]
       end
 
       it do
         is_expected.to be_invalid
         expect(subject.errors).to match_array(errors)
-        expect(subject.unpack).to match({ Test::Login => [:no_matches] })
       end
     end
   end
@@ -254,15 +245,12 @@ RSpec.describe BloodContracts::Core do
             attribute_errors.merge(password: kind_of(dynamic_password_type))
           end
           let(:attribute_errors) { { email: kind_of(BC::ContractFailure) } }
-          let(:tuple_invalid) do
-            { Test::InlineRegistrationInput => [:invalid_tuple] }
-          end
 
           it do
             expect(subject).to be_invalid
             expect(subject.attributes).to match(attributes)
             expect(subject.to_h).to match(email: email_error)
-            expect(subject.errors).to match_array([email_error, tuple_invalid])
+            expect(subject.errors).to match_array([email_error])
             expect(subject.attribute_errors).to match(attribute_errors)
           end
         end
@@ -295,13 +283,12 @@ RSpec.describe BloodContracts::Core do
         attribute_errors.merge(password: kind_of(Test::Ascii))
       end
       let(:attribute_errors) { { email: kind_of(BC::ContractFailure) } }
-      let(:tuple_invalid) { { Test::RegistrationInput => [:invalid_tuple] } }
 
       it do
         expect(subject).to be_invalid
         expect(subject.attributes).to match(attributes)
         expect(subject.to_h).to match(email: email_error)
-        expect(subject.errors).to match_array([email_error, tuple_invalid])
+        expect(subject.errors).to match_array([email_error])
         expect(subject.attribute_errors).to match(attribute_errors)
       end
     end
@@ -347,19 +334,22 @@ RSpec.describe BloodContracts::Core do
     context "when value is valid JSON" do
       context "when value is invalid registration data" do
         let(:response) { '{"phone":"+78889992211"}' }
-        let(:error) { { Test::RegistrationInput => [:invalid_tuple] } }
-        let(:errors) do
+        let(:error) do
           [
             { Test::Email => ["Not an email"] },
             { Test::Phone => ["Not a phone"] },
-            { Test::Ascii => ["Not ASCII"] },
-            { Test::RegistrationInput => [:invalid_tuple] }
+            { Test::Ascii => ["Not ASCII"] }
           ]
         end
-        let(:validation_context) do
+        let(:password_errors) do
+          [
+            { Test::Ascii => ["Not ASCII"] }
+          ]
+        end
+        let(:password_context) do
           hash_including(
             raw_value: response,
-            errors: array_including(errors),
+            errors: array_including(password_errors),
             steps: ["Test::Json", "BloodContracts::Core::TupleContractFailure"],
             steps_values: {
               parse: response,
@@ -367,12 +357,35 @@ RSpec.describe BloodContracts::Core do
             }
           )
         end
+        let(:login_errors) do
+          [
+            { Test::Email => ["Not an email"] },
+            { Test::Phone => ["Not a phone"] }
+          ]
+        end
+        let(:login_context) do
+          hash_including(
+            raw_value: response,
+            errors: array_including(login_errors),
+            steps: ["Test::Json", "BloodContracts::Core::TupleContractFailure"],
+            steps_values: {
+              parse: response,
+              validate: { phone: "+78889992211" }
+            }
+          )
+        end
+        let(:validation_context) do
+          {
+            login: login_context,
+            password: password_context
+          }
+        end
 
         it do
           is_expected.to be_invalid
           is_expected.to be_kind_of(BC::TupleContractFailure)
-          expect(subject.unpack).to match(error)
-          expect(subject.context).to match(validation_context)
+          expect(subject.attribute_contexts).to match(validation_context)
+          expect(subject.errors).to match(error)
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blood_contracts-core
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Sergey Dolganov (sclinede)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-29 00:00:00.000000000 Z
+date: 2019-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler