fakeredis 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 472bc70d16d42ddd98a542825b81fdd5d8f7af18a8b704f5022046895ca5a867
-  data.tar.gz: 7f0b48ebe4cfa88e99b9d949be3e0bd6816dbc3c0629062d42e0e1fce92a03fc
+  metadata.gz: 8f5bfa00feb72f7ffcaa7a1b0c2f316fe6f0e83c1a1e5d68f09f6243aeadca14
+  data.tar.gz: 8c31af643286808f7226f138278673d4523d9ef2fdf39a67336519d762ea9385
 SHA512:
-  metadata.gz: fcef2e419257364269044dbd0d8b21d0aacdaeb613d91e83abaef77a18a6c5551e72ded9e90ac334d17760aaf80e4c0fec9fd72f15e3a80efe63c7be5b3f2903
-  data.tar.gz: 6076a543910d3eec4a6fb8912ce1be5b44bea9fa71cbd76fd62f8b0a130eb97d85a4a2390d05ef5bd2a1eae699c487b01de537f9781c8aa39553c198f53c9618
+  metadata.gz: 5164767bdeed993d36fdaf7410c8a79d933b1e3d3958437e5346b080c5ac1c3f78b0f0a4ba77f9438a84f5480cd9f1629aead81e58c1bb9999a258009a944eff
+  data.tar.gz: d337bec1b6a2d54dfa96686cc177ce3c15b660205f8d5c71f7e0b52bee9a40909642604dd70b975755ede946091bc55fec82d644c82df02f2305e0e2d27e630b

data/.github/workflows/ruby.yml

@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu, macos]
-        ruby: [3.0, 3.1, 3.2, head, debug, jruby, jruby-head, truffleruby, truffleruby-head]
+        ruby: [2.7, 3.0, 3.1, 3.2, head, debug, jruby, jruby-head, truffleruby, truffleruby-head]
     continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
     steps:
       - uses: actions/checkout@v3

data/README.md

@@ -87,7 +87,7 @@ require 'fakeredis/minitest'
 
 ## Acknowledgements
 
-Thanks to [all contributors](https://github.com/guilleiguaran/fakeredis/graphs/contributors), specially to [Caius Durling](https://github.com/caius) the most active one.
+Thanks to [all contributors](https://github.com/guilleiguaran/fakeredis/graphs/contributors).
 
 ## Contributing to FakeRedis
 

data/lib/fakeredis/geo_commands.rb

@@ -74,7 +74,7 @@ module FakeRedis
     def georadiusbymember(*args)
       args = args.dup
       raise_argument_error("georadiusbymember") if args.size < 4
-      key, member, radius, unit, *rest = args
+      key, member, radius, unit, *_ = args
       raise_argument_error("georadiusbymember") unless DISTANCE_UNITS.has_key?(unit)
       radius *= DISTANCE_UNITS[unit]
 

data/lib/fakeredis/version.rb

@@ -1,3 +1,3 @@
 module FakeRedis
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/lib/redis/connection/memory.rb

@@ -122,7 +122,7 @@ class Redis
         "OK"
       end
 
-      def auth(password)
+      def auth(*args)
         "OK"
       end
 
@@ -562,11 +562,17 @@ class Redis
         end
 
         # 0 = false, 1 = true unless an array was passed in
-        return result == 1 unless should_return_int
+        if Redis.sadd_returns_boolean && !should_return_int
+          return result == 1
+        end
 
         result
       end
 
+      def sadd?(key, value)
+        sadd(key, value) == 1
+      end
+
       def srem(key, value)
         data_type_check(key, ::Set)
         raise_argument_error('srem') if Array(value).empty?
@@ -775,28 +781,28 @@ class Redis
       def hset(key, *fields)
         fields = fields.first if fields.size == 1 && fields.first.is_a?(Hash)
         raise_argument_error('hset') if fields.empty?
-    
+
         is_list_of_arrays = fields.all?{|field| field.instance_of?(Array)}
-    
+
         raise_argument_error('hmset') if fields.size.odd? and !is_list_of_arrays
         raise_argument_error('hmset') if is_list_of_arrays and !fields.all?{|field| field.length == 2}
-        
+
         data_type_check(key, Hash)
         insert_count = 0
         data[key] ||= {}
-    
+
         if fields.is_a?(Hash)
           insert_count = fields.keys.size - (data[key].keys & fields.keys).size
-    
+
           data[key].merge!(fields)
         else
           fields.each_slice(2) do |field|
             insert_count += 1 if data[key][field[0].to_s].nil?
-    
+
             data[key][field[0].to_s] = field[1].to_s
           end
         end
-    
+
         insert_count
       end
 
@@ -1150,12 +1156,12 @@ class Redis
         count.nil? ? results.first : results.flatten
       end
 
-      def bzpopmax(*args)
-        bzpop(:bzpopmax, args)
+      def bzpopmax(*args, timeout: 0)
+        bzpop(:bzpopmax, args, timeout)
       end
 
-      def bzpopmin(*args)
-        bzpop(:bzpopmin, args)
+      def bzpopmin(*args, timeout: 0)
+        bzpop(:bzpopmin, args, timeout)
       end
 
       def zcard(key)
@@ -1594,15 +1600,7 @@ class Redis
           end
         end
 
-        def bzpop(command, args)
-          timeout =
-            if args.last.is_a?(Hash)
-              args.pop[:timeout]
-            elsif args.last.respond_to?(:to_int)
-              args.pop.to_int
-            end
-
-          timeout ||= 0
+        def bzpop(command, args, timeout)
           single_pop_command = command.to_s[1..-1]
           keys = args.flatten
           keys.each do |key|

data/spec/sets_spec.rb

@@ -7,8 +7,8 @@ module FakeRedis
     end
 
     it "should add a member to a set" do
-      expect(@client.sadd("key", "value")).to eq(true)
-      expect(@client.sadd("key", "value")).to eq(false)
+      expect(@client.sadd?("key", "value")).to eq(true)
+      expect(@client.sadd?("key", "value")).to eq(false)
 
       expect(@client.smembers("key")).to eq(["value"])
     end

data/spec/sorted_sets_spec.rb

@@ -120,14 +120,14 @@ module FakeRedis
     it "should pop members with the highest score from first sorted set that is non-empty" do
       @client.zadd("key1", [1, "val1", 2, "val2"])
       @client.zadd("key2", [3, "val3"])
-      expect(@client.bzpopmax("nonexistent", "key1", "key2", 0)).to eq(["key1", "val2", 2.0])
+      expect(@client.bzpopmax("nonexistent", "key1", "key2", timeout: 0)).to eq(["key1", "val2", 2.0])
       expect(@client.bzpopmax("nonexistent")).to eq(nil)
     end
 
     it "should pop members with the lowest score from first sorted set that is non-empty" do
       @client.zadd("key1", [1, "val1", 2, "val2"])
       @client.zadd("key2", [3, "val3"])
-      expect(@client.bzpopmin("nonexistent", "key1", "key2", 0)).to eq(["key1", "val1", 1.0])
+      expect(@client.bzpopmin("nonexistent", "key1", "key2", timeout: 0)).to eq(["key1", "val1", 1.0])
       expect(@client.bzpopmin("nonexistent")).to eq(nil)
     end
 

data/spec/spec_helper.rb

@@ -11,6 +11,9 @@ RSpec.configure do |config|
   # Enable memory adapter
   config.before(:each) { FakeRedis.enable }
 
+  # Set the default behavior for sadd in v5.0
+  config.before(:all) { Redis.sadd_returns_boolean = false }
+
   config.backtrace_exclusion_patterns = []
 end
 

data/spec/transactions_spec.rb

@@ -94,8 +94,8 @@ module FakeRedis
         @client.sadd('set', 'member1')
 
         responses = @client.multi do |multi|
-          multi.sadd('set', 'member1')
-          multi.sadd('set', 'member2')
+          multi.sadd?('set', 'member1')
+          multi.sadd?('set', 'member2')
         end
 
         expect(responses).to eq([false, true])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fakeredis
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Guillermo Iguaran
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-15 00:00:00.000000000 Z
+date: 2023-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis