redis_buddy 0.4.0 → 1.0.0

data/lib/redis_buddy/cache_store.rb

@@ -1,24 +1,26 @@
 module RedisBuddy
   class CacheStore < ActiveSupport::Cache::Store
     def initialize(*adresses)
-      ns = Rails.application.class.to_s.split('::').first.downcase
+      options = adresses.extract_options!
+      ns = options.delete(:redis_namespace) || Rails.application.class.to_s.split('::').first.downcase
       @r = RedisFactory.create(adresses)
       @client = Redis::Namespace.new(ns, :redis => @r)
+      super options
     end
 
-    def write(key, value, options = {})
-      method = :getset if options[:return]
-      method = :setnx if options[:nx]
-      method, ttl = :setex, options[:ttl] if options[:ttl]
-      method = :set unless method
-      value = encode(value)
+    def push(key, value)
+      @client.lpush(key, encode(value))
+    end
 
-      ttl ? @client.send(method, key, ttl, value) : @client.send(method, key, value)
+    def pop(key)
+      value = @client.rpop(key)
+      value ? decode(value) : nil
     end
 
-    def push(key, value)
-      @client.lpush(key, encode(value))
+    def exist?(key)
+      @client.exists(key)
     end
+    alias :exists? :exist?
 
     def increment(key, amount = nil)
       amount.nil? ? @client.incr(key) : @client.incrby(key, amount)
@@ -28,6 +30,10 @@ module RedisBuddy
       amount.nil? ? @client.decr(key) : @client.decrby(key, amount)
     end
 
+    def delete_matched(matcher, options = nil)
+      delete keys(matcher)
+    end
+
     def expire_in(key, ttl)
       @client.expire(key, ttl)
     end
@@ -36,16 +42,6 @@ module RedisBuddy
       @client.exipireat(key, time)
     end
 
-    def read(key)
-      value = @client.get(key)
-      value ? decode(value) : nil
-    end
-
-    def pop(key)
-      value = @client.rpop(key)
-      value ? decode(value) : nil
-    end
-
     def length(key)
       @client.llen(key)
     end
@@ -58,14 +54,6 @@ module RedisBuddy
       @client.type(key)
     end
 
-    def exists?(key)
-      @client.exists(key)
-    end
-
-    def delete(key)
-      @client.del(key)
-    end
-
     def clear
       @client.flushdb
     end
@@ -74,24 +62,49 @@ module RedisBuddy
       @client.info
     end
 
-    def keys(pattern = "*")
-      @client.keys(pattern)
+    def keys(matcher = "*", options = nil)
+      options = merged_options(options)
+      @client.keys namespaced_key(matcher, options)
     end
 
     def client
       @client
     end
 
+    protected
+    def write_entry(key, entry, options = {})
+      options[:expires_in] = options.delete(:ttl) if options[:ttl]
+      options[:unless_exist] = options.delete(:nx) if options[:nx]
+      options[:getset] = options.delete(:return) if options[:return]
+
+      method = :getset if options[:getset]
+      method = :setnx if options[:unless_exist]
+      method, expires_in = :setex, options[:expires_in] if options[:expires_in]
+      method = :set unless method
+      entry = encode(entry)
+
+      expires_in ? @client.send(method, key, expires_in, entry) : @client.send(method, key, entry)
+    end
+
+    def read_entry(key, options)
+      entry = @client.get(key)
+      entry ? decode(entry) : nil
+    end
+
+    def delete_entry(key, options)
+      @client.del(key)
+    end
+
     private
     def decode(value)
-      value = Yajl.load(value)
+      value = Marshal.load(value)
       value.with_indifferent_access if value.is_a?(Hash)
       value
     end
 
     def encode(value)
       return value unless encode?(value)
-      Yajl.dump(value)
+      Marshal.dump(value)
     end
 
     def encode?(value)

data/lib/redis_buddy/version.rb

@@ -1,3 +1,3 @@
 module RedisBuddy
-  VERSION = "0.4.0"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redis_buddy
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 23
   prerelease: 
   segments: 
+  - 1
   - 0
-  - 4
   - 0
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Ole Riesenberg
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-16 00:00:00 +01:00
+date: 2011-03-17 00:00:00 +01:00
 default_executable: 
 dependencies: []