redis_ha 0.1.1 → 0.1.2

data/lib/redis_ha/connection.rb

@@ -4,14 +4,21 @@ class RedisHA::Connection < Socket
   def initialize(redis, pool)
     @write_buffer = ""
     @read_buffer = ""
+    @response_offset = 0
 
     super(AF_INET, SOCK_STREAM, 0)
 
+    @redis = redis
     @pool = pool
     setup(redis)
   end
 
   def yield_connect
+    if @redis[:db] && !@db_selected
+      @db_selected = true
+      self <<  RedisHA::Protocol.request("select", @redis[:db])
+    end
+
     connect_nonblock(@__addr)
   rescue Errno::EINPROGRESS, Errno::ECONNABORTED, Errno::EINVAL
     nil
@@ -41,13 +48,19 @@ class RedisHA::Connection < Socket
   end
 
   def <<(buf)
+    @response_offset += 1
     @write_buffer << buf
   end
 
   def rewind
     @read_buffer = ""
-    @write_buffer = ""
     @ready = false
+    @response_offset = 0
+  end
+
+  def next
+    @response_offset -= 1
+    RedisHA::Protocol.parse(@read_buffer)
   end
 
   def wait_read?
@@ -65,7 +78,11 @@ class RedisHA::Connection < Socket
   end
 
   def ready?
-    @ready == true
+    if @ready && @response_offset > 0
+      self.next; @ready = false; check
+    end
+
+    !!@ready
   end
 
   def setup(redis)

data/lib/redis_ha/connection_pool.rb

@@ -41,7 +41,7 @@ private
     await
 
     @connections.map do |conn|
-      res = RedisHA::Protocol.parse(conn.read_buffer)
+      res = conn.next
 
       if res.is_a?(Exception)
         @connections.each(&:rewind)

data/lib/redis_ha/protocol.rb

@@ -2,7 +2,7 @@ class RedisHA::Protocol
 
   def self.request(*args)
     args.inject("*#{args.size}\r\n") do |s, arg|
-      s << "$#{arg.size}\r\n#{arg}\r\n"
+      s << "$#{arg.to_s.length}\r\n#{arg}\r\n"
     end
   end
 
@@ -38,9 +38,16 @@ class RedisHA::Protocol
 
   def self.parse(buf)
     case buf[0]
-      when "-" then RuntimeError.new(buf[1..-3])
-      when "+" then buf[1..-3]
-      when ":" then buf[1..-3].to_i
+      when "-", "+", ":" then
+        len = buf.index("\r\n")
+        ret = buf[0..len-1]
+        buf.replace(buf[len+2..-1])
+
+        case ret[0]
+          when "+" then ret[1..-1]
+          when ":" then ret[1..-1].to_i
+          when "-" then RuntimeError.new(ret[1..-1])
+        end
 
       when "$"
         if buf[1..2] == "-1"

data/lib/test.rb

@@ -17,16 +17,19 @@ pool = RedisHA::ConnectionPool.new
 pool.retry_timeout = 0.5
 pool.read_timeout = 10.1
 pool.connect(
-  {:host => "localhost", :port => 6379})
+  {:host => "localhost", :port => 6379, :db => 2})
 
-map = RedisHA::HashMap.new(pool, "fnordmap")
-set = RedisHA::Set.new(pool, "fnordset")
-ctr = RedisHA::Counter.new(pool, "fnordctr")
+#map = RedisHA::HashMap.new(pool, "fnordmap")
+#set = RedisHA::Set.new(pool, "fnordset")
+#ctr = RedisHA::Counter.new(pool, "fnordctr")
 
 #set.add(:fnord, :bar, :fubar, :blubb)
 #puts pool.smembers("fnordset").inspect
 #puts set.get.inspect
 
+puts pool.get("dawanda:session:fnord").inspect
+exit
+
 Ripl.start :binding => binding
 exit
 

data/redis_ha.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "redis_ha"
-  s.version     = "0.1.1"
+  s.version     = "0.1.2"
   s.date        = Date.today.to_s
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Paul Asmuth"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_ha
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors: