lacerda 2.1.3 → 2.1.4.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fa036be3aa64b8252a1f70c50845b30a3416c91
-  data.tar.gz: bdf9130ea1129c5d75ad957b0ead7c1415e79872
+  metadata.gz: 19b05d38440fd072d0007dea89ce2d9918ceb457
+  data.tar.gz: cf090174559cad51fd3fc811feeaba8963b7cef0
 SHA512:
-  metadata.gz: 4ecafbf4304cc8c8996872d24473250c5b0160d18ed1570abda7b82f2cb3a74a1c9eb9d835883b0f2fc921efeeea46df51a3e8e0c5054d5b0cdf5c57c9b0c4d8
-  data.tar.gz: f928393cc76f332f8ca5efed5a714e44cdcdc6ae7bff3ba1a01d715cb6ce637b7a4717c0774a8a82ec3f50924fa3951f64d3f2a6467a55ef2f892c4bf524be95
+  metadata.gz: 5d9448fde020aad2ce929c3027f038bfaf66d3cd008c4b33038cc2d24517b43d271340fc6bb7055c0d34511a7b29093044dc8aa84e93ec6826f32761b26d9d62
+  data.tar.gz: f2f184248f2a47d2cd7db01fd788a8da85abffa38b68fa4aaa8547f619dc7c98c98646077d679485219e655768ebea358ad23dc683fdcdc5e119a648560fc5a5

data/.gitignore

@@ -8,3 +8,4 @@ coverage
 **/*.gem
 Gemfile.lock
 tmp/
+.byebug_history

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# [2.1.4.beta1] - 2017-09-27
+### Fixed
+- Fix json schema inclusion for `required` fields
+
 # [2.1.3] - 2017-09-15
 ### Fixed
 - Allow Lacerda::Reporter::Rspec to work when RSpec config.disable_monkey_paching! is set.

data/lib/lacerda/compare/json_schema.rb

@@ -125,16 +125,10 @@ module Lacerda
 
             # Check all publish types for a compatible consume type
             publish_types.each do |publish_type|
-              compatible_consume_type_found = false
-              consume_types.each do |consume_type|
-                next unless publish_type == consume_type or
-                            compare_sub_types(publish_type, consume_type, location + [publish_type])
-                compatible_consume_type_found = true
-              end
-
-              unless compatible_consume_type_found
-                return _e(:ERR_MISSING_MULTI_PUBLISH_MULTI_CONSUME, location, publish_type)
+              matched = consume_types.any? do |consume_type|
+                compare_sub_types(publish_type, consume_type, location + [publish_type])
               end
+              return _e(:ERR_MISSING_MULTI_PUBLISH_MULTI_CONSUME, location, publish_type) if !matched
             end
 
           # Mixed case 1/2:
@@ -175,11 +169,11 @@ module Lacerda
         end
 
         if consume['type'] == 'array'
-          sorted_publish = publish['items'].sort
-          consume['items'].sort.each_with_index do |item, i|
-            # TODO why just compare sorted_publish[i] and not all??
-            next if schema_contains?(publish: sorted_publish[i], consume: item)
-            return _e(:ERR_ARRAY_ITEM_MISMATCH, location, nil)
+          publish['items'].each do |publish_item|
+            matched = consume['items'].any? do |consume_item|
+              schema_contains?(publish: publish_item, consume: consume_item)
+            end
+            return _e(:ERR_ARRAY_ITEM_MISMATCH, location, nil) unless matched
           end
         end
 
@@ -189,24 +183,37 @@ module Lacerda
       private
 
       def properties_contained?
-        @contained_schema['properties'].each do |property, contained_property|
-          resolved_contained_property = data_for_pointer(contained_property, @contained_schema)
-          containing_property = @containing_schema['properties'][property]
-          if !containing_property
-            _e(:ERR_MISSING_DEFINITION, [@initial_location, property], "(in publish.mson)")
-          else
-            resolved_containing_property = data_for_pointer(
-              containing_property,
-              @containing_schema
-            )
-            schema_contains?(
-              publish: resolved_containing_property,
-              consume: resolved_contained_property,
-              location: [property]
-            )
-          end
+        # success is used to ensure we have no errors.
+        success = @contained_schema['properties'].map do |name, content|
+          property_contained?(name, content)
+        end.all? {|is_property_contained| is_property_contained }
+        success && @errors.empty?
+      end
+
+      def property_contained?(property_name, content)
+        resolved_contained_property = data_for_pointer(content, @contained_schema)
+        containing_property = @containing_schema['properties'][property_name]
+
+        if !containing_property
+          return _e(:ERR_MISSING_DEFINITION, [@initial_location, property_name], "(in publish.mson)")
         end
-        @errors.empty?
+
+        # Make sure required properties in consume are required in publish
+        publish_required = @containing_schema['required'] || []
+        consume_required = @contained_schema['required'] || []
+        missing = (consume_required - publish_required)
+        return _e(:ERR_MISSING_REQUIRED, [property_name], missing.to_json) unless missing.empty?
+
+        resolved_containing_property = data_for_pointer(
+          containing_property,
+          @containing_schema
+        )
+
+        schema_contains?(
+          publish: resolved_containing_property,
+          consume: resolved_contained_property,
+          location: [property_name]
+        )
       end
 
       def _e(error, location, extra = nil)
@@ -233,7 +240,7 @@ module Lacerda
       #
       def data_for_pointer(data_or_pointer, schema)
         data = nil
-        if data_or_pointer['type']
+        if data_or_pointer['type'] || data_or_pointer['oneOf']
           data = data_or_pointer
         elsif pointer = data_or_pointer['$ref']
           data = resolve_pointer(pointer, schema)
@@ -259,10 +266,12 @@ module Lacerda
       # this method wraps them into full schemas, creates a new
       # instance of self and compares
       def compare_sub_types(containing, contained, location)
+
         resolved_containing = data_for_pointer(containing, @containing_schema)
         resolved_contained  = data_for_pointer(contained,  @contained_schema)
+
         containing_schema = {
-          'definitions' => { 'foo' =>  resolved_containing },
+          'definitions' => { 'foo' => resolved_containing},
           'properties' => { 'bar' => { '$ref' => '#/definitions/foo' } }
         }
         comparator = self.class.new(containing_schema)

data/lib/lacerda/version.rb

@@ -1,3 +1,3 @@
 module Lacerda
-  VERSION = '2.1.3'
+  VERSION = '2.1.4.beta1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lacerda
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4.beta1
 platform: ruby
 authors:
 - Jannis Hermanns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -284,12 +284,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Markdown publish/consume contract parser and validator