mock_redis 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a63181a124183a90e68a84d2aaa16957e47398e
-  data.tar.gz: a633c58b9b8eabe402eeb593bfb72fe83e36f069
+  metadata.gz: 0e83c6871358c3a1fb0dcec3a3b197e9910781df
+  data.tar.gz: 3b08ea384505fc494190e51cfe3f812f8d3f63e8
 SHA512:
-  metadata.gz: 41f515662a87bb3a51d2c1f8f5f9f92a0d3d93f9a909a30eb89b03a6a7a454b64d136cb2c3286217e45e9b64252bcd3bc177bae52655f1ad0f8aa773cdaa2b7f
-  data.tar.gz: f262b7fc4dcf2cfe0a6a44017521a8962ba4769899d65271214a6d909a5aca17f3cbe628b7811d22678e69b014f632d2bc2705032158aebe91f6964b7c768ec4
+  metadata.gz: ffe8619a761fdb4898e326b971019e167ea47bf091251b8113f8ee16bfd94d5122c355a7bd87c47503212b076148128a37da1a5efa932f94869ef1b670b0da44
+  data.tar.gz: 4d5a6c0cd48dff3cc89f5e71f7899e6fae2bac72f14ac5e4eccd2705ebad0ed99f0a23786314df43f468907cab2188ccbc8c0e81ccfe09facad072f0362dbecd

data/.travis.yml

@@ -4,4 +4,9 @@ services:
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.1
   - jruby-19mode
+
+matrix:
+  allow_failures:
+    - rvm: 2.1.0

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # MockRedis Changelog
 
+### 0.13.1
+
+* Fix bug where certain characters in keys were treated as regex characters
+  rather than literals
+* Add back support for legacy integer timeouts on blocking list commands
+
 ### 0.13.0
 
 * Fix bug where SETBIT command would not correctly unset a bit

data/lib/mock_redis/database.rb

@@ -231,6 +231,9 @@ class MockRedis
       if options.is_a?(Hash) && options[:timeout]
         timeout = assert_valid_timeout(options[:timeout])
         [arglist[0..-2], timeout]
+      elsif options.kind_of?(Integer)
+        timeout = assert_valid_timeout(options)
+        [arglist[0..-2], timeout]
       else
         [arglist, 0]
       end
@@ -255,6 +258,7 @@ class MockRedis
     def redis_pattern_to_ruby_regex(pattern)
       Regexp.new(
         "^#{pattern}$".
+        gsub(/([+|()])/, '\\\\\1').
         gsub(/([^\\])\?/, "\\1.").
         gsub(/([^\\])\*/, "\\1.*"))
     end

data/lib/mock_redis/list_methods.rb

@@ -33,6 +33,7 @@ class MockRedis
     end
 
     def brpoplpush(source, destination, options = {})
+      options = { :timeout => options } if options.kind_of?(Integer)
       timeout = options.is_a?(Hash) && options[:timeout] || 0
       assert_valid_timeout(timeout)
 

data/lib/mock_redis/version.rb

@@ -1,4 +1,4 @@
 # Defines the gem version.
 class MockRedis
-  VERSION = '0.13.0'
+  VERSION = '0.13.1'
 end

data/spec/commands/blpop_spec.rb

@@ -46,6 +46,10 @@ describe '#blpop(key [, key, ...,], timeout)' do
       @redises.mock.blpop('mock-redis-test:not-here', :timeout => 1).should be_nil
     end
 
+    it "ignores positive legacy timeouts and returns nil" do
+      @redises.mock.blpop('mock-redis-test:not-here', 1).should be_nil
+    end
+
     it "raises WouldBlock on zero timeout (no blocking in the mock)" do
       lambda do
         @redises.mock.blpop('mock-redis-test:not-here', :timeout => 0)

data/spec/commands/brpop_spec.rb

@@ -45,6 +45,10 @@ describe '#brpop(key [, key, ...,], timeout)' do
       @redises.mock.brpop('mock-redis-test:not-here', :timeout => 1).should be_nil
     end
 
+    it "ignores positive legacy timeouts and returns nil" do
+      @redises.mock.brpop('mock-redis-test:not-here', 1).should be_nil
+    end
+
     it "raises WouldBlock on zero timeout (no blocking in the mock)" do
       lambda do
         @redises.mock.brpop('mock-redis-test:not-here', :timeout => 0)

data/spec/commands/brpoplpush_spec.rb

@@ -38,6 +38,11 @@ describe '#brpoplpush(source, destination, timeout)' do
         should be_nil
     end
 
+    it "ignores positive legacy timeouts and returns nil" do
+      @redises.mock.brpoplpush('mock-redis-test:not-here', @list1, 1).
+        should be_nil
+    end
+
     it "raises WouldBlock on zero timeout (no blocking in the mock)" do
       lambda do
         @redises.mock.brpoplpush('mock-redis-test:not-here', @list1, :timeout => 0)

data/spec/commands/keys_spec.rb

@@ -20,6 +20,14 @@ describe '#keys()' do
       @redises.set("mock-redis-test:key20", 20)
       @redises.set("mock-redis-test:key30", 30)
 
+      @redises.set("mock-redis-test:regexp-key(1|22)", 40)
+      @redises.set("mock-redis-test:regexp-key3+", 40)
+      @redises.set("mock-redis-test:regexp-key33", 40)
+      @redises.set("mock-redis-test:regexp-key4a", 40)
+      @redises.set("mock-redis-test:regexp-key4-", 40)
+      @redises.set("mock-redis-test:regexp-key4b", 40)
+      @redises.set("mock-redis-test:regexp-key4c", 40)
+
       @redises.set("mock-redis-test:special-key?", 'true')
       @redises.set("mock-redis-test:special-key*", 'true')
     end
@@ -77,6 +85,32 @@ describe '#keys()' do
       end
     end
 
+    describe "the | character" do
+      it "is treated as literal (not 'or')" do
+        @redises.keys('mock-redis-test:regexp-key(1|22)').sort.should == [
+          'mock-redis-test:regexp-key(1|22)'
+        ]
+      end
+    end
+
+    describe "the + character" do
+      it "is treated as literal (not 'one or more' quantifier)" do
+        @redises.keys('mock-redis-test:regexp-key3+').sort.should == [
+          'mock-redis-test:regexp-key3+'
+        ]
+      end
+    end
+
+    describe "character classes ([a-c])" do
+      it "specifies a range which matches any lowercase letter from \"a\" to \"c\"" do
+        @redises.keys('mock-redis-test:regexp-key4[a-c]').sort.should == [
+          'mock-redis-test:regexp-key4a',
+          'mock-redis-test:regexp-key4b',
+          'mock-redis-test:regexp-key4c',
+        ]
+      end
+    end
+
     describe "combining metacharacters" do
       it "works with different metacharacters simultaneously" do
         @redises.keys('mock-redis-test:k*[12]?').sort.should == [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mock_redis
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Causes Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake