lacerda 0.12.4 → 0.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 588430006c27bd1ea88993283adbc0eb49be000b
-  data.tar.gz: cc255e3eecb951c9037b35b10aea65cd7b7560b2
+  metadata.gz: eb103cbaef02d7242cb5e6fca4394709496aa9b4
+  data.tar.gz: 133a8e88e4f034ddf4b1026355e240010a3f687c
 SHA512:
-  metadata.gz: bd0795617cd98d03414c77d6c5ad3b17293003fc953ccd87dd036c6617b04b3b44c92334747140cc8ccef7e5ec731fecff98ebf0cd6fe19548560647efa84a90
-  data.tar.gz: 5c7ca3268b8abcf1643df2cc04deff7903b44d63c14e79a6265f45f5fb881e9350e05d56534554ff508149e2722e578bf061984050a3ddd5e875a30bfd0cf024
+  metadata.gz: 3fa4c39961f7ffc8f39011661fbd2096e994c01e9a072e0a45c56bade9341fa90d725bd60adc41a78b986672eb0cab157fd6339b4d62f7469b590c1ed22b5ef3
+  data.tar.gz: 31b516bbad9d48abf2e61decb50f719a1faf46da940431369ba297f50adcc345be21e0dfdadab5823593f8c157e837a29f7e07412367c8649cc60cc903fd65f0

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 0.12.5
+- fix https://github.com/moviepilot/zeta/issues/18 (infinite loops
+  for some cases where json pointers are used)
+
 # 0.12.4
 - fix https://github.com/moviepilot/lacerda/issues/17
 

data/lib/lacerda/consume_specification.rb

@@ -50,12 +50,17 @@ module Lacerda
 
     def object(name)
       underscored_name = Lacerda.underscore(name)
-      object_schema = Lacerda.deep_copy(@schema[:definitions][underscored_name])
+      schema_dup = Lacerda.deep_copy(@schema)
+
+      # It's critical to delete this object from the definitions
+      # or else the json validator gem will go into an endless loop
+      object_schema =schema_dup['definitions'].delete underscored_name.to_s
+
       raise Lacerda::Service::InvalidObjectTypeError.new("Invalid object type: #{underscored_name.to_s.to_json}") unless object_schema
 
       # Copy the definitions of our schema into the schema for the
       # object in case its properties include json pointers
-      object_schema[:definitions] = Lacerda.deep_copy(@schema[:definitions])
+      object_schema['definitions'] = schema_dup['definitions']
 
       Lacerda::ConsumedObject.new(service, name, object_schema)
     end

data/lib/lacerda/publish_specification.rb

@@ -27,12 +27,16 @@ module Lacerda
 
     def object(name)
       scoped_name = scopify_name(name)
-      object_schema = @schema[:definitions][scoped_name]
+      schema_dup = Lacerda.deep_copy(@schema)
+
+      # It's critical to delete this object from the definitions
+      # or else the json validator gem will go into an endless loop
+      object_schema = schema_dup['definitions'].delete scoped_name.to_s
       raise Lacerda::Service::InvalidObjectTypeError.new(scoped_name) unless object_schema
 
       # Copy the definitions of our schema into the schema for the
       # object in case its properties include json pointers
-      object_schema[:definitions] = Lacerda.deep_copy(@schema[:definitions])
+      object_schema['definitions'] = schema_dup['definitions']
 
       Lacerda::PublishedObject.new(service, scoped_name, object_schema)
     end

data/lib/lacerda/version.rb

@@ -1,3 +1,3 @@
 module Lacerda
-  VERSION = '0.12.4'
+  VERSION = '0.12.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lacerda
 version: !ruby/object:Gem::Version
-  version: 0.12.4
+  version: 0.12.5
 platform: ruby
 authors:
 - Jannis Hermanns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport