fakeredis 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20688b94f039d268518697ede7cdfad15f26cf73
-  data.tar.gz: ab1982d7e9ed2f7c6b864d2beadd63d6041bb59a
+  metadata.gz: 30c50ee5b3390908b28564542cf9d6ad6c1dfb20
+  data.tar.gz: 30c85e12c5689721c1ead41da72a91c47a010a0b
 SHA512:
-  metadata.gz: 080b44a262bae01a09dcd2660cb35e1a52543cad7d3780fc58224854b6007adb8a0598a0b892560988f7a86c921a1ea1d3b36fa19248542017ffb97ce8caa0ef
-  data.tar.gz: 687896c96f26f389776216ef6397ce9bb025e9fb04008860dc377f8ba0965245185b02bb4381e7e560a5d76621b8c87ee4989878fbe0bd086e5fc30e2e3c6442
+  metadata.gz: 62ec40ecbbf36d198b0a8b95d5772f6d1e79a9709378a67a9e5aaba8cc15f6122fba3966524831ce5a8e7b6ebdbceaf620a4320f338497deff52c8361d8c41c7
+  data.tar.gz: 7d7c9066f97f7accfc95e40819b726ffcbf318e5e6f1af9fda405ce3104c56e546e2a2c6b5e61cac58a283a4d56f868c8c1c6bb5ca811ca440cc0eb62adf599a

data/.gitignore

@@ -1,6 +1,10 @@
 *.gem
 .bundle
 Gemfile.lock
+gemfiles/*.gemfile.lock
 pkg/*
 .rvmrc
 *.rbc
+.ruby-version
+.ruby-gemset
+bin

data/.travis.yml

@@ -1,8 +1,19 @@
 language: ruby
+before_install:
+  - travis_retry gem install bundler
 rvm:
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
-  - jruby-19mode
+  - 2.1
+  - 2.2
+  - 2.3.1
+  - ruby-head
+  - jruby
   - rbx-2
+gemfile:
+  - Gemfile
+  - gemfiles/redisrb-master.gemfile
+matrix:
+  allow_failures:
+    - rvm: rbx-2
+# Use the faster container based infrastructure
+# http://blog.travis-ci.com/2014-12-17-faster-builds-with-container-based-infrastructure/
+sudo: false

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2014 Guillermo Iguaran
+Copyright (c) 2011-2016 Guillermo Iguaran
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -39,7 +39,7 @@ You can use FakeRedis without any changes:
     >> redis.get "foo"
     => "bar"
 
-Read [redis-rb](https://github.com/ezmobius/redis-rb) documentation and
+Read [redis-rb](https://github.com/redis/redis-rb) documentation and
 [Redis](http://redis.io) homepage for more info about commands
 
 ## Usage with RSpec
@@ -57,6 +57,22 @@ Or:
     # spec/support/fakeredis.rb
     require 'fakeredis/rspec'
 
+## Usage with Minitest
+
+Require this either in your Gemfile or in Minitest's support scripts. So
+either: 
+
+    # Gemfile
+    group :test do
+      gem "minitest"
+      gem "fakeredis", :require => "fakeredis/minitest"
+    end
+
+Or:
+
+    # test/test_helper.rb (or test/minitest_config.rb)
+    require 'fakeredis/minitest'
+
 ## Acknowledgements
 
 * [dim](https://github.com/dim)
@@ -82,5 +98,5 @@ Or:
 
 ## Copyright
 
-Copyright (c) 2011-2014 Guillermo Iguaran. See LICENSE for
+Copyright (c) 2011-2016 Guillermo Iguaran. See LICENSE for
 further details.

data/fakeredis.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency(%q<redis>, ["~> 3.0"])
+  s.add_runtime_dependency(%q<redis>, ["~> 3.2"])
   s.add_development_dependency(%q<rspec>, ["~> 3.0"])
 end

data/gemfiles/redisrb-master.gemfile

@@ -0,0 +1,14 @@
+source "https://rubygems.org"
+
+gem 'rake'
+gem 'rdoc'
+gem "redis", github: "redis/redis-rb"
+
+platforms :rbx do
+  gem 'racc'
+  gem 'rubysl', '~> 2.0'
+  gem 'psych'
+end
+
+# Specify your gem's dependencies in fakeredis.gemspec
+gemspec :path => ".."

data/lib/fakeredis/bitop_command.rb

@@ -0,0 +1,56 @@
+module FakeRedis
+  module BitopCommand
+    BIT_OPERATORS = {
+      'or'  => :|,
+      'and' => :&,
+      'xor' => :'^',
+      'not' => :~,
+    }
+
+    def bitop(operation, destkey, *keys)
+      if result = apply(operator(operation), keys)
+        set(destkey, result)
+        result.length
+      else
+        0
+      end
+    rescue ArgumentError => _
+      raise_argument_error('bitop')
+    end
+
+    private
+
+    def operator(operation)
+      BIT_OPERATORS[operation.to_s.downcase]
+    end
+
+    def apply(operator, keys)
+      case operator
+      when :~
+        raise ArgumentError if keys.count != 1
+        bitwise_not(keys.first)
+      when :&, :|, :'^'
+        raise ArgumentError if keys.empty?
+        bitwise_operation(operator, keys)
+      else
+        raise ArgumentError
+      end
+    end
+
+    def bitwise_not(key)
+      if value = get(keys.first)
+        value.bytes.map { |byte| ~ byte }.pack('c*')
+      end
+    end
+
+    def bitwise_operation(operation, keys)
+      apply_onto, *values = keys.map { |key| get(key) }.reject(&:nil?)
+      values.reduce(apply_onto) do |memo, value|
+        shorter, longer = [memo, value].sort_by(&:length).map(&:bytes).map(&:to_a)
+        longer.each_with_index.map do |byte, index|
+          byte.send(operation, shorter[index] || 0)
+        end.pack('c*')
+      end
+    end
+  end
+end

data/lib/fakeredis/expiring_hash.rb

@@ -34,7 +34,7 @@ module FakeRedis
 
     def expired?(key)
       key = normalize key
-      expires.include?(key) && expires[key] < Time.now
+      expires.include?(key) && expires[key] <= Time.now
     end
 
     def key?(key)

data/lib/fakeredis/minitest.rb

@@ -0,0 +1,24 @@
+# Require this either in your Gemfile or in your minitest configuration.
+# Examples:
+#
+#   # Gemfile
+#   group :test do
+#     gem 'minitest'
+#     gem 'fakeredis', :require => 'fakeredis/minitest'
+#   end
+#
+#   # test/test_helper.rb (or test/minitest_config.rb)
+#   require 'fakeredis/minitest'
+
+require 'fakeredis'
+
+module FakeRedis
+  module Minitest
+    def setup
+      super
+      Redis::Connection::Memory.reset_all_databases
+    end
+
+    ::Minitest::Test.send(:include, self)
+  end
+end

data/lib/fakeredis/rspec.rb

@@ -18,6 +18,7 @@ RSpec.configure do |c|
 
   c.before do    
     Redis::Connection::Memory.reset_all_databases
+    Redis::Connection::Memory.reset_all_channels
   end
 
 end

data/lib/fakeredis/sort_method.rb

@@ -3,6 +3,7 @@ module FakeRedis
   module SortMethod
     def sort(key, *redis_options_array)
       return [] unless key
+      return [] if type(key) == 'none'
 
       unless %w(list set zset).include? type(key)
         warn "Operation against a key holding the wrong kind of value: Expected list, set or zset at #{key}."
@@ -21,7 +22,7 @@ module FakeRedis
       # We have to flatten it down as redis-rb adds back the array to the return value
       result = sliced.flatten(1)
 
-      options[:store] ? rpush(options[:store], sliced) : sliced.flatten(1)
+      options[:store] ? rpush(options[:store], sliced) : result
     end
 
     private
@@ -100,7 +101,7 @@ module FakeRedis
       skip = limit.first || 0
       take = limit.last || sorted.length
 
-      sorted[skip...(skip + take)] || sorted
+      sorted[skip...(skip + take)] || []
     end
 
     def lookup_from_pattern(pattern, element)

data/lib/fakeredis/transaction_commands.rb

@@ -72,7 +72,7 @@ module FakeRedis
       "OK"
     end
 
-    def watch(_)
+    def watch(*_)
       "OK"
     end
 

data/lib/fakeredis/version.rb

@@ -1,3 +1,3 @@
 module FakeRedis
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/fakeredis/zset.rb

@@ -5,6 +5,10 @@ module FakeRedis
       super(key, _floatify(val))
     end
 
+    def identical_scores?
+      values.uniq.size == 1
+    end
+
     # Increments the value of key by val
     def increment(key, val)
       self[key] += _floatify(val)
@@ -25,8 +29,10 @@ module FakeRedis
       elsif (( number = str.to_s.match(/^\((\d+)/i) ))
         number[1].to_i + (increment ? 1 : -1)
       else
-        Float str
+        Float str.to_s
       end
+    rescue ArgumentError
+      raise Redis::CommandError, "ERR value is not a valid float"
     end
 
   end

data/lib/redis/connection/memory.rb

@@ -8,6 +8,7 @@ require "fakeredis/sorted_set_argument_handler"
 require "fakeredis/sorted_set_store"
 require "fakeredis/transaction_commands"
 require "fakeredis/zset"
+require "fakeredis/bitop_command"
 
 class Redis
   module Connection
@@ -16,6 +17,7 @@ class Redis
       include FakeRedis
       include SortMethod
       include TransactionCommands
+      include BitopCommand
       include CommandExecutor
 
       attr_accessor :options
@@ -35,6 +37,14 @@ class Redis
         @databases = nil
       end
 
+      def self.channels
+        @channels ||= Hash.new {|h,k| h[k] = [] }
+      end
+
+      def self.reset_all_channels
+        @channels = nil
+      end
+
       def self.connect(options = {})
         new(options)
       end
@@ -86,14 +96,6 @@ class Redis
         replies.shift
       end
 
-      # NOT IMPLEMENTED:
-      # * blpop
-      # * brpop
-      # * brpoplpush
-      # * subscribe
-      # * psubscribe
-      # * publish
-
       def flushdb
         databases.delete_at(database_id)
         "OK"
@@ -146,6 +148,45 @@ class Redis
         true
       end
 
+      def dump(key)
+        return nil unless exists(key)
+
+        value = data[key]
+
+        Marshal.dump(
+          value: value,
+          version: FakeRedis::VERSION, # Redis includes the version, so we might as well
+        )
+      end
+
+      def restore(key, ttl, serialized_value)
+        raise Redis::CommandError, "ERR Target key name is busy." if exists(key)
+
+        raise Redis::CommandError, "ERR DUMP payload version or checksum are wrong" if serialized_value.nil?
+
+        parsed_value = begin
+          Marshal.load(serialized_value)
+        rescue TypeError
+          raise Redis::CommandError, "ERR DUMP payload version or checksum are wrong"
+        end
+
+        if parsed_value[:version] != FakeRedis::VERSION
+          raise Redis::CommandError, "ERR DUMP payload version or checksum are wrong"
+        end
+
+        # We could figure out what type the key was and set it with the public API here,
+        # or we could just assign the value. If we presume the serialized_value is only ever
+        # a return value from `dump` then we've only been given something that was in
+        # the internal data structure anyway.
+        data[key] = parsed_value[:value]
+
+        # Set a TTL if one has been passed
+        ttl = ttl.to_i # Makes nil into 0
+        expire(key, ttl / 1000) unless ttl.zero?
+
+        "OK"
+      end
+
       def get(key)
         data_type_check(key, String)
         data[key]
@@ -202,11 +243,22 @@ class Redis
       end
 
       def hdel(key, field)
-        field = field.to_s
         data_type_check(key, Hash)
-        deleted = data[key] && data[key].delete(field)
+        return 0 unless data[key]
+
+        if field.is_a?(Array)
+          old_keys_count = data[key].size
+          fields = field.map(&:to_s)
+
+          data[key].delete_if { |k, v| fields.include? k }
+          deleted = old_keys_count - data[key].size
+        else
+          field = field.to_s
+          deleted = data[key].delete(field) ? 1 : 0
+        end
+
         remove_key_for_empty_collection(key)
-        deleted ? 1 : 0
+        deleted
       end
 
       def hkeys(key)
@@ -215,6 +267,44 @@ class Redis
         data[key].keys
       end
 
+      def hscan(key, start_cursor, *args)
+        data_type_check(key, Hash)
+        return ["0", []] unless data[key]
+
+        match = "*"
+        count = 10
+
+        if args.size.odd?
+          raise_argument_error('hscan')
+        end
+
+        if idx = args.index("MATCH")
+          match = args[idx + 1]
+        end
+
+        if idx = args.index("COUNT")
+          count = args[idx + 1]
+        end
+
+        start_cursor = start_cursor.to_i
+
+        cursor = start_cursor
+        next_keys = []
+
+        if start_cursor + count >= data[key].length
+          next_keys = (data[key].to_a)[start_cursor..-1]
+          cursor = 0
+        else
+          cursor = start_cursor + count
+          next_keys = (data[key].to_a)[start_cursor..cursor-1]
+        end
+
+        filtered_next_keys = next_keys.select{|k,v| File.fnmatch(match, k)}
+        result = filtered_next_keys.flatten.map(&:to_s)
+
+        return ["#{cursor}", result]
+      end
+
       def keys(pattern = "*")
         data.keys.select { |key| File.fnmatch(pattern, key) }
       end
@@ -256,7 +346,14 @@ class Redis
 
       def lrange(key, startidx, endidx)
         data_type_check(key, Array)
-        (data[key] && data[key][startidx..endidx]) || []
+        if data[key]
+          # In Ruby when negative start index is out of range Array#slice returns
+          # nil which is not the case for lrange in Redis.
+          startidx = 0 if startidx < 0 && startidx.abs > data[key].size
+          data[key][startidx..endidx] || []
+        else
+          []
+        end
       end
 
       def ltrim(key, start, stop)
@@ -284,7 +381,11 @@ class Redis
       def linsert(key, where, pivot, value)
         data_type_check(key, Array)
         return unless data[key]
-        index = data[key].index(pivot)
+
+        value = value.to_s
+        index = data[key].index(pivot.to_s)
+        return -1 if index.nil?
+
         case where
           when :before then data[key].insert(index, value)
           when :after  then data[key].insert(index + 1, value)
@@ -296,12 +397,14 @@ class Redis
         data_type_check(key, Array)
         return unless data[key]
         raise Redis::CommandError, "ERR index out of range" if index >= data[key].size
-        data[key][index] = value
+        data[key][index] = value.to_s
       end
 
       def lrem(key, count, value)
         data_type_check(key, Array)
-        return unless data[key]
+        return 0 unless data[key]
+
+        value = value.to_s
         old_size = data[key].size
         diff =
           if count == 0
@@ -318,6 +421,7 @@ class Redis
       end
 
       def rpush(key, value)
+        raise_argument_error('rpush') if value.respond_to?(:each) && value.empty?
         data_type_check(key, Array)
         data[key] ||= []
         [value].flatten.each do |val|
@@ -327,12 +431,14 @@ class Redis
       end
 
       def rpushx(key, value)
+        raise_argument_error('rpushx') if value.respond_to?(:each) && value.empty?
         data_type_check(key, Array)
         return unless data[key]
         rpush(key, value)
       end
 
       def lpush(key, value)
+        raise_argument_error('lpush') if value.respond_to?(:each) && value.empty?
         data_type_check(key, Array)
         data[key] ||= []
         [value].flatten.each do |val|
@@ -342,6 +448,7 @@ class Redis
       end
 
       def lpushx(key, value)
+        raise_argument_error('lpushx') if value.respond_to?(:each) && value.empty?
         data_type_check(key, Array)
         return unless data[key]
         lpush(key, value)
@@ -353,6 +460,18 @@ class Redis
         data[key].pop
       end
 
+      def brpop(keys, timeout=0)
+        #todo threaded mode
+        keys = Array(keys)
+        keys.each do |key|
+          if data[key] && data[key].size > 0
+            return [key, data[key].pop]
+          end
+        end
+        sleep(timeout.to_f)
+        nil
+      end
+
       def rpoplpush(key1, key2)
         data_type_check(key1, Array)
         rpop(key1).tap do |elem|
@@ -360,12 +479,31 @@ class Redis
         end
       end
 
+      def brpoplpush(key1, key2, opts={})
+        data_type_check(key1, Array)
+        brpop(key1).tap do |elem|
+          lpush(key2, elem) unless elem.nil?
+        end
+      end
+
       def lpop(key)
         data_type_check(key, Array)
         return unless data[key]
         data[key].shift
       end
 
+      def blpop(keys, timeout=0)
+        #todo threaded mode
+        keys = Array(keys)
+        keys.each do |key|
+          if data[key] && data[key].size > 0
+            return [key, data[key].shift]
+          end
+        end
+        sleep(timeout.to_f)
+        nil
+      end
+
       def smembers(key)
         data_type_check(key, ::Set)
         return [] unless data[key]
@@ -404,7 +542,7 @@ class Redis
         if value.is_a?(Array)
           old_size = data[key].size
           values = value.map(&:to_s)
-          values.each { |value| data[key].delete(value) }
+          values.each { |v| data[key].delete(v) }
           deleted = old_size - data[key].size
         else
           deleted = !!data[key].delete?(value.to_s)
@@ -435,6 +573,7 @@ class Redis
       end
 
       def sinter(*keys)
+        keys = keys[0] if flatten?(keys)
         raise_argument_error('sinter') if keys.empty?
 
         keys.each { |k| data_type_check(k, ::Set) }
@@ -452,6 +591,9 @@ class Redis
       end
 
       def sunion(*keys)
+        keys = keys[0] if flatten?(keys)
+        raise_argument_error('sunion') if keys.empty?
+
         keys.each { |k| data_type_check(k, ::Set) }
         keys = keys.map { |k| data[k] || ::Set.new }
         keys.inject(::Set.new) do |set, key|
@@ -466,6 +608,7 @@ class Redis
       end
 
       def sdiff(key1, *keys)
+        keys = keys[0] if flatten?(keys)
         [key1, *keys].each { |k| data_type_check(k, ::Set) }
         keys = keys.map { |k| data[k] || ::Set.new }
         keys.inject(data[key1] || Set.new) do |memo, set|
@@ -483,6 +626,44 @@ class Redis
         number.nil? ? srandmember_single(key) : srandmember_multiple(key, number)
       end
 
+      def sscan(key, start_cursor, *args)
+        data_type_check(key, ::Set)
+        return ["0", []] unless data[key]
+
+        match = "*"
+        count = 10
+
+        if args.size.odd?
+          raise_argument_error('sscan')
+        end
+
+        if idx = args.index("MATCH")
+          match = args[idx + 1]
+        end
+
+        if idx = args.index("COUNT")
+          count = args[idx + 1]
+        end
+
+        start_cursor = start_cursor.to_i
+
+        cursor = start_cursor
+        next_keys = []
+
+        if start_cursor + count >= data[key].length
+          next_keys = (data[key].to_a)[start_cursor..-1]
+          cursor = 0
+        else
+          cursor = start_cursor + count
+          next_keys = (data[key].to_a)[start_cursor..cursor-1]
+        end
+
+        filtered_next_keys = next_keys.select{ |k,v| File.fnmatch(match, k)}
+        result = filtered_next_keys.flatten.map(&:to_s)
+
+        return ["#{cursor}", result]
+      end
+
       def del(*keys)
         keys = keys.flatten(1)
         raise_argument_error('del') if keys.empty?
@@ -496,10 +677,10 @@ class Redis
 
       def setnx(key, value)
         if exists(key)
-          false
+          0
         else
           set(key, value)
-          true
+          1
         end
       end
 
@@ -525,6 +706,12 @@ class Redis
         1
       end
 
+      def pexpire(key, ttl)
+        return 0 unless data[key]
+        data.expires[key] = Time.now + (ttl / 1000.0)
+        1
+      end
+
       def ttl(key)
         if data.expires.include?(key) && (ttl = data.expires[key].to_i - Time.now.to_i) > 0
           ttl
@@ -533,6 +720,14 @@ class Redis
         end
       end
 
+      def pttl(key)
+        if data.expires.include?(key) && (ttl = data.expires[key].to_f - Time.now.to_f) > 0
+          ttl * 1000
+        else
+          exists(key) ? -1 : -2
+        end
+      end
+
       def expireat(key, timestamp)
         data.expires[key] = Time.at(timestamp)
         true
@@ -548,10 +743,10 @@ class Redis
         if data[key]
           result = !data[key].include?(field)
           data[key][field] = value.to_s
-          result
+          result ? 1 : 0
         else
           data[key] = { field => value.to_s }
-          true
+          1
         end
       end
 
@@ -727,6 +922,11 @@ class Redis
         data[key].to_i
       end
 
+      def incrbyfloat(key, by)
+        data.merge!({ key => (data[key].to_f + by.to_f).to_s || by })
+        data[key]
+      end
+
       def decr(key)
         data.merge!({ key => (data[key].to_i - 1).to_s || "-1"})
         data[key].to_i
@@ -758,10 +958,6 @@ class Redis
         match = "*"
         count = 10
 
-        if args.size.odd?
-          raise_argument_error('scan')
-        end
-
         if idx = args.index("MATCH")
           match = args[idx + 1]
         end
@@ -774,17 +970,22 @@ class Redis
         data_type_check(start_cursor, Fixnum)
 
         cursor = start_cursor
-        next_keys = []
+        returned_keys = []
+        final_page = start_cursor + count >= keys(match).length
+
+        if final_page
+          previous_keys_been_deleted = (count >= keys(match).length)
+          start_index = previous_keys_been_deleted ? 0 : cursor
 
-        if start_cursor + count >= data.length
-          next_keys = keys(match)[start_cursor..-1]
+          returned_keys = keys(match)[start_index..-1]
           cursor = 0
         else
-          cursor = start_cursor + 10
-          next_keys = keys(match)[start_cursor..cursor]
+          end_index = start_cursor + (count - 1)
+          returned_keys = keys(match)[start_cursor..end_index]
+          cursor = start_cursor + count
         end
 
-        return "#{cursor}", next_keys
+        return "#{cursor}", returned_keys
       end
 
       def zadd(key, *args)
@@ -873,19 +1074,44 @@ class Redis
         data_type_check(key, ZSet)
         return [] unless data[key]
 
-        # Sort by score, or if scores are equal, key alphanum
-        results = data[key].sort do |(k1, v1), (k2, v2)|
-          if v1 == v2
-            k1 <=> k2
-          else
-            v1 <=> v2
-          end
-        end
+        results = sort_keys(data[key])
         # Select just the keys unless we want scores
         results = results.map(&:first) unless with_scores
         results[start..stop].flatten.map(&:to_s)
       end
 
+      def zrangebylex(key, start, stop, *opts)
+        data_type_check(key, ZSet)
+        return [] unless data[key]
+        zset = data[key]
+
+        sorted = if zset.identical_scores?
+          zset.keys.sort { |x, y| x.to_s <=> y.to_s }
+        else
+          zset.keys
+        end
+
+        range = get_range start, stop, sorted.first, sorted.last
+
+        filtered = []
+        sorted.each do |element|
+          filtered << element if (range[0][:value]..range[1][:value]).cover?(element)
+        end
+        filtered.shift if filtered[0] == range[0][:value] && !range[0][:inclusive]
+        filtered.pop if filtered.last == range[1][:value] && !range[1][:inclusive]
+
+        limit = get_limit(opts, filtered)
+        if limit
+          filtered = filtered[limit[0]..-1].take(limit[1])
+        end
+
+        filtered
+      end
+
+      def zrevrangebylex(key, start, stop, *args)
+        zrangebylex(key, stop, start, args).reverse
+      end
+
       def zrevrange(key, start, stop, with_scores = nil)
         data_type_check(key, ZSet)
         return [] unless data[key]
@@ -966,6 +1192,131 @@ class Redis
         data[out].size
       end
 
+      def subscribe(*channels)
+        raise_argument_error('subscribe') if channels.empty?()
+
+        #Create messages for all data from the channels
+        channel_replies = channels.map do |channel|
+          self.class.channels[channel].slice!(0..-1).map!{|v| ["message", channel, v]}
+        end
+        channel_replies.flatten!(1)
+        channel_replies.compact!()
+
+        #Put messages into the replies for the future
+        channels.each_with_index do |channel,index|
+          replies << ["subscribe", channel, index+1]
+        end
+        replies.push(*channel_replies)
+
+        #Add unsubscribe message to stop blocking (see https://github.com/redis/redis-rb/blob/v3.2.1/lib/redis/subscribe.rb#L38)
+        replies.push(self.unsubscribe())
+
+        replies.pop() #Last reply will be pushed back on
+      end
+
+      def psubscribe(*patterns)
+        raise_argument_error('psubscribe') if patterns.empty?()
+
+        #Create messages for all data from the channels
+        channel_replies = self.class.channels.keys.map do |channel|
+          pattern = patterns.find{|p| File.fnmatch(p, channel) }
+          unless pattern.nil?()
+            self.class.channels[channel].slice!(0..-1).map!{|v| ["pmessage", pattern, channel, v]}
+          end
+        end
+        channel_replies.flatten!(1)
+        channel_replies.compact!()
+
+        #Put messages into the replies for the future
+        patterns.each_with_index do |pattern,index|
+          replies << ["psubscribe", pattern, index+1]
+        end
+        replies.push(*channel_replies)
+
+        #Add unsubscribe to stop blocking
+        replies.push(self.punsubscribe())
+
+        replies.pop() #Last reply will be pushed back on
+      end
+
+      def publish(channel, message)
+        self.class.channels[channel] << message
+        0 #Just fake number of subscribers
+      end
+
+      def unsubscribe(*channels)
+        if channels.empty?()
+          replies << ["unsubscribe", nil, 0]
+        else
+          channels.each do |channel|
+            replies << ["unsubscribe", channel, 0]
+          end
+        end
+        replies.pop() #Last reply will be pushed back on
+      end
+
+      def punsubscribe(*patterns)
+        if patterns.empty?()
+          replies << ["punsubscribe", nil, 0]
+        else
+          patterns.each do |pattern|
+            replies << ["punsubscribe", pattern, 0]
+          end
+        end
+        replies.pop() #Last reply will be pushed back on
+      end
+
+      def zscan(key, start_cursor, *args)
+        data_type_check(key, ZSet)
+        return [] unless data[key]
+
+        match = "*"
+        count = 10
+
+        if args.size.odd?
+          raise_argument_error('zscan')
+        end
+
+        if idx = args.index("MATCH")
+          match = args[idx + 1]
+        end
+
+        if idx = args.index("COUNT")
+          count = args[idx + 1]
+        end
+
+        start_cursor = start_cursor.to_i
+        data_type_check(start_cursor, Fixnum)
+
+        cursor = start_cursor
+        next_keys = []
+
+        sorted_keys = sort_keys(data[key])
+
+        if start_cursor + count >= sorted_keys.length
+          next_keys = sorted_keys.to_a.select { |k| File.fnmatch(match, k[0]) } [start_cursor..-1]
+          cursor = 0
+        else
+          cursor = start_cursor + count
+          next_keys = sorted_keys.to_a.select { |k| File.fnmatch(match, k[0]) } [start_cursor..cursor-1]
+        end
+        return "#{cursor}", next_keys.flatten.map(&:to_s)
+      end
+
+      # Originally from redis-rb
+      def zscan_each(key, *args, &block)
+        data_type_check(key, ZSet)
+        return [] unless data[key]
+
+        return to_enum(:zscan_each, key, options) unless block_given?
+        cursor = 0
+        loop do
+          cursor, values = zscan(key, cursor, options)
+          values.each(&block)
+          break if cursor == "0"
+        end
+      end
+
       private
         def raise_argument_error(command, match_string=command)
           error_message = if %w(hmset mset_odd).include?(match_string.downcase)
@@ -992,6 +1343,27 @@ class Redis
           end
         end
 
+        def get_range(start, stop, min = -Float::INFINITY, max = Float::INFINITY)
+          range_options = []
+
+          [start, stop].each do |value|
+            case value[0]
+            when "-"
+              range_options << { value: min, inclusive: true }
+            when "+"
+              range_options << { value: max, inclusive: true }
+            when "["
+              range_options << { value: value[1..-1], inclusive: true }
+            when "("
+              range_options << { value: value[1..-1], inclusive: false }
+            else
+              raise Redis::CommandError, "ERR min or max not valid string range item"
+            end
+          end
+
+          range_options
+        end
+
         def get_limit(opts, vals)
           index = opts.index('LIMIT')
 
@@ -1008,6 +1380,9 @@ class Redis
         def mapped_param? param
           param.size == 1 && param[0].is_a?(Array)
         end
+        # NOTE : Redis-rb 3.x will flatten *args, so method(["a", "b", "c"])
+        #        should be handled the same way as method("a", "b", "c")
+        alias_method :flatten?, :mapped_param?
 
         def srandmember_single(key)
           data_type_check(key, ::Set)
@@ -1027,6 +1402,17 @@ class Redis
             (1..-number).map { data[key].to_a[rand(data[key].size)] }.flatten
           end
         end
+
+        def sort_keys(arr)
+          # Sort by score, or if scores are equal, key alphanum
+          sorted_keys = arr.sort do |(k1, v1), (k2, v2)|
+            if v1 == v2
+              k1 <=> k2
+            else
+              v1 <=> v2
+            end
+          end
+        end
     end
   end
 end