lacerda 2.1.4.beta2 → 2.1.4.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71c56c5058384e3ab9389f6633dd510b9d50498d
-  data.tar.gz: 04fce6e09bec4144382033f2d5bd3729ff54b72e
+  metadata.gz: a807acc73bace0f06ff5bf9bb62991eba9f93dfc
+  data.tar.gz: d9b6720d89815ec353ccfc5cd462365eb17577ca
 SHA512:
-  metadata.gz: e48c02b02612199cf19193617522f7611b5731e65b970189c682cb31cf1b2d9e9480f584ac484136beccdda97035dfabf1d03768418fb747c5bad629e26d4b75
-  data.tar.gz: fdd53fed2a48fa3fdb4cff036303befcae886247d65059b68245bd32afa8a2ec50dbdf20e51137bc40257a89181aa2e75cd55c38d7848afaad8f9ce17cdefeac
+  metadata.gz: b5b37c5e2e799942ed9121b5a3eac91c9204c70a8423a42531c2ff4d8e5235a9fd6899760886a060ea00932253f800ddd1bf3afc728fb99cc26c15315cc99153
+  data.tar.gz: 3fba51c4b13b1e2e7e81290e4e193ef96ff54d9311bd512eefb8260e3a586ed2681bd81856938debf60812e2f72832e8cb26a834bfe4e682f360ad2e88c5476a

data/CHANGELOG.markdown

@@ -1,7 +1,8 @@
-# [2.1.4.beta1] - 2017-09-28
+# [2.1.4.beta3] - 2017-09-28
 ### Fixed
 - Fix json schema inclusion for `required` fields
 - Update how we compare array item types, do not allow array as types.
+- Bubble up errors for oneOfs of one type
 
 # [2.1.3] - 2017-09-15
 ### Fixed

data/lib/lacerda/compare/json_schema.rb

@@ -126,10 +126,21 @@ module Lacerda
 
             # Check all publish types for a compatible consume type
             publish_types.each do |publish_type|
-              matched = consume_types.any? do |consume_type|
-                compare_sub_types(publish_type, consume_type, location + [publish_type])
+              errors = []
+              consume_types.any? do |consume_type|
+               errors = compare_sub_types(publish_type, consume_type, location + [publish_type])
+               errors.empty?
+              end
+              if errors.any?
+                # As there is only one type in each oneOf, we can give more specific error.
+                # TODO: add this to other cases
+                if publish_types.size == 1 && consume_types.size == 1
+                  @errors.push(*errors)
+                else
+                  _e(:ERR_MISSING_MULTI_PUBLISH_MULTI_CONSUME, location, publish_type)
+                end
+                return false
               end
-              return _e(:ERR_MISSING_MULTI_PUBLISH_MULTI_CONSUME, location, publish_type) if !matched
             end
 
           # Mixed case 1/2:
@@ -274,9 +285,8 @@ module Lacerda
           'properties' => { 'bar' => { '$ref' => '#/definitions/foo' } }
         }
         comparator = self.class.new(containing_schema)
-        # TODO we need errorrs to bubble up here
-        result = comparator.schema_contains?(publish: resolved_containing, consume: resolved_contained)
-        result
+        comparator.schema_contains?(publish: resolved_containing, consume: resolved_contained)
+        comparator.errors
       end
     end
   end

data/lib/lacerda/version.rb

@@ -1,3 +1,3 @@
 module Lacerda
-  VERSION = '2.1.4.beta2'
+  VERSION = '2.1.4.beta3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lacerda
 version: !ruby/object:Gem::Version
-  version: 2.1.4.beta2
+  version: 2.1.4.beta3
 platform: ruby
 authors:
 - Jannis Hermanns