mock_redis 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da2c2693b445e51b487e52f7c9b3986960417686792f9a5e554ca4d215c323e2
-  data.tar.gz: 8da2170fcc49e768133a61deb716d72cc18d66291567008d96287b8d2104b15c
+  metadata.gz: 0e3dccfea232f8d47d28dc16362a79232cd69a2a12e6d8127a43c83c03287ef4
+  data.tar.gz: a2918811810246e6ddf92643e88121550310a7628f396aba12ed163b61c979a5
 SHA512:
-  metadata.gz: 15b8b59cff1120de0befaee6cf08facfb120e239d3fbc1b6b55f40bb60c526f57e5cbb61f1d9f6fd5538067122e49b80e9e782590cd98070a3d49943ec8bb929
-  data.tar.gz: 52a09f0896a405137be0075db930bec09898dd96e3d5366a95ef6a189268348f91244c051dbe45db5b4b37023a12f87552868fcaf2a5383316bebe9bdaf44997
+  metadata.gz: e8233e6e66afbaa2f7801e33f7b16a7bbbb2eb4cb3caab73a0c19e94857542fe49a96a9c45e8e995b54bf71d50c90ef78cfb5e293e85d91a3ade26f0e3a3e4d8
+  data.tar.gz: e30d5a2656ef3fb793cb9a0a2df9e1e24cd78aaa83a6cf5a3483353075f2a475379e294fc6b9c5905229db1a453d16cc7fa02095aed3ad59799312ff5d76ced5

data/.rubocop.yml

@@ -1,7 +1,10 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.4
+
+Layout/AlignArguments:
+  Enabled: false
 
 Layout/AlignParameters:
   Enabled: false
@@ -9,6 +12,9 @@ Layout/AlignParameters:
 Layout/DotPosition:
   Enabled: false
 
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
+
 Lint/AssignmentInCondition:
   Enabled: false
 

data/.travis.yml

@@ -1,7 +1,5 @@
 language: ruby
 
-sudo: false
-
 cache: bundler
 
 addons:
@@ -12,11 +10,16 @@ addons:
 services:
   - redis-server
 
+before_install:
+  - sudo sed -e 's/^bind.*/bind 127.0.0.1/' /etc/redis/redis.conf > redis.conf
+  - sudo mv redis.conf /etc/redis
+  - sudo service redis-server start
+  - echo PING | nc localhost 6379
+
 rvm:
-  - 2.2
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
 
 before_script:
   - git config --local user.email "travis@travis.ci"
@@ -27,7 +30,3 @@ script:
   - bundle exec rspec
   - bundle exec overcommit --sign
   - bundle exec overcommit --run
-
-matrix:
-  allow_failures:
-    - rvm: 2.1.0

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # MockRedis Changelog
 
+### 0.20.0
+
+* Add support for `count` parameter of `spop`
+* Fix `mget` and `mset` to accept array as parameters
+* Fix pipelined array replies
+* Fix nested pipelining
+* Allow nested multi
+* Require Redis gem 4.0.1 or newer
+* Add support for stream commands on Redis 5
+* Keep empty strings on type mismatch
+* Improve performance of `set_expiration`
+* Fix `watch` to allow multiple keys
+* Add `unlink` alias for `del`
+* Drop support for Ruby 2.3 or older
+
 ### 0.19.0
 
 * Require Ruby 2.2+

data/Gemfile

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

data/README.md

@@ -1,8 +1,8 @@
 # MockRedis
 
 [![Gem Version](https://badge.fury.io/rb/mock_redis.svg)](http://badge.fury.io/rb/mock_redis)
-[![Build Status](https://travis-ci.org/brigade/mock_redis.svg)](https://travis-ci.org/brigade/mock_redis)
-[![Coverage Status](https://coveralls.io/repos/brigade/mock_redis/badge.svg)](https://coveralls.io/r/brigade/mock_redis)
+[![Build Status](https://travis-ci.org/sds/mock_redis.svg)](https://travis-ci.org/sds/mock_redis)
+[![Coverage Status](https://coveralls.io/repos/sds/mock_redis/badge.svg)](https://coveralls.io/r/sds/mock_redis)
 
 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

data/lib/mock_redis/database.rb

@@ -10,6 +10,7 @@ require 'mock_redis/indifferent_hash'
 require 'mock_redis/info_method'
 require 'mock_redis/utility_methods'
 require 'mock_redis/geospatial_methods'
+require 'mock_redis/stream_methods'
 
 class MockRedis
   class Database
@@ -22,6 +23,7 @@ class MockRedis
     include InfoMethod
     include UtilityMethods
     include GeospatialMethods
+    include StreamMethods
 
     attr_reader :data, :expire_times
 
@@ -73,6 +75,7 @@ class MockRedis
         each { |k| data.delete(k) }.
         length
     end
+    alias unlink del
 
     def echo(msg)
       msg.to_s
@@ -303,11 +306,9 @@ class MockRedis
 
     def set_expiration(key, time)
       remove_expiration(key)
-
-      expire_times << [time, key.to_s]
-      expire_times.sort! do |a, b|
-        a.first <=> b.first
-      end
+      found = expire_times.each_with_index.to_a.bsearch { |item, _| item.first >= time }
+      index = found ? found.last : -1
+      expire_times.insert(index, [time, key.to_s])
     end
 
     def zero_pad(string, desired_length)

data/lib/mock_redis/geospatial_methods.rb

@@ -1,7 +1,7 @@
 class MockRedis
   module GeospatialMethods
-    LNG_RANGE = (-180..180)
-    LAT_RANGE = (-85.05112878..85.05112878)
+    LNG_RANGE = (-180..180).freeze
+    LAT_RANGE = (-85.05112878..85.05112878).freeze
     STEP = 26
     UNITS = {
       m: 1,
@@ -23,21 +23,13 @@ class MockRedis
       zadd(key, scored_points)
     end
 
-    def geodist(key, *args)
-      if args.length < 2
-        raise Redis::CommandError,
-          "ERR wrong number of arguments for 'geodist' command"
-      end
-
-      raise Redis::CommandError, 'ERR syntax error' if args.length > 3
-
-      to_meter = 1
-      to_meter = parse_unit(args[2]) if args.length == 3
+    def geodist(key, member1, member2, unit = 'm')
+      to_meter = parse_unit(unit)
 
       return nil if zcard(key).zero?
 
-      score1 = zscore(key, args[0])
-      score2 = zscore(key, args[1])
+      score1 = zscore(key, member1)
+      score2 = zscore(key, member2)
       return nil if score1.nil? || score2.nil?
       hash1 = { bits: score1.to_i, step: STEP }
       hash2 = { bits: score2.to_i, step: STEP }
@@ -49,12 +41,12 @@ class MockRedis
       format('%.4f', distance)
     end
 
-    def geohash(key, *members)
+    def geohash(key, members)
       lng_range = (-180..180)
       lat_range = (-90..90)
       geoalphabet = '0123456789bcdefghjkmnpqrstuvwxyz'
 
-      members.map do |member|
+      Array(members).map do |member|
         score = zscore(key, member)
         next nil unless score
         score = score.to_i
@@ -71,8 +63,8 @@ class MockRedis
       end
     end
 
-    def geopos(key, *members)
-      members.map do |member|
+    def geopos(key, members)
+      Array(members).map do |member|
         score = zscore(key, member)
         next nil unless score
         hash = { bits: score.to_i, step: STEP }

data/lib/mock_redis/hash_methods.rb

@@ -6,15 +6,15 @@ class MockRedis
     include Assertions
     include UtilityMethods
 
-    def hdel(key, field)
+    def hdel(key, *fields)
       with_hash_at(key) do |hash|
-        if field.is_a?(Array)
+        if fields.is_a?(Array)
           orig_size = hash.size
-          fields    = field.map(&:to_s)
+          fields    = fields.map(&:to_s)
           hash.delete_if { |k, _v| fields.include?(k) }
           orig_size - hash.size
         else
-          hash.delete(field.to_s) ? 1 : 0
+          hash.delete(fields[0].to_s) ? 1 : 0
         end
       end
     end

data/lib/mock_redis/indifferent_hash.rb

@@ -1,13 +1,5 @@
 class MockRedis
   class IndifferentHash < Hash
-    def [](key)
-      super(key.to_s)
-    end
-
-    def []=(key, value)
-      super(key.to_s, value)
-    end
-
     def has_key?(key)
       super(key.to_s)
     end

data/lib/mock_redis/list_methods.rb

@@ -146,13 +146,13 @@ class MockRedis
 
     def ltrim(key, start, stop)
       with_list_at(key) do |list|
-        list.replace(list[[start.to_i, -list.length].max..stop.to_i] || []) if list
+        list&.replace(list[[start.to_i, -list.length].max..stop.to_i] || [])
         'OK'
       end
     end
 
     def rpop(key)
-      with_list_at(key) { |list| list.pop if list }
+      with_list_at(key) { |list| list&.pop }
     end
 
     def rpoplpush(source, destination)

data/lib/mock_redis/pipelined_wrapper.rb

@@ -9,7 +9,7 @@ class MockRedis
     def initialize(db)
       @db = db
       @pipelined_futures = []
-      @in_pipeline = false
+      @nesting_level = 0
     end
 
     def initialize_copy(source)
@@ -19,7 +19,7 @@ class MockRedis
     end
 
     def method_missing(method, *args, &block)
-      if @in_pipeline
+      if in_pipeline?
         future = MockRedis::Future.new([method, *args], block)
         @pipelined_futures << future
         future
@@ -29,9 +29,17 @@ class MockRedis
     end
 
     def pipelined(_options = {})
-      @in_pipeline = true
-      yield self
-      @in_pipeline = false
+      begin
+        @nesting_level += 1
+        yield self
+      ensure
+        @nesting_level -= 1
+      end
+
+      if in_pipeline?
+        return
+      end
+
       responses = @pipelined_futures.flat_map do |future|
         begin
           result = if future.block
@@ -40,7 +48,12 @@ class MockRedis
                      send(*future.command)
                    end
           future.store_result(result)
-          result
+
+          if future.block
+            result
+          else
+            [result]
+          end
         rescue StandardError => e
           e
         end
@@ -48,5 +61,11 @@ class MockRedis
       @pipelined_futures = []
       responses
     end
+
+    private
+
+    def in_pipeline?
+      @nesting_level > 0
+    end
   end
 end

data/lib/mock_redis/set_methods.rb

@@ -81,11 +81,22 @@ class MockRedis
       end
     end
 
-    def spop(key)
+    def spop(key, count = nil)
       with_set_at(key) do |set|
-        member = set.first
-        set.delete(member)
-        member
+        if count.nil?
+          member = set.first
+          set.delete(member)
+          member
+        else
+          members = []
+          count.times do
+            member = set.first
+            break if member.nil?
+            set.delete(member)
+            members << member
+          end
+          members
+        end
       end
     end
 

data/lib/mock_redis/stream.rb

@@ -0,0 +1,62 @@
+require 'forwardable'
+require 'set'
+require 'date'
+require 'mock_redis/stream/id'
+
+class MockRedis
+  class Stream
+    include Enumerable
+    extend Forwardable
+
+    attr_accessor :members
+
+    def_delegators :members, :empty?
+
+    def initialize
+      @members = Set.new
+      @last_id = nil
+    end
+
+    def last_id
+      @last_id.to_s
+    end
+
+    def add(id, values)
+      @last_id = MockRedis::Stream::Id.new(id, min: @last_id)
+      members.add [@last_id, Hash[values.map { |k, v| [k.to_s, v.to_s] }]]
+      @last_id.to_s
+    end
+
+    def trim(count)
+      deleted = @members.size - count
+      @members = @members.to_a[-count..-1].to_set
+      deleted
+    end
+
+    def range(start, finish, reversed, *opts_in)
+      opts = options opts_in, ['count']
+      start_id = MockRedis::Stream::Id.new(start)
+      finish_id = MockRedis::Stream::Id.new(finish, sequence: Float::INFINITY)
+      items = members
+              .select { |m| (start_id <= m[0]) && (finish_id >= m[0]) }
+              .map { |m| [m[0].to_s, m[1]] }
+      items.reverse! if reversed
+      return items.first(opts['count'].to_i) if opts.key?('count')
+      items
+    end
+
+    def each
+      members.each { |m| yield m }
+    end
+
+    private
+
+    def options(opts_in, permitted)
+      opts_out = {}
+      raise Redis::CommandError, 'ERR syntax error' unless (opts_in.length % 2).zero?
+      opts_in.each_slice(2).map { |pair| opts_out[pair[0].downcase] = pair[1] }
+      raise Redis::CommandError, 'ERR syntax error' unless (opts_out.keys - permitted).empty?
+      opts_out
+    end
+  end
+end

data/lib/mock_redis/stream/id.rb

@@ -0,0 +1,53 @@
+class MockRedis
+  class Stream
+    class Id
+      include Comparable
+
+      attr_accessor :timestamp, :sequence
+
+      def initialize(id, min: nil, sequence: 0)
+        case id
+        when '*'
+          @timestamp = (Time.now.to_f * 1000).to_i
+          @sequence = 0
+          if self <= min
+            @timestamp = min.timestamp
+            @sequence = min.sequence + 1
+          end
+        when '-'
+          @timestamp = @sequence = 0
+        when '+'
+          @timestamp = @sequence = Float::INFINITY
+        else
+          if id.is_a? String
+            (_, @timestamp, @sequence) = id.match(/^(\d+)-?(\d+)?$/)
+                                           .to_a
+            if @timestamp.nil?
+              raise Redis::CommandError,
+                    'ERR Invalid stream ID specified as stream command argument'
+            end
+            @timestamp = @timestamp.to_i
+          else
+            @timestamp = id
+          end
+          @sequence = @sequence.nil? ? sequence : @sequence.to_i
+          if (@timestamp == 0 && @sequence == 0) || self <= min
+            raise Redis::CommandError,
+                  'ERR The ID specified in XADD is equal or smaller than ' \
+                  'the target stream top item'
+          end
+        end
+      end
+
+      def to_s
+        "#{@timestamp}-#{@sequence}"
+      end
+
+      def <=>(other)
+        return 1 if other.nil?
+        return @sequence <=> other.sequence if @timestamp == other.timestamp
+        @timestamp <=> other.timestamp
+      end
+    end
+  end
+end