redis_buddy 0.1.9 → 0.2.0

data/lib/redis/distributed_json_redis.rb

@@ -0,0 +1,14 @@
+class DistributedJsonRedis < Redis::Distributed
+
+  # backwards compat
+  def self.inherited(child)
+    ActiveSupport::Deprecation.warn("#{child.to_s} is deprecated. Use DistributedJsonRedis instead.") if defined?(ActiveSupport::Deprecation)
+  end
+
+  def initialize(addresses)
+    nodes = addresses.map do |address|
+      JsonRedis.new(address)
+    end
+    @ring = Redis::HashRing.new(nodes)
+  end
+end

data/lib/redis/distributed_marshaled_redis.rb

@@ -1,13 +1,4 @@
-# (c) 2009 Luca Guidi
-
-class DistributedMarshaledRedis < Redis::Distributed
-  def initialize(addresses)
-    nodes = addresses.map do |address|
-      MarshaledRedis.new address
-    end
-    @ring = Redis::HashRing.new nodes
-  end
-
-  alias_method :flush_db, :delete_cloud!
+# backwards compat
+class DistributedMarshaledRedis < DistributedJsonRedis
 end
 

data/lib/redis/json_redis.rb

@@ -0,0 +1,29 @@
+class JsonRedis < Redis
+
+  # backwards compat
+  def self.inherited(child)
+    ActiveSupport::Deprecation.warn("#{child.to_s} is deprecated. Use JsonRedis instead.") if defined?(ActiveSupport::Deprecation)
+  end
+
+  def set(key, value)
+    value = Yajl.dump(value) if encode?(value)
+    super(key, value)
+  end
+
+  def setex(key, value, expires)
+    value = Yajl.dump(value) if encode?(value)
+    super(key, value, expires)
+  end
+
+  def get(key)
+    result = @client.call(:get, key)
+    result = Yajl.load(result) if result
+    result
+  end
+
+  private
+  def encode?(value)
+    !value.is_a?(Integer)
+  end
+end
+

data/lib/redis/marshaled_redis.rb

@@ -1,36 +1,4 @@
-# (c) 2009 Luca Guidi
-
-class MarshaledRedis < Redis
-  def set(key, val, options = nil)
-    val = Marshal.dump val unless raw?(options)
-    super key, val, expires_in(options)
-  end
-
-  def set_unless_exists(key, val, options = nil)
-    val = Marshal.dump val unless raw?(options)
-    super key, val
-  end
-
-  def get(key, options = nil)
-    result = call_command([:get, key])
-    result = Marshal.load result if unmarshal?(result, options)
-    result
-  end
-
-  private
-    def unmarshal?(result, options)
-      result && result.size > 0 && !raw?(options)
-    end
-
-    def raw?(options)
-      options && options[:raw]
-    end
-
-    def expires_in(options)
-      if options
-        # Rack::Session           Merb                    Rails/Sinatra
-        options[:expire_after] || options[:expires_in] || options[:expire_in]
-      end
-    end
+# backwards compat
+class MarshaledRedis < JsonRedis
 end
 

data/lib/redis/redis_factory.rb

@@ -7,7 +7,7 @@ class RedisFactory
       if addresses.size > 1
         DistributedMarshaledRedis.new addresses
       else
-        MarshaledRedis.new addresses.first || {}
+        JsonRedis.new addresses.first || {}
       end
     end
 

data/lib/redis_buddy/cache_store.rb

@@ -8,54 +8,47 @@ module ActiveSupport
       end
 
       def write(key, value, options = nil)
-        super do
-          method = options && options[:unless_exist] ? :set_unless_exists : :set
+        method = options && options[:unless_exist] ? :set_unless_exists : :set
 
-	  if options && options[:expire]
-	    if info['redis_version'] <= '1.2.6'
-              method = :set
-              options = options[:expire]
-	    else
-              @data.send(:setex, options[:expire], value)
-	    end
-	  end
-	  @data.send(method, key, value, options) if options.is_a?(Integer) || !options || (options && !options[:expire])
+        if options && options[:expire]
+          if (info.is_a?(Array) ? info.first['redis_version'] : info['redis_version']) <= '1.2.6'
+            @data.send(:set, key, value)
+            @data.send(:expire, key, options[:expire])
+          else
+            @data.send(:setex, key, value,options[:expire])
+          end
+        else
+          @data.send(method, key, value)
         end
       end
 
-      def read(key, options = nil)
-        super do
-          @data.get key
-        end
+      def read(key)
+        @data.get(key)
       end
 
-      def ttl(key, options = nil)
-        @data.ttl key, options
+      def ttl(key)
+        @data.ttl(key)
       end
 
-      def delete(key, options = nil)
-        super do
-          @data.del key
-        end
+      def delete(key)
+        @data.del(key)
       end
 
-      def exist?(key, options = nil)
-        super do
-          @data.exists key
-        end
+      def exist?(key)
+        @data.exists(key)
       end
 
-      def increment(key, amount = 1)
-        @data.incr key, amount
+      def increment(key, amount = nil)
+        amount.nil? ? @data.incr(key) : @data.incrby(key, amount)
       end
 
-      def decrement(key, amount = 1)
-        @data.decr key, amount
+      def decrement(key, amount = nil)
+        amount.nil? ? @data.decr(key) : @data.decrby(key, amount)
       end
 
-      def delete_matched(matcher, options = nil)
+      def delete_matched(matcher)
         super do
-          @data.keys(matcher).each { |key| @data.delete key }
+          @data.keys(matcher).each { |key| @data.del(key) }
         end
       end
 

data/lib/redis_buddy.rb

@@ -3,6 +3,8 @@ require 'redis/distributed'
 require 'redis/namespace'
 
 require 'redis/redis_factory'
+require 'redis/json_redis'
+require 'redis/distributed_json_redis'
 require 'redis/marshaled_redis'
 require 'redis/distributed_marshaled_redis'
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 9
-  version: 0.1.9
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Ole Riesenberg
@@ -14,37 +14,52 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-14 00:00:00 +02:00
+date: 2010-09-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: redis
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
+        - 2
         - 0
-        - 7
-        version: 1.0.7
+        - 6
+        version: 2.0.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: redis-namespace
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 4
-        - 2
-        version: 0.4.2
+        - 10
+        - 0
+        version: 0.10.0
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: yajl-ruby
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: A namespaced Redis Cache Store for Rails 3, based on redis-store
 email: labs@buddybrand.de
 executables: []
@@ -54,7 +69,9 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
+- lib/redis/distributed_json_redis.rb
 - lib/redis/distributed_marshaled_redis.rb
+- lib/redis/json_redis.rb
 - lib/redis/marshaled_redis.rb
 - lib/redis/redis_factory.rb
 - lib/redis_buddy.rb
@@ -70,6 +87,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -77,6 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -86,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A namespaced Redis Cache Store for Rails 3