redis 3.0.3 → 3.0.4

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # 3.0.4 (unreleased)
 
-* ...
+* Ensure #watch without a block returns "OK" (#332).
+
+* Make futures identifiable (#330).
+
+* Fix an issue preventing STORE in a SORT with multiple GETs (#328).
 
 # 3.0.3
 

data/lib/redis.rb

@@ -524,7 +524,7 @@ class Redis
 
     synchronize do |client|
       client.call([:sort, key] + args) do |reply|
-        if get.size > 1
+        if get.size > 1 && !store
           if reply
             reply.each_slice(get.size).to_a
           end
@@ -1994,7 +1994,7 @@ class Redis
   # @see #multi
   def watch(*keys)
     synchronize do |client|
-      client.call([:watch] + keys)
+      res = client.call([:watch] + keys)
 
       if block_given?
         begin
@@ -2005,6 +2005,8 @@ class Redis
           unwatch
           raise
         end
+      else
+        res
       end
     end
   end

data/lib/redis/pipeline.rb

@@ -126,5 +126,13 @@ class Redis
       ::Kernel.raise(@object) if @object.kind_of?(::RuntimeError)
       @object
     end
+
+    def is_a?(other)
+      self.class.ancestors.include?(other)
+    end
+
+    def class
+      Future
+    end
   end
 end

data/lib/redis/version.rb

@@ -1,3 +1,3 @@
 class Redis
-  VERSION = "3.0.3"
+  VERSION = "3.0.4"
 end

data/test/pipelining_commands_test.rb

@@ -132,6 +132,18 @@ class TestPipeliningCommands < Test::Unit::TestCase
     end
   end
 
+  def test_futures_can_be_identified
+    r.pipelined do
+      @result = r.sadd("foo", 1)
+    end
+
+    assert_equal true, @result.is_a?(Redis::Future)
+    if defined?(::BasicObject)
+      assert_equal true, @result.is_a?(::BasicObject)
+    end
+    assert_equal Redis::Future, @result.class
+  end
+
   def test_returning_the_result_of_an_empty_pipeline
     result = r.pipelined do
     end

data/test/sorting_test.rb

@@ -42,4 +42,18 @@ class TestSorting < Test::Unit::TestCase
     r.sort("bar", :get => "foo:*", :store => "baz")
     assert_equal ["s1", "s2"], r.lrange("baz", 0, -1)
   end
+
+  def test_sort_with_an_array_of_gets_and_with_store
+    r.set("foo:1:a", "s1a")
+    r.set("foo:1:b", "s1b")
+
+    r.set("foo:2:a", "s2a")
+    r.set("foo:2:b", "s2b")
+
+    r.rpush("bar", "1")
+    r.rpush("bar", "2")
+
+    r.sort("bar", :get => ["foo:*:a", "foo:*:b"], :store => 'baz')
+    assert_equal ["s1a", "s1b", "s2a", "s2b"], r.lrange("baz", 0, -1)
+  end
 end

data/test/transactions_test.rb

@@ -157,6 +157,12 @@ class TestTransactions < Test::Unit::TestCase
     end
   end
 
+  def test_watch
+    res = r.watch "foo"
+
+    assert_equal "OK", res
+  end
+
   def test_watch_with_an_unmodified_key
     r.watch "foo"
     r.multi do |multi|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake