redis_buddy 0.2.1 → 0.3.0

data/.gitignore

@@ -0,0 +1,4 @@
+pkg/*
+*.gem
+.bundle
+redis_buddy.tmproj

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in redis_buddy.gemspec
+gemspec

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2010 Ole Riesenberg
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -22,6 +22,4 @@
 
 ## Copyright
 
-(c) 2010 Ole Riesenberg, released under the MIT license
-
-redis-store (c) 2009 Luca Guidi - [http://lucaguidi.com](http://lucaguidi.com), released under the MIT license
+(c) 2011 Ole Riesenberg, released under the MIT license

data/Rakefile

@@ -0,0 +1,2 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks

data/lib/redis/redis_factory.rb

@@ -5,9 +5,9 @@ class RedisFactory
     def create(*addresses)
       addresses = extract_addresses(addresses)
       if addresses.size > 1
-        DistributedMarshaledRedis.new addresses
+        Redis::Distributed.new addresses
       else
-        JsonRedis.new addresses.first || {}
+        Redis.new addresses.first || {}
       end
     end
 

data/lib/redis_buddy/cache_store.rb

@@ -4,60 +4,99 @@ module ActiveSupport
       def initialize(*adresses)
         ns = Rails.application.class.to_s.split('::').first.downcase
         @r = RedisFactory.create(adresses)
-        @data = Redis::Namespace.new(ns, :redis => @r)
+        @client = Redis::Namespace.new(ns, :redis => @r)
       end
 
-      def write(key, value, options = nil)
-        method = options && options[:unless_exist] ? :set_unless_exists : :set
+      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)
 
-        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
+        ttl ? @client.send(method, key, ttl, value) : @client.send(method, key, value)
+      end
+
+      def push(key, value)
+        @client.lpush(key, encode(value))
+      end
+
+      def increment(key, amount = nil)
+        amount.nil? ? @client.incr(key) : @client.incrby(key, amount)
+      end
+
+      def decrement(key, amount = nil)
+        amount.nil? ? @client.decr(key) : @client.decrby(key, amount)
+      end
+
+      def expire_in(key, ttl)
+        @client.expire(key, ttl)
+      end
+
+      def exipire_at(key, time)
+        @client.exipireat(key, time)
       end
 
       def read(key)
-        @data.get(key)
+        value = @client.get(key)
+        value ? decode(value) : nil
       end
 
-      def ttl(key)
-        @data.ttl(key)
+      def pop(key)
+        value = @client.rpop(key)
+        value ? decode(value) : nil
       end
 
-      def delete(key)
-        @data.del(key)
+      def length(key)
+        @client.llen(key)
       end
 
-      def exist?(key)
-        @data.exists(key)
+      def ttl(key)
+        @client.ttl(key)
       end
 
-      def increment(key, amount = nil)
-        amount.nil? ? @data.incr(key) : @data.incrby(key, amount)
+      def type(key)
+        @client.type(key)
       end
 
-      def decrement(key, amount = nil)
-        amount.nil? ? @data.decr(key) : @data.decrby(key, amount)
+      def exists?(key)
+        @client.exists(key)
       end
 
-      def delete_matched(matcher)
-        super do
-          @data.keys(matcher).each { |key| @data.del(key) }
-        end
+      def delete(key)
+        @client.del(key)
       end
 
       def clear
-        @data.flushdb
+        @client.flushdb
       end
 
       def info
-        @data.info
+        @client.info
+      end
+
+      def keys(pattern = "*")
+        @client.keys(pattern)
+      end
+
+      def client
+        @client
+      end
+
+      private
+      def decode(value)
+        value = Yajl.load(value)
+        value.with_indifferent_access if value.is_a?(Hash)
+        value
+      end
+
+      def encode(value)
+        return value unless encode?(value)
+        Yajl.dump(value)
+      end
+
+      def encode?(value)
+        !value.is_a?(Integer) 
       end
     end
   end

data/lib/redis_buddy/version.rb

@@ -0,0 +1,3 @@
+module RedisBuddy
+  VERSION = "0.3.0"
+end

data/lib/redis_buddy.rb

@@ -1,11 +1,3 @@
-require 'redis'
-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'
-
-require 'redis_buddy/cache_store'
+module RedisBuddy
+  # Your code goes here...
+end

data/redis_buddy.gemspec

@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "redis_buddy/version"
+
+Gem::Specification.new do |s|
+  s.name        = "redis_buddy"
+  s.version     = RedisBuddy::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Ole Riesenberg"]
+  s.email       = ["or@buddybrand.com"]
+  s.homepage    = "http://rubygems.org/gems/redis_buddy"
+  s.summary     = %q{A namespaced Redis Cache Store for Rails 3}
+  s.description = %q{A namespaced Redis Cache Store for Rails 3}
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  Gem::Specification.new do |s|  
+    s.add_dependency(%q<redis>, ["~> 2.1.1"])
+    s.add_dependency(%q<redis-namespace>, [">= 0.10.0"])
+    s.add_dependency(%q<yajl-ruby>, [">= 0"])
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redis_buddy
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Ole Riesenberg
@@ -14,76 +15,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 +02:00
+date: 2011-02-16 00:00:00 +01: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: 
-        - 2
-        - 0
-        - 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
-        - 8
-        - 0
-        version: 0.8.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
+dependencies: []
+
+description: A namespaced Redis Cache Store for Rails 3
+email: 
+- or@buddybrand.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.md
+extra_rdoc_files: []
+
 files: 
-- lib/redis/distributed_json_redis.rb
-- lib/redis/distributed_marshaled_redis.rb
-- lib/redis/json_redis.rb
-- lib/redis/marshaled_redis.rb
+- .gitignore
+- Gemfile
+- MIT-LICENSE
+- README.md
+- Rakefile
 - lib/redis/redis_factory.rb
 - lib/redis_buddy.rb
 - lib/redis_buddy/cache_store.rb
-- README.md
+- lib/redis_buddy/version.rb
+- redis_buddy.gemspec
 has_rdoc: true
-homepage: http://buddybrand.de
+homepage: http://rubygems.org/gems/redis_buddy
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -91,6 +53,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -99,13 +62,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: A namespaced Redis Cache Store for Rails 3

data/lib/redis/distributed_json_redis.rb

@@ -1,14 +0,0 @@
-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,4 +0,0 @@
-# backwards compat
-class DistributedMarshaledRedis < DistributedJsonRedis
-end
-

data/lib/redis/json_redis.rb

@@ -1,29 +0,0 @@
-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,4 +0,0 @@
-# backwards compat
-class MarshaledRedis < JsonRedis
-end
-