satt 0.0.1 → 0.0.2

data/lib/satt.rb

@@ -4,11 +4,11 @@ class Satt
   class InvalidArgument < RuntimeError; end
 
   def self.dump(obj)
-    MessagePack.dump(Satt::Primitive::Dumper.new.dump(obj))
+    MessagePack.pack(Satt::Primitive::Dumper.new.dump(obj))
   end
 
   def self.load(blob)
-    Satt::Primitive::Loader.new.load(MessagePack.load(blob))
+    Satt::Primitive::Loader.new.load(MessagePack.unpack(blob))
   end
 end
 
@@ -108,55 +108,53 @@ class Satt
           raise InvalidArgument unless priv.last.class == objclass
         end
 
-        # TODO: allocate object immediatelly and add to cache
-        # even if ivars not present (but come later), error if two entries
-        # with same id and both with ivars
-        if priv.length == 2
-          return fetch_obj(priv[1])
+        if priv.length == 2 and cache_has(priv[1])
+          return cache_get(priv[1])
         end
 
+        obj = cache_has(priv[1]) ? cache_get(priv[1]) : cache_put(priv[1], objclass.allocate)
+
         if objclass == Array
-          return cache_obj(priv[1], priv[2].map{ |e| load(e) })
+          priv[2].each_with_index do |e,i|
+            obj[i] = load(e)
+          end
+          return obj
         end
 
         if objclass == Hash
-          return cache_obj(priv[1], priv[2].reduce(Hash.new) { |hash, (key, value)|
+          return priv[2].reduce(obj) { |hash, (key, value)|
             hash[load(key)] = load(value)
             hash
-          })
+          }
         end
 
         if objclass == String
           raise InvalidArgument if priv.last.class != String
-          return cache_obj(priv[1], priv[2])
+          return obj.gsub!(/\A.*\z/, priv[2])
         end
 
         if priv.last.class != Hash
           raise InvalidArgument, priv.last.inspect
         end
 
-        return build_and_cache_obj(objclass, priv[1], priv[2])
+        priv[2].each do |(var, val)|
+          obj.instance_variable_set "@#{var}".to_sym, load(val)
+        end
+        return obj
       end
 
       private
 
-      def fetch_obj(ref)
-        return @objs[ref] if @objs[ref]
-        raise InvalidArgument, "can't find object with reference id #{ref.to_s}"
+      def cache_has(ref)
+        @objs.key?(ref)
       end
 
-      def cache_obj(ref, obj)
-        return @objs[ref] = obj unless @objs[ref]
-        raise InvalidArgument, "an object with reference id #{ref.to_s} already exists"
+      def cache_get(ref)
+        @objs[ref]
       end
 
-      def build_and_cache_obj(objclass, ref, ivars)
-        # Cache first, only then go deeper, to avoid following circular references
-        obj = cache_obj(ref, objclass.allocate)
-        ivars.each do |(var, val)|
-          obj.instance_variable_set "@#{var}".to_sym, load(val)
-        end
-        return obj
+      def cache_put(ref, obj)
+        @objs[ref] = obj
       end
 
       def get_class(id)

metadata

@@ -1,16 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: satt
 version: !ruby/object:Gem::Version
+  version: 0.0.2
   prerelease: 
-  version: 0.0.1
 platform: ruby
 authors:
 - Florian Weingarten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
-dependencies: []
+date: 2013-05-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Serializing arbitrary Ruby objects with MessagePack
 email: flo@hackvalue.de
 executables: []
@@ -18,24 +34,24 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/satt.rb
-homepage: http://rubygems.org/gems/satt
+homepage: https://github.com/fw42/satt/
 licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23