rediska 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5efa2877ed6be2aaac8746a197e0c0af6a82684a
-  data.tar.gz: 30d0a4254f13357960664cf89e8737ec3ac05703
+  metadata.gz: ace76e76418b38e8b9b46fcdb5c4db0455e89c95
+  data.tar.gz: 902e598e4cd72baae2e0f376edb6c9215a3873c3
 SHA512:
-  metadata.gz: 7c053f2ec1b3b5dfaeaffe3e3319d4c7d3644f3300ca868066ae9bc38f45012299ae14cd5b7b3189f5f2730b8adea503c33dce565b7cb925ec9e07c3ea0b5a79
-  data.tar.gz: c0ce4d41e22a9215144ebaef7d714720b7567c7729b17c3d3b4305d9e0cbd6573db6f23aad7cf5a848d070e1009e648cd0204d88a6ab5daab39c1c012db1b6d9
+  metadata.gz: 19eb6136ff931a2cd42f2c71fd17ab6e83433822fcb7105c1993f30a1b39102e11fd04feded16da5a317abc294149f9c42c876461fe44b0f8bafda00856dd744
+  data.tar.gz: 4393f6c7a5f98b32c8bb0a6432ed3248c702344cac9221fcc4c44b138a1ff1f1d433045d0e7a7ee2a888a2a61dff215db94fc03296f822d9b8c294df93058f25

data/README.md

@@ -182,6 +182,7 @@ end
 * ZREVRANGE
 * ZREVRANGEBYSCORE
 * ZREVRANK
+* ZSCAN
 * ZSCORE
 
 ## Credits and Contributors

data/lib/rediska/driver.rb

@@ -915,14 +915,8 @@ module Rediska
       data_type_check(key, ZSet)
       return [] unless data[key]
 
-      # Sort by score, or if scores are equal, key alphanum
-      results = data[key].sort do |(k1, v1), (k2, v2)|
-        if v1 == v2
-          k1 <=> k2
-        else
-          v1 <=> v2
-        end
-      end
+      results = sort_keys(data[key])
+
       # Select just the keys unless we want scores
       results = results.map(&:first) unless with_scores
       results[start..stop].flatten.map(&:to_s)
@@ -1008,6 +1002,58 @@ module Rediska
       data[out].size
     end
 
+    def zscan(key, start_cursor, *args)
+      data_type_check(key, ZSet)
+      return [] unless data[key]
+
+      match = '*'
+      count = 10
+
+      if args.size.odd?
+        raise_argument_error('zscan')
+      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
+      data_type_check(start_cursor, Fixnum)
+
+      cursor = start_cursor
+      next_keys = []
+
+      sorted_keys = sort_keys(data[key])
+
+      if start_cursor + count >= sorted_keys.length
+        next_keys = sorted_keys.to_a.select { |k| File.fnmatch(match, k[0]) } [start_cursor..-1]
+        cursor = 0
+      else
+       cursor = start_cursor + count
+       next_keys = sorted_keys.to_a.select { |k| File.fnmatch(match, k[0]) } [start_cursor..cursor-1]
+      end
+
+      return "#{cursor}", next_keys.flatten.map(&:to_s)
+    end
+
+    # Originally from redis-rb
+    def zscan_each(key, *args, &block)
+      data_type_check(key, ZSet)
+      return [] unless data[key]
+
+      return to_enum(:zscan_each, key, options) unless block_given?
+      cursor = 0
+      loop do
+        cursor, values = zscan(key, cursor, options)
+        values.each(&block)
+        break if cursor == '0'
+      end
+    end
+
     private
     def raise_argument_error(command, match_string = command)
       error_message = if %w(hmset mset_odd).include?(match_string.downcase)
@@ -1064,5 +1110,16 @@ module Rediska
         (1..-number).map { data[key].to_a[rand(data[key].size)] }.flatten
       end
     end
+
+    def sort_keys(arr)
+      # Sort by score, or if scores are equal, key alphanum
+      arr.sort do |(k1, v1), (k2, v2)|
+        if v1 == v2
+          k1 <=> k2
+        else
+          v1 <=> v2
+        end
+      end
+    end
   end
 end

data/lib/rediska/version.rb

@@ -1,3 +1,3 @@
 module Rediska
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/spec/support/sorted_sets.rb

@@ -448,6 +448,46 @@ shared_examples 'sorted sets' do
     expect(subject.zscore('key1', 3)).to be_nil
   end
 
+  describe '#zscan' do
+    before do
+      50.times { |x| subject.zadd('key', x, "key #{x}") }
+    end
+
+    it 'with no arguments should return 10 numbers in ascending order' do
+      result = subject.zscan('key', 0)[1]
+      expect(result).to eq(result.sort { |x, y| x[1] <=> y[1] })
+      expect(result.count).to eq(10)
+    end
+
+    it 'with a count should return that number of members' do
+      expect(subject.zscan('key', 0, count: 2)).to eq(['2', [['key 0', 0.0], ['key 1', 1.0]]])
+    end
+
+    it 'with a count greater than the number of members, returns all the members in asc order' do
+      result = subject.zscan('key', 0, count: 1000)[1]
+      expect(result).to eq(result.sort { |x, y| x[1] <=> y[1] })
+      expect(result.size).to eq(50)
+    end
+
+    it 'with match, should return key-values where the key matches' do
+      subject.zadd('key', 1.0, 'blah')
+      subject.zadd('key', 2.0, 'bluh')
+      result = subject.zscan('key', 0, count: 100, match: 'key*')[1]
+      expect(result).to_not include(['blah', 1.0])
+      expect(result).to_not include(['bluh', 2.0])
+    end
+  end
+
+  describe '#zscan_each' do
+    before do
+      50.times { |x| subject.zadd('key', x, "key #{x}") }
+    end
+
+    it 'enumerates over the items in the sorted set' do
+      expect(subject.zscan_each('key').to_a).to eq(subject.zscan('key', 0, count: 50)[1])
+    end
+  end
+
   #it 'should remove all members in a sorted set within the given indexes'
   #it 'should return a range of members in a sorted set, by index, with scores ordered from high to low'
   #it 'should return a range of members in a sorted set, by score, with scores ordered from high to low'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rediska
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Leonid Beder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis