mock_redis 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb3767ba43e249e21a60d9a6d98c9774252a9358
-  data.tar.gz: b6e646227a8ee1a21397a91d66855b5a35fd7c04
+  metadata.gz: 516b9db310fcc1afb4836e614d64d2e6eaf182be
+  data.tar.gz: 346ab1f34936cd9b19387912c34c694d27ef1ff9
 SHA512:
-  metadata.gz: 0809de69122227d0ab9935b12b3f4fa65a4af1855ad33042a3cc8df59de5cb4ca4545cea3e6a693622661f5d20a2c9ab395dc3a87075ab5df318e5f2c819e38e
-  data.tar.gz: 7f245ec950344101749bd080025d3b164a935f3ba8862cd54d9aeb84a0be29a75de7e1b0240294eb1efe1facc94b34e6587ad4143ed707e28e1ed2284d524cb0
+  metadata.gz: 2c4e3966c3ad7feba84548c6591aa55bbf7c1fe3d01d8051da4b1be41749fe23afb02475ba176bd7fad4d3ed761be2bbdbf511151c80c74ed9e1b3b133b7b7a6
+  data.tar.gz: df2c5def2bd41aba2671033ee2064dfbf31a5dabaf21ba5ba9a578200623648ef7d3a8c1b92e64a0d63b35af2bc00dd30c856afb6b4b07704b428a44324ba1d2

data/.overcommit.yml

@@ -0,0 +1,3 @@
+CommitMsg:
+  GerritChangeId:
+    enabled: true

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# MockRedis Changelog
+
+### 0.12.0
+
+* Fix bug where `del` would not raise error when given empty array
+* Add support for the BITCOUNT command
+
 ### 0.11.0
 
 * Raise errors for empty arrays as arguments

data/lib/mock_redis/database.rb

@@ -54,8 +54,10 @@ class MockRedis
     end
 
     def del(*keys)
+      keys = keys.flatten.map(&:to_s)
+      assert_has_args(keys, 'del')
+
       keys.
-        flatten.
         find_all{|key| data[key]}.
         each {|k| persist(k)}.
         each {|k| data.delete(k)}.

data/lib/mock_redis/string_methods.rb

@@ -208,6 +208,33 @@ class MockRedis
       retval
     end
 
+    def bitcount(key, start = 0, stop = -1)
+      assert_stringy(key)
+
+      str   = data[key] || ""
+      count = 0
+      m1    = 0x5555555555555555
+      m2    = 0x3333333333333333
+      m4    = 0x0f0f0f0f0f0f0f0f
+      m8    = 0x00ff00ff00ff00ff
+      m16   = 0x0000ffff0000ffff
+      m32   = 0x00000000ffffffff
+
+      str.bytes.to_a[start..stop].each do |byte|
+        # Naive Hamming weight
+        c = byte
+        c = (c & m1)  + ((c >> 1) & m1)
+        c = (c & m2)  + ((c >> 2) & m2)
+        c = (c & m4)  + ((c >> 4) & m4)
+        c = (c & m8)  + ((c >> 8) & m8)
+        c = (c & m16) + ((c >> 16) & m16)
+        c = (c & m32) + ((c >> 32) & m32)
+        count += c
+      end
+
+      count
+    end
+
     def setex(key, seconds, value)
       set(key, value)
       expire(key, seconds)

data/lib/mock_redis/version.rb

@@ -1,3 +1,4 @@
+# Defines the gem version.
 class MockRedis
-  VERSION = '0.11.0'
+  VERSION = '0.12.0'
 end

data/mock_redis.gemspec

@@ -1,5 +1,4 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
+$LOAD_PATH << File.expand_path('../lib', __FILE__)
 require 'mock_redis/version'
 
 Gem::Specification.new do |s|
@@ -19,10 +18,10 @@ Gem::Specification.new do |s|
 
   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.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_development_dependency 'rake', '~> 0.9.2'
+  s.add_development_dependency 'rake', '~> 10.0'
   s.add_development_dependency 'redis', '~> 3.0.0'
-  s.add_development_dependency 'rspec', '~> 2.6.0'
+  s.add_development_dependency 'rspec', '~> 2.14.0'
 end

data/spec/commands/bitcount_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe "#bitcount(key [, start, end ])" do
+  before do
+    @key = 'mock-redis-test:bitcount'
+    @redises.set(@key, "foobar")
+  end
+
+  it 'gets the number of set bits from the key' do
+    @redises.bitcount(@key).should == 26
+  end
+
+  it 'gets the number of set bits from the key in an interval' do
+    @redises.bitcount(@key, 0, 1000).should == 26
+    @redises.bitcount(@key, 0, 0).should == 4
+    @redises.bitcount(@key, 1, 1).should == 6
+    @redises.bitcount(@key, 1, -2).should == 18
+  end
+
+  it 'treats nonexistent keys as empty strings' do
+    @redises.bitcount('mock-redis-test:not-found').should == 0
+  end
+
+  it_should_behave_like "a string-only command"
+end

data/spec/commands/blpop_spec.rb

@@ -30,7 +30,7 @@ describe '#blpop(key [, key, ...,], timeout)' do
   it "allows subsecond timeouts" do
     lambda do
       @redises.blpop(@list1, @list2, 0.5)
-    end.should_not raise_error(Redis::CommandError)
+    end.should_not raise_error
   end
 
   it "raises an error on negative timeout" do

data/spec/commands/brpop_spec.rb

@@ -29,7 +29,7 @@ describe '#brpop(key [, key, ...,], timeout)' do
   it "allows subsecond timeouts" do
     lambda do
       @redises.brpop(@list1, @list2, 0.5)
-    end.should_not raise_error(Redis::CommandError)
+    end.should_not raise_error
   end
 
   it "raises an error on negative timeout" do

data/spec/commands/brpoplpush_spec.rb

@@ -24,12 +24,6 @@ describe '#brpoplpush(source, destination, timeout)' do
     @redises.brpoplpush(@list1, @list2, 0).should == "B"
   end
 
-  it "allows subsecond timeout" do
-    lambda do
-      @redises.brpoplpush(@list1, @list2, 0.5)
-    end.should_not raise_error(Redis::CommandError)
-  end
-
   it "raises an error on negative timeout" do
     lambda do
       @redises.brpoplpush(@list1, @list2, -1)

data/spec/commands/del_spec.rb

@@ -27,4 +27,8 @@ describe '#del(key [, key, ...])' do
     @redises.get('mock-redis-test:1').should be_nil
     @redises.get('mock-redis-test:2').should be_nil
   end
+
+  it "raises an error if an empty array is given" do
+    expect { @redises.del [] }.to raise_error Redis::CommandError
+  end
 end

data/spec/commands/expire_spec.rb

@@ -39,12 +39,12 @@ describe "#expire(key, seconds)" do
 
     before do
       @now = Time.now
-      Time.stub!(:now).and_return(@now)
+      Time.stub(:now).and_return(@now)
     end
 
     it "removes keys after enough time has passed" do
       @mock.expire(@key, 5)
-      Time.stub!(:now).and_return(@now + 5)
+      Time.stub(:now).and_return(@now + 5)
       @mock.get(@key).should be_nil
     end
 
@@ -52,15 +52,15 @@ describe "#expire(key, seconds)" do
       @mock.expire(@key, 5)
       @mock.expire(@key, 6)
 
-      Time.stub!(:now).and_return(@now + 5)
+      Time.stub(:now).and_return(@now + 5)
       @mock.get(@key).should_not be_nil
     end
 
     it "has millisecond precision" do
       @now = Time.at(@now.to_i + 0.5)
-      Time.stub!(:now).and_return(@now)
+      Time.stub(:now).and_return(@now)
       @mock.expire(@key, 5)
-      Time.stub!(:now).and_return(@now + 4.9)
+      Time.stub(:now).and_return(@now + 4.9)
       @mock.get(@key).should_not be_nil
     end
 
@@ -73,7 +73,7 @@ describe "#expire(key, seconds)" do
         @mock.del(@key)
         @mock.set(@key, 'string')
 
-        Time.stub!(:now).and_return(@now + 2)
+        Time.stub(:now).and_return(@now + 2)
 
         @mock.get(@key).should_not be_nil
       end
@@ -85,7 +85,7 @@ describe "#expire(key, seconds)" do
 
         @mock.rpush(@key, 'coconuts')
 
-        Time.stub!(:now).and_return(@now + 2)
+        Time.stub(:now).and_return(@now + 2)
 
         @mock.lindex(@key, 0).should_not be_nil
       end

data/spec/commands/expireat_spec.rb

@@ -35,12 +35,12 @@ describe "#expireat(key, timestamp)" do
 
     before do
       @now = Time.now
-      Time.stub!(:now).and_return(@now)
+      Time.stub(:now).and_return(@now)
     end
 
     it "removes keys after enough time has passed" do
       @mock.expireat(@key, @now.to_i + 5)
-      Time.stub!(:now).and_return(@now + 5)
+      Time.stub(:now).and_return(@now + 5)
       @mock.get(@key).should be_nil
     end
 

data/spec/commands/persist_spec.rb

@@ -35,13 +35,13 @@ describe "#persist(key)" do
 
     before do
       @now = Time.now
-      Time.stub!(:now).and_return(@now)
+      Time.stub(:now).and_return(@now)
     end
 
     it "makes keys stay around" do
       @mock.expire(@key, 5)
       @mock.persist(@key)
-      Time.stub!(:now).and_return(@now + 5)
+      Time.stub(:now).and_return(@now + 5)
       @mock.get(@key).should_not be_nil
     end
 

data/spec/commands/pexpire_spec.rb

@@ -39,12 +39,12 @@ describe "#pexpire(key, ms)" do
 
     before do
       @now = Time.now.round
-      Time.stub!(:now).and_return(@now)
+      Time.stub(:now).and_return(@now)
     end
 
     it "removes keys after enough time has passed" do
       @mock.pexpire(@key, 5)
-      Time.stub!(:now).and_return(@now + Rational(6, 1000))
+      Time.stub(:now).and_return(@now + Rational(6, 1000))
       @mock.get(@key).should be_nil
     end
 
@@ -52,7 +52,7 @@ describe "#pexpire(key, ms)" do
       @mock.pexpire(@key, 5)
       @mock.pexpire(@key, 6)
 
-      Time.stub!(:now).and_return(@now + Rational(5, 1000))
+      Time.stub(:now).and_return(@now + Rational(5, 1000))
       @mock.get(@key).should_not be_nil
     end
 
@@ -65,7 +65,7 @@ describe "#pexpire(key, ms)" do
         @mock.del(@key)
         @mock.set(@key, 'string')
 
-        Time.stub!(:now).and_return(@now + 0.003)
+        Time.stub(:now).and_return(@now + 0.003)
 
         @mock.get(@key).should_not be_nil
       end
@@ -77,7 +77,7 @@ describe "#pexpire(key, ms)" do
 
         @mock.rpush(@key, 'coconuts')
 
-        Time.stub!(:now).and_return(@now + 0.003)
+        Time.stub(:now).and_return(@now + 0.003)
 
         @mock.lindex(@key, 0).should_not be_nil
       end

data/spec/commands/pexpireat_spec.rb

@@ -36,12 +36,12 @@ describe "#pexpireat(key, timestamp_ms)" do
 
     before do
       @now = Time.now
-      Time.stub!(:now).and_return(@now)
+      Time.stub(:now).and_return(@now)
     end
 
     it "removes keys after enough time has passed" do
       @mock.pexpireat(@key, (@now.to_f * 1000).to_i + 5)
-      Time.stub!(:now).and_return(@now + 0.006)
+      Time.stub(:now).and_return(@now + 0.006)
       @mock.get(@key).should be_nil
     end
   end

data/spec/commands/pttl_spec.rb

@@ -30,7 +30,7 @@ describe "#pttl(key)" do
 
     before do
       @now = Time.now.round
-      Time.stub!(:now).and_return(@now)
+      Time.stub(:now).and_return(@now)
     end
 
     it "gives you the key's remaining lifespan in milliseconds" do

data/spec/commands/select_spec.rb

@@ -29,7 +29,7 @@ describe "#select(db)" do
     # Time dependence introduces a bit of nondeterminism here
     before do
       @now = Time.now
-      Time.stub!(:now).and_return(@now)
+      Time.stub(:now).and_return(@now)
 
       @mock = @redises.mock
 

data/spec/commands/set_spec.rb

@@ -40,14 +40,14 @@ describe '#set(key, value)' do
 
       before do
         @now = Time.now
-        Time.stub!(:now).and_return(@now)
+        Time.stub(:now).and_return(@now)
       end
 
       it 'accepts EX seconds' do
         key = 'mock-redis-test'
         @mock.set(key, 1, ex: 1).should == 'OK'
         @mock.get(key).should_not be_nil
-        Time.stub!(:now).and_return(@now + 2)
+        Time.stub(:now).and_return(@now + 2)
         @mock.get(key).should be_nil
       end
 
@@ -55,7 +55,7 @@ describe '#set(key, value)' do
         key = 'mock-redis-test'
         @mock.set(key, 1, px: 1000).should == 'OK'
         @mock.get(key).should_not be_nil
-        Time.stub!(:now).and_return(@now + 2)
+        Time.stub(:now).and_return(@now + 2)
         @mock.get(key).should be_nil
       end
     end

data/spec/commands/ttl_spec.rb

@@ -29,7 +29,7 @@ describe "#ttl(key)" do
 
     before do
       @now = Time.now
-      Time.stub!(:now).and_return(@now)
+      Time.stub(:now).and_return(@now)
     end
 
     it "gives you the key's remaining lifespan in seconds" do

data/spec/transactions_spec.rb

@@ -28,10 +28,9 @@ describe 'transactions (multi/exec/discard)' do
       lambda do
         @redises.mock.multi do |r|
           # do stuff that succeed
-          s.set(nil, 'string')
+          r.set(nil, 'string')
         end
-      end.should_not raise_error(RuntimeError)
-
+      end.should_not raise_error
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mock_redis
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Causes Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.14.0
 description: Instantiate one with `redis = MockRedis.new` and treat it like you would
   a normal Redis object. It supports all the usual Redis operations.
 email:
@@ -63,6 +63,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .mailmap
+- .overcommit.yml
 - .rspec
 - .travis.yml
 - CHANGELOG.md
@@ -97,6 +98,7 @@ files:
 - spec/commands/auth_spec.rb
 - spec/commands/bgrewriteaof_spec.rb
 - spec/commands/bgsave_spec.rb
+- spec/commands/bitcount_spec.rb
 - spec/commands/blpop_spec.rb
 - spec/commands/brpop_spec.rb
 - spec/commands/brpoplpush_spec.rb
@@ -256,6 +258,7 @@ test_files:
 - spec/commands/auth_spec.rb
 - spec/commands/bgrewriteaof_spec.rb
 - spec/commands/bgsave_spec.rb
+- spec/commands/bitcount_spec.rb
 - spec/commands/blpop_spec.rb
 - spec/commands/brpop_spec.rb
 - spec/commands/brpoplpush_spec.rb