satt 0.0.2 → 0.0.3

data/lib/satt.rb

@@ -1,4 +1,11 @@
-require "msgpack"
+unless defined?(MessagePack)
+  require "msgpack"
+end
+
+unless defined?(BigDecimal)
+  class BigDecimal
+  end
+end
 
 class Satt
   class InvalidArgument < RuntimeError; end
@@ -16,7 +23,7 @@ class Satt
   class Primitive
     NOT_DUMPABLE     = [ Binding, IO, Proc, Class ].freeze
     DONT_SERIALIZE   = [ NilClass, Fixnum, Float, TrueClass, FalseClass ].freeze
-    OTHER_PRIMITIVES = [ Symbol, String, Array, Hash, Bignum ].freeze
+    OTHER_PRIMITIVES = [ Symbol, String, Array, Hash, Bignum, BigDecimal ].freeze
 
     class Dumper
       def initialize()
@@ -29,10 +36,18 @@ class Satt
           raise InvalidArgument, "objects of type #{cl.to_s} are not dumpable" if obj.is_a?(cl)
         end
 
+        if obj.respond_to?(:marshal_dump)
+          return [ class_identifier(obj), dump(obj.marshal_dump) ]
+        end
+
+        if obj.respond_to?(:_dump)
+          return [ class_identifier(obj), obj._dump ]
+        end
+
         case obj
         when *DONT_SERIALIZE
           obj
-        when Symbol, Bignum
+        when Symbol, Bignum, BigDecimal
           [ class_identifier(obj), dump_value(obj) ]
         else
           id, cached = local_id(obj)
@@ -50,7 +65,7 @@ class Satt
           obj
         when Symbol
           obj.to_s
-        when Bignum
+        when Bignum, BigDecimal
           obj.to_s(16)
         when Array
           obj.map{ |e| dump(e) }
@@ -94,6 +109,16 @@ class Satt
         raise InvalidArgument, priv.inspect if priv.class != Array or priv.empty?
         objclass = get_class(priv.first)
 
+        if objclass.respond_to?(:marshal_load)
+          raise InvalidArgument unless priv.length == 2
+          return objclass.marshal_load(load(priv.last))
+        end
+
+        if objclass.respond_to?(:_load)
+          raise InvalidArgument, priv.inspect unless priv.length == 2
+          return objclass._load(priv.last)
+        end
+
         if objclass == Symbol
           raise InvalidArgument unless priv.length == 2 and priv.last.class == String
           return priv.last.to_sym
@@ -104,6 +129,11 @@ class Satt
           return priv.last.to_i(16)
         end
 
+        if objclass == BigDecimal
+          raise InvalidArgument unless priv.length == 2 and priv.last.class == String
+          return BigDecimal.new(priv.last)
+        end
+
         if [Array, Hash].include?(objclass) and priv.length == 3
           raise InvalidArgument unless priv.last.class == objclass
         end
@@ -159,8 +189,15 @@ class Satt
 
       def get_class(id)
         return OTHER_PRIMITIVES[id] if id.class == Fixnum
-        unless Object.constants.include?(id.to_sym) and objclass = Object.const_get(id) and objclass.class == Class
-          raise InvalidArgument, "unknown class #{id.to_s}"
+        path = id.split("::")
+        objclass = Object
+        while tmp = path.shift
+          unless objclass.constants.include?(tmp.to_sym) and
+            objclass = objclass.const_get(tmp) and
+            (objclass.class == Class or (path != [] and objclass.class == Module)) then
+            raise InvalidArgument, "unknown class #{id.to_s}"
+          end
+          objclass
         end
         objclass
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: satt
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack