lacerda 0.13.2 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e1b8aebb10149b3485dfc1ad6346f244d741152
-  data.tar.gz: f6e2768f844519bc0a3a25d560ae7ede128b893f
+  metadata.gz: 02a819a552f7641904455f8f4a49343054018444
+  data.tar.gz: d0be854811c7f1c4ddd85d3c1249397a4c7d9f28
 SHA512:
-  metadata.gz: c453a2af7d5fd37035ffeba7ff87aa9b6c02324427a68a9762c1b8dc23fda6bb115e151ee51a866462a3e6de79c341ad0de82642e6440872eda1d2235557b062
-  data.tar.gz: f9c0d1a30e79eac870d879b4808ada927848dace4bea3198c032b4dbf4ccc93228d0cbfde7ef2e45e3112e8474c67ae73ca68da739cdc8f53c3127a11be32ddf
+  metadata.gz: 8b045f882e73febac8073f10095865a4ba3b81b3bf7202d8c18be9a8ca61fc853eeab730ecd5057cde6950117129fd16b3ab02b24f0fd13d7a59d9544e9edaac
+  data.tar.gz: 3724646f4afba1c1b6523b819aa8e184174940f159d9e27047742e22bac22b1c2fc3a486bb25a890d4fd78be6ee39bae7fac32022782581bfe63b11c86efb5e2

data/.ruby-version

@@ -1 +1 @@
-2
+2.3.0

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 0.14.0
+- FIX: a required array property may contain an empty array
+- don't expose local definitions as published objects
+
 # 0.13.1
 - don't choke on schemas without local definitions
 

data/circle.yml

@@ -1,3 +1,3 @@
 machine:
   ruby:
-    version: '1.9'
+    version: '2.3.0'

data/lacerda.gemspec

@@ -22,8 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "activesupport"
   spec.add_runtime_dependency "rake",          ["~> 10.2"]
 
-  # json-schema 2.6.0 validates differently than 2.5.1
-  spec.add_runtime_dependency "json-schema",   ["~> 2.5.1"]
+  spec.add_runtime_dependency "json-schema",   ["~> 2.6.2"]
 
   spec.add_runtime_dependency "redsnow",       ["~> 0.4.3"]
   spec.add_runtime_dependency "colorize"
@@ -32,12 +31,12 @@ Gem::Specification.new do |spec|
   # Tins 1.7.0 is ruby 2.0 only
   spec.add_runtime_dependency "tins", ["~> 1.6.0"]
 
-  spec.add_development_dependency "bundler",             ["~> 1"]
-  spec.add_development_dependency "guard-bundler",       ["~> 2.1"]
-  spec.add_development_dependency "guard-ctags-bundler", ["~> 1.4"]
-  spec.add_development_dependency "guard-rspec",         ["~> 4.6"]
-  spec.add_development_dependency "rspec",               ["~> 3.3"]
-  spec.add_development_dependency "coveralls",           ["~> 0.8"]
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "guard-bundler"
+  spec.add_development_dependency "guard-ctags-bundler"
+  spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "coveralls"
   spec.add_development_dependency "codeclimate-test-reporter"
   spec.add_development_dependency 'pry'
   # spec.add_development_dependency 'pry-byebug'

data/lib/lacerda/compare/json_schema.rb

@@ -16,6 +16,7 @@ module Lacerda
 
       def initialize(containing_schema)
         @containing_schema = containing_schema
+        @errors = []
       end
 
       def contains?(contained_schema, initial_location = nil)
@@ -29,6 +30,7 @@ module Lacerda
         publish      = options[:publish]
         consume      = options[:consume]
         location     = options[:location] || []
+        return false unless publish and consume
 
         # We can only compare types and $refs, so let's make
         # sure they're there
@@ -87,7 +89,8 @@ module Lacerda
 
         # We already know that publish and consume's type are equal
         # but if they're objects, we need to do some recursion
-        if [consume['type']].flatten.include?('object')
+        isnt_a_primitive  = [consume['type']].flatten.include?('object') || consume['oneOf'] || publish['oneOf']
+        if isnt_a_primitive
 
           # An object can either be described by its properties
           # like this:
@@ -122,16 +125,16 @@ module Lacerda
 
             # Check all publish types for a compatible consume type
             publish_types.each do |publish_type|
-              original_errors = @errors
-              @errors = []
               compatible_consume_type_found = false
               consume_types.each do |consume_type|
-                next unless publish_type == consume_type or # Because null types are stripped in schema_contains
-                            schema_contains?(publish: publish_type, consume: consume_type, location: location + [publish_type])
+                next unless publish_type == consume_type or
+                            compare_sub_types(publish_type, consume_type, location + [publish_type])
                 compatible_consume_type_found = true
               end
-              @errors = original_errors
-              return _e(:ERR_MISSING_MULTI_PUBLISH_MULTI_CONSUME, location, publish_type) unless compatible_consume_type_found
+
+              unless compatible_consume_type_found
+                return _e(:ERR_MISSING_MULTI_PUBLISH_MULTI_CONSUME, location, publish_type)
+              end
             end
 
           # Mixed case 1/2:
@@ -145,7 +148,9 @@ module Lacerda
               compatible_consume_type_found = true
             end
             @errors = original_errors
-            return _e(:ERR_MISSING_SINGLE_PUBLISH_MULTI_CONSUME, location, publish['type']) unless compatible_consume_type_found
+            unless compatible_consume_type_found
+              return _e(:ERR_MISSING_SINGLE_PUBLISH_MULTI_CONSUME, location, publish['type'])
+            end
 
           # Mixed case 2/2:
           elsif consume['properties'] and publish['oneOf']
@@ -158,7 +163,9 @@ module Lacerda
               incompatible_publish_type = publish_type
             end
             @errors = original_errors
-            return _e(:ERR_MISSING_MULTI_PUBLISH_SINGLE_CONSUME, location, incompatible_publish_type) if incompatible_publish_type
+            if incompatible_publish_type
+              return _e(:ERR_MISSING_MULTI_PUBLISH_SINGLE_CONSUME, location, incompatible_publish_type)
+            end
 
           # We don't know how to handle this 😳
           # an object can either have "properties" or "oneOf", if the schema has anything else, we break
@@ -170,6 +177,7 @@ module Lacerda
         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)
           end
@@ -182,7 +190,7 @@ module Lacerda
 
       def properties_contained?
         @contained_schema['properties'].each do |property, contained_property|
-          resolved_contained_property = data_for_pointer(property, @contained_schema)
+          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)")
@@ -242,6 +250,22 @@ module Lacerda
         return false unless type
         schema['definitions'][type]
       end
+
+      # If you just want to compare two json objects/types,
+      # 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 },
+          '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
+      end
     end
   end
 end

data/lib/lacerda/conversion.rb

@@ -44,16 +44,8 @@ module Lacerda
         "properties"  => {},
       }
 
-      # The scope for the data structure is the name of the service
-      # publishing the object. So if we're parsing a 'consume' schema,
-      # the containing objects are alredy scoped (because a consume
-      # schema says 'i consume object X from service Y'.
       basename = File.basename(filename)
-      if basename.end_with?("publish.mson")
-        data_structure_autoscope = service_scope
-      elsif basename.end_with?("consume.mson")
-        data_structure_autoscope = nil
-      else
+      if !basename.end_with?("publish.mson") and !basename.end_with?("consume.mson")
         raise Error, "Invalid filename #{basename}, can't tell if it's a publish or consume schema"
       end
 
@@ -90,7 +82,7 @@ module Lacerda
       #
       data_structures.each do |data|
         id = data['name']['literal']
-        json= DataStructure.new(id, data, data_structure_autoscope).to_json
+        json= DataStructure.new(id, data, nil).to_json
         member = json.delete('title')
         schema['definitions'][member] = json
         schema['properties'][member] = {"$ref" => "#/definitions/#{member}"}

data/lib/lacerda/conversion/data_structure.rb

@@ -81,7 +81,8 @@ module Lacerda
           # If it's an array, we need to pluck out the item types
           if type == 'array'
             nestedTypes = type_definition['typeSpecification']['nestedTypes']
-            spec['items'] = nestedTypes.map{|t| primitive_or_reference(t, is_required) }
+            # Passing false here, because an empty array is still an array
+            spec['items'] = nestedTypes.map{|t| primitive_or_reference(t, false) }
 
           # If it's an object, we need recursion
           elsif type == 'object'

data/lib/lacerda/object_description.rb

@@ -25,12 +25,19 @@ module Lacerda
       @scoped_name = scoped_name
       @name = remove_service_from_scoped_name(scoped_name)
       @schema = schema.with_indifferent_access
+      @schema['$schema'] ||= 'http://json-schema.org/draft-04/schema#'
     end
 
     def validate_data!(data)
       JSON::Validator.validate!(@schema, data)
     end
 
+    def validate_data(data)
+      JSON::Validator.validate!(@schema, data)
+    rescue JSON::Schema::ValidationError
+      false
+    end
+
     private
 
     def remove_service_from_scoped_name(n)

data/lib/lacerda/specification.rb

@@ -14,8 +14,9 @@ module Lacerda
     def objects
       return [] unless @schema[:definitions]
       @schema[:definitions].map do |scoped_name, schema|
+        next if !scoped_name.index(SCOPE_SEPARATOR)
         object_description_class.new(service, scoped_name, schema)
-      end
+      end.compact
     end
 
     private

data/lib/lacerda/version.rb

@@ -1,3 +1,3 @@
 module Lacerda
-  VERSION = '0.13.2'
+  VERSION = '0.14.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lacerda
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.14.0
 platform: ruby
 authors:
 - Jannis Hermanns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 2.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 2.6.2
 - !ruby/object:Gem::Dependency
   name: redsnow
   requirement: !ruby/object:Gem::Requirement
@@ -112,86 +112,86 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-ctags-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -281,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Markdown publish/consume contract parser and validator