mock_redis 0.6.5 → 0.6.6

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.6.6
+* Avoid mutation of @data from external reference
+* Fix sorted set (e.g. `zadd`) with multiple score/member pairs
+
 ### 0.6.5
 * Fix `zrevrange` to return an empty array on invalid range
 * Fix `srandmember` spec on redis-rb 3.0.3

data/lib/mock_redis/utility_methods.rb

@@ -9,12 +9,16 @@ class MockRedis
         data_key_ref = data[key]
         ret = yield data[key]
         data[key] = data_key_ref if data[key].nil?
-        ret
+        primitive?(ret) ? ret.dup : ret
       ensure
         clean_up_empties_at(key)
       end
     end
 
+    def primitive?(value)
+      value.kind_of?(::Array) || value.kind_of?(::Hash) || value.kind_of?(::String)
+    end
+
     def clean_up_empties_at(key)
       if data[key] && data[key].empty?
         del(key)

data/lib/mock_redis/version.rb

@@ -1,3 +1,3 @@
 class MockRedis
-  VERSION = '0.6.5'
+  VERSION = '0.6.6'
 end

data/lib/mock_redis/zset_methods.rb

@@ -8,30 +8,20 @@ class MockRedis
     include UtilityMethods
 
     def zadd(key, *args)
-      if !args.first.is_a?(Array)
-        if args.size < 2
-          raise Redis::CommandError, "ERR wrong number of arguments for 'zadd' command"
-        elsif args.size.odd?
-          raise Redis::CommandError, "ERR syntax error"
-        end
-      else
-        unless args.all? {|pair| pair.size == 2 }
-          raise(Redis::CommandError, "ERR syntax error")
-        end
-      end
-
-      if args.size == 2
-        score, member = args
-        assert_scorey(score)
-        retval = !zscore(key, member)
-        with_zset_at(key) {|z| z.add(score, member.to_s)}
-      else
+      if args.size == 1 && args[0].is_a?(Array)
         args = args.first
         args = args.each_slice(2).to_a unless args.first.is_a?(Array)
         retval = args.map(&:last).map { |member| !!zscore(key, member.to_s) }.count(false)
         with_zset_at(key) do |z|
           args.each { |score, member| z.add(score, member.to_s) }
         end
+      elsif args.size == 2
+        score, member = args
+        assert_scorey(score)
+        retval = !zscore(key, member)
+        with_zset_at(key) {|z| z.add(score, member.to_s)}
+      else
+        raise Redis::CommandError, "ERR wrong number of arguments"
       end
 
       retval

data/spec/commands/hgetall_spec.rb

@@ -18,5 +18,15 @@ describe "#hgetall(key)" do
     @redises.hgetall('mock-redis-test:nonesuch').should == {}
   end
 
+  it "doesn't return a mutable reference to the returned data" do
+    mr = MockRedis.new
+    mr.hset(@key, 'k1', 'v1')
+    mr.hset(@key, 'k2', 'v2')
+    hash =  mr.hgetall(@key)
+    hash['dont'] = 'mutate'
+    new_hash = mr.hgetall(@key)
+    new_hash.keys.sort.should == ['k1', 'k2']
+  end
+
   it_should_behave_like "a hash-only command"
 end

data/spec/commands/zadd_spec.rb

@@ -32,7 +32,8 @@ describe "#zadd(key, score, member)" do
 
   it "supports a variable number of arguments" do
     @redises.zadd(@key, [[1, 'one'], [2, 'two']])
-    @redises.zrange(@key, 0, -1).should == ['one', 'two']
+    @redises.zadd(@key, [[3, 'three']])
+    @redises.zrange(@key, 0, -1).should == ['one', 'two', 'three']
   end
 
   it_should_behave_like "arg 1 is a score"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mock_redis
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake