rediska 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 42912927e01fc9f997529b763f267bfd3b38b54f
-  data.tar.gz: a1a484bc665c5b6464bfbde5731f2c3d120d8528
+SHA256:
+  metadata.gz: '09a30ec9909bf8d0e289b62a48184649e43a5053e4d38049efc1514fc496d29f'
+  data.tar.gz: 211591dea5dc948d4bcb0fece84b33bb6899fe980b87b061daa6bcb44b8d8354
 SHA512:
-  metadata.gz: f97da1ce65e96864840900755ffd52b3f3f129c1e99bb162bc6d769272168249f211ac4ae32a4e9656e554ec15e30c0a58a8a8c321792f70793d407acc8cab8a
-  data.tar.gz: a29ad9857dd640e4e17b32cc375f397a1abeafb83f460cadc2d94c3a1aeb10128ff9e65993f22155a43bc0e9340e763f755647cb3b45515ffeffc2e8c7d0b2fd
+  metadata.gz: 3d0ee50c993ca33227397ad369ce542555422ff9d589e09d3944dd2cc03fb093bc6799c7c139e987b52fc30ae34e986aa743259d4791688bee60763a351c9c2e
+  data.tar.gz: a29a26ffa641cbd11c8cd0569206f1e1547c569a1a365ec7bd8c4bf443afaf5345bbe55917ae7531d5a4d4947bd8b00bf9194dd43990ba59e0df35a7b3e8cad6

data/.travis.yml

@@ -2,12 +2,9 @@ language: ruby
 before_install:
   - travis_retry gem install bundler
 rvm:
-  - 2.0.0
-  - 2.1.2
-  - 2.2.0
+  - 2.2.2
   - ruby-head
   - jruby
-  - rbx-2
 gemfile:
   - Gemfile
 services:

data/README.md

@@ -172,7 +172,6 @@ end
 * ZADD
 * ZCARD
 * ZCOUNT
-* ZINCRBY
 * ZINTERSTORE
 * ZUNIONSTORE
 * ZRANK
@@ -184,7 +183,6 @@ end
 * ZREVRANGEBYSCORE
 * ZREVRANK
 * ZSCAN
-* ZSCORE
 
 ## Credits and Contributors
 

data/lib/rediska/driver.rb

@@ -53,7 +53,7 @@ module Rediska
       'OK'
     end
 
-    def auth(password)
+    def auth(*args)
       'OK'
     end
 
@@ -961,26 +961,12 @@ module Rediska
       data[key] ? data[key].size : 0
     end
 
-    def zscore(key, value)
-      data_type_check(key, ZSet)
-      value = data[key] && data[key][value.to_s]
-      value && value.to_s
-    end
-
     def zcount(key, min, max)
       data_type_check(key, ZSet)
       return 0 unless data[key]
       data[key].select_by_score(min, max).size
     end
 
-    def zincrby(key, num, value)
-      data_type_check(key, ZSet)
-      data[key] ||= ZSet.new
-      data[key][value.to_s] ||= 0
-      data[key].increment(value.to_s, num)
-      data[key][value.to_s].to_s
-    end
-
     def zrank(key, value)
       data_type_check(key, ZSet)
       z = data[key]

data/lib/rediska/version.rb

@@ -1,3 +1,3 @@
 module Rediska
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/spec/support/bitop.rb

@@ -9,7 +9,7 @@ shared_examples_for 'a bitwise operation' do |operator|
 
   it 'should not create destination key if nothing found' do
     expect(subject.bitop(operator, 'dest1', 'nothing_here1')).to eq(0)
-    expect(subject.exists('dest1')).to be_falsy
+    expect(subject.exists('dest1')).to eq(0)
   end
 
   it 'should accept operator as a case-insensitive symbol' do

data/spec/support/hashes.rb

@@ -25,7 +25,7 @@ shared_examples 'hashes' do
     expect(subject.hdel('key1', 'k1')).to eq(1)
     expect(subject.hdel('key1', 'k2')).to eq(1)
 
-    expect(subject.exists('key1')).to be_falsey
+    expect(subject.exists('key1')).to eq(0)
   end
 
   it 'should convert key to a string for hset' do
@@ -122,7 +122,7 @@ shared_examples 'hashes' do
       subject.hmset('key')
     }.to raise_error(Redis::CommandError)
 
-    expect(subject.exists('key')).to be_falsey
+    expect(subject.exists('key')).to eq(0)
   end
 
   it 'rejects an insert with a key but no value' do
@@ -134,7 +134,7 @@ shared_examples 'hashes' do
       subject.hmset('key', 'foo', 3, 'bar')
     }.to raise_error(Redis::CommandError)
 
-    expect(subject.exists('key')).to be_falsey
+    expect(subject.exists('key')).to eq(0)
   end
 
   it 'should reject the wrong number of arguments' do
@@ -159,7 +159,7 @@ shared_examples 'hashes' do
 
   it 'should set the string value of a hash field' do
     expect(subject.hset('key1', 'k1', 'val1')).to be_truthy
-    expect(subject.hset('key1', 'k1', 'val1')).to be_falsey
+    expect(subject.hset('key1', 'k1', 'val1')).to eq(0)
 
     expect(subject.hget('key1', 'k1')).to eq('val1')
   end

data/spec/support/keys.rb

@@ -16,24 +16,14 @@ shared_examples 'keys' do
     expect(subject.get('key2')).to be_nil
   end
 
-  it 'should error deleting no keys' do
-    expect {
-      subject.del
-    }.to raise_error(Redis::CommandError)
-
-    expect {
-      subject.del []
-    }.to raise_error(Redis::CommandError)
+  it "should return true when setnx keys that don't exist" do
+    expect(subject.setnx('key1', '1')).to be_truthy
   end
 
-   it "should return true when setnx keys that don't exist" do
-     expect(subject.setnx('key1', '1')).to be_truthy
-   end
-
-   it 'should return false when setnx keys exist' do
-     subject.set('key1', '1')
-     expect(subject.setnx('key1', '1')).to be_falsey
-   end
+  it 'should return false when setnx keys exist' do
+    subject.set('key1', '1')
+    expect(subject.setnx('key1', '1')).to be_falsey
+  end
 
   it 'should return true when setting expires on keys that exist' do
     subject.set('key1', '1')
@@ -58,7 +48,7 @@ shared_examples 'keys' do
     subject.set('key1', '1')
 
     expect(subject.exists('key1')).to be_truthy
-    expect(subject.exists('key2')).to be_falsey
+    expect(subject.exists('key2')).to eq(0)
   end
 
   it "should set a key's time to live in seconds" do
@@ -123,7 +113,7 @@ shared_examples 'keys' do
     subject.set('key1', '1')
     subject.expireat('key1', Time.now.to_i)
 
-    expect(subject.exists('key1')).to be_falsey
+    expect(subject.exists('key1')).to eq(0)
   end
 
   it 'should find all keys matching the given pattern' do
@@ -387,13 +377,13 @@ shared_examples 'keys' do
 
     it 'uses nx option to only set the key if it does not already exist' do
       expect(subject.set('key1', '1', nx: true)).to be_truthy
-      expect(subject.set('key1', '2', nx: true)).to be_falsey
+      expect(subject.set('key1', '2', nx: true)).to eq(0)
 
       expect(subject.get('key1')).to eq('1')
     end
 
     it 'uses xx option to only set the key if it already exists' do
-      expect(subject.set('key2', '1', xx: true)).to be_falsey
+      expect(subject.set('key2', '1', xx: true)).to eq(0)
       subject.set('key2', '2')
       expect(subject.set('key2', '1', xx: true)).to be_truthy
 
@@ -401,13 +391,13 @@ shared_examples 'keys' do
     end
 
     it 'does not set the key if both xx and nx option are specified' do
-      expect(subject.set('key2', '1', nx: true, xx: true)).to be_falsey
+      expect(subject.set('key2', '1', nx: true, xx: true)).to eq(0)
       expect(subject.get('key2')).to be_nil
     end
 
     describe '#dump' do
       it 'returns nil for unknown key' do
-        expect(subject.exists('key1')).to be_falsey
+        expect(subject.exists('key1')).to eq(0)
         expect(subject.dump('key1')).to be_nil
       end
 
@@ -445,7 +435,7 @@ shared_examples 'keys' do
           @dumped_value = subject.dump('key1')
 
           subject.del('key1')
-          expect(subject.exists('key1')).to be_falsey
+          expect(subject.exists('key1')).to eq(0)
         end
 
         it 'restores to a new key successfully' do

data/spec/support/lists.rb

@@ -90,7 +90,7 @@ shared_examples 'lists' do
   end
 
   it 'should return 0 if key does not map to a list' do
-    expect(subject.exists('nonexistant')).to eq(false)
+    expect(subject.exists('nonexistant')).to eq(0)
     expect(subject.lrem('nonexistant', 0, 'value')).to eq(0)
   end
 
@@ -100,7 +100,7 @@ shared_examples 'lists' do
     subject.lrem('key1', 1, 'v1')
     subject.lrem('key1', 1, 'v2')
 
-    expect(subject.exists('key1')).to be_falsey
+    expect(subject.exists('key1')).to eq(0)
   end
 
   it 'should set the value of an element in a list by its index' do

data/spec/support/server.rb

@@ -40,12 +40,12 @@ shared_examples 'server' do
       subject.select(0)
       expect(subject.dbsize).to eq(2)
       expect(subject.exists('key1')).to be_truthy
-      expect(subject.exists('key3')).to be_falsey
+      expect(subject.exists('key3')).to eq(0)
 
       subject.select(1)
       expect(subject.dbsize).to eq(3)
       expect(subject.exists('key4')).to be_truthy
-      expect(subject.exists('key2')).to be_falsey
+      expect(subject.exists('key2')).to eq(0)
 
       subject.flushall
       expect(subject.dbsize).to eq(0)

data/spec/support/sets.rb

@@ -157,7 +157,7 @@ shared_examples 'sets' do
     subject.srem('key1', 'b')
     subject.srem('key1', 'a')
 
-    expect(subject.exists('key1')).to be_falsey
+    expect(subject.exists('key1')).to eq(0)
   end
 
   it 'should add multiple sets' do

data/spec/support/sorted_sets.rb

@@ -1,47 +1,4 @@
 shared_examples 'sorted sets' do
-  let(:infinity) { 1.0 / 0.0 }
-
-  it 'should add a member to a sorted set, or update its score if it already exists' do
-    expect(subject.zadd('key', 1, 'val')).to be_truthy
-    expect(subject.zscore('key', 'val')).to eq(1.0)
-
-    expect(subject.zadd('key', 2, 'val')).to be_falsey
-    expect(subject.zscore('key', 'val')).to eq(2.0)
-
-    expect(subject.zadd('key2', 'inf', 'val')).to be_truthy
-    expect(subject.zscore('key2', 'val')).to eq(infinity)
-
-    expect(subject.zadd('key3', '+inf', 'val')).to be_truthy
-    expect(subject.zscore('key3', 'val')).to eq(infinity)
-
-    expect(subject.zadd('key4', '-inf', 'val')).to be_truthy
-    expect(subject.zscore('key4', 'val')).to eq(-infinity)
-  end
-
-  it 'should return a nil score for value not in a sorted set or empty key' do
-    subject.zadd('key', 1, 'val')
-
-    expect(subject.zscore('key', 'val')).to eq(1.0)
-    expect(subject.zscore('key', 'val2')).to be_nil
-    expect(subject.zscore('key2', 'val')).to be_nil
-  end
-
-  it 'should add multiple members to a sorted set, or update its score if it already exists' do
-    expect(subject.zadd('key', [1, 'val', 2, 'val2'])).to eq(2)
-    expect(subject.zscore('key', 'val')).to eq(1)
-    expect(subject.zscore('key', 'val2')).to eq(2)
-
-    expect(subject.zadd('key', [[5, 'val'], [3, 'val3'], [4, 'val4']])).to eq(2)
-    expect(subject.zscore('key', 'val')).to eq(5)
-    expect(subject.zscore('key', 'val2')).to eq(2)
-    expect(subject.zscore('key', 'val3')).to eq(3)
-    expect(subject.zscore('key', 'val4')).to eq(4)
-
-    expect(subject.zadd('key', [[5, 'val5'], [3, 'val6']])).to eq(2)
-    expect(subject.zscore('key', 'val5')).to eq(5)
-    expect(subject.zscore('key', 'val6')).to eq(3)
-  end
-
   it 'should error with wrong number of arguments when adding members' do
     expect {
       subject.zadd('key')
@@ -64,14 +21,6 @@ shared_examples 'sorted sets' do
     }.to raise_error(Redis::CommandError)
   end
 
-  it 'should allow floats as scores when adding or updating' do
-    expect(subject.zadd('key', 4.321, 'val')).to be_truthy
-    expect(subject.zscore('key', 'val')).to eq(4.321)
-
-    expect(subject.zadd('key', 54.3210, 'val')).to be_falsey
-    expect(subject.zscore('key', 'val')).to eq(54.321)
-  end
-
   it 'should remove members from sorted sets' do
     expect(subject.zrem('key', 'val')).to be_falsey
     expect(subject.zadd('key', 1, 'val')).to be_truthy
@@ -92,7 +41,7 @@ shared_examples 'sorted sets' do
   it "should remove sorted set's key when it is empty" do
     subject.zadd('key', 1, 'val')
     subject.zrem('key', 'val')
-    expect(subject.exists('key')).to be_falsey
+    expect(subject.exists('key')).to eq(0)
   end
 
   it 'should get the number of members in a sorted set' do
@@ -111,26 +60,6 @@ shared_examples 'sorted sets' do
     expect(subject.zcount('key', 2, 3)).to eq(2)
   end
 
-  it 'should increment the score of a member in a sorted set' do
-    subject.zadd('key', 1, 'val1')
-    expect(subject.zincrby('key', 2, 'val1')).to eq(3)
-    expect(subject.zscore('key', 'val1')).to eq(3)
-  end
-
-  it 'initializes the sorted set if the key wasnt already set' do
-    expect(subject.zincrby('key', 1, 'val1')).to eq(1)
-  end
-
-  it 'should convert the key to a string for zscore' do
-    subject.zadd('key', 1, 1)
-    expect(subject.zscore('key', 1)).to eq(1)
-  end
-
-  it 'should handle infinity values when incrementing a sorted set key' do
-    expect(subject.zincrby('bar', '+inf', 's2')).to eq(infinity)
-    expect(subject.zincrby('bar', '-inf', 's1')).to eq(-infinity)
-  end
-
   it 'should return a range of members in a sorted set, by index' do
     subject.zadd('key', 1, 'one')
     subject.zadd('key', 2, 'two')
@@ -318,17 +247,6 @@ shared_examples 'sorted sets' do
       expect(subject.zcard('key')).to eq(1)
     end
 
-    it 'should remove items by score with infinity' do # Issue #50
-      subject.zadd('key', 10.0, 'one')
-      subject.zadd('key', 20.0, 'two')
-      subject.zadd('key', 30.0, 'three')
-      expect(subject.zremrangebyscore('key', '-inf', '+inf')).to eq(3)
-      expect(subject.zcard('key')).to eq(0)
-      expect(subject.zscore('key', 'one')).to be_nil
-      expect(subject.zscore('key', 'two')).to be_nil
-      expect(subject.zscore('key', 'three')).to be_nil
-    end
-
     it 'should return 0 if the key did not exist' do
       expect(subject.zremrangebyscore('key', 0, 2)).to eq(0)
     end
@@ -442,12 +360,6 @@ shared_examples 'sorted sets' do
     end
   end
 
-  it 'zrem should remove members add by zadd' do
-    subject.zadd('key1', 1, 3)
-    subject.zrem('key1', 3)
-    expect(subject.zscore('key1', 3)).to be_nil
-  end
-
   describe '#zscan' do
     before do
       50.times { |x| subject.zadd('key', x, "key #{x}") }

data/spec/support/upcase_method_names.rb

@@ -2,8 +2,4 @@ shared_examples 'upcase method names' do
   it '#ZCOUNT' do
     expect(subject.ZCOUNT('key', 2, 3)).to eq(subject.zcount('key', 2, 3))
   end
-
-  it '#ZSCORE' do
-    expect(subject.ZSCORE('key', 2)).to eq(subject.zscore('key', 2))
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rediska
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Leonid Beder
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-17 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -134,7 +134,7 @@ homepage: https://github.com/lbeder/rediska
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -149,9 +149,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: A light-weighted redis driver for testing, development, and minimal environments
 test_files: