redic 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dc763e03ae47f86f5bfeef03c3e6b041a3cefd4
-  data.tar.gz: 5e0caf8544cd4501df91a4125375bd8ebebf08f3
+  metadata.gz: a910a65a110dbb59ba57ac6f9bc012b12b59a1ff
+  data.tar.gz: 0b0af9cbf96cb99db9d854b1cc491df57afacffe
 SHA512:
-  metadata.gz: adc94f3aaf1b6ea29e735d26ece898d910419f87eb3edcb7998584aedb7a213342254e2e1be0b6dcac12fc6068c8507c84ed1c895c0d89c4f884998194edf143
-  data.tar.gz: 7a602b0fc1b8dc193b33f3f0d501f9e6eb7f0b550159ea77ec85d690b9599ce0dec279ca553f6d0779e3dc2d7ac461f6cd789c7475f79f434dcc55d19c880712
+  metadata.gz: 44bf2375dedfd7694997dafcf6b6c2202fded203ff330100af7141cf8581680be1381060b9c7e22af90047c9036ebae4a4f1a24cca63fa05728dbefc495d8360
+  data.tar.gz: 83967139fd09cbce0f1c706b3b4535e376cf880489c362f3252c3e1970303e4413b1a156ca2318b20bc33ab94b578f7a6846116402a9489e0c8db6c7ac3a96af

data/.gems

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

data/lib/redic.rb

@@ -55,4 +55,8 @@ class Redic
   def timeout
     @client.timeout
   end
+
+  def quit
+    @client.quit
+  end
 end

data/lib/redic/client.rb

@@ -7,13 +7,16 @@ class Redic
 
     def initialize(url, timeout)
       @semaphore = Mutex.new
+      @connection = false
+
       configure(url, timeout)
     end
 
     def configure(url, timeout)
+      disconnect!
+
       @uri = URI.parse(url)
       @timeout = timeout
-      @connection = nil
     end
 
     def read
@@ -31,10 +34,32 @@ class Redic
         yield
       end
     rescue Errno::ECONNRESET
-      @connection = nil
+      @connection = false
       retry
     end
 
+    def connected?
+      @connection && @connection.connected?
+    end
+
+    def disconnect!
+      if connected?
+        @connection.disconnect
+        @connection = false
+      end
+    end
+
+    def quit
+      if connected?
+        assert_ok(call("QUIT"))
+        disconnect!
+
+        true
+      else
+        false
+      end
+    end
+
   private
     def establish_connection
       begin
@@ -56,10 +81,6 @@ class Redic
       end
     end
 
-    def connected?
-      @connection && @connection.connected?
-    end
-
     def assert(value, error)
       raise error unless value
     end

data/redic.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name              = "redic"
-  s.version           = "1.3.0"
+  s.version           = "1.4.0"
   s.summary           = "Lightweight Redis Client"
   s.description       = "Lightweight Redis Client"
   s.authors           = ["Michel Martens", "Cyril David"]

data/tests/redic_test.rb

@@ -4,7 +4,14 @@ require_relative "../lib/redic"
 REDIS_URL = "redis://localhost:6379/"
 
 prepare do
-  Redic.new(REDIS_URL).call("FLUSHDB")
+  c = Redic.new(REDIS_URL)
+  begin
+    c.call("FLUSHDB")
+  rescue
+    c.call("AUTH", "foo")
+    c.call("FLUSHDB")
+    c.call("CONFIG", "SET", "requirepass", "")
+  end
 end
 
 setup do
@@ -39,20 +46,25 @@ test "error when selecting db from url" do
   end
 end
 
-test "error when authenticating from url" do
+test "error when authenticating from url" do |c1|
 
-  # The correct password for 6381 is "foo"
-  c2 = Redic.new("redis://:foo@localhost:6381/")
-  c2.call("PING")
+  # Configure password as "foo"
+  c1.call("CONFIG", "SET", "requirepass", "foo")
 
   # The password provided is wrong
-  c3 = Redic.new("redis://:bar@localhost:6381/")
+  c2 = Redic.new("redis://:bar@localhost:6379/")
 
   assert_raise(RuntimeError) do
 
     # Connection is lazy, send a command
-    c3.call("PING")
+    c2.call("PING")
   end
+
+  c3 = Redic.new("redis://:foo@localhost:6379/")
+  assert_equal "PONG", c3.call("PING")
+
+  # Remove password
+  c3.call("CONFIG", "SET", "requirepass", "")
 end
 
 test "Can connect to sentinel" do
@@ -175,9 +187,23 @@ test "pub/sub" do |c1|
 end
 
 test "reconnect" do |c1|
-  assert_equal "6379", c1.call("INFO", "server").slice(/tcp_port:(\d+)/, 1)
+  c1.call("CONFIG", "SET", "requirepass", "foo")
+
+  c1.configure("redis://:foo@localhost:6379/")
+
+  assert_equal "PONG", c1.call("PING")
+end
+
+test "disconnect" do |c1|
+
+  # Connection is lazy
+  assert_equal false, c1.client.connected?
+  assert_equal false, c1.quit
+
+  c1.call("PING")
 
-  c1.configure("redis://:foo@localhost:6381/")
+  assert_equal true, c1.client.connected?
+  assert_equal true, c1.quit
 
-  assert_equal "6381", c1.call("INFO", "server").slice(/tcp_port:(\d+)/, 1)
+  assert_equal false, c1.client.connected?
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redic
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Michel Martens
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hiredis