rediska 0.5.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92a517169e6ce339fc0dd41bb2a3bc14ae34968e
-  data.tar.gz: 1cf4658e43eea53a54c3105a4b3cc829a2d22fdb
+  metadata.gz: 42912927e01fc9f997529b763f267bfd3b38b54f
+  data.tar.gz: a1a484bc665c5b6464bfbde5731f2c3d120d8528
 SHA512:
-  metadata.gz: e98bc067fa8f7e0b3a46a03833efeaec2a9c2f01705d30cec74dcf1c8ad738f179b3c9fc28efbdafabadea5b4f2f76b8089e0dd91abc7549664fd3f2d8a7f2ba
-  data.tar.gz: f2c501f284dabc099cbeb65f2805e1e2487fe163a25f2d67417e806e2809079ed028bb16660a457e5155aff5e2265c110d3b0a98eaebab4e2e19736f5cae4a8e
+  metadata.gz: f97da1ce65e96864840900755ffd52b3f3f129c1e99bb162bc6d769272168249f211ac4ae32a4e9656e554ec15e30c0a58a8a8c321792f70793d407acc8cab8a
+  data.tar.gz: a29ad9857dd640e4e17b32cc375f397a1abeafb83f460cadc2d94c3a1aeb10128ff9e65993f22155a43bc0e9340e763f755647cb3b45515ffeffc2e8c7d0b2fd

data/README.md

@@ -160,6 +160,7 @@ end
 * SPOP
 * SRANDMEMBER
 * SREM
+* SSCAN
 * STRLEN
 * SUNION
 * SUNIONSTORE

data/lib/rediska/command_executor.rb

@@ -1,13 +1,16 @@
 module Rediska
   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
@@ -16,6 +19,8 @@ module Rediska
         reply = 1
       elsif reply == false
         reply = 0
+      elsif reply.is_a?(Array)
+        reply = reply.map { |r| r == true ? 1 : r == false ? 0 : r }
       end
 
       replies << reply

data/lib/rediska/driver.rb

@@ -17,6 +17,16 @@ module Rediska
     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
 
@@ -535,6 +545,44 @@ module Rediska
       number.nil? ? srandmember_single(key) : srandmember_multiple(key, number)
     end
 
+    def sscan(key, start_cursor, *args)
+      data_type_check(key, ::Set)
+      return ['0', []] unless data[key]
+
+      match = '*'
+      count = 10
+
+      if args.size.odd?
+        raise_argument_error('sscan')
+      end
+
+      if idx = args.index('MATCH')
+        match = args[idx + 1]
+      end
+
+      if idx = args.index('COUNT')
+        count = args[idx + 1]
+      end
+
+      start_cursor = start_cursor.to_i
+
+      cursor = start_cursor
+      next_keys = []
+
+      if start_cursor + count >= data[key].length
+        next_keys = (data[key].to_a)[start_cursor..-1]
+        cursor = 0
+      else
+        cursor = start_cursor + count
+        next_keys = (data[key].to_a)[start_cursor..cursor-1]
+      end
+
+      filtered_next_keys = next_keys.select{ |k,v| File.fnmatch(match, k)}
+      result = filtered_next_keys.flatten.map(&:to_s)
+
+      return ["#{cursor}", result]
+    end
+
     def del(*keys)
       keys = keys.flatten(1)
       raise_argument_error('del') if keys.empty?
@@ -849,7 +897,7 @@ module Rediska
       end
 
       start_cursor = start_cursor.to_i
-      data_type_check(start_cursor, Fixnum)
+      data_type_check(start_cursor, Integer)
 
       cursor = start_cursor
       next_keys = []
@@ -1058,7 +1106,7 @@ module Rediska
       end
 
       start_cursor = start_cursor.to_i
-      data_type_check(start_cursor, Fixnum)
+      data_type_check(start_cursor, Integer)
 
       cursor = start_cursor
       next_keys = []

data/lib/rediska/transaction_commands.rb

@@ -1,5 +1,5 @@
 module Rediska
-  TRANSACTION_COMMANDS = [:discard, :exec, :multi, :watch, :unwatch]
+  TRANSACTION_COMMANDS = [:discard, :exec, :multi, :watch, :unwatch, :client]
 
   module TransactionCommands
     def self.included(klass)
@@ -46,7 +46,7 @@ module Rediska
         raise Redis::CommandError, 'ERR EXEC without MULTI'
       end
 
-      responses  = queued_commands.map do |cmd|
+      responses = queued_commands.map do |cmd|
         begin
           send(*cmd)
         rescue => e
@@ -54,8 +54,8 @@ module Rediska
         end
       end
 
-      self.queued_commands = [] # reset queued_commands
-      self.in_multi = false     # reset in_multi state
+      self.queued_commands = []
+      self.in_multi = false
 
       responses
     end

data/lib/rediska/version.rb

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

data/spec/support/connection.rb

@@ -51,7 +51,7 @@ shared_examples 'connection' do
 
   it 'should not error with a disconnected client' do
     subject1 = Redis.new
-    subject1.client.disconnect
+    subject1.disconnect
     expect(subject1.get('key1')).to be_nil
   end
 

data/spec/support/sets.rb

@@ -258,4 +258,42 @@ shared_examples 'sets' do
       end
     end
   end
+
+  describe 'sscan' do
+    it 'with no arguments and few items, returns all items' do
+      subject.sadd('set', ['name', 'Jack', 'age', '33'])
+      result = subject.sscan('set', 0)
+
+      expect(result[0]).to eq('0')
+      expect(result[1]).to eq(['name', 'Jack', 'age', '33'])
+    end
+
+    it 'with a count should return that number of members or more' do
+      subject.sadd('set', ['a', '1', 'b', '2', 'c', '3', 'd', '4', 'e', '5', 'f', '6', 'g', '7'])
+      result = subject.sscan('set', 0, count: 3)
+      expect(result[0]).to eq('3')
+      expect(result[1]).to eq([ 'a', '1', 'b'])
+    end
+
+    it 'returns items starting at the provided cursor' do
+      subject.sadd('set', ['a', '1', 'b', '2', 'c', '3', 'd', '4', 'e', '5', 'f', '6', 'g', '7'])
+      result = subject.sscan('set', 2, count: 3)
+      expect(result[0]).to eq('5')
+      expect(result[1]).to eq(['b', '2', 'c'])
+    end
+
+    it 'with match, returns items matching the given pattern' do
+      subject.sadd('set', ['aa', '1', 'b', '2', 'cc', '3', 'd', '4', 'ee', '5', 'f', '6', 'gg', '7'])
+      result = subject.sscan('set', 2, count: 7, match: '??')
+      expect(result[0]).to eq('9')
+      expect(result[1]).to eq(['cc','ee'])
+    end
+
+    it 'returns an empty result if the key is not found' do
+      result = subject.sscan('set', 0)
+
+      expect(result[0]).to eq('0')
+      expect(result[1]).to eq([])
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rediska
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Leonid Beder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2018-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A light-weighted redis driver for testing, development, and minimal environments
@@ -172,4 +172,3 @@ test_files:
 - spec/support/strings.rb
 - spec/support/transactions.rb
 - spec/support/upcase_method_names.rb
-has_rdoc: