mock_redis 0.4.0 → 0.4.1

data/.mailmap

@@ -0,0 +1,2 @@
+Samuel Merritt <spam@andcheese.org> Sam Merritt <spam@andcheese.org>
+Samuel Merritt <spam@andcheese.org> Samuel Merritt <spam@andcheese.org>

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 0.4.1
+* bugfixes: teach various methods to correctly handle non-string values
+
 ### 0.4.0
 * Support `mapped_hmset`/`mapped_hmget`
 * Support `pipelined`

data/lib/mock_redis/hash_methods.rb

@@ -8,16 +8,16 @@ class MockRedis
 
     def hdel(key, field)
       with_hash_at(key) do |hash|
-        hash.delete(field) ? 1 : 0
+        hash.delete(field.to_s) ? 1 : 0
       end
     end
 
     def hexists(key, field)
-      with_hash_at(key) {|h| h.has_key?(field)}
+      with_hash_at(key) {|h| h.has_key?(field.to_s)}
     end
 
     def hget(key, field)
-      with_hash_at(key) {|h| h[field]}
+      with_hash_at(key) {|h| h[field.to_s]}
     end
 
     def hgetall(key)
@@ -26,6 +26,7 @@ class MockRedis
 
     def hincrby(key, field, increment)
       with_hash_at(key) do |hash|
+        field = field.to_s
         unless can_incr?(data[key][field])
           raise RuntimeError, "ERR hash value is not an integer"
         end
@@ -80,7 +81,7 @@ class MockRedis
     end
 
     def hset(key, field, value)
-      with_hash_at(key) {|h| h[field] = value.to_s}
+      with_hash_at(key) {|h| h[field.to_s] = value.to_s}
       true
     end
 

data/lib/mock_redis/version.rb

@@ -1,3 +1,3 @@
 class MockRedis
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/lib/mock_redis/zset_methods.rb

@@ -11,7 +11,7 @@ class MockRedis
       assert_scorey(score)
 
       retval = !zscore(key, member)
-      with_zset_at(key) {|z| z.add(score, member)}
+      with_zset_at(key) {|z| z.add(score, member.to_s)}
       retval
     end
 
@@ -32,6 +32,7 @@ class MockRedis
 
     def zincrby(key, increment, member)
       assert_scorey(increment)
+      member = member.to_s
       with_zset_at(key) do |z|
         old_score = z.include?(member) ? z.score(member) : 0
         new_score = old_score + increment
@@ -61,11 +62,11 @@ class MockRedis
     end
 
     def zrank(key, member)
-      with_zset_at(key) {|z| z.sorted_members.index(member) }
+      with_zset_at(key) {|z| z.sorted_members.index(member.to_s) }
     end
 
     def zrem(key, member)
-      with_zset_at(key) {|z| !!z.delete?(member)}
+      with_zset_at(key) {|z| !!z.delete?(member.to_s)}
     end
 
     def zrevrange(key, start, stop, options={})
@@ -97,12 +98,12 @@ class MockRedis
     end
 
     def zrevrank(key, member)
-      with_zset_at(key) {|z| z.sorted_members.reverse.index(member) }
+      with_zset_at(key) {|z| z.sorted_members.reverse.index(member.to_s) }
     end
 
     def zscore(key, member)
       with_zset_at(key) do |z|
-        score = z.score(member)
+        score = z.score(member.to_s)
         score.to_s if score
       end
     end

data/spec/commands/hdel_spec.rb

@@ -20,6 +20,13 @@ describe "#hdel(key, field)" do
     @redises.hget(@key, 'k1').should be_nil
   end
 
+  it "treats the field as a string" do
+    field = 2
+    @redises.hset(@key, field, 'two')
+    @redises.hdel(@key, field)
+    @redises.hget(@key, field).should be_nil
+  end
+
   it "removes only the field specified" do
     @redises.hdel(@key, 'k1')
     @redises.hget(@key, 'k2').should == 'v2'

data/spec/commands/hexists_spec.rb

@@ -14,6 +14,11 @@ describe "#hexists(key, field)" do
     @redises.hexists(@key, 'nonesuch').should be_false
   end
 
+  it "treats the field as a string" do
+    @redises.hset(@key, 1, 'one')
+    @redises.hexists(@key, 1).should be_true
+  end
+
   it "returns nil when there is no such key" do
     @redises.hexists('mock-redis-test:nonesuch', 'key').should be_false
   end

data/spec/commands/hget_spec.rb

@@ -11,6 +11,11 @@ describe "#hget(key, field)" do
     @redises.hget(@key, 'k1').should == 'v1'
   end
 
+  it "treats the field as a string" do
+    @redises.hset(@key, '3', 'v3')
+    @redises.hget(@key, 3).should == 'v3'
+  end
+
   it "returns nil when there is no such field" do
     @redises.hget(@key, 'nonesuch').should be_nil
   end

data/spec/commands/hincrby_spec.rb

@@ -35,6 +35,12 @@ describe '#hincrby(key, field, increment)' do
     @redises.hincrby(@key, @field, "2").should == 2
   end
 
+  it "treats the field as a string" do
+    field = 11
+    @redises.hset(@key, field, 2)
+    @redises.hincrby(@key, field, 2).should == 4
+  end
+
   it "raises an error if the value does not look like an integer" do
     @redises.hset(@key, @field, "one")
     lambda do

data/spec/commands/hmget_spec.rb

@@ -11,6 +11,12 @@ describe "#hmget(key, field [, field, ...])" do
     @redises.hmget(@key, 'k1', 'k2').sort.should == %w[v1 v2]
   end
 
+  it "treats the fielsd as strings" do
+    @redises.hset(@key, 1, 'one')
+    @redises.hset(@key, 2, 'two')
+    @redises.hmget(@key, 1, 2).sort.should == %w[one two]
+  end
+
   it "returns nils when there are no such fields" do
     @redises.hmget(@key, 'k1', 'mock-redis-test:nonesuch').
       should == ['v1', nil]

data/spec/commands/hset_spec.rb

@@ -19,5 +19,10 @@ describe "#hset(key, field)" do
     @redises.hget(@key, 'num').should == "1"
   end
 
+  it "stores fields as strings" do
+    @redises.hset(@key, 1, "one")
+    @redises.hget(@key, "1").should == "one"
+  end
+
   it_should_behave_like "a hash-only command"
 end

data/spec/commands/hsetnx_spec.rb

@@ -35,5 +35,10 @@ describe "#hsetnx(key, field)" do
     @redises.hget(@key, 'num').should == "1"
   end
 
+  it "stores fields as strings" do
+    @redises.hsetnx(@key, 1, "one")
+    @redises.hget(@key, "1").should == "one"
+  end
+
   it_should_behave_like "a hash-only command"
 end

data/spec/commands/zadd_spec.rb

@@ -17,6 +17,12 @@ describe "#zadd(key, score, member)" do
     @redises.zrange(@key, 0, -1).should == ['foo']
   end
 
+  it "treats integer members as strings" do
+    member = 11
+    @redises.zadd(@key, 1, member)
+    @redises.zrange(@key, 0, -1).should == [member.to_s]
+  end
+
   it "updates the score" do
     @redises.zadd(@key, 1, 'foo')
     @redises.zadd(@key, 2, 'foo')

data/spec/commands/zincrby_spec.rb

@@ -15,6 +15,13 @@ describe "#zincrby(key, increment, member)" do
     @redises.zscore(@key, 'bert').should == "11"
   end
 
+  it "handles integer members correctly" do
+    member = 11
+    @redises.zadd(@key, 1, member)
+    @redises.zincrby(@key, 1, member)
+    @redises.zscore(@key, member).should == "2"
+  end
+
   it "adds missing members with score increment" do
     @redises.zincrby(@key, 5.5, 'bigbird').should == "5.5"
   end

data/spec/commands/zrank_spec.rb

@@ -19,5 +19,11 @@ describe "#zrank(key, member)" do
     @redises.zrank(@key, 'three').should == 2
   end
 
+  it "handles integer members correctly" do
+    member = 11
+    @redises.zadd(@key, 4, member)
+    @redises.zrank(@key, member).should == 3
+  end
+
   it_should_behave_like "a zset-only command"
 end

data/spec/commands/zrem_spec.rb

@@ -21,5 +21,12 @@ describe "#zrem(key, member)" do
     @redises.zrange(@key, 0, -1).should == ['two']
   end
 
+  it "removes integer member from the set" do
+    member = 11
+    @redises.zadd(@key, 3, member)
+    @redises.zrem(@key, member).should be_true
+    @redises.zrange(@key, 0, -1).should == ['one', 'two']
+  end
+
   it_should_behave_like "a zset-only command"
 end

data/spec/commands/zrevrank_spec.rb

@@ -19,5 +19,11 @@ describe "#zrevrank(key, member)" do
     @redises.zrevrank(@key, 'three').should == 0
   end
 
+  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"
 end

data/spec/commands/zscore_spec.rb

@@ -8,6 +8,12 @@ describe "#zscore(key, member)" do
     @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"
+  end
+
   it "returns nil if member is not present in the set" do
     @redises.zscore(@key, 'foo').should be_nil
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: mock_redis
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
+  - 1
   segments_generated: true
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Causes Engineering
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-04 00:00:00 -08:00
+date: 2012-03-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .mailmap
 - .rspec
 - CHANGELOG.md
 - Gemfile