redis-kit 0.0.3 → 0.0.4

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.0.4 (May 17th, 2013)
+----------------------
+
+  * Add support for Resque 1.24.x. This change is fully backwards-compatible
+    with Resque 1.23.x and below.
+
 0.0.3 (March 8th, 2013)
 -----------------------
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    redis-kit (0.0.2)
+    redis-kit (0.0.4)
       hiredis (~> 0.4.0)
       mock_redis (~> 0.6.0)
       redis (~> 3.0.0)
@@ -22,7 +22,7 @@ GEM
     listen (0.7.3)
     lumberjack (1.0.2)
     method_source (0.8.1)
-    mock_redis (0.6.4)
+    mock_redis (0.6.6)
     pry (0.9.12)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -34,7 +34,7 @@ GEM
       spoon (~> 0.0)
     rake (10.0.3)
     rb-fsevent (0.9.3)
-    redis (3.0.3)
+    redis (3.0.4)
     slop (3.4.3)
     spoon (0.0.1)
     terminal-table (1.4.5)

data/README.md

@@ -187,6 +187,8 @@ Set up and run tests with:
 TODO
 ====
 
+* Add block support to RedisKit::Cache's cache_namespace: `cache_namespace {
+  |instance_or_class| ... }`
 * Add generators for common files
   * Resque initializer
   * Unicorn config (after fork hook)

data/lib/redis-kit/resque.rb

@@ -5,15 +5,20 @@
 
 module RedisKit
   module Resque
+    # Don't clobber any existing hooks. Resque 1.24 changed the way hooks are
+    # stored, so we have to branch for that.
     def self.setup
-      # Don't clobber any existing hooks.
-      if existing_hook = ::Resque.after_fork
+      existing_hook = ::Resque.after_fork
+
+      if existing_hook == nil || existing_hook.is_a?(Array)
+        # resque >= 1.24 (or <= 1.23 with no existing hook)
         ::Resque.after_fork do |job|
-          existing_hook.call( job )
           check_redis
         end
-      else
+      elsif existing_hook.is_a?(Proc)
+        # resque <= 1.23
         ::Resque.after_fork do |job|
+          existing_hook.call( job )
           check_redis
         end
       end

data/lib/redis-kit/version.rb

@@ -1,4 +1,4 @@
 module RedisKit
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end
 

data/test/railsapi/Gemfile.rails_3_2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    redis-kit (0.0.1)
+    redis-kit (0.0.4)
       hiredis (~> 0.4.0)
       mock_redis (~> 0.6.0)
       redis (~> 3.0.0)
@@ -42,7 +42,6 @@ GEM
     erubis (2.7.0)
     hike (1.2.1)
     hiredis (0.4.5)
-    hiredis (0.4.5-java)
     i18n (0.6.4)
     journey (1.0.4)
     json (1.7.7)
@@ -54,7 +53,7 @@ GEM
     method_source (0.8.1)
     mime-types (1.21)
     minitest (4.6.2)
-    mock_redis (0.6.4)
+    mock_redis (0.6.6)
     multi_json (1.6.1)
     polyglot (0.3.3)
     pry (0.9.12)

data/test/railsapi/Gemfile.rails_head

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem "rails", git: "git://github.com/rails/rails.git"
 gem "rails-api", "~> 0.0.3"
 gem "rake", "~> 0.9.0"
-gem "resque", "~> 1.23.0"
+gem "resque", "~> 1.24.0"
 
 gem "redis-kit", path: "../../"
 

data/test/railsapi/Gemfile.rails_head.lock

@@ -43,7 +43,7 @@ GIT
 PATH
   remote: ../../
   specs:
-    redis-kit (0.0.1)
+    redis-kit (0.0.4)
       hiredis (~> 0.4.0)
       mock_redis (~> 0.6.0)
       redis (~> 3.0.0)
@@ -60,7 +60,6 @@ GEM
     erubis (2.7.0)
     hike (1.2.1)
     hiredis (0.4.5)
-    hiredis (0.4.5-java)
     i18n (0.6.4)
     json (1.7.7)
     json (1.7.7-java)
@@ -71,8 +70,9 @@ GEM
     method_source (0.8.1)
     mime-types (1.21)
     minitest (4.6.2)
-    mock_redis (0.6.4)
-    multi_json (1.6.1)
+    mock_redis (0.6.6)
+    mono_logger (1.0.1)
+    multi_json (1.7.3)
     polyglot (0.3.3)
     pry (0.9.12)
       coderay (~> 1.0.5)
@@ -84,7 +84,7 @@ GEM
       slop (~> 3.4)
       spoon (~> 0.0)
     rack (1.5.2)
-    rack-protection (1.4.0)
+    rack-protection (1.5.0)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -95,18 +95,19 @@ GEM
     rake (0.9.6)
     rdoc (3.12.2)
       json (~> 1.4)
-    redis (3.0.3)
-    redis-namespace (1.2.1)
+    redis (3.0.4)
+    redis-namespace (1.3.0)
       redis (~> 3.0.0)
-    resque (1.23.0)
+    resque (1.24.1)
+      mono_logger (~> 1.0)
       multi_json (~> 1.0)
-      redis-namespace (~> 1.0)
+      redis-namespace (~> 1.2)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    sinatra (1.3.5)
-      rack (~> 1.4)
-      rack-protection (~> 1.3)
-      tilt (~> 1.3, >= 1.3.3)
+    sinatra (1.4.2)
+      rack (~> 1.5, >= 1.5.2)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
     slop (3.4.3)
     spoon (0.0.1)
     sprockets (2.9.0)
@@ -121,7 +122,7 @@ GEM
     thor (0.17.0)
     thread_safe (0.1.0)
       atomic
-    tilt (1.3.4)
+    tilt (1.4.1)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
@@ -140,4 +141,4 @@ DEPENDENCIES
   rails-api (~> 0.0.3)
   rake (~> 0.9.0)
   redis-kit!
-  resque (~> 1.23.0)
+  resque (~> 1.24.0)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-kit
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis