spymemcached 0.2.0-java → 0.2.1-java

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/spymemcached.rb

@@ -18,7 +18,7 @@ class Spymemcached
 
   def get(key, marshal = true)
     value = @client.get(key)
-    marshal && value ?  Marshal.load(value) : value
+    marshal && value ? marshal_load(value) : value
   end
 
   def incr(key, by = 1)
@@ -38,7 +38,7 @@ class Spymemcached
   end
 
   def multiget(keys, marshal = true)
-    Hash[*@client.getBulk(*keys).map { |k,v| [k, marshal ? Marshal.load(v) : v] }.flatten]
+    Hash[*@client.getBulk(*keys).map { |k,v| [k, marshal ? marshal_load(v) : v] }.flatten]
   end
 
   def add(key, value, expiration = 0, marshal = true)
@@ -55,6 +55,10 @@ class Spymemcached
 
   private
     def marshal(value, marshal)
-      marshal ? Marshal.dump(value) : value.to_s
+      marshal ? Marshal.dump(value).to_java_bytes : value.to_s
+    end
+
+    def marshal_load(value)
+      Marshal.load(String.from_java_bytes(value))
     end
 end

data/spec/spymemcached_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require "action_view"
 
 describe Spymemcached do
   before do
@@ -115,4 +116,14 @@ describe Spymemcached do
     @cache.add("a", {:a => "b"}, 0, false)
     @cache.get("a", false).should == {:a => "b"}.to_s
   end
+
+  # not sure exactly why, but ActionView::SafeBuffer
+  # is the only repeatable instance of this bug that
+  # I can find
+  it "supports marshalling ActionView::SafeBuffers" do
+    s = ActionView::SafeBuffer.new "<div class=\"story_2 clearfix\">\n    <a href=\"/users/4\"><img alt=\"\" class=\"\" height=\"35\" src=\"http:///avatar_missing_35x35.gif\" title=\"\" width=\"35\" /></a>"
+    @cache.set("a", s)
+    @cache.get("a").should == s
+    @cache.multiget(["a"]).should == {"a" => s}
+  end
 end

data/spymemcached.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{spymemcached}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
   s.platform = %q{java}
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 2
-    - 0
-  version: 0.2.0
+    - 1
+  version: 0.2.1
 platform: java
 authors: 
   - James Golick