mock_redis 0.17.3 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 293ef8fd1bbce6f4a890edc7dbf7afa1235eb885
-  data.tar.gz: 2339b903a136416a24d6630c06dde8ffcde8eee1
+SHA256:
+  metadata.gz: d45157a6761c4ee6db463b692fc9576ea1635576702423d8482e4a108662a1bc
+  data.tar.gz: 1fd788a1b8d7260c68f964af5cad36d83d360ae86616d4b764c1a655b1df953d
 SHA512:
-  metadata.gz: ec8caa7328b7365c9b120837acd873bf535ccee1364590045d8be55989e20e4a53d00fd5952cda910826ba506d61b2a509b06e139deff5f8bd79029475c9b28c
-  data.tar.gz: 68fcb5906a717d679f2d8f3278226a0a213dc4250e314e97fdba647aaf2b3bcd9dec0640ca8db4b916dea9278d4737fce17d3b6f6de8d6288947a83c93128881
+  metadata.gz: fb6a1a256bca8464aff700e90db426ce3e98b454c9bbdb56f44316dba0b8c10dd66afe7938b3f0fb3b22e61cee3c2f96675fc3f5ce1d2efcae24c09c9bd6ba76
+  data.tar.gz: 6720e42db8d2aafeae70dfeb79ad827b054b10143013510a2f3ac8b209438d70a05aafbf1039aae3f9b85194221cb80461c33700cf0215895ab6989999bcf605

data/.rubocop.yml

@@ -9,6 +9,9 @@ Lint/Void:
 Metrics/AbcSize:
   Enabled: false
 
+Metrics/BlockLength:
+  Enabled: false
+
 Metrics/CyclomaticComplexity:
   Enabled: false
 
@@ -90,6 +93,9 @@ Style/SignalException:
 Style/SingleLineBlockParams:
   Enabled: false
 
+Style/SymbolArray:
+  Enabled: false
+
 Style/TrailingCommaInArguments:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # MockRedis Changelog
 
+### 0.18.0
+
+* Fix `hset` return value to return false when the field exists in the hash
+* Fix message on exception raised from hincrbyfloat to match Redis 4
+* Fix `lpushx`/`rpushx` to correctly accept an array as the value
+* Fix rename to allow `rename(k1, k1)`
+
 ### 0.17.3
 
 * Fix `zrange` behavior with negative stop argument

data/Gemfile

@@ -4,9 +4,9 @@ source 'http://rubygems.org'
 gemspec
 
 # Run all pre-commit hooks via Overcommit during CI runs
-gem 'overcommit', '0.37.0'
+gem 'overcommit', '0.39.0'
 
 # Pin tool versions (which are executed by Overcommit) for Travis builds
-gem 'rubocop', '0.45.0'
+gem 'rubocop', '0.48.1'
 
 gem 'coveralls', require: false

data/README.md

@@ -9,7 +9,7 @@ MockRedis provides the same interface as `redis-rb`, but it stores its
 data in memory instead of talking to a Redis server. It is intended
 for use in tests.
 
-The current implementation is tested against *Redis 3*. Older versions
+The current implementation is tested against *Redis 4*. Older versions
 of Redis may return different results or not support some commands.
 
 ## Getting Started

data/lib/mock_redis/database.rb

@@ -160,25 +160,26 @@ class MockRedis
     end
 
     def rename(key, newkey)
-      if !data.include?(key)
+      unless data.include?(key)
         raise Redis::CommandError, 'ERR no such key'
-      elsif key == newkey
-        raise Redis::CommandError, 'ERR source and destination objects are the same'
       end
-      data[newkey] = data.delete(key)
-      if has_expiration?(key)
-        set_expiration(newkey, expiration(key))
-        remove_expiration(key)
+
+      if key != newkey
+        data[newkey] = data.delete(key)
+        if has_expiration?(key)
+          set_expiration(newkey, expiration(key))
+          remove_expiration(key)
+        end
       end
+
       'OK'
     end
 
     def renamenx(key, newkey)
-      if !data.include?(key)
+      unless data.include?(key)
         raise Redis::CommandError, 'ERR no such key'
-      elsif key == newkey
-        raise Redis::CommandError, 'ERR source and destination objects are the same'
       end
+
       if exists(newkey)
         false
       else
@@ -229,14 +230,11 @@ class MockRedis
       end
     end
 
-    def script(subcommand, *args)
-    end
+    def script(subcommand, *args); end
 
-    def evalsha(*args)
-    end
+    def evalsha(*args); end
 
-    def eval(*args)
-    end
+    def eval(*args); end
 
     private
 

data/lib/mock_redis/hash_methods.rb

@@ -51,7 +51,7 @@ class MockRedis
       with_hash_at(key) do |hash|
         field = field.to_s
         unless can_incr_float?(data[key][field])
-          raise Redis::CommandError, 'ERR hash value is not a valid float'
+          raise Redis::CommandError, 'ERR hash value is not a float'
         end
 
         unless looks_like_float?(increment.to_s)
@@ -126,8 +126,9 @@ class MockRedis
     end
 
     def hset(key, field, value)
+      field_exists = hexists(key, field)
       with_hash_at(key) { |h| h[field.to_s] = value.to_s }
-      true
+      !field_exists
     end
 
     def hsetnx(key, field, value)

data/lib/mock_redis/list_methods.rb

@@ -91,7 +91,7 @@ class MockRedis
 
     def lpushx(key, value)
       value = [value] unless value.is_a?(Array)
-      if value.length != 1
+      if value.empty?
         raise Redis::CommandError, "ERR wrong number of arguments for 'lpushx' command"
       end
       assert_listy(key)
@@ -170,7 +170,7 @@ class MockRedis
 
     def rpushx(key, value)
       value = [value] unless value.is_a?(Array)
-      if value.length != 1
+      if value.empty?
         raise Redis::CommandError, "ERR wrong number of arguments for 'rpushx' command"
       end
       assert_listy(key)

data/lib/mock_redis/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 class MockRedis
-  VERSION = '0.17.3'
+  VERSION = '0.18.0'.freeze
 end

data/spec/commands/hset_spec.rb

@@ -5,10 +5,20 @@ describe '#hset(key, field)' do
     @key = 'mock-redis-test:hset'
   end
 
-  it 'returns true' do
+  it 'returns true if the key does not exist' do
     @redises.hset(@key, 'k1', 'v1').should == true
   end
 
+  it 'returns true if the key exists but the field does not' do
+    @redises.hset(@key, 'k1', 'v1')
+    @redises.hset(@key, 'k2', 'v2').should == true
+  end
+
+  it 'returns false if the field already exists' do
+    @redises.hset(@key, 'k1', 'v1')
+    @redises.hset(@key, 'k1', 'v1').should == false
+  end
+
   it 'creates a hash there is no such field' do
     @redises.hset(@key, 'k1', 'v1')
     @redises.hget(@key, 'k1').should == 'v1'

data/spec/commands/lpushx_spec.rb

@@ -30,15 +30,16 @@ describe '#lpushx(key, value)' do
   end
 
   it 'raises an error if an empty array is given' do
+    @redises.lpush(@key, 'X')
     lambda do
       @redises.lpushx(@key, [])
     end.should raise_error(Redis::CommandError)
   end
 
-  it 'raises an error if an array of more than one item is given' do
-    lambda do
-      @redises.lpushx(@key, [1, 2])
-    end.should raise_error(Redis::CommandError)
+  it 'stores multiple items if an array of more than one item is given' do
+    @redises.lpush(@key, 'X')
+    @redises.lpushx(@key, [1, 2]).should == 3
+    @redises.lrange(@key, 0, -1).should == %w[2 1 X]
   end
 
   it_should_behave_like 'a list-only command'

data/spec/commands/rename_spec.rb

@@ -8,7 +8,7 @@ describe '#rename(key, newkey)' do
     @redises.set(@key, 'oof')
   end
 
-  it "responds with 'OK'" do
+  it 'responds with "OK"' do
     @redises.rename(@key, @newkey).should == 'OK'
   end
 
@@ -24,10 +24,8 @@ describe '#rename(key, newkey)' do
     end.should raise_error(Redis::CommandError)
   end
 
-  it 'raises an error when key == newkey' do
-    lambda do
-      @redises.rename(@key, @key)
-    end.should raise_error(Redis::CommandError)
+  it 'responds with "OK" when key == newkey' do
+    @redises.rename(@key, @key).should == 'OK'
   end
 
   it 'overwrites any existing value at newkey' do

data/spec/commands/renamenx_spec.rb

@@ -29,10 +29,8 @@ describe '#renamenx(key, newkey)' do
     end.should raise_error(Redis::CommandError)
   end
 
-  it 'raises an error when key == newkey' do
-    lambda do
-      @redises.renamenx(@key, @key)
-    end.should raise_error(Redis::CommandError)
+  it 'returns false when key == newkey' do
+    @redises.renamenx(@key, @key).should == false
   end
 
   it 'leaves any existing value at newkey alone' do

data/spec/commands/rpushx_spec.rb

@@ -30,15 +30,16 @@ describe '#rpushx(key, value)' do
   end
 
   it 'raises an error if an empty array is given' do
+    @redises.lpush(@key, 'X')
     lambda do
       @redises.rpushx(@key, [])
     end.should raise_error(Redis::CommandError)
   end
 
-  it 'raises an error if an array of more than one item is given' do
-    lambda do
-      @redises.rpushx(@key, [1, 2])
-    end.should raise_error(Redis::CommandError)
+  it 'stores multiple items if an array of more than one item is given' do
+    @redises.lpush(@key, 'X')
+    @redises.rpushx(@key, [1, 2]).should == 3
+    @redises.lrange(@key, 0, -1).should == %w[X 1 2]
   end
 
   it_should_behave_like 'a list-only command'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mock_redis
 version: !ruby/object:Gem::Version
-  version: 0.17.3
+  version: 0.18.0
 platform: ruby
 authors:
 - Brigade Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-05 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -281,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Redis mock that just lives in memory; useful for testing.