right_support 2.8.25 → 2.8.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4d1fe10f00edff41986d12d3974498f8dc14ace
-  data.tar.gz: 7358538374cc52741957dd32c5cd86e28322d72a
+  metadata.gz: 6010fe3e9ebbaa222eacaf224b0576a36e350f7c
+  data.tar.gz: a4a49a381d7a250a19230b0a3cd848436a51f221
 SHA512:
-  metadata.gz: d23cdbb1ed41af6ea575de60bedc7de338317c90866fbe52496f80f0bff85fcc4cf32afec52a5bbcb00e0e43ec7c608f556aa7b4c7b827e42d3669514d187230
-  data.tar.gz: 3cbded75569f2a003032861dffb60414cb050274c85f6cd30fd278f245cd1525cda2b6ea10c8e5c72bb156c0916e0a8c3618cccb78117d02611d644f82b83036
+  metadata.gz: a74303a4224cd7bc1ffa4bb3d65df38b4664baa9c55ba31f63327696ff598756c7898d6de68ac625caa8f0e453e5811c73adf8b725a9dc709ebdf200d5f09189
+  data.tar.gz: 9f1d6b77e03702c6e8f83e04633f5fe8708d79f4a790dfbae77a4c860b5da1772576405db4d30d00f8eb19cb15b21d9591b3a91b575806702bd212b68f88cd91

data/VERSION

@@ -1 +1 @@
-2.8.25
+2.8.26

data/features/serialization.feature

@@ -104,5 +104,9 @@ Feature: JSON serialization
 
   Scenario: unrecognized Ruby object class
     When I unserialize the JSON value: {"_ruby_class":"DoesNotExist","hello":"world"}
-    Then the unserialized object should be an OpenStruct
+    Then the unserialized object should be an RightSupport::Data::UnknownType
     And the unserialized object should have a "hello" attribute with value: "world"
+
+  Scenario: unrecognized Ruby object class
+    When I serialize the Ruby value: RightSupport::Data::UnknownType.new("DoesNotExist", {"hello" => "world"})
+    Then the serialized value should be: {"_ruby_class":"DoesNotExist","hello":"world"}

data/lib/right_support/data/serializer.rb

@@ -210,6 +210,12 @@ module RightSupport::Data
         # Ruby Class/Module needs special handling - no instance vars
         { @marker => object.class.name,
           CLASS_ESCAPE_KEY  => object.name }
+      when UnknownType
+        # An unknown Ruby type that got deserialized and needs to be round-tripped.
+        object.marshal_dump.inject({@marker => object.__typename__}) do |result, (k,v)|
+          result[k.to_s] = object_to_jsonish(v)
+          result
+        end
       else
         # Generic serialized object; convert to Hash.
         hash = {}
@@ -257,6 +263,7 @@ module RightSupport::Data
             jsonish = Time.at(hash.delete(TIME_ESCAPE_KEY))
           else
             # Generic serialized object
+            klassname = klass
             klass = klass.to_const
 
             if klass
@@ -267,9 +274,9 @@ module RightSupport::Data
                 jsonish.instance_variable_set("@#{k}", jsonish_to_object(v))
               end
             else
-
-              # Unknown types turn into an OpenStruct.
-              jsonish = OpenStruct.new(hash.inject({}) do |result, (k, v)|
+              # Objects of unknown types are represented by a special derivative of OpenStruct
+              # so we can round-trip them later.
+              jsonish = UnknownType.new(klassname, hash.inject({}) do |result, (k, v)|
                 result[k] = jsonish_to_object(v)
                 result
               end)

data/lib/right_support/data/unknown_type.rb

@@ -0,0 +1,43 @@
+#
+# Copyright (c) 2009-2011 RightScale Inc
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'ostruct'
+
+module RightSupport::Data
+  # A type that can be instantiated by the DataSerializer (or anyone else) when an unknown Ruby
+  # type is encountered in serialized data. It functions like an OpenStruct, but it has a distinct
+  # type identity so the DataSerializer can work with it.
+  #
+  # UnknownType remembers the original Ruby type name of the serialized object so it can be
+  # dumped back to a serialization stream without losing type identity or attribute information.
+  class UnknownType < OpenStruct
+    attr_reader :__typename__
+
+    # Construct a new object representing a serialized object of unknown type.
+    # @param [String] typename
+    # @param [Hash] attributes
+    def initialize(typename, attributes)
+      @__typename__ = typename
+      super(attributes)
+    end
+  end
+end

data/lib/right_support/data.rb

@@ -29,6 +29,7 @@ module RightSupport
   end
 end
 
+require 'right_support/data/unknown_type'
 require 'right_support/data/serializer'
 require 'right_support/data/hash_tools'
 require 'right_support/data/uuid'

data/right_support.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: right_support 2.8.25 ruby lib
+# stub: right_support 2.8.26 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "right_support"
-  s.version = "2.8.25"
+  s.version = "2.8.26"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Tony Spataro", "Sergey Sergyenko", "Ryan Williamson", "Lee Kirchhoff", "Alexey Karpik", "Scott Messier"]
-  s.date = "2014-08-01"
+  s.date = "2014-08-06"
   s.description = "A toolkit of useful, reusable foundation code created by RightScale."
   s.email = "support@rightscale.com"
   s.extra_rdoc_files = [
@@ -54,6 +54,7 @@ Gem::Specification.new do |s|
     "lib/right_support/data.rb",
     "lib/right_support/data/hash_tools.rb",
     "lib/right_support/data/serializer.rb",
+    "lib/right_support/data/unknown_type.rb",
     "lib/right_support/data/uuid.rb",
     "lib/right_support/db.rb",
     "lib/right_support/db/cassandra_model.rb",
@@ -140,7 +141,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "https://github.com/rightscale/right_support"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.0"
+  s.rubygems_version = "2.2.2"
   s.summary = "Reusable foundation code."
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_support
 version: !ruby/object:Gem::Version
-  version: 2.8.25
+  version: 2.8.26
 platform: ruby
 authors:
 - Tony Spataro
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies: []
 description: A toolkit of useful, reusable foundation code created by RightScale.
 email: support@rightscale.com
@@ -58,6 +58,7 @@ files:
 - lib/right_support/data.rb
 - lib/right_support/data/hash_tools.rb
 - lib/right_support/data/serializer.rb
+- lib/right_support/data/unknown_type.rb
 - lib/right_support/data/uuid.rb
 - lib/right_support/db.rb
 - lib/right_support/db/cassandra_model.rb
@@ -161,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Reusable foundation code.