fakeredis 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30c50ee5b3390908b28564542cf9d6ad6c1dfb20
-  data.tar.gz: 30c85e12c5689721c1ead41da72a91c47a010a0b
+  metadata.gz: 1be2134927d3b7838ee3e2fd4376791bea516561
+  data.tar.gz: 2b3e0c64b79df1358151bbd1405000395fa06e86
 SHA512:
-  metadata.gz: 62ec40ecbbf36d198b0a8b95d5772f6d1e79a9709378a67a9e5aaba8cc15f6122fba3966524831ce5a8e7b6ebdbceaf620a4320f338497deff52c8361d8c41c7
-  data.tar.gz: 7d7c9066f97f7accfc95e40819b726ffcbf318e5e6f1af9fda405ce3104c56e546e2a2c6b5e61cac58a283a4d56f868c8c1c6bb5ca811ca440cc0eb62adf599a
+  metadata.gz: cfb37be84fd30d941fadc44a177e2029cd2de063fc090bc3004166a72f5dba6e7378e9c918aa1d156d44b8277f830dfedbd34aad57142770512f420f4f12fae3
+  data.tar.gz: 2f841badb4c16e9ff6d3c35b697b9ee262022bc8286553e7187a47173af742114eacd5cccdb3d0477c111457fc9a7f50fdb7de970a25c04ba1be33318c84a1ac

data/.travis.yml

@@ -1,19 +1,22 @@
 language: ruby
-before_install:
-  - travis_retry gem install bundler
+cache: bundler
+# Use the faster container based infrastructure
+# http://blog.travis-ci.com/2014-12-17-faster-builds-with-container-based-infrastructure/
+sudo: false
+
 rvm:
-  - 2.1
   - 2.2
-  - 2.3.1
+  - 2.3.6
+  - 2.4
+  - 2.5
   - 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-2016 Guillermo Iguaran
+Copyright (c) 2011-2018 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

@@ -15,8 +15,8 @@ Add it to your Gemfile:
 
 ## Versions
 
-FakeRedis currently supports redis-rb v3.x.y or later, if you are using
-redis-rb v2.2.x install the version 0.3.x:
+FakeRedis currently supports redis-rb v3 or later, if you are using
+redis-rb v2.2 install the version 0.3.x:
 
     gem install fakeredis -v "~> 0.3.0"
 
@@ -29,61 +29,63 @@ or use the branch 0-3-x on your Gemfile:
 
 You can use FakeRedis without any changes:
 
+```
     require "fakeredis"
-    
+
     redis = Redis.new
-    
+
     >> redis.set "foo", "bar"
     => "OK"
-    
+
     >> redis.get "foo"
     => "bar"
+```
 
 Read [redis-rb](https://github.com/redis/redis-rb) documentation and
 [Redis](http://redis.io) homepage for more info about commands
 
 ## Usage with RSpec
 
-Require this either in your Gemfile or in RSpec's support scripts. So either: 
+Require this either in your Gemfile or in RSpec's support scripts. So either:
 
-    # Gemfile
-    group :test do
-      gem "rspec"
-      gem "fakeredis", :require => "fakeredis/rspec"
-    end
+```ruby
+# Gemfile
+group :test do
+  gem "rspec"
+  gem "fakeredis", :require => "fakeredis/rspec"
+end
+```
 
 Or:
 
-    # spec/support/fakeredis.rb
-    require 'fakeredis/rspec'
+```ruby
+# spec/support/fakeredis.rb
+require 'fakeredis/rspec'
+```
 
 ## Usage with Minitest
 
 Require this either in your Gemfile or in Minitest's support scripts. So
-either: 
+either:
 
-    # Gemfile
-    group :test do
-      gem "minitest"
-      gem "fakeredis", :require => "fakeredis/minitest"
-    end
+```ruby
+# 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'
+```ruby
+# test/test_helper.rb (or test/minitest_config.rb)
+require 'fakeredis/minitest'
+```
 
 ## Acknowledgements
 
-* [dim](https://github.com/dim)
-* [czarneckid](https://github.com/czarneckid)
-* [obrie](https://github.com/obrie)
-* [jredville](https://github.com/jredville)
-* [redsquirrel](https://github.com/redsquirrel)
-* [dpick](https://github.com/dpick)
-* [caius](https://github.com/caius) 
-* [Travis-CI](http://travis-ci.org/) (Travis-CI also uses Fakeredis in its tests!!!)
-
+Thanks to [all contributors](https://github.com/guilleiguaran/fakeredis/graphs/contributors), specially to [Caius Durling](https://github.com/caius) the most active one.
 
 ## Contributing to FakeRedis
 
@@ -98,5 +100,5 @@ Or:
 
 ## Copyright
 
-Copyright (c) 2011-2016 Guillermo Iguaran. See LICENSE for
+Copyright (c) 2011-2018 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.2"])
+  s.add_runtime_dependency(%q<redis>, [">= 3.2", "< 5.0"])
   s.add_development_dependency(%q<rspec>, ["~> 3.0"])
 end

data/lib/fakeredis.rb

@@ -3,4 +3,16 @@ require 'redis/connection/memory'
 
 module FakeRedis
   Redis = ::Redis
+
+  def self.enable
+    Redis::Connection.drivers << Redis::Connection::Memory unless enabled?
+  end
+
+  def self.enabled?
+    Redis::Connection.drivers.last == Redis::Connection::Memory
+  end
+
+  def self.disable
+    Redis::Connection.drivers.delete_if {|driver| Redis::Connection::Memory == driver }
+  end
 end

data/lib/fakeredis/command_executor.rb

@@ -1,13 +1,16 @@
 module FakeRedis
   module CommandExecutor
     def write(command)
-      meffod = command.shift.to_s.downcase.to_sym
+      meffod = command[0].to_s.downcase.to_sym
+      args = command[1..-1]
 
       if in_multi && !(TRANSACTION_COMMANDS.include? meffod) # queue commands
-        queued_commands << [meffod, *command]
+        queued_commands << [meffod, *args]
         reply = 'QUEUED'
+      elsif respond_to?(meffod) && method(meffod).arity.zero?
+        reply = send(meffod)
       elsif respond_to?(meffod)
-        reply = send(meffod, *command)
+        reply = send(meffod, *args)
       else
         raise Redis::CommandError, "ERR unknown command '#{meffod}'"
       end

data/lib/fakeredis/sorted_set_store.rb

@@ -68,7 +68,7 @@ module FakeRedis
 
   class SortedSetIntersectStore < SortedSetStore
     def selected_keys
-      @values ||= hashes.inject([]) { |r, h| r.empty? ? h.keys : (r & h.keys) }
+      @values ||= hashes.map(&:keys).reduce(:&)
     end
   end
 

data/lib/fakeredis/transaction_commands.rb

@@ -1,5 +1,5 @@
 module FakeRedis
-  TRANSACTION_COMMANDS = [:discard, :exec, :multi, :watch, :unwatch]
+  TRANSACTION_COMMANDS = [:discard, :exec, :multi, :watch, :unwatch, :client]
 
   module TransactionCommands
     def self.included(klass)

data/lib/fakeredis/version.rb

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

data/lib/redis/connection/memory.rb

@@ -9,6 +9,7 @@ require "fakeredis/sorted_set_store"
 require "fakeredis/transaction_commands"
 require "fakeredis/zset"
 require "fakeredis/bitop_command"
+require "fakeredis/version"
 
 class Redis
   module Connection
@@ -56,6 +57,7 @@ class Redis
       def database_id
         @database_id ||= 0
       end
+
       attr_writer :database_id
 
       def database_instance_key
@@ -89,6 +91,16 @@ class Redis
       def disconnect
       end
 
+      def client(command, _options = {})
+        case command
+        when :setname then true
+        when :getname then nil
+        when :client then true
+        else
+          raise Redis::CommandError, "ERR unknown command '#{command}'"
+        end
+      end
+
       def timeout=(usecs)
       end
 
@@ -386,9 +398,9 @@ class Redis
         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)
+        case where.to_s
+          when /\Abefore\z/i then data[key].insert(index, value)
+          when /\Aafter\z/i  then data[key].insert(index + 1, value)
           else raise_syntax_error
         end
       end
@@ -559,11 +571,14 @@ class Redis
         result
       end
 
-      def spop(key)
+      def spop(key, count = nil)
         data_type_check(key, ::Set)
-        elem = srandmember(key)
-        srem(key, elem)
-        elem
+        results = (count || 1).times.map do
+          elem = srandmember(key)
+          srem(key, elem)
+          elem
+        end.compact
+        count.nil? ? results.first : results
       end
 
       def scard(key)
@@ -779,6 +794,7 @@ class Redis
             data[key][field[0].to_s] = field[1].to_s
           end
         end
+        "OK"
       end
 
       def hmget(key, *fields)
@@ -967,7 +983,7 @@ class Redis
         end
 
         start_cursor = start_cursor.to_i
-        data_type_check(start_cursor, Fixnum)
+        data_type_check(start_cursor, Integer)
 
         cursor = start_cursor
         returned_keys = []
@@ -1077,7 +1093,7 @@ class Redis
         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)
+        (results[start..stop] || []).flatten.map(&:to_s)
       end
 
       def zrangebylex(key, start, stop, *opts)
@@ -1286,7 +1302,7 @@ class Redis
         end
 
         start_cursor = start_cursor.to_i
-        data_type_check(start_cursor, Fixnum)
+        data_type_check(start_cursor, Integer)
 
         cursor = start_cursor
         next_keys = []
@@ -1417,4 +1433,5 @@ class Redis
   end
 end
 
+# FIXME this line should be deleted as explicit enabling is better
 Redis::Connection.drivers << Redis::Connection::Memory

data/spec/command_executor_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+RSpec.describe FakeRedis::CommandExecutor do
+  
+  let(:redis) { Redis.new }
+
+  context '#write' do
+    it 'does not modify its argument' do
+      command = [:get, 'key']
+      redis.write(command)
+      expect(command).to eql([:get, 'key'])
+    end
+  end
+
+end

data/spec/connection_spec.rb

@@ -70,7 +70,7 @@ module FakeRedis
 
     it "should not error with a disconnected client" do
       @client1 = Redis.new
-      @client1.client.disconnect
+      @client1.close
       expect(@client1.get("key1")).to be_nil
     end
 

data/spec/fakeredis_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe FakeRedis do
+  after { described_class.disable }
+
+  describe '.enable' do
+    it 'in memory connection' do
+      described_class.enable
+      expect(described_class.enabled?).to be_truthy
+    end
+  end
+
+  describe '.disable' do
+    before { described_class.enable }
+
+    it 'in memory connection' do
+      described_class.disable
+      expect(described_class.enabled?).to be_falsy
+    end
+  end
+end

data/spec/hashes_spec.rb

@@ -137,6 +137,10 @@ module FakeRedis
       expect { @client.hmset("hash", "foo1", "bar1", "foo2", "bar2", "foo3") }.to raise_error(Redis::CommandError, "ERR wrong number of arguments for HMSET")
     end
 
+    it "should return OK on success" do
+      expect(@client.hmset("key", "k1", "value1")).to eq("OK")
+    end
+
     it "should set multiple hash fields to multiple values" do
       @client.hmset("key", "k1", "value1", "k2", "value2")
 

data/spec/lists_spec.rb

@@ -25,6 +25,18 @@ module FakeRedis
       expect(@client.lrange("key1", 0, -1)).to eq(["v1", "v2", "v3", "99", "100"])
     end
 
+    it "inserts with case-insensitive position token" do
+      @client.rpush("key1", "v1")
+      @client.rpush("key1", "v4")
+
+      @client.linsert("key1", :BEFORE, "v4", "v2")
+      @client.linsert("key1", "Before", "v4", "v3")
+      @client.linsert("key1", :AFTER, "v4", "v5")
+      @client.linsert("key1", "After", "v5", "v6")
+
+      expect(@client.lrange("key1", 0, -1)).to eq(%w(v1 v2 v3 v4 v5 v6))
+    end
+
     it "should not insert if after/before index not found" do
       @client.rpush("key", "v1")
       expect(@client.linsert("key", :before, "unknown", "v2")).to eq(-1)

data/spec/memory_spec.rb

@@ -9,6 +9,12 @@ RSpec.describe FakeRedis do
     end
   end
 
+  describe '#write' do
+    it 'should not send unexpected arguments' do
+      expect { redis.write(['info', 'server']) }.not_to raise_error
+    end
+  end
+
   describe '#scan' do
     def result
       returned_keys = []
@@ -78,4 +84,22 @@ RSpec.describe FakeRedis do
       end
     end
   end
+
+  describe '#client' do
+    it 'returns 1 when command is :setname' do
+      expect(redis.write([:client, :setname])).to eq 1
+    end
+
+    it 'returns nil when command is :getname' do
+      expect(redis.write([:client, :getname])).to eq nil
+    end
+
+    it 'returns true when the comment is :client with an argument' do
+      expect(redis.write([:client, :client, :list])).to eq 1
+    end
+
+    it 'raises error for other commands' do
+      expect { redis.write([:client, :wrong]) }.to raise_error(Redis::CommandError, "ERR unknown command 'wrong'")
+    end
+  end
 end

data/spec/sets_spec.rb

@@ -148,6 +148,22 @@ module FakeRedis
       expect(["a", "b"].include?(@client.spop("key1"))).to be true
     end
 
+    it "should pop multiple members from a set" do
+      @client.sadd("key1", "a")
+      @client.sadd("key1", "b")
+      @client.sadd("key1", "c")
+
+      vals = @client.spop("key1", 2)
+      expect(vals.count).to eq(2)
+      vals.each { |v| expect(["a", "b", "c"].include?(v)).to be true }
+
+      new_vals = @client.spop("key1", 2)
+      expect(new_vals.count).to eq(1)
+      expect(["a", "b", "c"].include?(new_vals.first)).to be true
+
+      expect(["a", "b", "c"]).to eq((vals + new_vals).sort)
+    end
+
     it "should remove a member from a set" do
       @client.sadd("key1", "a")
       @client.sadd("key1", "b")

data/spec/sorted_sets_spec.rb

@@ -306,6 +306,22 @@ module FakeRedis
       it "should error with an invalid aggregate" do
         expect { @client.zinterstore("out", %w(key1 key2), :aggregate => :invalid) }.to raise_error(Redis::CommandError, "ERR syntax error")
       end
+
+      it 'stores nothing when there are no members in common' do
+        @client.zadd("k1", 1, "1")
+        @client.zadd("k1", 1, "2")
+        @client.sadd("k2", "a")
+        @client.sadd("k3", "b")
+
+        expect(@client.zinterstore("out", %w(k1 k2 k3))).to eq(0)
+        expect(@client.zrange("out", 0, -1)).to eq([])
+      end
+
+      it 'handles range start being higher than number of members' do
+        @client.zadd("key", 1, "1")
+
+        expect(@client.zrange("key", 10, 10)).to eq([])
+      end
     end
 
     context "zremrangebyscore" do

data/spec/spec_helper.rb

@@ -7,7 +7,11 @@ require "fakeredis/rspec"
 require "support/shared_examples/sortable"
 require "support/shared_examples/bitwise_operation"
 
+
 RSpec.configure do |config|
+  # Enable memory adapter
+  config.before(:each) { FakeRedis.enable }
+
   # replaces -b -fdoc --color in .rspec
   config.color = true
   config.default_formatter = "doc"
@@ -25,5 +29,5 @@ RSpec.configure do |config|
 end
 
 def fakeredis?
-  true
+  FakeRedis.enabled?
 end

data/spec/spec_helper_live_redis.rb

@@ -1,14 +1,14 @@
 require "spec_helper"
 
-# Remove memory so we test against actual redis
-Redis::Connection.drivers.pop
-
 RSpec.configure do |config|
   config.before(:each) do
+    # Disable so we test against actual redis
+    FakeRedis.disable
+
     Redis.new.flushall
   end
 end
 
 def fakeredis?
-  false
+  FakeRedis.enabled?
 end

data/spec/transactions_spec.rb

@@ -33,7 +33,7 @@ module FakeRedis
     end
 
     context '#discard' do
-      it "should responde with 'OK' after #multi" do
+      it "should respond with 'OK' after #multi" do
         @client.multi
         expect(@client.discard).to eq('OK')
       end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: fakeredis
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Guillermo Iguaran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2018-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -69,8 +75,10 @@ files:
 - lib/fakeredis/zset.rb
 - lib/redis/connection/memory.rb
 - spec/bitop_command_spec.rb
+- spec/command_executor_spec.rb
 - spec/compatibility_spec.rb
 - spec/connection_spec.rb
+- spec/fakeredis_spec.rb
 - spec/hashes_spec.rb
 - spec/keys_spec.rb
 - spec/lists_spec.rb
@@ -107,14 +115,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Fake (In-memory) driver for redis-rb.
 test_files:
 - spec/bitop_command_spec.rb
+- spec/command_executor_spec.rb
 - spec/compatibility_spec.rb
 - spec/connection_spec.rb
+- spec/fakeredis_spec.rb
 - spec/hashes_spec.rb
 - spec/keys_spec.rb
 - spec/lists_spec.rb