memcache 1.0.1 → 1.1.0

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :build: 
-:minor: 0
-:patch: 1
+:minor: 1
+:patch: 0
 :major: 1

data/lib/memcache.rb

@@ -82,7 +82,7 @@ class Memcache
       else
         value = server(key).get(key, opts[:cas])
       end
-      unmarshal(value, opts)
+      opts[:raw] ? value : unmarshal(value, key)
     end
   end
 
@@ -329,7 +329,7 @@ protected
     keys_by_server.each do |server, keys|
       server.get(keys, opts[:cas]).each do |key, value|
         input_key = key_to_input_key[key]
-        results[input_key] = unmarshal(value, opts)
+        results[input_key] = opts[:raw] ? value : unmarshal(value, key)
       end
     end
     results
@@ -348,15 +348,15 @@ protected
     opts[:raw] ? value : Marshal.dump(value)
   end
 
-  def unmarshal(value, opts = {})
-    return value if value.nil? or opts[:raw]
+  def unmarshal(value, key = nil)
+    return value if value.nil?
     
     object = Marshal.load(value)
     object.memcache_flags = value.memcache_flags
     object.memcache_cas   = value.memcache_cas
     object
   rescue Exception => e
-    puts "Memcache read error: #{e.class} #{e.to_s} while unmarshalling value: #{value}"
+    puts "Memcache read error: #{e.class} #{e.to_s} on key '#{key}' while unmarshalling value: #{value}"
     nil
   end
 

data/lib/memcache/segmented_server.rb

@@ -5,8 +5,8 @@ class Memcache
     MAX_SIZE = 1000000 # bytes
     PARTIAL_VALUE = 0x40000000
     
-    def get(keys, opts = {})
-      return get([keys], opts)[keys.to_s] unless keys.kind_of?(Array)
+    def get(keys, cas = nil)
+      return get([keys], cas)[keys.to_s] unless keys.kind_of?(Array)
       return {} if keys.empty?
 
       results = super
@@ -38,8 +38,8 @@ class Memcache
         if value
           value.memcache_cas   = results[key].memcache_cas
           value.memcache_flags = results[key].memcache_flags ^ PARTIAL_VALUE
-          results[key] = value
         end
+        results[key] = value
       end
       results
     end
@@ -86,7 +86,7 @@ class Memcache
       if value and value.size > MAX_SIZE
         master_key, parts = segment(key, value)
         parts.each do |hash, data|
-          set(hash, data, expiry)
+          set(hash, data, expiry + 1) # We want the segments to expire slightly after the master key.
         end
         [master_key, flags | PARTIAL_VALUE]
       else

data/lib/memcache/server.rb

@@ -23,7 +23,7 @@ class Memcache
     end
 
     def inspect
-      "<Memcache::Server: %s:%d (%s)>" % [@host, @port, @status]
+      "<#{self.class.name}: %s:%d (%s)>" % [@host, @port, @status]
     end
 
     def name
@@ -87,7 +87,7 @@ class Memcache
       get(keys, true)
     end
 
-    def get(keys, cas = false)
+    def get(keys, cas = nil)
       return get([keys], cas)[keys.to_s] unless keys.kind_of?(Array)
       return {} if keys.empty?
 

data/memcache.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memcache}
-  s.version = "1.0.1"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Balthrop"]
-  s.date = %q{2009-11-20}
+  s.date = %q{2009-11-25}
   s.description = %q{Ruby client for memcached supporting advanced protocol features and pluggable architecture.}
   s.email = %q{code@justinbalthrop.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: memcache
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-20 00:00:00 -08:00
+date: 2009-11-25 00:00:00 -08:00
 default_executable: 
 dependencies: []