fakeredis 0.7.0 → 0.9.0

data/spec/strings_spec.rb

@@ -183,6 +183,12 @@ module FakeRedis
       expect { @client.mget }.to raise_error(Redis::CommandError)
     end
 
+    it 'raises an argument error when the data is a hash' do
+      @client.hincrby("key1", "cont1", 5)
+
+      expect { @client.mget("key1") }.to raise_error(Redis::CommandError)
+    end
+
     it "should set multiple keys to multiple values" do
       @client.mset(:key1, "value1", :key2, "value2")
 
@@ -242,9 +248,14 @@ module FakeRedis
       expect(@client.ttl("key1")).to eq(30)
     end
 
+    it "should raise an error if a non-integer is provided as the expiration" do
+      expect { @client.setex("key1", 1.5, "value1") }.to raise_error(Redis::CommandError)
+      expect { @client.set("key1", "value1", ex: 1.5) }.to raise_error(Redis::CommandError)
+    end
+
     it "should set the value of a key, only if the key does not exist" do
-      @client.set("key1", "test value")
-      @client.setnx("key1", "new value")
+      expect(@client.setnx("key1", "test value")).to eq(true)
+      expect(@client.setnx("key1", "new value")).to eq(false)
       @client.setnx("key2", "another value")
 
       expect(@client.get("key1")).to eq("test value")
@@ -285,5 +296,34 @@ module FakeRedis
       expect(@client.bitcount("key1", 1, 1)).to eq(6)
       expect(@client.bitcount("key1", 0, 1)).to eq(10)
     end
+
+    describe "#bitpos" do
+      it "should return -1 when there's no key" do
+        expect(@client.bitpos("key", 0)).to eq(-1)
+      end
+
+      it "should return -1 for empty key" do
+        @client.set("key", "")
+        expect(@client.bitpos("key", 0)).to eq(-1)
+      end
+
+      it "should return position of the bit in a string" do
+        @client.set("key", "foobar") # 01100110 01101111 01101111
+        expect(@client.bitpos("key", 1)).to eq(1)
+      end
+
+      it "should return position of the bit correctly with UTF-8 strings" do
+        @client.set("key", "判") # 11100101 10001000 10100100
+        expect(@client.bitpos("key", 0)).to eq(3)
+      end
+
+      it "should return position of the bit in a string given a range" do
+        @client.set("key", "foobar")
+
+        expect(@client.bitpos("key", 1, 0)).to eq(1)
+        expect(@client.bitpos("key", 1, 1, 2)).to eq(9)
+        expect(@client.bitpos("key", 0, 1, -1)).to eq(8)
+      end
+    end
   end
 end

data/spec/subscription_spec.rb

@@ -6,50 +6,50 @@ module FakeRedis
     before(:each) do
       @client = Redis.new
     end
-    
+
     context "publish" do
       it "should add to channels" do
-        @client.publish("channel1", "val1").should be == 0
-        @client.publish("channel1", "val2").should be == 0
+        expect(@client.publish("channel1", "val1")).to eq(0)
+        expect(@client.publish("channel1", "val2")).to eq(0)
       end
     end
-    
+
     context "subscribe" do
       it "should get all messages from a channel" do
         @client.publish("channel1", "val1")
         @client.publish("channel1", "val2")
         @client.publish("channel2", "val3")
-        
+
         msgs = []
         subscribe_sent = unsubscribe_sent = false
         Timeout.timeout(1) do
           @client.subscribe("channel1") do |on|
             on.subscribe do |channel|
               subscribe_sent = true
-              channel.should be == "channel1"
+              expect(channel).to eq("channel1")
             end
-          
+
             on.message do |channel,msg|
-              channel.should be == "channel1"
+              expect(channel).to eq("channel1")
               msgs << msg
             end
-            
+
             on.unsubscribe do
               unsubscribe_sent = true
             end
           end
         end
-        
-        msgs.should be == ["val1", "val2"]
-        subscribe_sent.should
-        unsubscribe_sent.should
+
+        expect(msgs).to eq(["val1", "val2"])
+        expect(subscribe_sent).to eq(true)
+        expect(unsubscribe_sent).to eq(true)
       end
-      
+
       it "should get all messages from multiple channels" do
         @client.publish("channel1", "val1")
         @client.publish("channel2", "val2")
         @client.publish("channel2", "val3")
-        
+
         msgs = []
         Timeout.timeout(1) do
           @client.subscribe("channel1", "channel2") do |on|
@@ -58,23 +58,23 @@ module FakeRedis
             end
           end
         end
-        
-        msgs[0].should be == ["channel1", "val1"]
-        msgs[1].should be == ["channel2", "val2"]
-        msgs[2].should be == ["channel2", "val3"]
+
+        expect(msgs[0]).to eq(["channel1", "val1"])
+        expect(msgs[1]).to eq(["channel2", "val2"])
+        expect(msgs[2]).to eq(["channel2", "val3"])
       end
     end
-    
+
     context "unsubscribe" do
     end
-    
+
     context "with patterns" do
       context "psubscribe" do
         it "should get all messages using pattern" do
           @client.publish("channel1", "val1")
           @client.publish("channel1", "val2")
           @client.publish("channel2", "val3")
-          
+
           msgs = []
           subscribe_sent = unsubscribe_sent = false
           Timeout.timeout(1) do
@@ -82,26 +82,26 @@ module FakeRedis
               on.psubscribe do |channel|
                 subscribe_sent = true
               end
-          
+
               on.pmessage do |pattern,channel,msg|
-                pattern.should be == "channel*"
+                expect(pattern).to eq("channel*")
                 msgs << msg
               end
-            
+
               on.punsubscribe do
                 unsubscribe_sent = true
               end
             end
           end
-          
-          msgs.should be == ["val1", "val2", "val3"]
-          subscribe_sent.should
-          unsubscribe_sent.should
+
+          expect(msgs).to eq(["val1", "val2", "val3"])
+          expect(subscribe_sent).to eq(true)
+          expect(unsubscribe_sent).to eq(true)
         end
       end
-      
+
       context "punsubscribe" do
       end
     end
   end
-end
+end

data/spec/support/shared_examples/bitwise_operation.rb

@@ -1,11 +1,11 @@
 shared_examples_for "a bitwise operation" do |operator|
   it 'raises an argument error when not passed any source keys' do
-    lambda { @client.bitop(operator, "destkey") }.should raise_error(Redis::CommandError)
+    expect { @client.bitop(operator, "destkey") }.to raise_error(Redis::CommandError)
   end
 
   it "should not create destination key if nothing found" do
-    @client.bitop(operator, "dest1", "nothing_here1").should be == 0
-    @client.exists("dest1").should be false
+    expect(@client.bitop(operator, "dest1", "nothing_here1")).to eq(0)
+    expect(@client.exists?("dest1")).to eq(false)
   end
 
   it "should accept operator as a case-insensitive symbol" do
@@ -13,8 +13,8 @@ shared_examples_for "a bitwise operation" do |operator|
     @client.bitop(operator.to_s.downcase.to_sym, "dest1", "key1")
     @client.bitop(operator.to_s.upcase.to_sym, "dest2", "key1")
 
-    @client.get("dest1").should be == "foobar"
-    @client.get("dest2").should be == "foobar"
+    expect(@client.get("dest1")).to eq("foobar")
+    expect(@client.get("dest2")).to eq("foobar")
   end
 
   it "should accept operator as a case-insensitive string" do
@@ -22,30 +22,30 @@ shared_examples_for "a bitwise operation" do |operator|
     @client.bitop(operator.to_s.downcase, "dest1", "key1")
     @client.bitop(operator.to_s.upcase, "dest2", "key1")
 
-    @client.get("dest1").should be == "foobar"
-    @client.get("dest2").should be == "foobar"
+    expect(@client.get("dest1")).to eq("foobar")
+    expect(@client.get("dest2")).to eq("foobar")
   end
 
   it "should copy original string for single key" do
     @client.set("key1", "foobar")
     @client.bitop(operator, "dest1", "key1")
 
-    @client.get("dest1").should be == "foobar"
+    expect(@client.get("dest1")).to eq("foobar")
   end
 
   it "should copy original string for single key" do
     @client.set("key1", "foobar")
     @client.bitop(operator, "dest1", "key1")
 
-    @client.get("dest1").should be == "foobar"
+    expect(@client.get("dest1")).to eq("foobar")
   end
 
   it "should return length of the string stored in the destination key" do
     @client.set("key1", "foobar")
     @client.set("key2", "baz")
 
-    @client.bitop(operator, "dest1", "key1").should be == 6
-    @client.bitop(operator, "dest2", "key2").should be == 3
+    expect(@client.bitop(operator, "dest1", "key1")).to eq(6)
+    expect(@client.bitop(operator, "dest2", "key2")).to eq(3)
   end
 
   it "should overwrite previous value with new one" do
@@ -54,6 +54,6 @@ shared_examples_for "a bitwise operation" do |operator|
     @client.bitop(operator, "dest1", "key1")
     @client.bitop(operator, "dest1", "key2")
 
-    @client.get("dest1").should be == "baz"
+    expect(@client.get("dest1")).to eq("baz")
   end
 end

data/spec/transactions_spec.rb

@@ -85,7 +85,20 @@ module FakeRedis
       it "returns true if the nested hash command succeeds" do
         responses = @client.multi { |multi| multi.hset('hash', 'key', 'value') }
 
-        expect(responses[0]).to eq(true)
+        expect(responses[0]).to eq(1)
+      end
+    end
+
+    context 'executing set commands in a block' do
+      it "returns commands' responses for nested commands" do
+        @client.sadd('set', 'member1')
+
+        responses = @client.multi do |multi|
+          multi.sadd('set', 'member1')
+          multi.sadd('set', 'member2')
+        end
+
+        expect(responses).to eq([false, true])
       end
     end
   end

metadata

@@ -1,49 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: fakeredis
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Guillermo Iguaran
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-04 00:00:00.000000000 Z
+date: 2023-04-15 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'
+        version: '4.8'
   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'
+        version: '4.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
 description: Fake (In-memory) driver for redis-rb. Useful for testing environment
   and machines without Redis.
 email:
@@ -52,19 +46,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/codeql.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - fakeredis.gemspec
-- gemfiles/redisrb-master.gemfile
 - lib/fake_redis.rb
 - lib/fakeredis.rb
 - lib/fakeredis/bitop_command.rb
 - lib/fakeredis/command_executor.rb
 - lib/fakeredis/expiring_hash.rb
+- lib/fakeredis/geo_commands.rb
+- lib/fakeredis/geo_set.rb
 - lib/fakeredis/minitest.rb
 - lib/fakeredis/rspec.rb
 - lib/fakeredis/sort_method.rb
@@ -79,7 +75,9 @@ files:
 - spec/compatibility_spec.rb
 - spec/connection_spec.rb
 - spec/fakeredis_spec.rb
+- spec/geo_set_spec.rb
 - spec/hashes_spec.rb
+- spec/hyper_log_logs_spec.rb
 - spec/keys_spec.rb
 - spec/lists_spec.rb
 - spec/memory_spec.rb
@@ -99,7 +97,7 @@ homepage: https://guilleiguaran.github.com/fakeredis
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -114,9 +112,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.4.1
+signing_key:
 specification_version: 4
 summary: Fake (In-memory) driver for redis-rb.
 test_files:
@@ -125,7 +122,9 @@ test_files:
 - spec/compatibility_spec.rb
 - spec/connection_spec.rb
 - spec/fakeredis_spec.rb
+- spec/geo_set_spec.rb
 - spec/hashes_spec.rb
+- spec/hyper_log_logs_spec.rb
 - spec/keys_spec.rb
 - spec/lists_spec.rb
 - spec/memory_spec.rb

data/.travis.yml

@@ -1,22 +0,0 @@
-language: ruby
-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.2
-  - 2.3.6
-  - 2.4
-  - 2.5
-  - ruby-head
-  - jruby
-  - rbx-2
-
-gemfile:
-  - Gemfile
-  - gemfiles/redisrb-master.gemfile
-
-matrix:
-  allow_failures:
-    - rvm: rbx-2

data/gemfiles/redisrb-master.gemfile

@@ -1,14 +0,0 @@
-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 => ".."