mock_redis 0.2.0 → 0.3.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.3.0
+* Support hash operator (`[]`/`[]=`) as synonym of `get`/`set`
+* Misc bugfixes
+
 ### 0.2.0
 * Support passing a block to `#multi`.
 

data/lib/mock_redis/set_methods.rb

@@ -22,7 +22,7 @@ class MockRedis
     def sdiffstore(destination, *keys)
       assert_has_args(keys, 'sdiffstore')
       with_set_at(destination) do |set|
-        set.merge(sdiff(*keys))
+        set.replace(sdiff(*keys))
       end
       scard(destination)
     end
@@ -38,7 +38,7 @@ class MockRedis
     def sinterstore(destination, *keys)
       assert_has_args(keys, 'sinterstore')
       with_set_at(destination) do |set|
-        set.merge(sinter(*keys))
+        set.replace(sinter(*keys))
       end
       scard(destination)
     end
@@ -88,7 +88,7 @@ class MockRedis
     def sunionstore(destination, *keys)
       assert_has_args(keys, 'sunionstore')
       with_set_at(destination) do |dest_set|
-        dest_set.merge(sunion(*keys))
+        dest_set.replace(sunion(*keys))
       end
       scard(destination)
     end

data/lib/mock_redis/string_methods.rb

@@ -24,6 +24,10 @@ class MockRedis
       data[key]
     end
 
+    def [](key)
+      get(key)
+    end
+
     def getbit(key, offset)
       assert_stringy(key)
 
@@ -108,6 +112,10 @@ class MockRedis
       'OK'
     end
 
+    def []=(key, value)
+      set(key, value)
+    end
+
     def setbit(key, offset, value)
       assert_stringy(key, "ERR bit is not an integer or out of range")
       retval = getbit(key, offset)

data/lib/mock_redis/utility_methods.rb

@@ -6,7 +6,10 @@ class MockRedis
       begin
         send(assertion, key)
         data[key] ||= empty_thing_generator.call
-        yield data[key]
+        data_key_ref = data[key]
+        ret = yield data[key]
+        data[key] = data_key_ref if data[key].nil?
+        ret
       ensure
         clean_up_empties_at(key)
       end

data/lib/mock_redis/version.rb

@@ -1,3 +1,3 @@
 class MockRedis
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/mock_redis.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   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 "redis", "~> 2.2.1"
   s.add_development_dependency "rspec", "~> 2.6.0"
-  s.add_development_dependency "ZenTest"
 end

data/spec/commands/hash_operator_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe "#[](key)" do
+  before do
+    @key = 'mock-redis-test:hash_operator'
+  end
+
+  it "returns nil for a nonexistent value" do
+    @redises['mock-redis-test:does-not-exist'].should be_nil
+  end
+
+  it "returns a stored string value" do
+    @redises[@key] = 'forsooth'
+    @redises[@key].should == 'forsooth'
+  end
+
+  it "treats integers as strings" do
+    @redises[@key] = 100
+    @redises[@key].should == "100"
+  end
+end

data/spec/commands/sdiffstore_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe '#sdiffstore(destination, key [, key, ...])' do
   before do
     @numbers     = 'mock-redis-test:sdiffstore:numbers'
-    @evens       = 'mock-redis-test:sdiffstore:odds'
+    @evens       = 'mock-redis-test:sdiffstore:evens'
     @primes      = 'mock-redis-test:sdiffstore:primes'
     @destination = 'mock-redis-test:sdiffstore:destination'
 
@@ -31,6 +31,13 @@ describe '#sdiffstore(destination, key [, key, ...])' do
     @redises.smembers(@destination).should == %w[10 2 4 6 8]
   end
 
+  it "removes existing elements in destination" do
+    @redises.sadd(@destination, 42)
+
+    @redises.sdiffstore(@destination, @primes)
+    @redises.smembers(@destination).should == %w[2 3 5 7]
+  end
+
   it "raises an error if given 0 sets" do
     lambda do
       @redises.sdiffstore(@destination)

data/spec/commands/sinterstore_spec.rb

@@ -26,6 +26,13 @@ describe '#sinterstore(destination, key [, key, ...])' do
     @redises.get(@destination).should be_nil
   end
 
+  it "removes existing elements in destination" do
+    @redises.sadd(@destination, 42)
+
+    @redises.sinterstore(@destination, @primes)
+    @redises.smembers(@destination).should == %w[2 3 5 7]
+  end
+
   it "raises an error if given 0 sets" do
     lambda do
       @redises.sinterstore(@destination)

data/spec/commands/sunionstore_spec.rb

@@ -26,6 +26,19 @@ describe '#sunionstore(destination, key [, key, ...])' do
     @redises.get(@destination).should be_nil
   end
 
+  it "removes existing elements in destination" do
+    @redises.sadd(@destination, 42)
+
+    @redises.sunionstore(@destination, @primes)
+    @redises.smembers(@destination).should == %w[2 3 5 7]
+  end
+
+  it "correctly unions and stores when the destination is empty and is one of the arguments" do
+    @redises.sunionstore(@destination, @destination, @primes)
+
+    @redises.smembers(@destination).should == %w[2 3 5 7]
+  end
+
   it "raises an error if given 0 sets" do
     lambda do
       @redises.sunionstore(@destination)

data/spec/commands/zinterstore_spec.rb

@@ -28,6 +28,14 @@ describe "#zinterstore(destination, keys, [:weights => [w,w,], [:aggregate => :s
       %w[three 6 five 10 seven 14]
   end
 
+  it "removes existing elements in destination" do
+    @redises.zadd(@dest, 10, 'ten')
+
+    @redises.zinterstore(@dest, [@primes])
+    @redises.zrange(@dest, 0, -1, :with_scores => true).should ==
+      %w[two 2 three 3 five 5 seven 7]
+  end
+
   it "raises an error if keys is empty" do
     lambda do
       @redises.zinterstore(@dest, [])

data/spec/commands/zunionstore_spec.rb

@@ -27,6 +27,14 @@ describe "#zunionstore(destination, keys, [:weights => [w,w,], [:aggregate => :s
       %w[one 3 three 3 two 4]
   end
 
+  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 ==
+      %w[one 1]
+  end
+
   it "raises an error if keys is empty" do
     lambda do
       @redises.zunionstore(@dest, [])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mock_redis
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Samuel Merritt
@@ -15,53 +15,55 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-28 00:00:00 -07:00
+date: 2011-12-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: redis
+  name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 63
         segments: 
+        - 0
+        - 9
         - 2
-        - 2
-        - 1
-        version: 2.2.1
+        version: 0.9.2
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: redis
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 5
         segments: 
         - 2
-        - 6
-        - 0
-        version: 2.6.0
+        - 2
+        - 1
+        version: 2.2.1
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: ZenTest
+  name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 23
         segments: 
+        - 2
+        - 6
         - 0
-        version: "0"
+        version: 2.6.0
   type: :development
   version_requirements: *id003
 description: Instantiate one with `redis = MockRedis.new` and treat it like you would a normal Redis object. It supports all the usual Redis operations.
@@ -120,6 +122,7 @@ files:
 - spec/commands/getbit_spec.rb
 - spec/commands/getrange_spec.rb
 - spec/commands/getset_spec.rb
+- spec/commands/hash_operator_spec.rb
 - spec/commands/hdel_spec.rb
 - spec/commands/hexists_spec.rb
 - spec/commands/hget_spec.rb
@@ -268,6 +271,7 @@ test_files:
 - spec/commands/getbit_spec.rb
 - spec/commands/getrange_spec.rb
 - spec/commands/getset_spec.rb
+- spec/commands/hash_operator_spec.rb
 - spec/commands/hdel_spec.rb
 - spec/commands/hexists_spec.rb
 - spec/commands/hget_spec.rb