rediska 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ace76e76418b38e8b9b46fcdb5c4db0455e89c95
-  data.tar.gz: 902e598e4cd72baae2e0f376edb6c9215a3873c3
+  metadata.gz: 92a517169e6ce339fc0dd41bb2a3bc14ae34968e
+  data.tar.gz: 1cf4658e43eea53a54c3105a4b3cc829a2d22fdb
 SHA512:
-  metadata.gz: 19eb6136ff931a2cd42f2c71fd17ab6e83433822fcb7105c1993f30a1b39102e11fd04feded16da5a317abc294149f9c42c876461fe44b0f8bafda00856dd744
-  data.tar.gz: 4393f6c7a5f98b32c8bb0a6432ed3248c702344cac9221fcc4c44b138a1ff1f1d433045d0e7a7ee2a888a2a61dff215db94fc03296f822d9b8c294df93058f25
+  metadata.gz: e98bc067fa8f7e0b3a46a03833efeaec2a9c2f01705d30cec74dcf1c8ad738f179b3c9fc28efbdafabadea5b4f2f76b8089e0dd91abc7549664fd3f2d8a7f2ba
+  data.tar.gz: f2c501f284dabc099cbeb65f2805e1e2487fe163a25f2d67417e806e2809079ed028bb16660a457e5155aff5e2265c110d3b0a98eaebab4e2e19736f5cae4a8e

data/.travis.yml

@@ -10,6 +10,8 @@ rvm:
   - rbx-2
 gemfile:
   - Gemfile
+services:
+  - redis-server
 matrix:
   allow_failures:
     - rvm: rbx-2

data/lib/rediska/driver.rb

@@ -198,6 +198,42 @@ module Rediska
       data[key].keys
     end
 
+    def hscan(key, start_cursor, *args)
+      data_type_check(key, Hash)
+      return ['0', []] unless data[key]
+
+      match = '*'
+      count = 10
+
+      raise_argument_error('hscan') if args.size.odd?
+
+      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 keys(pattern = '*')
       data.keys.select { |key| File.fnmatch(pattern, key) }
     end
@@ -281,7 +317,7 @@ module Rediska
 
     def lrem(key, count, value)
       data_type_check(key, Array)
-      return unless data[key]
+      return 0 unless data[key]
       old_size = data[key].size
       diff =
         if count == 0

data/lib/rediska/version.rb

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

data/spec/redis_spec.rb

@@ -46,7 +46,7 @@ describe 'Rediska' do
     end
   end
 
-  pending 'real redis (interoperability)' do
+  context 'real redis (interoperability)' do
     before(:all) do
       Redis::Connection.drivers.pop
     end

data/spec/support/hashes.rb

@@ -210,4 +210,53 @@ shared_examples 'hashes' do
     subject.hset('key1', 1, 0)
     expect(subject.hincrby('key1', 1, 1)).to eq(1)
   end
+
+  describe "#hscan" do
+    it 'with no arguments and few items, returns all items' do
+      subject.hmset('hash', 'name', 'Jack', 'age', '33')
+      result = subject.hscan('hash', 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.hmset('hash','a', '1', 'b', '2', 'c', '3', 'd', '4', 'e', '5', 'f', '6', 'g', '7')
+      result = subject.hscan('hash', 0, count: 3)
+      expect(result[0]).to eq('3')
+      expect(result[1]).to eq([
+        ['a', '1'],
+        ['b', '2'],
+        ['c', '3'],
+      ])
+    end
+
+    it 'returns items starting at the provided cursor' do
+      subject.hmset('hash', 'a', '1', 'b', '2', 'c', '3', 'd', '4', 'e', '5', 'f', '6', 'g', '7')
+      result = subject.hscan('hash', 2, count: 3)
+      expect(result[0]).to eq('5')
+      expect(result[1]).to eq([
+        ['c', '3'],
+        ['d', '4'],
+        ['e', '5']
+      ])
+    end
+
+    it 'with match, returns items matching the given pattern' do
+      subject.hmset('hash', 'aa', '1', 'b', '2', 'cc', '3', 'd', '4', 'ee', '5', 'f', '6', 'gg', '7')
+      result = subject.hscan('hash', 2, count: 3, match: '??')
+      expect(result[0]).to eq('5')
+      expect(result[1]).to eq([
+        ['cc', '3'],
+        ['ee', '5']
+      ])
+    end
+
+    it 'returns an empty result if the key is not found' do
+      result = subject.hscan('hash', 0)
+
+      expect(result[0]).to eq('0')
+      expect(result[1]).to eq([])
+    end
+  end
 end

data/spec/support/lists.rb

@@ -89,6 +89,11 @@ shared_examples 'lists' do
     expect(subject.llen('key1')).to eq(2)
   end
 
+  it 'should return 0 if key does not map to a list' do
+    expect(subject.exists('nonexistant')).to eq(false)
+    expect(subject.lrem('nonexistant', 0, 'value')).to eq(0)
+  end
+
   it "should remove list's key when list is empty" do
     subject.rpush('key1', 'v1')
     subject.rpush('key1', 'v2')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rediska
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Leonid Beder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2015-10-07 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.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A light-weighted redis driver for testing, development, and minimal environments