rediska 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36df5f692f1e0f339067724d881d9dafbc1adf0b
-  data.tar.gz: a9b209cbf028770c18e97f439302c3d03ba0c84f
+  metadata.gz: 4d77d882d3c846316e1fe0cb5c1628184154c86a
+  data.tar.gz: e5931f8cdcf8e39edd688a9a663df1cc7199585e
 SHA512:
-  metadata.gz: 6ae5405c346c20201aaaec1f01f55ebf439c1ab81278ad014a0085448fa8264829b57d5c16374f3fe6ab0248d2a88e3ed3b3a59f6b1a1569226ad07f2e2651e6
-  data.tar.gz: 532bb3de0fd6f411dd297fc7c24f189ed4db27cc01670017257268f76612689a37c63c2c032774eb9f52fc529c5308253fa71b5caf4e92c99510da3612cf6b24
+  metadata.gz: fddb731338fb80d8b722cddbc820b8fbe324207335a688fd3e7160701a2868c6b648a0f2097cba4a0864131a14f11fff3389656f12890d4b939c8d409748b7f8
+  data.tar.gz: 9ce7639c68f40f0dc7a631c4380b598778b1c7afcc7e01c6aef6c943515ab45a34d20b373ba650dfcfdd39bd9054dbf6bbd72a1667246f0946554f579d87cca8

data/.travis.yml

@@ -1,3 +1,3 @@
 rvm:
-  - 1.9.3
   - 2.0.0
+  - 2.1.2

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    rediska (0.1.10)
+    rediska (0.1.11)
       redis (>= 3)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
     connection_pool (2.0.0)
     coveralls (0.7.1)
       multi_json (~> 1.3)
@@ -18,6 +18,7 @@ GEM
       thor
     diff-lcs (1.2.5)
     docile (1.1.5)
+    hitimes (1.2.2)
     json (1.8.1)
     mime-types (2.3)
     multi_json (1.10.1)
@@ -31,19 +32,19 @@ GEM
     rest-client (1.7.2)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.4)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.4)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.1)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.4)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.4)
-    sidekiq (3.2.2)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.0)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.0)
+    sidekiq (3.2.4)
       celluloid (>= 0.15.2)
       connection_pool (>= 2.0.0)
       json
@@ -57,8 +58,9 @@ GEM
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     thor (0.19.1)
-    timers (1.1.0)
-    tins (1.3.1)
+    timers (4.0.0)
+      hitimes
+    tins (1.3.2)
 
 PLATFORMS
   ruby

data/lib/rediska/driver.rb

@@ -142,11 +142,22 @@ module Rediska
     end
 
     def hdel(key, field)
-      field = field.to_s
       data_type_check(key, Hash)
-      deleted = data[key] && data[key].delete(field)
+      return 0 unless data[key]
+
+      if field.is_a?(Array)
+        old_keys_count = data[key].size
+        fields = field.map(&:to_s)
+
+        data[key].delete_if { |k, v| fields.include? k }
+        deleted = old_keys_count - data[key].size
+      else
+        field = field.to_s
+        deleted = data[key].delete(field) ? 1 : 0
+      end
+
       remove_key_for_empty_collection(key)
-      deleted ? 1 : 0
+      deleted
     end
 
     def hkeys(key)
@@ -432,10 +443,10 @@ module Rediska
 
     def setnx(key, value)
       if exists(key)
-        false
+        0
       else
         set(key, value)
-        true
+        1
       end
     end
 

data/lib/rediska/version.rb

@@ -1,3 +1,3 @@
 module Rediska
-  VERSION = '0.1.10'.freeze
+  VERSION = '0.1.11'.freeze
 end

data/spec/support/hashes.rb

@@ -8,6 +8,17 @@ shared_examples 'hashes' do
     expect(subject.hget('key1', 'k2')).to eq('val2')
   end
 
+  it 'should delete array of fields' do
+    subject.hset('key1', 'k1', 'val1')
+    subject.hset('key1', 'k2', 'val2')
+    subject.hset('key1', 'k3', 'val3')
+    expect(subject.hdel('key1', ['k1', 'k2'])).to eq(2)
+
+    expect(subject.hget('key1', 'k1')).to be_nil
+    expect(subject.hget('key1', 'k2')).to be_nil
+    expect(subject.hget('key1', 'k3')).to eq('val3')
+  end
+
   it 'should remove a hash with no keys left' do
     subject.hset('key1', 'k1', 'val1')
     subject.hset('key1', 'k2', 'val2')

data/spec/support/keys.rb

@@ -26,6 +26,15 @@ shared_examples 'keys' do
     }.to raise_error(Redis::CommandError)
   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 true when setting expires on keys that exist' do
     subject.set('key1', '1')
     expect(subject.expire('key1', 1)).to be_truthy

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rediska
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Leonid Beder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis