mock_redis 0.14.1 → 0.15.0

data/spec/commands/zremrangebyscore_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'date'
 
-describe "#zremrangebyscore(key, min, max)" do
+describe '#zremrangebyscore(key, min, max)' do
   before do
     @key = 'mock-redis-test:zremrangebyscore'
     @redises.zadd(@key, 1, 'Washington')
@@ -10,24 +10,26 @@ describe "#zremrangebyscore(key, min, max)" do
     @redises.zadd(@key, 4, 'Madison')
   end
 
-  it "returns the number of elements in range" do
+  it 'returns the number of elements in range' do
     @redises.zremrangebyscore(@key, 2, 3).should == 2
   end
 
-  it "removes the elements" do
+  it 'removes the elements' do
     @redises.zremrangebyscore(@key, 2, 3)
     @redises.zrange(@key, 0, -1).should == %w[Washington Madison]
   end
 
   # As seen in http://redis.io/commands/zremrangebyscore
-  it "removes the elements for complex statements" do
+  it 'removes the elements for complex statements' do
     @redises.zremrangebyscore(@key, '-inf', '(4')
     @redises.zrange(@key, 0, -1).should == %w[Madison]
   end
 
-  it_should_behave_like "a zset-only command"
+  it_should_behave_like 'a zset-only command'
 
-  it "throws a command error" do
-    expect { @redises.zrevrangebyscore(@key, DateTime.now, '-inf') }.to raise_error(Redis::CommandError)
+  it 'throws a command error' do
+    expect do
+      @redises.zrevrangebyscore(@key, DateTime.now, '-inf')
+    end.to raise_error(Redis::CommandError)
   end
 end

data/spec/commands/zrevrange_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "#zrevrange(key, start, stop [, :with_scores => true])" do
+describe '#zrevrange(key, start, stop [, :with_scores => true])' do
   before do
     @key = 'mock-redis-test:zrevrange'
     @redises.zadd(@key, 1, 'Washington')
@@ -20,27 +20,27 @@ describe "#zrevrange(key, start, stop [, :with_scores => true])" do
     end
   end
 
-  it "returns the elements in order by score" do
-    @redises.zrevrange(@key, 0, 1).should == ['Madison', 'Jefferson']
+  it 'returns the elements in order by score' do
+    @redises.zrevrange(@key, 0, 1).should == %w[Madison Jefferson]
   end
 
-  it "returns the elements in order by score (negative indices)" do
-    @redises.zrevrange(@key, -2, -1).should == ['Adams', 'Washington']
+  it 'returns the elements in order by score (negative indices)' do
+    @redises.zrevrange(@key, -2, -1).should == %w[Adams Washington]
   end
 
   it 'returns empty list when start is too large' do
     @redises.zrevrange(@key, 5, -1).should == []
   end
 
-  it "returns the scores when :with_scores is specified" do
+  it 'returns the scores when :with_scores is specified' do
     @redises.zrevrange(@key, 2, 3, :with_scores => true).
-      should == [["Adams", 2.0], ["Washington", 1.0]]
+      should == [['Adams', 2.0], ['Washington', 1.0]]
   end
 
-  it "returns the scores when :withscores is specified" do
+  it 'returns the scores when :withscores is specified' do
     @redises.zrevrange(@key, 2, 3, :withscores => true).
-      should == [["Adams", 2.0], ["Washington", 1.0]]
+      should == [['Adams', 2.0], ['Washington', 1.0]]
   end
 
-  it_should_behave_like "a zset-only command"
+  it_should_behave_like 'a zset-only command'
 end

data/spec/commands/zrevrangebyscore_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "#zrevrangebyscore(key, start, stop [:with_scores => true] [:limit => [offset count]])" do
+describe '#zrevrangebyscore(key, start, stop [:with_scores => true] [:limit => [offset count]])' do
   before do
     @key = 'mock-redis-test:zrevrangebyscore'
     @redises.zadd(@key, 1, 'Washington')
@@ -20,28 +20,28 @@ describe "#zrevrangebyscore(key, start, stop [:with_scores => true] [:limit => [
     end
   end
 
-  it "returns the elements in order by score" do
-    @redises.zrevrangebyscore(@key, 4, 3).should == ['Madison', 'Jefferson']
+  it 'returns the elements in order by score' do
+    @redises.zrevrangebyscore(@key, 4, 3).should == %w[Madison Jefferson]
   end
 
-  it "returns the scores when :with_scores is specified" do
+  it 'returns the scores when :with_scores is specified' do
     @redises.zrevrangebyscore(@key, 4, 3, :with_scores => true).
-      should == [["Madison", 4.0], ["Jefferson", 3.0]]
+      should == [['Madison', 4.0], ['Jefferson', 3.0]]
   end
 
-  it "returns the scores when :withscores is specified" do
+  it 'returns the scores when :withscores is specified' do
     @redises.zrevrangebyscore(@key, 4, 3, :withscores => true).
-      should == [["Madison", 4.0], ["Jefferson", 3.0]]
+      should == [['Madison', 4.0], ['Jefferson', 3.0]]
   end
 
-  it "treats +inf as positive infinity" do
-    @redises.zrevrangebyscore(@key, "+inf", 3).
+  it 'treats +inf as positive infinity' do
+    @redises.zrevrangebyscore(@key, '+inf', 3).
       should == %w[Madison Jefferson]
   end
 
-  it "honors the :limit => [offset count] argument" do
+  it 'honors the :limit => [offset count] argument' do
     @redises.zrevrangebyscore(@key, 100, -100, :limit => [1, 2]).
-      should == ["Jefferson", "Adams"]
+      should == %w[Jefferson Adams]
   end
 
   it "raises an error if :limit isn't a 2-tuple" do
@@ -50,9 +50,9 @@ describe "#zrevrangebyscore(key, start, stop [:with_scores => true] [:limit => [
     end.should raise_error(RuntimeError)
 
     lambda do
-      @redises.zrevrangebyscore(@key, 100, -100, :limit => "1, 2")
-    end.should raise_error
+      @redises.zrevrangebyscore(@key, 100, -100, :limit => '1, 2')
+    end.should raise_error(RedisMultiplexer::MismatchedResponse)
   end
 
-  it_should_behave_like "a zset-only command"
+  it_should_behave_like 'a zset-only command'
 end

data/spec/commands/zrevrank_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "#zrevrank(key, member)" do
+describe '#zrevrank(key, member)' do
   before do
     @key = 'mock-redis-test:zrevrank'
 
@@ -13,17 +13,17 @@ describe "#zrevrank(key, member)" do
     @redises.zrevrank(@key, 'foo').should be_nil
   end
 
-  it "returns the index of the member in the set (ordered by -score)" do
+  it 'returns the index of the member in the set (ordered by -score)' do
     @redises.zrevrank(@key, 'one').should == 2
     @redises.zrevrank(@key, 'two').should == 1
     @redises.zrevrank(@key, 'three').should == 0
   end
 
-  it "handles integer members correctly" do
+  it 'handles integer members correctly' do
     member = 11
     @redises.zadd(@key, 4, member)
     @redises.zrevrank(@key, member).should == 0
   end
 
-  it_should_behave_like "a zset-only command"
+  it_should_behave_like 'a zset-only command'
 end

data/spec/commands/zscore_spec.rb

@@ -1,22 +1,22 @@
 require 'spec_helper'
 
-describe "#zscore(key, member)" do
+describe '#zscore(key, member)' do
   before { @key = 'mock-redis-test:zscore' }
 
-  it "returns the score as a string" do
+  it 'returns the score as a string' do
     @redises.zadd(@key, 0.25, 'foo').should == true
     @redises.zscore(@key, 'foo').should == 0.25
   end
 
-  it "handles integer members correctly" do
+  it 'handles integer members correctly' do
     member = 11
     @redises.zadd(@key, 0.25, member).should == true
     @redises.zscore(@key, member).should == 0.25
   end
 
-  it "returns nil if member is not present in the set" do
+  it 'returns nil if member is not present in the set' do
     @redises.zscore(@key, 'foo').should be_nil
   end
 
-  it_should_behave_like "a zset-only command"
+  it_should_behave_like 'a zset-only command'
 end

data/spec/commands/zunionstore_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "#zunionstore(destination, keys, [:weights => [w,w,], [:aggregate => :sum|:min|:max])" do
+describe '#zunionstore(destination, keys, [:weights => [w,w,], [:aggregate => :sum|:min|:max])' do
   before do
     @set1 = 'mock-redis-test:zunionstore1'
     @set2 = 'mock-redis-test:zunionstore2'
@@ -17,45 +17,45 @@ describe "#zunionstore(destination, keys, [:weights => [w,w,], [:aggregate => :s
     @redises.zadd(@set3, 3, 'three')
   end
 
-  it "returns the number of elements in the new set" do
+  it 'returns the number of elements in the new set' do
     @redises.zunionstore(@dest, [@set1, @set2, @set3]).should == 3
   end
 
   it "sums the members' scores by default" do
     @redises.zunionstore(@dest, [@set1, @set2, @set3])
     @redises.zrange(@dest, 0, -1, :with_scores => true).should ==
-      [["one", 3.0], ["three", 3.0], ["two", 4.0]]
+      [['one', 3.0], ['three', 3.0], ['two', 4.0]]
   end
 
-  it "removes existing elements in destination" do
+  it 'removes existing elements in destination' do
     @redises.zadd(@dest, 10, 'ten')
 
     @redises.zunionstore(@dest, [@set1])
     @redises.zrange(@dest, 0, -1, :with_scores => true).should ==
-      [["one", 1.0]]
+      [['one', 1.0]]
   end
 
-  it "raises an error if keys is empty" do
+  it 'raises an error if keys is empty' do
     lambda do
       @redises.zunionstore(@dest, [])
     end.should raise_error(RuntimeError)
   end
 
-  context "the :weights argument" do
-    it "multiplies the scores by the weights while aggregating" do
+  context 'the :weights argument' do
+    it 'multiplies the scores by the weights while aggregating' do
       @redises.zunionstore(@dest, [@set1, @set2, @set3], :weights => [2, 3, 5])
       @redises.zrange(@dest, 0, -1, :with_scores => true).should ==
-        [["one", 10.0], ["three", 15.0], ["two", 16.0]]
+        [['one', 10.0], ['three', 15.0], ['two', 16.0]]
     end
 
-    it "raises an error if the number of weights != the number of keys" do
+    it 'raises an error if the number of weights != the number of keys' do
       lambda do
-        @redises.zunionstore(@dest, [@set1, @set2, @set3], :weights => [1,2])
+        @redises.zunionstore(@dest, [@set1, @set2, @set3], :weights => [1, 2])
       end.should raise_error(RuntimeError)
     end
   end
 
-  context "the :aggregate argument" do
+  context 'the :aggregate argument' do
     before do
       @smalls = 'mock-redis-test:zunionstore:smalls'
       @bigs   = 'mock-redis-test:zunionstore:bigs'
@@ -66,19 +66,19 @@ describe "#zunionstore(destination, keys, [:weights => [w,w,], [:aggregate => :s
       @redises.zadd(@bigs, 200, 'ernie')
     end
 
-    it "aggregates scores with min when :aggregate => :min is specified" do
+    it 'aggregates scores with min when :aggregate => :min is specified' do
       @redises.zunionstore(@dest, [@bigs, @smalls], :aggregate => :min)
       @redises.zrange(@dest, 0, -1, :with_scores => true).should ==
-        [["bert", 1.0], ["ernie", 2.0]]
+        [['bert', 1.0], ['ernie', 2.0]]
     end
 
-    it "aggregates scores with max when :aggregate => :max is specified" do
+    it 'aggregates scores with max when :aggregate => :max is specified' do
       @redises.zunionstore(@dest, [@bigs, @smalls], :aggregate => :max)
       @redises.zrange(@dest, 0, -1, :with_scores => true).should ==
-        [["bert", 100.0], ["ernie", 200.0]]
+        [['bert', 100.0], ['ernie', 200.0]]
     end
 
-    it "ignores scores for missing members" do
+    it 'ignores scores for missing members' do
       @redises.zadd(@smalls, 3, 'grover')
       @redises.zunionstore(@dest, [@bigs, @smalls], :aggregate => :min)
       @redises.zscore(@dest, 'grover').should == 3.0
@@ -95,7 +95,7 @@ describe "#zunionstore(destination, keys, [:weights => [w,w,], [:aggregate => :s
       @redises.zscore(@dest, 'bert').should == 1.0
     end
 
-    it "raises an error for unknown aggregation function" do
+    it 'raises an error for unknown aggregation function' do
       lambda do
         @redises.zunionstore(@dest, [@bigs, @smalls], :aggregate => :mix)
       end.should raise_error(RuntimeError)

data/spec/mock_redis_spec.rb

@@ -58,11 +58,21 @@ describe MockRedis do
       its(:now) { should == now }
     end
 
+    describe '.time' do
+      let(:now)       { 'Now' }
+      let(:time_stub) { double 'Time', :now => now }
+      let(:options)   { { :time_class => time_stub } }
+
+      subject { MockRedis.new(options) }
+
+      its(:time) { should == now }
+    end
+
     describe '.expireat' do
       let(:time_at)   { 'expireat' }
       let(:time_stub) { double 'Time' }
       let(:options)   { { :time_class => time_stub } }
-      let(:timestamp) { 123456 }
+      let(:timestamp) { 123_456 }
 
       subject { MockRedis.new(options) }
 

data/spec/spec_helper.rb

@@ -1,11 +1,20 @@
-require 'rspec'
+if ENV['TRAVIS']
+  # When running in Travis, report coverage stats to Coveralls.
+  require 'coveralls'
+  Coveralls.wear!
+else
+  # Otherwise render coverage information in coverage/index.html and display
+  # coverage percentage in the console.
+  require 'simplecov'
+end
+
 require 'rspec/its'
 require 'redis'
-$LOAD_PATH.unshift(File.expand_path(File.join(__FILE__, "..", "..", "lib")))
+$LOAD_PATH.unshift(File.expand_path(File.join(__FILE__, '..', '..', 'lib')))
 require 'mock_redis'
 
 $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..')))
-Dir["spec/support/**/*.rb"].each {|x| require x}
+Dir['spec/support/**/*.rb'].each { |x| require x }
 
 module TypeCheckingHelper
   def method_from_description(example)
@@ -45,7 +54,7 @@ RSpec.configure do |config|
     # databases mentioned in our tests
     [1, 0].each do |db|
       @redises.send_without_checking(:select, db)
-      @redises.send_without_checking(:keys, "mock-redis-test:*").each do |key|
+      @redises.send_without_checking(:keys, 'mock-redis-test:*').each do |key|
         @redises.send_without_checking(:del, key)
       end
     end

data/spec/support/redis_multiplexer.rb

@@ -1,5 +1,7 @@
 class BlankSlate
-  instance_methods.each {|m| undef_method(m) unless m =~ /^__/ || ['inspect', 'object_id'].include?(m.to_s)}
+  instance_methods.each do |m|
+    undef_method(m) unless m =~ /^__/ || %w[inspect object_id].include?(m.to_s)
+  end
 end
 
 class RedisMultiplexer < BlankSlate
@@ -11,50 +13,54 @@ class RedisMultiplexer < BlankSlate
   end
 
   def method_missing(method, *args, &blk)
-    # if we're in a Redis command that accepts a block, and we execute more redis commands, ONLY execute them
-    # on the Redis implementation that the block came from.
-    # e.g. if a pipelined command is started on a MockRedis object, DON'T send commands inside the pipelined block
-    # to the real Redis object, as that one WON'T be inside a pipelined command, and we'll see weird behaviour
+    # If we're in a Redis command that accepts a block, and we execute more
+    # redis commands, ONLY execute them on the Redis implementation that the
+    # block came from.
+    # e.g. if a pipelined command is started on a MockRedis object, DON'T send
+    # commands inside the pipelined block to the real Redis object, as that one
+    # WON'T be inside a pipelined command, and we'll see weird behaviour
     if blk
       @in_mock_block  = false
       @in_redis_block = true
     end
-    real_retval, real_error = catch_errors { @in_mock_block ? :no_op : @real_redis.send(method, *args, &blk) }
+    real_retval, real_error =
+      catch_errors { @in_mock_block ? :no_op : @real_redis.send(method, *args, &blk) }
 
     if blk
       @in_mock_block  = true
       @in_redis_block = false
     end
-    mock_retval, mock_error = catch_errors { @in_redis_block ? :no_op : @mock_redis.send(method, *args, &blk) }
+    mock_retval, mock_error =
+      catch_errors { @in_redis_block ? :no_op : @mock_redis.send(method, *args, &blk) }
 
     if blk
       @in_mock_block  = false
       @in_redis_block = false
     end
 
-    if (mock_retval == :no_op || real_retval == :no_op)
-        # ignore, we were inside a block (like pipelined)
-    elsif (!equalish?(mock_retval, real_retval) && !mock_error && !real_error)
+    if mock_retval == :no_op || real_retval == :no_op
+      # ignore, we were inside a block (like pipelined)
+    elsif !equalish?(mock_retval, real_retval) && !mock_error && !real_error
       # no exceptions, just different behavior
       raise MismatchedResponse,
-        "Mock failure: responses not equal.\n" +
-        "Redis.#{method}(#{args.inspect}) returned #{real_retval.inspect}\n" +
+        "Mock failure: responses not equal.\n" \
+        "Redis.#{method}(#{args.inspect}) returned #{real_retval.inspect}\n" \
         "MockRedis.#{method}(#{args.inspect}) returned #{mock_retval.inspect}\n"
-    elsif (!mock_error && real_error)
+    elsif !mock_error && real_error
       raise MismatchedResponse,
-        "Mock failure: didn't raise an error when it should have.\n" +
-        "Redis.#{method}(#{args.inspect}) raised #{real_error.inspect}\n" +
-        "MockRedis.#{method}(#{args.inspect}) raised nothing " +
+        "Mock failure: didn't raise an error when it should have.\n" \
+        "Redis.#{method}(#{args.inspect}) raised #{real_error.inspect}\n" \
+        "MockRedis.#{method}(#{args.inspect}) raised nothing " \
         "and returned #{mock_retval.inspect}"
-    elsif (!real_error && mock_error)
+    elsif !real_error && mock_error
       raise MismatchedResponse,
-        "Mock failure: raised an error when it shouldn't have.\n" +
-        "Redis.#{method}(#{args.inspect}) returned #{real_retval.inspect}\n" +
+        "Mock failure: raised an error when it shouldn't have.\n" \
+        "Redis.#{method}(#{args.inspect}) returned #{real_retval.inspect}\n" \
         "MockRedis.#{method}(#{args.inspect}) raised #{mock_error.inspect}"
-    elsif (mock_error && real_error && !equalish?(mock_error, real_error))
+    elsif mock_error && real_error && !equalish?(mock_error, real_error)
       raise MismatchedResponse,
-        "Mock failure: raised the wrong error.\n" +
-        "Redis.#{method}(#{args.inspect}) raised #{real_error.inspect}\n" +
+        "Mock failure: raised the wrong error.\n" \
+        "Redis.#{method}(#{args.inspect}) raised #{real_error.inspect}\n" \
         "MockRedis.#{method}(#{args.inspect}) raised #{mock_error.inspect}"
     end
 
@@ -77,8 +83,13 @@ class RedisMultiplexer < BlankSlate
     end
   end
 
-  def mock() @mock_redis end
-  def real() @real_redis end
+  def mock
+    @mock_redis
+  end
+
+  def real
+    @real_redis
+  end
 
   # Used in cleanup before() blocks.
   def send_without_checking(method, *args)
@@ -87,12 +98,9 @@ class RedisMultiplexer < BlankSlate
   end
 
   def catch_errors
-    begin
-      retval = yield
-      [retval, nil]
-    rescue StandardError => e
-      [nil, e]
-    end
+    retval = yield
+    [retval, nil]
+  rescue StandardError => e
+    [nil, e]
   end
 end
-