mock_redis 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e3dccfea232f8d47d28dc16362a79232cd69a2a12e6d8127a43c83c03287ef4
-  data.tar.gz: a2918811810246e6ddf92643e88121550310a7628f396aba12ed163b61c979a5
+  metadata.gz: 4443d90955b31a149afd0c66972a06993bf9b01f6bd826276c2d60edb49b3141
+  data.tar.gz: 2d096c0b7438b81720adcd50ecb36a8fa19df7a05c822ed4beee6d06d459f1b4
 SHA512:
-  metadata.gz: e8233e6e66afbaa2f7801e33f7b16a7bbbb2eb4cb3caab73a0c19e94857542fe49a96a9c45e8e995b54bf71d50c90ef78cfb5e293e85d91a3ade26f0e3a3e4d8
-  data.tar.gz: e30d5a2656ef3fb793cb9a0a2df9e1e24cd78aaa83a6cf5a3483353075f2a475379e294fc6b9c5905229db1a453d16cc7fa02095aed3ad59799312ff5d76ced5
+  metadata.gz: bdcb30c9756e77fcc4f857f0bdaa01d73faa28b8ea7cc37aa669c0f5cf2e2967d3e216a32ff50c7c78f6945b313f8525073060daf9f980187d566202f3dbcda2
+  data.tar.gz: 17502b628f1a5a62fa2046b529ef0178d8b84453d3a8b83441e3f2eef72282d45a79e60bee34e9a871ea553deb08c1c286b915d4b2c6ffe52fab3e6e32a6cc56

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # MockRedis Changelog
 
+### 0.21.0
+
+* Fix behavior of `time` to return array of two integers ([#161](https://github.com/sds/mock_redis/pull/161))
+* Add support for `close` and `disconnect!` ([#163](https://github.com/sds/mock_redis/pull/163))
+* Fix `set` to properly handle (and ignore) other options ([#164](https://github.com/sds/mock_redis/pull/163))
+* Fix `srem` to allow array of integers as argument ([#166](https://github.com/sds/mock_redis/pull/166))
+* Fix `hdel` to allow array as argument ([#168](https://github.com/sds/mock_redis/pull/168))
+
 ### 0.20.0
 
 * Add support for `count` parameter of `spop`

data/lib/mock_redis.rb

@@ -65,7 +65,9 @@ class MockRedis
   end
 
   def now
-    options[:time_class].now
+    current_time = options[:time_class].now
+    miliseconds = (current_time.to_r - current_time.to_i) * 1_000
+    [current_time.to_i, miliseconds.to_i]
   end
   alias time now
 

data/lib/mock_redis/database.rb

@@ -56,6 +56,8 @@ class MockRedis
     def disconnect
       nil
     end
+    alias close disconnect
+    alias disconnect! close
 
     def connected?
       true
@@ -86,7 +88,8 @@ class MockRedis
     end
 
     def pexpire(key, ms)
-      now_ms = (@base.now.to_r * 1000).to_i
+      now, miliseconds = @base.now
+      now_ms = (now * 1000) + miliseconds
       pexpireat(key, now_ms + ms.to_i)
     end
 
@@ -140,7 +143,7 @@ class MockRedis
     end
 
     def lastsave
-      @base.now.to_i
+      @base.now.first
     end
 
     def persist(key)
@@ -201,17 +204,21 @@ class MockRedis
       if !exists(key)
         -2
       elsif has_expiration?(key)
-        expiration(key).to_i - @base.now.to_i
+        now, = @base.now
+        expiration(key).to_i - now
       else
         -1
       end
     end
 
     def pttl(key)
+      now, miliseconds = @base.now
+      now_ms = now * 1000 + miliseconds
+
       if !exists(key)
         -2
       elsif has_expiration?(key)
-        (expiration(key).to_r * 1000).to_i - (@base.now.to_r * 1000).to_i
+        (expiration(key).to_r * 1000).to_i - now_ms
       else
         -1
       end
@@ -321,10 +328,11 @@ class MockRedis
     # This method isn't private, but it also isn't a Redis command, so
     # it doesn't belong up above with all the Redis commands.
     def expire_keys
-      now = @base.now
+      now, miliseconds = @base.now
+      now_ms = now * 1_000 + miliseconds
 
       to_delete = expire_times.take_while do |(time, _key)|
-        (time.to_r * 1_000).to_i <= (now.to_r * 1_000).to_i
+        (time.to_r * 1_000).to_i <= now_ms
       end
 
       to_delete.each do |(_time, key)|

data/lib/mock_redis/hash_methods.rb

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

data/lib/mock_redis/set_methods.rb

@@ -117,6 +117,7 @@ class MockRedis
       with_set_at(key) do |s|
         if members.is_a?(Array)
           orig_size = s.size
+          members = members.map(&:to_s)
           s.delete_if { |m| members.include?(m) }
           orig_size - s.size
         else

data/lib/mock_redis/string_methods.rb

@@ -220,15 +220,22 @@ class MockRedis
       end
       data[key] = value.to_s
 
-      # take latter
-      expire_option = options.to_a.last
-      if expire_option
-        type, duration = expire_option
+      duration = options.delete(:ex)
+      if duration
         if duration == 0
           raise Redis::CommandError, 'ERR invalid expire time in set'
         end
-        expire(key, type.to_sym == :ex ? duration : duration / 1000.0)
+        expire(key, duration)
       end
+
+      duration = options.delete(:px)
+      if duration
+        if duration == 0
+          raise Redis::CommandError, 'ERR invalid expire time in set'
+        end
+        expire(key, duration / 1000.0)
+      end
+
       return_true ? true : 'OK'
     end
 

data/lib/mock_redis/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 class MockRedis
-  VERSION = '0.20.0'
+  VERSION = '0.21.0'
 end

data/spec/client_spec.rb

@@ -14,4 +14,16 @@ describe 'client' do
       redis.connect.should == redis
     end
   end
+
+  context '#disconnect!' do
+    it 'responds to disconnect!' do
+      expect(MockRedis.new).to respond_to(:disconnect!)
+    end
+  end
+
+  context '#close' do
+    it 'responds to close' do
+      expect(MockRedis.new).to respond_to(:close)
+    end
+  end
 end

data/spec/commands/hdel_spec.rb

@@ -50,5 +50,21 @@ describe '#hdel(key, field)' do
     @redises.hget(@key, field).should be_nil
   end
 
+  it 'supports a variable number of fields as array' do
+    @redises.hdel(@key, %w[k1 k2]).should == 2
+
+    @redises.hget(@key, 'k1').should be_nil
+    @redises.hget(@key, 'k2').should be_nil
+    @redises.get(@key).should be_nil
+  end
+
+  it 'supports a list of fields in various way' do
+    @redises.hdel(@key, ['k1'], 'k2').should == 2
+
+    @redises.hget(@key, 'k1').should be_nil
+    @redises.hget(@key, 'k2').should be_nil
+    @redises.get(@key).should be_nil
+  end
+
   it_should_behave_like 'a hash-only command'
 end

data/spec/commands/set_spec.rb

@@ -33,6 +33,12 @@ describe '#set(key, value)' do
       @redises.set(key, 1, xx: true).should == true
     end
 
+    it 'ignores other options' do
+      key = 'mock-redis-test'
+      @redises.del(key)
+      @redises.set(key, 1, logger: :something).should == 'OK'
+    end
+
     context '[mock only]' do
       before(:all) do
         @mock = @redises.mock

data/spec/commands/srem_spec.rb

@@ -36,5 +36,10 @@ describe '#srem(key, member)' do
     @redises.get(@key).should be_nil
   end
 
+  it 'allow passing an array of integers as argument' do
+    @redises.sadd(@key, %w[1 2])
+    @redises.srem(@key, [1, 2]).should == 2
+  end
+
   it_should_behave_like 'a set-only command'
 end

data/spec/mock_redis_spec.rb

@@ -49,23 +49,21 @@ describe MockRedis do
     end
 
     describe '.now' do
-      let(:now)       { 'Now' }
-      let(:time_stub) { double 'Time', :now => now }
+      let(:time_stub) { double 'Time', :now => Time.new(2019, 1, 2, 3, 4, 6, '+00:00') }
       let(:options)   { { :time_class => time_stub } }
 
       subject { MockRedis.new(options) }
 
-      its(:now) { should == now }
+      its(:now) { should == [1_546_398_246, 0] }
     end
 
     describe '.time' do
-      let(:now)       { 'Now' }
-      let(:time_stub) { double 'Time', :now => now }
+      let(:time_stub) { double 'Time', :now => Time.new(2019, 1, 2, 3, 4, 6, '+00:00') }
       let(:options)   { { :time_class => time_stub } }
 
       subject { MockRedis.new(options) }
 
-      its(:time) { should == now }
+      its(:time) { should == [1_546_398_246, 0] }
     end
 
     describe '.expireat' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mock_redis
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Shane da Silva
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-03 00:00:00.000000000 Z
+date: 2019-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake