hirlite 0.0.1.3 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08c6b72ffe8ba3eecbcf7b1ca1150c86e6a56592
-  data.tar.gz: 67d2dd1febbf2f5e729fa7d93c5477572681d273
+  metadata.gz: 6438f8e71c00a0088e572db6afc4c7e4d9f45fbe
+  data.tar.gz: e73519a70326bb1b5348e721f20f74e2c897c056
 SHA512:
-  metadata.gz: 85b6bc9d6db7f62a630df99b990e9e63af7272300ef758e63c3c0b4d21fec436862cf3b1530daf6199ea1699e8ef26f8a511869c50b2e45f0d31c4dd5c0f9372
-  data.tar.gz: 456d4361265c9189d639ea0a4e44a3c55ec3524c1e1bd73f1eadf3ee79ad5f5b7ef088161913e0e9ac577841b370b672b8fe1011d7bc5b82a5116f24870589a5
+  metadata.gz: 572064e64e3910a85a0f78076c95adb1fcad9d2fc4aed55039b203bd87eea9c8ab238fe82e3bd908de751df3627fa2b861bb7c87c4d19252aa85dd55c24edf8d
+  data.tar.gz: 3f8a2d8509c6fb564dcfd94b4e52a08e6926eb8a64703e943b7d4060e100b50decaad5fccdb818acc6cd580f561462de08704506b1293ab8bb9aab8f9fc4e699

data/ext/hirlite_ext/rlite.c

@@ -243,9 +243,6 @@ static VALUE createDecodedString(char *str, size_t len) {
 
 static VALUE reply_to_value(rliteReply *reply) {
     if (reply->type == RLITE_REPLY_STATUS || reply->type == RLITE_REPLY_STRING) {
-        if (reply->type == RLITE_REPLY_STATUS && reply->len == 2 && memcmp(reply->str, "OK", 2) == 0) {
-            return Qtrue;
-        }
         return createDecodedString(reply->str, reply->len);
     }
     if (reply->type == RLITE_REPLY_NIL) {

data/lib/hirlite/connection.rb

@@ -0,0 +1,64 @@
+require "redis/connection/registry"
+require "redis/errors"
+require "hirlite"
+require "timeout"
+
+class Rlite
+  module Connection
+    class Hirlite
+
+      def self.connect(config)
+        connection = ::Hirlite::Rlite.new
+        connect_timeout = (config.fetch(:connect_timeout, 0) * 1_000_000).to_i
+
+        if config[:scheme] == "unix"
+          connection.connect_unix(config[:path], connect_timeout)
+        else
+          connection.connect(config[:host], config[:port], connect_timeout)
+        end
+
+        instance = new(connection)
+        instance.timeout = config[:timeout]
+        instance
+      rescue Errno::ETIMEDOUT
+        raise TimeoutError
+      end
+
+      def initialize(connection)
+        @connection = connection
+      end
+
+      def connected?
+        @connection && @connection.connected?
+      end
+
+      def timeout=(timeout)
+        # Hirlite works with microsecond timeouts
+        @connection.timeout = Integer(timeout * 1_000_000)
+      end
+
+      def disconnect
+        @connection.disconnect
+        @connection = nil
+      end
+
+      def write(command)
+        @connection.write(command.flatten(1))
+      rescue Errno::EAGAIN
+        raise TimeoutError
+      end
+
+      def read
+        reply = @connection.read
+        reply = CommandError.new(reply.message) if reply.is_a?(RuntimeError)
+        reply
+      rescue Errno::EAGAIN
+        raise TimeoutError
+      rescue RuntimeError => err
+        raise ProtocolError.new(err.message)
+      end
+    end
+  end
+end
+
+Redis::Connection.drivers << Rlite::Connection::Hirlite

data/lib/hirlite/rlite.rb

@@ -8,11 +8,14 @@ module Hirlite
 
     def write(command)
       super
-      @responses.push self.class.superclass.instance_method(:read).bind(self).call
+      @responses.push read_ext
     end
 
-    def read
+    def read_ruby
       @responses.shift
     end
+
+    alias_method :read_ext, :read
+    alias_method :read, :read_ruby
   end
 end

data/lib/hirlite/version.rb

@@ -1,3 +1,3 @@
 module Hirlite
-  VERSION = "0.0.1.3"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hirlite
 version: !ruby/object:Gem::Version
-  version: 0.0.1.3
+  version: 0.0.2
 platform: ruby
 authors:
 - Sebastian Waisbrot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-01 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -67,6 +67,7 @@ files:
 - ext/hirlite_ext/hirlite_ext.h
 - ext/hirlite_ext/rlite.c
 - lib/hirlite.rb
+- lib/hirlite/connection.rb
 - lib/hirlite/rlite.rb
 - lib/hirlite/version.rb
 - vendor/rlite/Makefile