lacerda 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf9cdcab9b0b20b1febda478e06f431a48250ec8
-  data.tar.gz: 12499578a02c7c5e57c6393d93312a3a21284e9d
+  metadata.gz: 80b98ebf42e7ed35930cb10db57a3881d5e981cd
+  data.tar.gz: 3928dcda4bc9ed3e7acd49859cb581f2a8d01a3d
 SHA512:
-  metadata.gz: fbcffea2beb291540f0fe39203f1e50fabbe76ba8ec1021e98b39dd335224dfd9accf4a2457fd49403b63371a99caf945ef6d5ba86c03fda3438093ff9c4dec9
-  data.tar.gz: f0e514af65dea7e6b16ea849ff0bfc3d1539eeb1a79fbf943142749829c01d32806fbb228adad90803c384e6737995021bb9437da60b63f274a099712aabd16c
+  metadata.gz: 65f3a0acecd4291f21c0304ff95053d94b0a3fbc35d072b6255681c5b7271457f73fcc2a7be0c99dd8245d1f186f4691430b60b726f1e8edc3bcb43faa71d4eb
+  data.tar.gz: 09067d6844600f0aee410e6f6c69f7a420e4ed47eef0c0b91cead42cd609f498e712f0792194f06e25215e82ccee56d2afcf3f2b4a014433aa38ad1010d8317e

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 0.13.1
+- don't set type and oneOf in json schema, just oneOf
+- update blumquist from ~> 0.3 to ~> 0.4
+
 # 0.13.0
 - enhance some error messages (invalid object types)
 - make non required properties nullable https://github.com/moviepilot/lacerda/pull/21

data/lacerda.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "redsnow",       ["~> 0.4.3"]
   spec.add_runtime_dependency "colorize"
-  spec.add_runtime_dependency "blumquist",     ["~> 0.3"]
+  spec.add_runtime_dependency "blumquist",     ["~> 0.4"]
 
   # Tins 1.7.0 is ruby 2.0 only
   spec.add_runtime_dependency "tins", ["~> 1.6.0"]

data/lib/lacerda/compare/json_schema.rb

@@ -7,7 +7,7 @@ module Lacerda
         :ERR_MISSING_POINTER      => "A JSON pointer could not be resolved.",
         :ERR_MISSING_PROPERTY     => "The published object is missing a property required by your specification.",
         :ERR_MISSING_REQUIRED     => "The published object has an optional property that you marked as required in your specification.",
-        :ERR_MISSING_TYPE_AND_REF => 'A property has to either have a "type" or a "$ref" property.',
+        :ERR_MISSING_TYPE_AND_REF_AND_ONE_OF => 'A property has to either have a "type", "oneOf" or "$ref" property.',
         :ERR_TYPE_MISMATCH        => "The published object has a property with a different type than the consumer's specification.",
         :ERR_NOT_SUPPORTED        => 'I don\'t yet know what to do when the consumer\'s specification has a "$ref" defined and the publisher\'s specification has a "type".'
       }
@@ -32,9 +32,9 @@ module Lacerda
 
         # We can only compare types and $refs, so let's make
         # sure they're there
-        return _e(:ERR_MISSING_TYPE_AND_REF, location) unless
-          (consume['type'] or consume['$ref']) and
-          (publish['type'] or publish['$ref'])
+        return _e(:ERR_MISSING_TYPE_AND_REF_AND_ONE_OF, location) unless
+          (consume['type'] or consume['$ref'] or consume['oneOf']) and
+          (publish['type'] or publish['$ref'] or publish['oneOf'])
 
         # There's four possibilities here:
         #

data/lib/lacerda/conversion/data_structure.rb

@@ -111,7 +111,6 @@ module Lacerda
           types = [{'$ref' => "#/definitions/#{self.class.scope(@scope, type['literal'])}" }]
           types << { 'type' => 'null' } unless is_required
           {
-            'type' => 'object',
             'oneOf' => types
           }
         end

data/lib/lacerda/version.rb

@@ -1,3 +1,3 @@
 module Lacerda
-  VERSION = '0.13.0'
+  VERSION = '0.13.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lacerda
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Jannis Hermanns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: tins
   requirement: !ruby/object:Gem::Requirement