redic 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22a26d943e92d11d2dbe989f1b7439453376b2e5
-  data.tar.gz: c9f7001a56b5a853282339e5dd3976dceb7bedd9
+  metadata.gz: 826a4619b6aec694f3b74b8221db03a6e4cf8f61
+  data.tar.gz: 7c3635c0daf967b9567c9c9f92b8ad5b7ec09284
 SHA512:
-  metadata.gz: 7d515e2ae172a21083ec61445828dac0c4edc5bea6599c8f525cfa9a6e97ff6c3e5e597b98232f7852c08cd79c5dc2b8e4318b8c96253617535bed108d045ce9
-  data.tar.gz: 95d6eed5fb6210f0147ae46fb4f4940c218dfef27242f12e1ea628d3a19298e023ac6b9db4110b7ca8e7ae40f9763d31fe5187ff52c846d86413968da59d0e47
+  metadata.gz: 53ee3848f37877d86f789e8883867b5f4d6daec0f6575df993e291b343829089471b986a529d09da358316c136b824209e47bebb23604d85da57ef26e99e53d4
+  data.tar.gz: df61e6d8c6551297490450d0001dc2b68691d0008321bfb296d34ed41048fce8f1f0e28163a13b619870c78d13651d8fe2971136e2ae850a5fe1ea85689bf0c2

data/.gems

@@ -0,0 +1,2 @@
+cutest -v 1.2.0
+hiredis -v 0.4.5

data/.gitignore

@@ -0,0 +1 @@
+/.gs

data/README.md

@@ -6,8 +6,8 @@ Lightweight Redis Client
 Description
 -----------
 
-Wrapper for `Redis::Client` that avoids rubyisms. It is inspired
-by [redigo](https://github.com/garyburd/redigo), a Redis client
+Lightweight Redis Client inspired by
+[redigo](https://github.com/garyburd/redigo), a Redis client
 library for golang.
 
 ## Usage
@@ -17,16 +17,16 @@ library for golang.
 redis = Redic.new
 
 # Processes the command and returns the response.
-c.call("SET", "foo", "bar")
+redis.call("SET", "foo", "bar")
 
-assert_equal "bar", c.call("GET", "foo")
+assert_equal "bar", redis.call("GET", "foo")
 
 # Pipelining is implemented by buffering commands,
 # then calling Redic#run
-c.write("SET", "foo", "bar")
-c.write("GET", "foo")
+redis.write("SET", "foo", "bar")
+redis.write("GET", "foo")
 
-assert_equal ["OK", "bar"], c.run
+assert_equal ["OK", "bar"], redis.run
 ```
 
 ## Installation

data/lib/redic.rb

@@ -1,13 +1,16 @@
-require "redis"
+require "redic/client"
 
 class Redic
-  def initialize(options = {})
-    @client = Redis::Client.new(options)
+  attr :url
+
+  def initialize(url = "redis://127.0.0.1:6379")
+    @url = url
+    @client = Redic::Client.new(url)
     @buffer = []
   end
 
   def call(*args)
-    @client.send(:ensure_connected) do
+    @client.connect do
       @client.write(args)
       @client.read
     end
@@ -18,7 +21,7 @@ class Redic
   end
 
   def run
-    @client.send(:ensure_connected) do
+    @client.connect do
       @buffer.each do |args|
         @client.write(args)
       end

data/lib/redic/client.rb

@@ -0,0 +1,71 @@
+require "redic/connection"
+require "uri"
+
+class Redic
+  class Client
+    def initialize(url)
+      @uri = URI.parse(url)
+      @connection = nil
+      @semaphore = Mutex.new
+    end
+
+    def read
+      @connection.read.tap do |reply|
+        raise reply if reply.kind_of?(RuntimeError)
+      end
+    end
+
+    def write(command)
+      @connection.write(command)
+    end
+
+    def connect
+      try(3) do
+        establish_connection unless connected?
+
+        @semaphore.synchronize do
+          yield
+        end
+      end
+    end
+
+  private
+    def try(times)
+      tries = 0
+
+      begin
+        yield
+      rescue Exception => err
+        if (tries += 1) <= times
+          sleep 0.01
+          retry
+        else
+          raise err, "%s (retries=%d)" % [err.message, tries]
+        end
+      end
+    end
+
+    def establish_connection
+      begin
+        @connection = Redic::Connection.new(@uri)
+      rescue Exception => err
+        raise err, "Can't connect to: %s" % @uri
+      end
+
+      authenticate
+    end
+
+    def authenticate
+      if @uri.password
+        @semaphore.synchronize do
+          write [:auth, @uri.password]
+          read
+        end
+      end
+    end
+
+    def connected?
+      @connection && @connection.connected?
+    end
+  end
+end

data/lib/redic/connection.rb

@@ -0,0 +1,19 @@
+require "hiredis/connection"
+
+class Redic
+  module Connection
+    TIMEOUT = 10_000_000
+
+    def self.new(uri)
+      connection = Hiredis::Connection.new
+
+      if uri.scheme == "unix"
+        connection.connect_unix(uri.path, TIMEOUT)
+      else
+        connection.connect(uri.host, uri.port, TIMEOUT)
+      end
+
+      connection
+    end
+  end
+end

data/makefile

@@ -0,0 +1,2 @@
+build:
+	RUBYLIB=./lib cutest test/*.rb

data/redic.gemspec

@@ -2,13 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name              = "redic"
-  s.version           = "0.0.2"
+  s.version           = "0.0.3"
   s.summary           = "Lightweight Redis Client"
-  s.description       = "Wrapper for Redis::Client that avoids rubyisms."
+  s.description       = "Lightweight Redis Client"
   s.authors           = ["Michel Martens", "Cyril David"]
-  s.email             = ["michel@soveran.com", "me@cyrildavid.com"]
+  s.email             = ["michel@soveran.com", "cyx@cyx.is"]
   s.homepage          = "https://github.com/amakawa/redic"
   s.files             = `git ls-files`.split("\n")
   s.license           = "MIT"
-  s.add_dependency "redis"
+
+  s.add_dependency "hiredis"
 end

data/test/redic_test.rb

@@ -4,23 +4,33 @@ setup do
   Redic.new
 end
 
+test "url" do |c|
+  assert_equal "redis://127.0.0.1:6379", c.url
+end
+
 test "normal commands" do |c|
-  c.call("SET", "foo", "bar") 
+  c.call("SET", "foo", "bar")
 
   assert_equal "bar", c.call("GET", "foo")
 end
 
 test "pipelining" do |c|
-  c.write("SET", "foo", "bar") 
+  c.write("SET", "foo", "bar")
   c.write("GET", "foo")
 
   assert_equal ["OK", "bar"], c.run
 end
 
 test "multi/exec" do |c|
-  c.write("MULTI") 
-  c.write("SET", "foo", "bar") 
+  c.write("MULTI")
+  c.write("SET", "foo", "bar")
   c.write("EXEC")
 
   assert_equal ["OK", "QUEUED", ["OK"]], c.run
 end
+
+test "runtime errors" do |c|
+  assert_raise RuntimeError do
+    c.call("KABLAMMO")
+  end
+end

data/test/unix_test.rb

@@ -0,0 +1,26 @@
+require File.expand_path("../lib/redic", File.dirname(__FILE__))
+
+setup do
+  Redic.new("unix:///tmp/redis.sock")
+end
+
+test "normal commands" do |c|
+  c.call("SET", "foo", "bar")
+
+  assert_equal "bar", c.call("GET", "foo")
+end
+
+test "pipelining" do |c|
+  c.write("SET", "foo", "bar")
+  c.write("GET", "foo")
+
+  assert_equal ["OK", "bar"], c.run
+end
+
+test "multi/exec" do |c|
+  c.write("MULTI")
+  c.write("SET", "foo", "bar")
+  c.write("EXEC")
+
+  assert_equal ["OK", "QUEUED", ["OK"]], c.run
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redic
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Michel Martens
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: hiredis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -25,19 +25,25 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Wrapper for Redis::Client that avoids rubyisms.
+description: Lightweight Redis Client
 email:
 - michel@soveran.com
-- me@cyrildavid.com
+- cyx@cyx.is
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gems
+- .gitignore
 - LICENSE
 - README.md
 - lib/redic.rb
+- lib/redic/client.rb
+- lib/redic/connection.rb
+- makefile
 - redic.gemspec
 - test/redic_test.rb
+- test/unix_test.rb
 homepage: https://github.com/amakawa/redic
 licenses:
 - MIT