rediska 0.0.5 → 0.0.6

data/.travis.yml

@@ -1,4 +1,3 @@
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0

data/Gemfile

@@ -1,6 +1,5 @@
 source 'http://rubygems.org'
 
-gem 'rake'
 gem 'rdoc'
 
 # Specify your gem's dependencies in rediska.gemspec

data/Gemfile.lock

@@ -1,42 +1,25 @@
 PATH
   remote: .
   specs:
-    rediska (0.0.5)
+    rediska (0.0.6)
       redis (~> 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    coderay (1.0.9)
-    columnize (0.3.6)
     coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
       term-ansicolor
       thor
-    debugger (1.6.2)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.3)
-    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.3)
     diff-lcs (1.2.4)
     json (1.8.1)
-    method_source (0.8.2)
     mime-types (1.25)
     multi_json (1.8.2)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    pry-debugger (0.2.2)
-      debugger (~> 1.3)
-      pry (~> 0.9.10)
-    rake (10.1.0)
     rdoc (4.0.1)
       json (~> 1.4)
-    redis (3.0.5)
+    redis (3.0.6)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.14.1)
@@ -51,7 +34,6 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    slop (3.4.6)
     term-ansicolor (1.2.2)
       tins (~> 0.8)
     thor (0.18.1)
@@ -62,9 +44,6 @@ PLATFORMS
 
 DEPENDENCIES
   coveralls
-  pry
-  pry-debugger
-  rake
   rdoc
   rediska!
   rspec (~> 2.14)

data/lib/rediska/driver.rb

@@ -467,7 +467,7 @@ module Rediska
       if data.expires.include?(key) && (ttl = data.expires[key].to_i - Time.now.to_i) > 0
         ttl
       else
-        -1
+        exists(key) ? -1 : -2
       end
     end
 
@@ -610,7 +610,10 @@ module Rediska
     def mset(*pairs)
       # Handle pairs for mapped_mset command
       pairs = pairs[0] if mapped_param?(pairs)
-      raise_argument_error('mset') if pairs.empty? || pairs.size.odd?
+      raise_argument_error('mset') if pairs.empty? || pairs.size == 1
+      # We have to reply with a different error message here to be consistent with
+      # redis-rb 3.0.6 / redis-server 2.8.1.
+      raise_argument_error('mset', 'mset_odd') if pairs.size.odd?
 
       pairs.each_slice(2) do |pair|
         data[pair[0].to_s] = pair[1].to_s
@@ -655,16 +658,12 @@ module Rediska
 
     def type(key)
       case data[key]
-        when nil
-          'none'
-        when String
-          'string'
-        when Hash
-          'hash'
-        when Array
-          'list'
-        when ::Set
-          'set'
+        when nil then 'none'
+        when String then 'string'
+        when ZSet then 'zset'
+        when Hash then 'hash'
+        when Array then 'list'
+        when ::Set then 'set'
       end
     end
 
@@ -824,6 +823,7 @@ module Rediska
     end
 
     def zrevrangebyscore(key, max, min, *opts)
+      opts = opts.flatten
       data_type_check(key, ZSet)
       return [] unless data[key]
 
@@ -872,8 +872,14 @@ module Rediska
     end
 
     private
-    def raise_argument_error command
-      raise Redis::CommandError, "ERR wrong number of arguments for #{command.upcase}"
+    def raise_argument_error(command, match_string = command)
+      error_message = if %w(hmset mset_odd).include?(match_string.downcase)
+        "ERR wrong number of arguments for #{command.upcase}"
+      else
+        "ERR wrong number of arguments for '#{command}' command"
+      end
+
+      raise Redis::CommandError, error_message
     end
 
     def raise_syntax_error
@@ -886,7 +892,7 @@ module Rediska
 
     def data_type_check(key, klass)
       if data[key] && !data[key].is_a?(klass)
-        raise Redis::CommandError.new('ERR Operation against a key holding the wrong kind of value')
+        raise Redis::CommandError.new('WRONGTYPE Operation against a key holding the wrong kind of value')
       end
     end
 

data/lib/rediska/version.rb

@@ -1,3 +1,3 @@
 module Rediska
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/rediska.gemspec

@@ -21,6 +21,4 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency     'redis', '~> 3.0.0'
   s.add_development_dependency 'rspec', '~> 2.14'
   s.add_development_dependency 'coveralls'
-  s.add_development_dependency 'pry'
-  s.add_development_dependency 'pry-debugger'
 end

data/spec/spec_helper.rb

@@ -2,8 +2,6 @@ ENV['RACK_ENV'] = 'test'
 
 require 'rubygems'
 require 'coveralls'
-require 'pry'
-require 'pry-debugger'
 require 'rediska'
 
 Coveralls.wear!

data/spec/support/hashes.rb

@@ -116,7 +116,7 @@ shared_examples 'hashes' do
   it 'should reject the wrong number of arguments' do
     expect {
       subject.hmset('hash', 'foo1', 'bar1', 'foo2', 'bar2', 'foo3')
-    }.to raise_error(Redis::CommandError)
+    }.to raise_error(Redis::CommandError, 'ERR wrong number of arguments for HMSET')
   end
 
   it 'should set multiple hash fields to multiple values' do
@@ -169,7 +169,7 @@ shared_examples 'hashes' do
   it 'should reject a list of arrays that contain an invalid number of arguments' do
     expect {
       subject.hmset('key1', [:k1, 'val1'], [:k2, 'val2', 'bogus val'])
-    }.to raise_error(Redis::CommandError)
+    }.to raise_error(Redis::CommandError, 'ERR wrong number of arguments for HMSET')
   end
 
   it 'should convert a integer field name to string for hdel' do

data/spec/support/keys.rb

@@ -55,11 +55,11 @@ shared_examples 'keys' do
     subject.ttl('key1').should eq(-1)
   end
 
-  it 'should not have a ttl if expired' do
+  it 'should not have a ttl if expired (and thus key does not exist)' do
     subject.set('key1', '1')
     subject.expireat('key1', Time.now.to_i)
 
-    subject.ttl('key1').should eq(-1)
+    subject.ttl('key1').should eq(-2)
   end
 
   it 'should not find a key if expired' do
@@ -149,8 +149,29 @@ shared_examples 'keys' do
   it 'should determine the type stored at key' do
     subject.set('key1', '1')
 
-    subject.type('key1').should eq('string')
-    subject.type('key0').should eq('none')
+    # Non-existing key.
+    subject.type('key0').should be == 'none'
+
+    # String.
+    subject.set('key1', '1')
+    subject.type('key1').should be == 'string'
+
+
+    # List.
+    subject.lpush('key2', '1')
+    subject.type('key2').should be == 'list'
+
+    # Set.
+    subject.sadd('key3', '1')
+    subject.type('key3').should be == 'set'
+
+    # Sorted Set.
+    subject.zadd('key4', 1.0, '1')
+    subject.type('key4').should be == 'zset'
+
+    # Hash.
+    subject.hset('key5', 'a', '1')
+    subject.type('key5').should be == 'hash'
   end
 
   it 'should convert the value into a string before storing' do
@@ -187,21 +208,21 @@ shared_examples 'keys' do
 
     expect {
       subject.get('key1')
-    }.to raise_error(Redis::CommandError, 'ERR Operation against a key holding the wrong kind of value')
+    }.to raise_error(Redis::CommandError, 'WRONGTYPE Operation against a key holding the wrong kind of value')
 
     expect {
       subject.getset('key1', 1)
-    }.to raise_error(Redis::CommandError, 'ERR Operation against a key holding the wrong kind of value')
+    }.to raise_error(Redis::CommandError, 'WRONGTYPE Operation against a key holding the wrong kind of value')
 
     subject.hset('key2', 'one', 'two')
 
     expect {
       subject.get('key2')
-    }.to raise_error(Redis::CommandError, 'ERR Operation against a key holding the wrong kind of value')
+    }.to raise_error(Redis::CommandError, 'WRONGTYPE Operation against a key holding the wrong kind of value')
 
     expect {
       subject.getset('key2', 1)
-    }.to raise_error(Redis::CommandError, 'ERR Operation against a key holding the wrong kind of value')
+    }.to raise_error(Redis::CommandError, 'WRONGTYPE Operation against a key holding the wrong kind of value')
   end
 
   it 'should move a key from one database to another successfully' do

data/spec/support/sorted_sets.rb

@@ -191,10 +191,10 @@ shared_examples 'sorted sets' do
     subject.zrevrangebyscore('key', 100, 0).should eq(['three', 'two', 'one'])
     subject.zrevrangebyscore('key', 2, 1).should eq(['two', 'one'])
     subject.zrevrangebyscore('key', 1, 2).should be_empty
-    subject.zrevrangebyscore('key', 2, 1, with_scores: true).should eq([['two', 2], ['one', 1]])
+    subject.zrevrangebyscore('key', 2, 1, with_scores: true).should eq([['two', 2.0], ['one', 1.0]])
     subject.zrevrangebyscore('key', 100, 0, limit: [0, 1]).should eq(['three'])
     subject.zrevrangebyscore('key', 100, 0, limit: [0, -1]).should eq(['three', 'two', 'one'])
-    subject.zrevrangebyscore('key', 100, 0, limit: [1, -1], with_scores: true).should eq([['two', 2], ['one', 1]])
+    subject.zrevrangebyscore('key', 100, 0, limit: [1, -1], with_scores: true).should eq([['two', 2.0], ['one', 1.0]])
   end
 
   it 'should determine the index of a member in a sorted set' do

data/spec/support/strings.rb

@@ -159,15 +159,15 @@ shared_examples 'strings' do
   it 'should raise error if command arguments count is wrong' do
     expect {
       subject.mset
-    }.to raise_error(Redis::CommandError)
+    }.to raise_error(Redis::CommandError, "ERR wrong number of arguments for 'mset' command")
 
     expect {
       subject.mset(:key1)
-    }.to raise_error(Redis::CommandError)
+    }.to raise_error(Redis::CommandError, "ERR wrong number of arguments for 'mset' command")
 
     expect {
       subject.mset(:key1, 'value', :key2)
-    }.to raise_error(Redis::CommandError)
+    }.to raise_error(Redis::CommandError, 'ERR wrong number of arguments for MSET')
 
     subject.get('key1').should be_nil
     subject.get('key2').should be_nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rediska
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -59,38 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-debugger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: ! "A light-weighted redis driver for testing, development, and minimal
   environments,\n    which supports various data storage strategies."
 email: