spymemcached 0.1.2-java → 0.2.0-java

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/lib/active_support/cache/spymemcached_store.rb

@@ -15,7 +15,7 @@ module ActiveSupport
 
       def read(key, options = nil)
         super
-        @cache.get(key)
+        @cache.get(key, !(options && options[:raw]))
       end
 
       # Set the key to the given value. Pass :unless_exist => true if you want to
@@ -23,7 +23,7 @@ module ActiveSupport
       def write(key, value, options = nil)
         super
         method = unless_exist?(options) ? :add : :set
-        @cache.send(method, key, value, expiry(options).to_i)
+        @cache.send(method, key, value, expiry(options).to_i, !(options && options[:raw]))
       end
 
       def delete(key, options = nil)

data/lib/spymemcached.rb

@@ -12,12 +12,13 @@ class Spymemcached
     end)
   end
 
-  def set(key, value, expiration = 0)
-    @client.set(key, expiration, value)
+  def set(key, value, expiration = 0, marshal = true)
+    @client.set(key, expiration, marshal(value, marshal))
   end
 
-  def get(key)
-    @client.get(key)
+  def get(key, marshal = true)
+    value = @client.get(key)
+    marshal && value ?  Marshal.load(value) : value
   end
 
   def incr(key, by = 1)
@@ -36,12 +37,12 @@ class Spymemcached
     @client.prepend(0, key, value).get
   end
 
-  def multiget(*keys)
-    Hash[*@client.getBulk(*keys).map { |k,v| [k,v] }.flatten]
+  def multiget(keys, marshal = true)
+    Hash[*@client.getBulk(*keys).map { |k,v| [k, marshal ? Marshal.load(v) : v] }.flatten]
   end
 
-  def add(key, value, expiration = 0)
-    @client.add(key, expiration, value).get
+  def add(key, value, expiration = 0, marshal = true)
+    @client.add(key, expiration, marshal(value, marshal)).get
   end
 
   def del(key)
@@ -51,4 +52,9 @@ class Spymemcached
   def flush
     @client.flush
   end
+
+  private
+    def marshal(value, marshal)
+      marshal ? Marshal.dump(value) : value.to_s
+    end
 end

data/spec/spymemcached_spec.rb

@@ -22,48 +22,48 @@ describe Spymemcached do
   end
 
   it "increments keys" do
-    @cache.set("number", "1")
+    @cache.set("number", "1", 0, false)
     @cache.incr("number")
-    @cache.get("number").should == "2"
+    @cache.get("number", false).should == "2"
   end
 
   it "increments keys by a set amount" do
-    @cache.set("number", "1")
+    @cache.set("number", "1", 0, false)
     @cache.incr("number", 2)
-    @cache.get("number").should == "3"
+    @cache.get("number", false).should == "3"
   end
 
   it "decrements keys" do
-    @cache.set("number", "2")
+    @cache.set("number", "2", 0, false)
     @cache.decr("number")
-    @cache.get("number").should == "1"
+    @cache.get("number", false).should == "1"
   end
 
   it "decrements keys by a set amount" do
-    @cache.set("number", "2")
+    @cache.set("number", "2", 0, false)
     @cache.decr("number", 2)
-    @cache.get("number").should == "0"
+    @cache.get("number", false).should == "0"
   end
 
   it "appends to keys" do
-    @cache.set("appendtome", "a")
+    @cache.set("appendtome", "a", 0, false)
     @cache.append("appendtome", "b")
-    @cache.get("appendtome").should == "ab"
+    @cache.get("appendtome", false).should == "ab"
   end
 
   it "prepends to keys" do
-    @cache.set("prependtome", "b")
+    @cache.set("prependtome", "b", 0, false)
     @cache.prepend("prependtome", "a")
-    @cache.get("prependtome").should == "ab"
+    @cache.get("prependtome", false).should == "ab"
   end
 
   it "returns boolean for prepend" do
-    @cache.set("prependtome", "b")
+    @cache.set("prependtome", "b", 0, false)
     @cache.prepend("prependtome", "a").should == true
   end
 
   it "returns boolean for append" do
-    @cache.set("appendtome", "b")
+    @cache.set("appendtome", "b", 0, false)
     @cache.append("appendtome", "a").should == true
   end
 
@@ -71,7 +71,7 @@ describe Spymemcached do
     @cache.set("a", "b")
     @cache.set("b", "c")
     @cache.set("c", "d")
-    @cache.multiget("a", "b", "c").should == {
+    @cache.multiget(["a", "b", "c"]).should == {
       "a" => "b",
       "b" => "c",
       "c" => "d"
@@ -100,4 +100,19 @@ describe Spymemcached do
     @cache.set("a", "b")
     @cache.del("a").should == true
   end
+
+  it "correctly marshals and unmarshals objects" do
+    @cache.set("a", {:a => "b"})
+    @cache.get("a").should == {:a => "b"}
+  end
+
+  it "supports setting and getting keys without marshalling the data" do
+    @cache.set("a", {:a => "b"}, 0, false)
+    @cache.get("a", false).should == {:a => "b"}.to_s
+  end
+  
+  it "supports adding keys without marshalling the data" do
+    @cache.add("a", {:a => "b"}, 0, false)
+    @cache.get("a", false).should == {:a => "b"}.to_s
+  end
 end

data/spec/spymemcached_store_spec.rb

@@ -37,27 +37,27 @@ describe "SpymemcachedStore" do
   end
 
   it "supports increment" do
-    @cache.write("a", "1")
+    @cache.write("a", "1", :raw => true)
     @cache.increment("a")
-    @cache.read("a").should == "2"
+    @cache.read("a", :raw => true).should == "2"
   end
 
   it "supports incrementing by a specific amount" do
-    @cache.write("a", "1")
+    @cache.write("a", "1", :raw => true)
     @cache.increment("a", 2)
-    @cache.read("a").should == "3"
+    @cache.read("a", :raw => true).should == "3"
   end
 
   it "supports decrement" do
-    @cache.write("a", "1")
+    @cache.write("a", "1", :raw => true)
     @cache.decrement("a")
-    @cache.read("a").should == "0"
+    @cache.read("a", :raw => true).should == "0"
   end
 
   it "supports decrementing by a specific amount" do
-    @cache.write("a", "2")
+    @cache.write("a", "2", :raw => true)
     @cache.decrement("a", 2)
-    @cache.read("a").should == "0"
+    @cache.read("a", :raw => true).should == "0"
   end
 
   it "supports :expires_in with a duration argument" do

data/spymemcached.gemspec

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

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
     - 0
-    - 1
     - 2
-  version: 0.1.2
+    - 0
+  version: 0.2.0
 platform: java
 authors: 
   - James Golick