mock_redis 0.4.1 → 0.5.0

data/spec/commands/zrevrange_spec.rb

@@ -19,12 +19,12 @@ describe "#zrevrange(key, start, stop [, :with_scores => true])" do
 
   it "returns the scores when :with_scores is specified" do
     @redises.zrevrange(@key, 2, 3, :with_scores => true).
-      should == ["Adams", "2", "Washington", "1"]
+      should == [["Adams", 2.0], ["Washington", 1.0]]
   end
 
   it "returns the scores when :withscores is specified" do
     @redises.zrevrange(@key, 2, 3, :withscores => true).
-      should == ["Adams", "2", "Washington", "1"]
+      should == [["Adams", 2.0], ["Washington", 1.0]]
   end
 
   it_should_behave_like "a zset-only command"

data/spec/commands/zrevrangebyscore_spec.rb

@@ -15,12 +15,12 @@ describe "#zrevrangebyscore(key, start, stop [:with_scores => true] [:limit => [
 
   it "returns the scores when :with_scores is specified" do
     @redises.zrevrangebyscore(@key, 4, 3, :with_scores => true).
-      should == %w[Madison 4 Jefferson 3]
+      should == [["Madison", 4.0], ["Jefferson", 3.0]]
   end
 
   it "returns the scores when :withscores is specified" do
     @redises.zrevrangebyscore(@key, 4, 3, :withscores => true).
-      should == %w[Madison 4 Jefferson 3]
+      should == [["Madison", 4.0], ["Jefferson", 3.0]]
   end
 
   it "treats +inf as positive infinity" do

data/spec/commands/zscore_spec.rb

@@ -5,13 +5,13 @@ describe "#zscore(key, member)" do
 
   it "returns the score as a string" do
     @redises.zadd(@key, 0.25, 'foo').should be_true
-    @redises.zscore(@key, 'foo').should == "0.25"
+    @redises.zscore(@key, 'foo').should == 0.25
   end
 
   it "handles integer members correctly" do
     member = 11
     @redises.zadd(@key, 0.25, member).should be_true
-    @redises.zscore(@key, member).should == "0.25"
+    @redises.zscore(@key, member).should == 0.25
   end
 
   it "returns nil if member is not present in the set" do

data/spec/commands/zunionstore_spec.rb

@@ -24,7 +24,7 @@ describe "#zunionstore(destination, keys, [:weights => [w,w,], [:aggregate => :s
   it "sums the members' scores by default" do
     @redises.zunionstore(@dest, [@set1, @set2, @set3])
     @redises.zrange(@dest, 0, -1, :with_scores => true).should ==
-      %w[one 3 three 3 two 4]
+      [["one", 3.0], ["three", 3.0], ["two", 4.0]]
   end
 
   it "removes existing elements in destination" do
@@ -32,7 +32,7 @@ describe "#zunionstore(destination, keys, [:weights => [w,w,], [:aggregate => :s
 
     @redises.zunionstore(@dest, [@set1])
     @redises.zrange(@dest, 0, -1, :with_scores => true).should ==
-      %w[one 1]
+      [["one", 1.0]]
   end
 
   it "raises an error if keys is empty" do
@@ -45,7 +45,7 @@ describe "#zunionstore(destination, keys, [:weights => [w,w,], [:aggregate => :s
     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 ==
-        %w[one 10 three 15 two 16]
+        [["one", 10.0], ["three", 15.0], ["two", 16.0]]
     end
 
     it "raises an error if the number of weights != the number of keys" do
@@ -69,30 +69,30 @@ describe "#zunionstore(destination, keys, [:weights => [w,w,], [:aggregate => :s
     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 ==
-        %w[bert 1 ernie 2]
+        [["bert", 1.0], ["ernie", 2.0]]
     end
 
     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 ==
-        %w[bert 100 ernie 200]
+        [["bert", 100.0], ["ernie", 200.0]]
     end
 
     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'
+      @redises.zscore(@dest, 'grover').should == 3.0
 
       @redises.zunionstore(@dest, [@bigs, @smalls], :aggregate => :max)
-      @redises.zscore(@dest, 'grover').should == '3'
+      @redises.zscore(@dest, 'grover').should == 3.0
     end
 
     it "allows 'min', 'MIN', etc. as aliases for :min" do
       @redises.zunionstore(@dest, [@bigs, @smalls], :aggregate => 'min')
-      @redises.zscore(@dest, 'bert').should == '1'
+      @redises.zscore(@dest, 'bert').should == 1.0
 
       @redises.zunionstore(@dest, [@bigs, @smalls], :aggregate => 'MIN')
-      @redises.zscore(@dest, 'bert').should == '1'
+      @redises.zscore(@dest, 'bert').should == 1.0
     end
 
     it "raises an error for unknown aggregation function" do

data/spec/mock_redis_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe MockRedis do
+
+  context "with passed options" do
+    before do
+      @mock = MockRedis.new(:url => "redis://127.0.0.1:6379/1")
+    end
+
+    it "should correctly parse options" do
+      @mock.host.should == "127.0.0.1"
+      @mock.port.should == 6379
+      @mock.db.should == 1
+    end
+
+    it "should have an id equal to redis url" do
+      @mock.id.should == "redis://127.0.0.1:6379/1"
+    end
+  end
+
+end

data/spec/support/redis_multiplexer.rb

@@ -11,13 +11,30 @@ class RedisMultiplexer < BlankSlate
   end
 
   def method_missing(method, *args, &blk)
-    mock_retval, mock_error = catch_errors { @mock_redis.send(method, *args, &blk) }
-    real_retval, real_error = catch_errors { @real_redis.send(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 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) }
+
+    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) }
 
-    mock_retval = handle_special_cases(method, mock_retval)
-    real_retval = handle_special_cases(method, real_retval)
+    if blk
+      @in_mock_block  = false
+      @in_redis_block = false
+    end
 
-    if (!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" +
@@ -49,7 +66,7 @@ class RedisMultiplexer < BlankSlate
     if a == b
       true
     elsif a.is_a?(Array) && b.is_a?(Array)
-      a.zip(b).all? {|(x,y)| equalish?(x,y)}
+      a.collect(&:to_s).sort == b.collect(&:to_s).sort
     elsif a.is_a?(Exception) && b.is_a?(Exception)
       a.class == b.class && a.message == b.message
     else
@@ -60,19 +77,6 @@ class RedisMultiplexer < BlankSlate
   def mock() @mock_redis end
   def real() @real_redis end
 
-  # Some commands require special handling due to nondeterminism in
-  # the returned values.
-  def handle_special_cases(method, value)
-    case method.to_s
-    when 'keys', 'hkeys', 'sdiff', 'sinter', 'smembers', 'sunion'
-      # The order is irrelevant, but [a,b] != [b,a] in Ruby, so we
-      # sort the returned values so we can ignore the order.
-      value.sort if value
-    else
-      value
-    end
-  end
-
   # Used in cleanup before() blocks.
   def send_without_checking(method, *args)
     @mock_redis.send(method, *args)

data/spec/transactions_spec.rb

@@ -16,6 +16,23 @@ describe 'transactions (multi/exec/discard)' do
         @redises.multi
       end.should raise_error(RuntimeError)
     end
+
+    it "cleanup the state of tansaction wrapper if an exception occurs while a transaction is being processed" do
+      lambda do
+        @redises.mock.multi do |r|
+          raise "i'm a command that fails"
+        end
+      end.should raise_error(RuntimeError)
+
+      # before the fix this used to raised a #<RuntimeError: ERR MULTI calls can not be nested>
+      lambda do
+        @redises.mock.multi do |r|
+          # do stuff that succeed
+          s.set(nil, 'string')
+        end
+      end.should_not raise_error(RuntimeError)
+
+    end
   end
 
   context "#blocks" do

metadata

@@ -1,86 +1,73 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mock_redis
-version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 1
-  segments_generated: true
-  version: 0.4.1
+version: !ruby/object:Gem::Version
+  version: 0.5.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Causes Engineering
 - Samuel Merritt
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-24 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2012-08-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
-        segments_generated: true
+      - !ruby/object:Gem::Version
         version: 0.9.2
-  requirement: *id001
-  name: rake
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 2
-        - 1
-        segments_generated: true
-        version: 2.2.1
-  requirement: *id002
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
   name: redis
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
-        segments_generated: true
-        version: 2.6.0
-  requirement: *id003
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
   type: :development
-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: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.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:
 - eng@causes.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .mailmap
 - .rspec
@@ -92,12 +79,12 @@ files:
 - lib/mock_redis.rb
 - lib/mock_redis/assertions.rb
 - lib/mock_redis/database.rb
-- lib/mock_redis/distributed.rb
 - lib/mock_redis/exceptions.rb
 - lib/mock_redis/expire_wrapper.rb
 - lib/mock_redis/hash_methods.rb
 - lib/mock_redis/list_methods.rb
 - lib/mock_redis/multi_db_wrapper.rb
+- lib/mock_redis/pipelined_wrapper.rb
 - lib/mock_redis/set_methods.rb
 - lib/mock_redis/string_methods.rb
 - lib/mock_redis/transaction_wrapper.rb
@@ -216,6 +203,7 @@ files:
 - spec/commands/zrevrank_spec.rb
 - spec/commands/zscore_spec.rb
 - spec/commands/zunionstore_spec.rb
+- spec/mock_redis_spec.rb
 - spec/spec_helper.rb
 - spec/support/redis_multiplexer.rb
 - spec/support/shared_examples/only_operates_on_hashes.rb
@@ -224,43 +212,37 @@ files:
 - spec/support/shared_examples/only_operates_on_strings.rb
 - spec/support/shared_examples/only_operates_on_zsets.rb
 - spec/transactions_spec.rb
-has_rdoc: true
 homepage: https://github.com/causes/mock_redis
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      segments_generated: true
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2382509530287634625
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      segments_generated: true
-      version: "0"
+      hash: 2382509530287634625
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Redis mock that just lives in memory; useful for testing.
-test_files: 
+test_files:
 - spec/cloning_spec.rb
 - spec/commands/append_spec.rb
 - spec/commands/auth_spec.rb
@@ -370,6 +352,7 @@ test_files:
 - spec/commands/zrevrank_spec.rb
 - spec/commands/zscore_spec.rb
 - spec/commands/zunionstore_spec.rb
+- spec/mock_redis_spec.rb
 - spec/spec_helper.rb
 - spec/support/redis_multiplexer.rb
 - spec/support/shared_examples/only_operates_on_hashes.rb

data/lib/mock_redis/distributed.rb

@@ -1,6 +0,0 @@
-class MockRedis
-  def pipelined(options = {})
-    yield
-    nil
-  end
-end