firm 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f6498bd122a2588336365f1120c424cfdf65fd5e05d87b4c5b3175c92d72965
-  data.tar.gz: bbf7816402e9f0c1b977dd47cfefc6b600e389c6e3710436a8d62fc9eee42a3d
+  metadata.gz: 5c1c7b999e2db422d608d8aaf8e28a9bace6824640f50a8e5dabb30e2ca89a36
+  data.tar.gz: a16d62247a09cc2e1d8b3c4d2a990ffefb7b48c18f6f1d8f27e12c770ff103eb
 SHA512:
-  metadata.gz: 0fcc10bf8e5d448f02482fe453fc20433ca26781d08c55a0dba0e0b0947e17aae91d4f97d45c858ae5f73b170c37cb0c646caad3904d573745b8737ac6e61aac
-  data.tar.gz: 7bc179e75ea98e4505156d3ff59d53f7d07931c0d24b40e4adb127ae82be1bcf205a19b0811bebd557f4c519dd507f8802c8e7f25c0ed60ef9d6c75f2fee30ef
+  metadata.gz: 6c45a0bc530a143ad8b37de7e00f6fdd4a2af91ffb52b18ce86f91ffac390ea05825d58b042e29361a96fd762be58d210d141bdb88d9748c3232e7c30232b8cc
+  data.tar.gz: 939fe265f4f55f1255851e5f246b73ca416c6649af2ffcdad6aa8fb63341289ef64c71678bc02a7372c66acd6a91a26111ebc049d2a571b5f3f189f7010d3fb2

data/lib/firm/serializer/json.rb

@@ -148,20 +148,20 @@ module FIRM
         def json_create(object)
           data = object['data']
           # deserializing (anchor) object or alias
-          if data.has_key?('*id')
-            if Serializable::Aliasing.restored?(self, data['*id'])
+          if object.has_key?('*id')
+            if Serializable::Aliasing.restored?(self, object['*id'])
               # resolving an already restored anchor for this alias
-              Serializable::Aliasing.resolve_anchor(self, data['*id'])
+              Serializable::Aliasing.resolve_anchor(self, object['*id'])
             else
               # in case of cyclic references JSON will restore aliases before the anchors
               # so in this case we allocate an instance here and register it as
               # the anchor; when the anchor is restored it will re-use this instance to initialize & restore
               # the properties
-              Serializable::Aliasing.restore_anchor(data['*id'], self.allocate)
+              Serializable::Aliasing.restore_anchor(object['*id'], self.allocate)
             end
           else
-            instance = if data.has_key?('&id')
-                         anchor_id = data.delete('&id') # extract anchor id
+            instance = if object.has_key?('&id')
+                         anchor_id = object['&id'] # extract anchor id
                          if Serializable::Aliasing.restored?(self, anchor_id)
                            # in case of cyclic references an alias will already have restored the anchor instance
                            # (default constructed); retrieve that instance here for deserialization of properties
@@ -192,19 +192,14 @@ module FIRM
             anchor_data = Serializable::Aliasing.get_anchor_data(self)
             # retroactively insert the anchor in the anchored instance's serialization data
             anchor_data['&id'] = anchor unless anchor_data.has_key?('&id')
-            json_data["data"] = {
-              '*id' => anchor
-            }
+            json_data['*id'] = anchor
           else
             # register anchor object **before** serializing properties to properly handle cycling (bidirectional
             # references)
-            if defined? JRUBY_VERSION
-              # JRuby has a problem modifying a hash while iterating it so we create a new copy here which we
-              # merge with the original because that may be updated with an anchor id
-              json_data['data'] = for_serialize(Serializable::Aliasing.register_anchor_object(self, {}))
-              json_data['data'].merge!(json_data['data'].transform_values { |v| v.respond_to?(:as_json) ? v.as_json : v })
-            else
-              json_data['data'] = for_serialize(Serializable::Aliasing.register_anchor_object(self, {}))
+            Serializable::Aliasing.register_anchor_object(self, json_data)
+            data = for_serialize({})
+            unless data.empty?
+              json_data['data'] = data
               json_data['data'].transform_values! { |v| v.respond_to?(:as_json) ? v.as_json : v }
             end
           end

data/lib/firm/version.rb

@@ -4,6 +4,6 @@
 module FIRM
 
   # FIRM version
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: firm
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Martin Corino