redis 1.0.7 → 2.0.0.rc1

data/lib/redis/pipeline.rb

@@ -1,19 +1,13 @@
 class Redis
-  class Pipeline < Client
-    BUFFER_SIZE = 50_000
+  class Pipeline
+    attr :commands
 
-    def initialize(redis)
-      @redis = redis
+    def initialize
       @commands = []
     end
 
-    def call_command(command)
-      @commands << command
-    end
-
-    def execute
-      return if @commands.empty?
-      @redis.call_command(@commands)
+    def call(*args)
+      @commands << args
     end
   end
 end

data/lib/redis/subscribe.rb

@@ -1,16 +1,89 @@
 class Redis
-  class Subscription	
+  class SubscribedClient
+    def initialize(client)
+      @client = client
+    end
+
+    def call(command, *args)
+      @client.call_async(command, *args)
+    end
+
+    def subscribe(*channels, &block)
+      @client.call_async(:subscribe, *channels)
+
+      sub = Subscription.new(&block)
+
+      begin
+        loop do
+          type, channel, message = @client.read
+          sub.callbacks[type].call(channel, message)
+          break if type == "unsubscribe" && message == 0
+        end
+      ensure
+        @client.call_async(:unsubscribe)
+      end
+    end
+
+    def unsubscribe(*channels)
+      @client.call_async(:unsubscribe, *channels)
+      @client
+    end
+
+    def psubscribe(*channels, &block)
+      @client.call_async(:psubscribe, *channels)
+
+      sub = Subscription.new(&block)
+
+      begin
+        loop do
+          type, pattern, channel, message = @client.read
+          sub.callbacks[type].call(pattern, channel, message)
+          break if type == "punsubscribe" && channel == 0
+        end
+      ensure
+        @client.call_async(:punsubscribe)
+      end
+    end
+
+    def punsubscribe(*channels)
+      @client.call_async(:punsubscribe, *channels)
+      @client
+    end
+  end
+
+  class Subscription
+    attr :callbacks
+
+    def initialize
+      @callbacks = Hash.new do |hash, key|
+        hash[key] = lambda { |*_| }
+      end
+
+      yield(self)
+    end
+
     def subscribe(&block)
-      if block_given? then @subscribe = block else @subscribe end
+      @callbacks["subscribe"] = block
+    end
+
+    def unsubscribe(&block)
+      @callbacks["unsubscribe"] = block
+    end
+
+    def message(&block)
+      @callbacks["message"] = block
+    end
+
+    def psubscribe(&block)
+      @callbacks["psubscribe"] = block
     end
-  
-    def unsubscribe(&block)	
-      if block_given? then @unsubscribe = block else @unsubscribe end
+
+    def punsubscribe(&block)
+      @callbacks["punsubscribe"] = block
     end
-  
-    def message(&block)	
-      if block_given? then @message = block else @message end
+
+    def pmessage(&block)
+      @callbacks["pmessage"] = block
     end
-  	
   end
-end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redis
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
-  - 1
+  - 2
   - 0
-  - 7
-  version: 1.0.7
+  - 0
+  - rc1
+  version: 2.0.0.rc1
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -19,7 +20,7 @@ autorequire: redis
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 -03:00
+date: 2010-04-26 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -37,7 +38,6 @@ files:
 - Rakefile
 - lib/edis.rb
 - lib/redis/client.rb
-- lib/redis/dist_redis.rb
 - lib/redis/distributed.rb
 - lib/redis/hash_ring.rb
 - lib/redis/pipeline.rb
@@ -63,11 +63,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 

data/lib/redis/dist_redis.rb

@@ -1,16 +0,0 @@
-Redis.deprecate %q{"redis/dist_redis" is deprecated. Require "redis/distributed" and replace DistRedis for Redis::Distributed.}, caller[0]
-
-require "redis/hash_ring"
-require "redis/distributed"
-
-class Redis
-  class DistRedis < Redis::Distributed
-    def initialize(*args)
-      Redis.deprecate "DistRedis is deprecated in favor of Redis::Distributed.", caller[1]
-      super(*args)
-    end
-  end
-end
-
-# For backwards compatibility
-DistRedis = Redis::DistRedis