firm 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 823d2ee34c56ec4457626d9dd06586825f33a01ad3dd34dfd135f9cdefafdd66
-  data.tar.gz: f0c33ff04609cfa111f98886ca3d92cab1478d81b5bde280c2000bdcaca614c5
+  metadata.gz: 5c1c7b999e2db422d608d8aaf8e28a9bace6824640f50a8e5dabb30e2ca89a36
+  data.tar.gz: a16d62247a09cc2e1d8b3c4d2a990ffefb7b48c18f6f1d8f27e12c770ff103eb
 SHA512:
-  metadata.gz: 9a7c5b5446f5bc1aae9e6f2fcaa3baa0d3589b235144367443292e2785570ce5765f3612fc10c9fc010e7ce4f0e820239167a5e6f4ef5ad77fe2ecdbc0820349
-  data.tar.gz: 129cb0defe0a5628f9c7731e23ba73b90747f973cfc2931021612f4d271efbd39b80bbb60c8ca751f64fa549110fd79362ca751dfa78d11e68e9c127856da5de
+  metadata.gz: 6c45a0bc530a143ad8b37de7e00f6fdd4a2af91ffb52b18ce86f91ffac390ea05825d58b042e29361a96fd762be58d210d141bdb88d9748c3232e7c30232b8cc
+  data.tar.gz: 939fe265f4f55f1255851e5f246b73ca416c6649af2ffcdad6aa8fb63341289ef64c71678bc02a7372c66acd6a91a26111ebc049d2a571b5f3f189f7010d3fb2

data/README.md

@@ -8,7 +8,8 @@
 
 ## Introduction
 
-FIRM is a pure Ruby library providing output format independent object (de-)serialization support.
+FIRM is a pure Ruby library that works across different Ruby implementations like MRI Ruby and JRuby providing output 
+format independent object (de-)serialization support.
 
 FIRM is explicitly **NOT** intended as a non-discriminative marshaling library (dumping any object's attributes)
 but rather as structured and safe serialization library requiring users to think about what state they want

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,14 +192,16 @@ 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)
-            json_data['data'] = for_serialize(Serializable::Aliasing.register_anchor_object(self, {}))
-            json_data['data'].transform_values! { |v| v.respond_to?(:as_json) ? v.as_json : v }
+            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
           json_data
         end

data/lib/firm/serializer/xml.rb

@@ -182,7 +182,11 @@ module FIRM
             xml
           end
           def from_xml(xml)
-            xml.content
+            # in case the xml was somehow formatted it may be additional text nodes
+            # get inserted because of added space and/or newlines
+            # (like with JRuby's Nokogiri when outputting pretty formatted XML)
+            # so just in case look up the one CDATA child and only use that one's content
+            xml.children.find { |child| child.cdata? }&.text || ''
           end
         end
 
@@ -212,8 +216,9 @@ module FIRM
             xml
           end
           def from_xml(xml)
-            case (s = xml.content)
-            when 'NaN' then :Float::NAN
+            s = xml.children.find { |child| child.cdata? }&.text
+            case s
+            when nil, 'NaN' then :Float::NAN
             when 'Infinity' then ::Float::INFINITY
             when '-Infinity' then -::Float::INFINITY
             else
@@ -307,7 +312,12 @@ module FIRM
               xml
             end
             def from_xml(xml)
-              ::BigDecimal._load(xml.content)
+              # in case the xml was somehow formatted it may be additional text nodes
+              # get inserted because of added space and/or newlines
+              # (like with JRuby's Nokogiri when outputting pretty formatted XML)
+              # so just in case look up the one CDATA child and only use that one's content
+              data = xml.children.find { |child| child.cdata? }&.text
+              ::BigDecimal._load(data || '')
             end
           end
         end

data/lib/firm/version.rb

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

data/tests/serializer_tests.rb

@@ -228,7 +228,7 @@ module SerializerTestMixin
     assert_equal(obj, obj_new)
 
     Struct.new('MyStruct', :one, :two) unless defined? Struct::MyStruct
-    obj = Struct::MyStruct.new(one: Point.new(10, 90), two: Point.new(20, 80))
+    obj = Struct::MyStruct.new(Point.new(10, 90), Point.new(20, 80))
     obj_serial = obj.serialize
     assert_nothing_raised { obj_new = FIRM.deserialize(obj_serial) }
     assert_equal(obj, obj_new)
@@ -705,10 +705,12 @@ module SerializerTestMixin
     end
   end
 
+  require 'base64'
+
   class NestedSerializer
     include FIRM::Serializable
 
-    property :nested, handler: :marshall_nested
+    property nested: :marshall_nested
 
     def initialize(serializable=nil)
       @nested = serializable
@@ -718,11 +720,13 @@ module SerializerTestMixin
 
     protected
 
-    def marshall_nested(_id, *val)
+    def marshall_nested(*val)
       if val.empty?
-        @nested.serialize
+        # as this results in another XML string to embed it is probably best to encode
+        # it (at least JRuby's Nokogiri version seems to have problems with this without encoding)
+        Base64.urlsafe_encode64(@nested.serialize)
       else
-        @nested = FIRM.deserialize(val.first)
+        @nested = FIRM.deserialize(Base64.urlsafe_decode64(val.first))
         nil
       end
     end
@@ -746,9 +750,8 @@ module SerializerTestMixin
     ref_obj = RefUser.new(container.map[:seven].id, container.map[:eight].id, container.map[:nine].id)
     container.map[:ten] = ref_obj
     nest_obj = NestedSerializer.new(container)
-    obj_serial = [nest_obj, container.map[:one], container.map[:two], container.map[:five], [container.map[:three], container.map[:four], container.map[:six]], ref_obj].serialize(nil, pretty: true)
-    obj_new = nil
-    assert_nothing_raised { obj_new = FIRM.deserialize(obj_serial) }
+    obj_serial = [nest_obj, container.map[:one], container.map[:two], container.map[:five], [container.map[:three], container.map[:four], container.map[:six]], ref_obj].serialize(pretty: true)
+    obj_new = assert_nothing_raised { FIRM.deserialize(obj_serial) }
     assert_instance_of(::Array, obj_new)
     assert_instance_of(NestedSerializer, obj_new[0])
     container = obj_new[0].nested

metadata

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