em-hiredis 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.2.1 (2013-04-22)
+
+[NEW] Support for connecting to redis on a unix socket.
+
+[CHANGED] Redis error reply message now used as message for RedisError.
+
 ## 0.2.0 (2013-04-05)
 
 [NEW] Richer interface for pubsub (accessible via `client.pubsub`). See example in `examples/pubsub.rb`.

data/lib/em-hiredis.rb

@@ -5,8 +5,8 @@ module EventMachine
     # All em-hiredis errors should descend from EM::Hiredis::Error
     class Error < RuntimeError; end
 
-    # In the case of error responses from Redis, the RuntimeError returned
-    # by ::Hiredis will be wrapped
+    # An error reply from Redis. The actual error retuned by ::Hiredis will be
+    # wrapped in the redis_error accessor.
     class RedisError < Error
       attr_accessor :redis_error
     end
@@ -23,6 +23,17 @@ module EventMachine
       client
     end
 
+    # Connects to redis and returns a client instance
+    #
+    # Will connect in preference order to the provided uri, the REDIS_URL
+    # environment variable, or localhost:6379
+    #
+    # TCP connections are supported via redis://:password@host:port/db (only
+    # host and port components are required)
+    #
+    # Unix socket uris are supported, e.g. unix:///tmp/redis.sock, however
+    # it's not possible to set the db or password - use initialize instead in
+    # this case
     def self.connect(uri = nil)
       client = setup(uri)
       client.connect

data/lib/em-hiredis/base_client.rb

@@ -16,7 +16,7 @@ module EventMachine::Hiredis
 
     attr_reader :host, :port, :password, :db
 
-    def initialize(host='localhost', port='6379', password=nil, db=nil)
+    def initialize(host = 'localhost', port = 6379, password = nil, db = nil)
       @host, @port, @password, @db = host, port, password, db
       @defs = []
       @command_queue = []
@@ -42,11 +42,17 @@ module EventMachine::Hiredis
     #
     def configure(uri_string)
       uri = URI(uri_string)
-      @host = uri.host
-      @port = uri.port
-      @password = uri.password
-      path = uri.path[1..-1]
-      @db = path.to_i # Empty path => 0
+
+      if uri.scheme == "unix"
+        @host = uri.path
+        @port = nil
+      else
+        @host = uri.host
+        @port = uri.port
+        @password = uri.password
+        path = uri.path[1..-1]
+        @db = path.to_i # Empty path => 0
+      end
     end
 
     def connect
@@ -110,7 +116,7 @@ module EventMachine::Hiredis
         if RuntimeError === reply
           raise "Replies out of sync: #{reply.inspect}" if @defs.empty?
           deferred = @defs.shift
-          error = RedisError.new("Error reply from redis (wrapped in redis_error)")
+          error = RedisError.new(reply.message)
           error.redis_error = reply
           deferred.fail(error) if deferred
         else

data/lib/em-hiredis/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   module Hiredis
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/spec/base_client_spec.rb

@@ -105,9 +105,11 @@ describe EM::Hiredis::BaseClient do
         df.errback { |e|
           e.class.should == EM::Hiredis::RedisError
           e.should be_kind_of(EM::Hiredis::Error)
-          e.message.should == 'Error reply from redis (wrapped in redis_error)'
+          msg = "ERR Operation against a key holding the wrong kind of value"
+          e.message.should == msg
           # This is the wrapped error from redis:
-          e.redis_error.message.should == 'ERR Operation against a key holding the wrong kind of value'
+          e.redis_error.class.should == RuntimeError
+          e.redis_error.message.should == msg
           done
         }
       }

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: em-hiredis
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
+  prerelease: 
 platform: ruby
 authors:
 - Martyn Loughran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-05 00:00:00.000000000 Z
+date: 2013-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hiredis
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: em-spec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,15 +62,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   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: Eventmachine redis client using hiredis native parser
@@ -105,26 +114,33 @@ files:
 - spec/url_param_spec.rb
 homepage: http://github.com/mloughran/em-hiredis
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3658727761083238148
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3658727761083238148
 requirements: []
 rubyforge_project: em-hiredis
-rubygems_version: 2.0.0
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Eventmachine redis client
 test_files:
 - spec/base_client_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: e19e2546bb52eb3e8f9f4a969d5666cd04eb0f39
-  data.tar.gz: 80435303e1cf652b489855c8e8f83228e614918e
-SHA512:
-  metadata.gz: aeea4ec51cc1a5ca3f0cf1ccecc5f00513d7840f1af34460ee5c19768e14d832d3460ada718927ac92c467d95a68f9e5f170bb318ea2b19510ef9b9c01de8158
-  data.tar.gz: 15d493eb81dfe7d044c8a55d25b3b269dd2af36d9d129fd5bfbd9d598f30d828a8ca7643a7a7f82a8f264b21d4ca8a2d5f5e43f25c48029792ff8024ba1a8062