mock_redis 0.13.2 → 0.14.0

data/spec/commands/zrem_spec.rb

@@ -9,11 +9,11 @@ describe "#zrem(key, member)" do
   end
 
   it "returns true if member is present in the set" do
-    @redises.zrem(@key, 'one').should be_true
+    @redises.zrem(@key, 'one').should == true
   end
 
   it "returns false if member is not present in the set" do
-    @redises.zrem(@key, 'nobody home').should be_false
+    @redises.zrem(@key, 'nobody home').should == false
   end
 
   it "removes member from the set" do
@@ -24,7 +24,7 @@ describe "#zrem(key, member)" do
   it "removes integer member from the set" do
     member = 11
     @redises.zadd(@key, 3, member)
-    @redises.zrem(@key, member).should be_true
+    @redises.zrem(@key, member).should == true
     @redises.zrange(@key, 0, -1).should == ['one', 'two']
   end
 

data/spec/commands/zremrangebyscore_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'date'
 
 describe "#zremrangebyscore(key, min, max)" do
   before do

data/spec/commands/zrevrange_spec.rb

@@ -15,7 +15,7 @@ describe "#zrevrange(key, start, stop [, :with_scores => true])" do
     end
 
     it 'should return an empty array' do
-      @redises.exists(@key).should be_false
+      @redises.exists(@key).should == false
       @redises.zrevrange(@key, 0, 4).should == []
     end
   end

data/spec/commands/zrevrangebyscore_spec.rb

@@ -15,7 +15,7 @@ describe "#zrevrangebyscore(key, start, stop [:with_scores => true] [:limit => [
     end
 
     it 'should return an empty array' do
-      @redises.exists(@key).should be_false
+      @redises.exists(@key).should == false
       @redises.zrevrangebyscore(@key, 0, 4).should == []
     end
   end

data/spec/commands/zscore_spec.rb

@@ -4,13 +4,13 @@ describe "#zscore(key, member)" do
   before { @key = 'mock-redis-test:zscore' }
 
   it "returns the score as a string" do
-    @redises.zadd(@key, 0.25, 'foo').should be_true
+    @redises.zadd(@key, 0.25, 'foo').should == true
     @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.zadd(@key, 0.25, member).should == true
     @redises.zscore(@key, member).should == 0.25
   end
 

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'rspec'
+require 'rspec/its'
 require 'redis'
 $LOAD_PATH.unshift(File.expand_path(File.join(__FILE__, "..", "..", "lib")))
 require 'mock_redis'
@@ -7,12 +8,12 @@ $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..')))
 Dir["spec/support/**/*.rb"].each {|x| require x}
 
 module TypeCheckingHelper
-  def method_from_description
+  def method_from_description(example)
     # extracting this from the RSpec description string may or may not
     # be a good idea. On the one hand, it enforces the convention of
     # putting the method name in the right place; on the other hand,
     # it's pretty magic-looking.
-    self.example.full_description.match(/#(\w+)/).captures.first
+    example.full_description.match(/#(\w+)/).captures.first
   end
 
   def args_for_method(method)
@@ -26,6 +27,14 @@ module TypeCheckingHelper
 end
 
 RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = [:expect, :should]
+  end
+
+  config.mock_with :rspec do |c|
+    c.syntax = [:expect, :should]
+  end
+
   config.include(TypeCheckingHelper)
 
   config.before(:all) do

data/spec/support/redis_multiplexer.rb

@@ -15,18 +15,18 @@ class RedisMultiplexer < BlankSlate
     # 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) }
 
+    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 = false

data/spec/support/shared_examples/only_operates_on_hashes.rb

@@ -1,8 +1,8 @@
 shared_examples_for "a hash-only command" do
-  it "raises an error for non-hash values" do
+  it "raises an error for non-hash values" do |example|
     key = 'mock-redis-test:hash-only'
 
-    method = method_from_description
+    method = method_from_description(example)
     args = args_for_method(method).unshift(key)
 
     @redises.set(key, 1)

data/spec/support/shared_examples/only_operates_on_lists.rb

@@ -1,8 +1,8 @@
 shared_examples_for "a list-only command" do
-  it "raises an error for non-list values" do
+  it "raises an error for non-list values" do |example|
     key = 'mock-redis-test:list-only'
 
-    method = method_from_description
+    method = method_from_description(example)
     args = args_for_method(method).unshift(key)
 
     @redises.set(key, 1)

data/spec/support/shared_examples/only_operates_on_sets.rb

@@ -1,8 +1,8 @@
 shared_examples_for "a set-only command" do
-  it "raises an error for non-set values" do
+  it "raises an error for non-set values" do |example|
     key = 'mock-redis-test:set-only'
 
-    method = method_from_description
+    method = method_from_description(example)
     args = args_for_method(method).unshift(key)
 
     @redises.set(key, 1)

data/spec/support/shared_examples/only_operates_on_strings.rb

@@ -1,8 +1,8 @@
 shared_examples_for "a string-only command" do
-  it "raises an error for non-string values" do
+  it "raises an error for non-string values" do |example|
     key = "mock-redis-test:string-only-command"
 
-    method = method_from_description
+    method = method_from_description(example)
     args = args_for_method(method).unshift(key)
 
     @redises.lpush(key, 1)

data/spec/support/shared_examples/only_operates_on_zsets.rb

@@ -1,8 +1,8 @@
 shared_examples_for "a zset-only command" do
-  it "raises an error for non-zset values" do
+  it "raises an error for non-zset values" do |example|
     key = 'mock-redis-test:zset-only'
 
-    method = method_from_description
+    method = method_from_description(example)
     args = args_for_method(method).unshift(key)
 
     @redises.set(key, 1)
@@ -23,10 +23,10 @@ shared_examples_for "arg 2 is a score" do
 end
 
 shared_examples_for "arg N is a score" do
-  before do
+  before do |example|
     key = 'mock-redis-test:zset-only'
 
-    @method = method_from_description
+    @method = method_from_description(example)
     @args = args_for_method(@method).unshift(key)
   end
 

data/spec/transactions_spec.rb

@@ -109,4 +109,27 @@ describe 'transactions (multi/exec/discard)' do
       responses[2].should == 1
     end
   end
+
+  context "saving commands with multi block" do
+    before(:each) do
+      @string = 'mock-redis-test:string'
+      @list = 'mock-redis-test:list'
+    end
+
+    it "commands return response after exec is called" do
+      set_response = nil
+      lpush_response = nil
+      second_lpush_response = nil
+
+      @redises.multi do |mult|
+        set_response = mult.set(@string, 'string')
+        lpush_response = mult.lpush(@list, 'list')
+        second_lpush_response = mult.lpush(@list, 'list')
+      end
+
+      set_response.value.should == 'OK'
+      lpush_response.value.should == 1
+      second_lpush_response.value.should == 2
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mock_redis
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.14.0
 platform: ruby
 authors:
 - Causes Engineering
@@ -9,50 +9,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.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:
@@ -61,11 +75,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .mailmap
-- .overcommit.yml
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".mailmap"
+- ".overcommit.yml"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -76,6 +90,7 @@ files:
 - lib/mock_redis/database.rb
 - lib/mock_redis/exceptions.rb
 - lib/mock_redis/expire_wrapper.rb
+- lib/mock_redis/future.rb
 - lib/mock_redis/hash_methods.rb
 - lib/mock_redis/indifferent_hash.rb
 - lib/mock_redis/info_method.rb
@@ -174,6 +189,7 @@ files:
 - spec/commands/rpushx_spec.rb
 - spec/commands/sadd_spec.rb
 - spec/commands/save_spec.rb
+- spec/commands/scan_spec.rb
 - spec/commands/scard_spec.rb
 - spec/commands/sdiff_spec.rb
 - spec/commands/sdiffstore_spec.rb
@@ -237,17 +253,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Redis mock that just lives in memory; useful for testing.
@@ -334,6 +350,7 @@ test_files:
 - spec/commands/rpushx_spec.rb
 - spec/commands/sadd_spec.rb
 - spec/commands/save_spec.rb
+- spec/commands/scan_spec.rb
 - spec/commands/scard_spec.rb
 - spec/commands/sdiff_spec.rb
 - spec/commands/sdiffstore_spec.rb
@@ -387,3 +404,4 @@ test_files:
 - spec/support/shared_examples/only_operates_on_zsets.rb
 - spec/support/shared_examples/sorts_enumerables.rb
 - spec/transactions_spec.rb
+has_rdoc: