mock_redis 0.16.1 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07dd0bf6f710e9b04f28aa4f3c52756fd98d0286
-  data.tar.gz: 10ed67b75a2ef384933f3a0eb53fd80130545bd9
+  metadata.gz: bb438752840e4549b0797ba546fe482c36bbfed7
+  data.tar.gz: af6544eeeabb9e54989b39aebf64bad53e2a4ac0
 SHA512:
-  metadata.gz: f32e91e4c52602c4f0873b076cdf382a0fbc875e803d593dd87841d42eb2bf3a0264b902e5bf8b97e4ccf80e6944a028f54561b62872abaa49337a676fdae13d
-  data.tar.gz: 2b2dc33938b162fb550cae6a38b83d68fea745bc3220f38d183c9168bbc7c2bf60cb1629ea18fc48a0614e68359cd5353649ca91ed2111a6fe3f01c1c4614eb7
+  metadata.gz: e548a84b1df2535ddde32358e88801383560e3cedb65e9892e07c4f1812b291e37d3e255cd5777463fa96ad11fa9c47c047b520d77fb101e3e430a5703159a69
+  data.tar.gz: e3c469733b2de7d7793ea892b651cc3b9d0005f97c73e8b71894d4d6e10a4e95ae12de0faf97bfc0110d60ea7352abd40272ac5cba8df0bbc05984646819afe7

data/.rubocop.yml

@@ -51,9 +51,16 @@ Style/IfUnlessModifier:
 Style/Lambda:
   Enabled: false
 
+# TODO: Address these at some point
+Style/MethodMissing:
+  Enabled: false
+
 Style/MultilineBlockChain:
   Enabled: false
 
+Style/NumericPredicate:
+  Enabled: false
+
 # Prefer curly braces except for %i/%w/%W, since those return arrays.
 Style/PercentLiteralDelimiters:
   PreferredDelimiters:

data/.travis.yml

@@ -4,22 +4,26 @@ sudo: false
 
 cache: bundler
 
+addons:
+  apt:
+    packages:
+      - redis-server
+
 services:
   - redis-server
 
 rvm:
-  - 1.9.3
   - 2.0
   - 2.1
   - 2.2
-  - 2.3.0
-  - jruby-19mode
+  - 2.3.1
 
 before_script:
   - git config --local user.email "travis@travis.ci"
   - git config --local user.name "Travis CI"
 
 script:
+  - redis-cli --version
   - bundle exec rspec
   - bundle exec overcommit --sign
   - bundle exec overcommit --run

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # MockRedis Changelog
 
+### 0.17.0
+
+* Upgrade minimum `redis` gem version to 3.3.0+
+* Add support for XX, NX and INCR parameters of `ZADD`
+* Drop support for Ruby 1.9.3/JRuby 1.7.x
+* Fix ZREM to raise error when argument is an empty array
+
 ### 0.16.1
 
 * Relax `rake` gem dependency to allow 11.x.x versions

data/Gemfile

@@ -4,10 +4,10 @@ source 'http://rubygems.org'
 gemspec
 
 # Run all pre-commit hooks via Overcommit during CI runs
-gem 'overcommit', '0.32.0'
+gem 'overcommit', '0.35.0'
 
 # Pin tool versions (which are executed by Overcommit) for Travis builds
-gem 'rubocop', '0.38.0'
+gem 'rubocop', '0.42.0'
 gem 'travis', '~> 1.7'
 
 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 2.8.17*. Older versions
+The current implementation is tested against *Redis 3*. Older versions
 of Redis may return different results or not support some commands.
 
 ## Getting Started
@@ -93,9 +93,8 @@ please submit a pull request with your (tested!) implementation.
 
 ## Compatibility
 
-As of version `0.8.2`, Ruby 1.9.3 and above are supported. For
-older versions of Ruby, use `0.8.1` or older. JRuby 1.7.9 is also
-supported.
+As of version `0.8.2`, Ruby 2.0.0 and above are supported. For
+older versions of Ruby, use `0.8.1` or older.
 
 ## Running the Tests
 

data/lib/mock_redis.rb

@@ -36,7 +36,11 @@ class MockRedis
       TransactionWrapper.new(
         ExpireWrapper.new(
           MultiDbWrapper.new(
-            Database.new(self, *args)))))
+            Database.new(self, *args)
+          )
+        )
+      )
+    )
   end
 
   def id

data/lib/mock_redis/database.rb

@@ -291,7 +291,8 @@ class MockRedis
         "^#{pattern}$".
         gsub(/([+|()])/, '\\\\\1').
         gsub(/([^\\])\?/, '\\1.').
-        gsub(/([^\\])\*/, '\\1.*'))
+        gsub(/([^\\])\*/, '\\1.*')
+      )
     end
 
     def remove_expiration(key)

data/lib/mock_redis/version.rb

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

data/lib/mock_redis/zset_methods.rb

@@ -8,27 +8,84 @@ class MockRedis
     include UtilityMethods
 
     def zadd(key, *args)
-      if args.size == 1 && args[0].is_a?(Array)
-        args = args.first
-        assert_has_args(args, 'zadd')
+      zadd_options = {}
+      zadd_options = args.pop if args.last.is_a?(Hash)
 
-        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
+      if zadd_options && zadd_options.include?(:nx) && zadd_options.include?(:xx)
+        raise Redis::CommandError, 'ERR XX and NX options at the same time are not compatible'
+      end
+
+      if args.size == 1 && args[0].is_a?(Array)
+        zadd_multiple_members(key, args.first, zadd_options)
       elsif args.size == 2
         score, member = args
-        assert_scorey(score) unless score =~ /(\+|\-)inf/
-        retval = !zscore(key, member)
-        with_zset_at(key) { |z| z.add(score, member.to_s) }
+        zadd_one_member(key, score, member, zadd_options)
       else
         raise Redis::CommandError, 'ERR wrong number of arguments'
       end
+    end
 
-      retval
+    def zadd_one_member(key, score, member, zadd_options = {})
+      assert_scorey(score) unless score =~ /(\+|\-)inf/
+
+      with_zset_at(key) do |zset|
+        if zadd_options[:incr]
+          if zadd_options[:xx]
+            member_present = zset.include?(member)
+            return member_present ? zincrby(key, score, member) : nil
+          end
+
+          if zadd_options[:nx]
+            member_present = zset.include?(member)
+            return member_present ? nil : zincrby(key, score, member)
+          end
+
+          zincrby(key, score, member)
+        elsif zadd_options[:xx]
+          zset.add(score, member.to_s) if zset.include?(member)
+          false
+        elsif zadd_options[:nx]
+          !zset.include?(member) && !!zset.add(score, member.to_s)
+        else
+          retval = !zscore(key, member)
+          zset.add(score, member.to_s)
+          retval
+        end
+      end
     end
 
+    private :zadd_one_member
+
+    def zadd_multiple_members(key, args, zadd_options = {})
+      assert_has_args(args, 'zadd')
+
+      args = args.each_slice(2).to_a unless args.first.is_a?(Array)
+      with_zset_at(key) do |zset|
+        if zadd_options[:incr]
+          raise Redis::CommandError, 'ERR INCR option supports a single increment-element pair'
+        elsif zadd_options[:xx]
+          args.each { |score, member| zset.include?(member) && zset.add(score, member.to_s) }
+          0
+        elsif zadd_options[:nx]
+          args.reduce(0) do |retval, (score, member)|
+            unless zset.include?(member)
+              zset.add(score, member.to_s)
+              retval += 1
+            end
+            retval
+          end
+        else
+          args.reduce(0) do |retval, (score, member)|
+            retval += 1 unless zset.include?(member)
+            zset.add(score, member.to_s)
+            retval
+          end
+        end
+      end
+    end
+
+    private :zadd_multiple_members
+
     def zcard(key)
       with_zset_at(key, &:size)
     end
@@ -83,9 +140,13 @@ class MockRedis
         retval = with_zset_at(key) { |z| !!z.delete?(args.first.to_s) }
       else
         args = args.first
-        retval = args.map { |member| !!zscore(key, member.to_s) }.count(true)
-        with_zset_at(key) do |z|
-          args.each { |member| z.delete?(member) }
+        if args.empty?
+          raise Redis::CommandError, "ERR wrong number of arguments for 'zrem' command"
+        else
+          retval = args.map { |member| !!zscore(key, member.to_s) }.count(true)
+          with_zset_at(key) do |z|
+            args.each { |member| z.delete?(member) }
+          end
         end
       end
 
@@ -119,8 +180,10 @@ class MockRedis
         to_response(
           apply_limit(
             zset.in_range(min, max).reverse,
-            options[:limit]),
-          options)
+            options[:limit]
+          ),
+          options
+        )
       end
     end
 
@@ -233,7 +296,7 @@ class MockRedis
     def assert_zsety(key)
       unless zsety?(key)
         raise Redis::CommandError,
-        'WRONGTYPE Operation against a key holding the wrong kind of value'
+          'WRONGTYPE Operation against a key holding the wrong kind of value'
       end
     end
 

data/mock_redis.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_development_dependency 'rake', '>= 10', '< 12'
-  s.add_development_dependency 'redis', '~> 3.2.0'
+  s.add_development_dependency 'redis', '~> 3.3.0'
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rspec-its', '~> 1.0'
 end

data/spec/commands/del_spec.rb

@@ -8,7 +8,8 @@ describe '#del(key [, key, ...])' do
     @redises.del(
       'mock-redis-test:1',
       'mock-redis-test:2',
-      'mock-redis-test:other').should == 2
+      'mock-redis-test:other'
+    ).should == 2
   end
 
   it 'actually removes the key' do

data/spec/commands/zadd_spec.rb

@@ -30,6 +30,82 @@ describe '#zadd(key, score, member)' do
     @redises.zscore(@key, 'foo').should == 2.0
   end
 
+  it 'with XX option command do nothing if element not exist' do
+    @redises.zadd(@key, 1, 'foo')
+    @redises.zadd(@key, 2, 'bar', xx: true)
+    @redises.zrange(@key, 0, -1).should_not include 'bar'
+  end
+
+  it 'with XX option command update index on exist element' do
+    @redises.zadd(@key, 1, 'foo')
+    @redises.zadd(@key, 2, 'foo', xx: true)
+    @redises.zscore(@key, 'foo').should == 2.0
+  end
+
+  it 'with XX option and multiple elements command update index on exist element' do
+    @redises.zadd(@key, 1, 'foo')
+    added_count = @redises.zadd(@key, [[2, 'foo'], [2, 'bar']], xx: true)
+    added_count.should == 0
+
+    @redises.zscore(@key, 'foo').should == 2.0
+    @redises.zrange(@key, 0, -1).should_not include 'bar'
+  end
+
+  it "with NX option don't update current element" do
+    @redises.zadd(@key, 1, 'foo')
+    @redises.zadd(@key, 2, 'foo', nx: true)
+    @redises.zscore(@key, 'foo').should == 1.0
+  end
+
+  it 'with NX option create new element' do
+    @redises.zadd(@key, 1, 'foo')
+    @redises.zadd(@key, 2, 'bar', nx: true)
+    @redises.zrange(@key, 0, -1).should include 'bar'
+  end
+
+  it 'with NX option and multiple elements command only create element' do
+    @redises.zadd(@key, 1, 'foo')
+    added_count = @redises.zadd(@key, [[2, 'foo'], [2, 'bar']], nx: true)
+    added_count.should == 1
+    @redises.zscore(@key, 'bar').should == 2.0
+    @redises.zrange(@key, 0, -1).should eq %w[foo bar]
+  end
+
+  it 'XX and NX options in same time raise error' do
+    lambda do
+      @redises.zadd(@key, 1, 'foo', nx: true, xx: true)
+    end.should raise_error(Redis::CommandError)
+  end
+
+  it 'with INCR is act like zincrby' do
+    @redises.zadd(@key, 10, 'bert', incr: true).should == 10.0
+    @redises.zadd(@key, 3, 'bert', incr: true).should == 13.0
+  end
+
+  it 'with INCR and XX not create element' do
+    @redises.zadd(@key, 10, 'bert', xx: true, incr: true).should be_nil
+  end
+
+  it 'with INCR and XX increase score for exist element' do
+    @redises.zadd(@key, 2, 'bert')
+    @redises.zadd(@key, 10, 'bert', xx: true, incr: true).should == 12.0
+  end
+
+  it 'with INCR and NX create element with score' do
+    @redises.zadd(@key, 11, 'bert', nx: true, incr: true).should == 11.0
+  end
+
+  it 'with INCR and NX not update element' do
+    @redises.zadd(@key, 1, 'bert')
+    @redises.zadd(@key, 10, 'bert', nx: true, incr: true).should be_nil
+  end
+
+  it 'with INCR with variable number of arguments raise error' do
+    lambda do
+      @redises.zadd(@key, [[1, 'one'], [2, 'two']], incr: true)
+    end.should raise_error(Redis::CommandError)
+  end
+
   it 'supports a variable number of arguments' do
     @redises.zadd(@key, [[1, 'one'], [2, 'two']])
     @redises.zadd(@key, [[3, 'three']])

data/spec/commands/zrem_spec.rb

@@ -33,5 +33,11 @@ describe '#zrem(key, member)' do
     @redises.zrange(@key, 0, -1).should be_empty
   end
 
+  it 'raises an error if member is an empty array' do
+    lambda do
+      @redises.zrem(@key, [])
+    end.should raise_error(Redis::CommandError)
+  end
+
   it_should_behave_like 'a zset-only command'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mock_redis
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.17.0
 platform: ruby
 authors:
 - Brigade Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -37,14 +37,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -281,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Redis mock that just lives in memory; useful for testing.