redic-pool 0.1.0 → 1.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGMwN2MxMjRiMzExYWE3YzIwNmIzOGQ5MGM0ZTVkMjEwYTkzYWQ4NA==
+    MWY0MzFlY2M4MWFjZTBkNmMwYzVlMjY5ZjI1NTUzZmE0OWQzMzg2Nw==
   data.tar.gz: !binary |-
-    MjUwMDgzYmY0YjA1MzI2Y2M3MzU2OTE4NmVmNmVlODExMDIyMmNiNg==
+    Y2Y1ZmM0NTQ0N2VlNjBlNDU3MmM2OWY0ZmVkYWNlZmI5OGEwN2M4NA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjA5NjdjYjg0YjY0Y2U4YmQ5MTNkMTYzNWM4YTc3ZTc0Nzc3M2IzZTI0Y2Qx
-    MzFlOGE1MjkzMzc4NjlkODlkZGY5ZGFjMmRiOTBjZWU2NDc4YjczNzAzMDgz
-    YWRjNzljMjhlOGI2NjkxMTFjOTc0NDU3YTQ1NDlhMTlkY2EyN2M=
+    ZWUzZmEyNGNmYjIzNGYyNzA3M2VlM2ZlZWY4NWZhMGE2ZjM2ZjZiYWMwNDFh
+    MzZlMzMxMzZkYmUyZjA1ZTVkNzg5ZmNjOWNiYWJhMjQwNjE2ZWM3ZjdkM2Ew
+    NmM4ZDQzNDMzZWQ0Y2ZmODA5YTk0YzY1YTE0OWVjYWUyNDcwOTk=
   data.tar.gz: !binary |-
-    ZTkyYWY5NzhlZjU3ODgzODliY2IzNDVjZTRjODJkMTkyMTdjN2IxYmE2ZTIz
-    M2U1NzcwNzkwZDFmOGIwZmRjMzgyYjY5OTcwZmJmM2ViOGVmMjkxZGUwMGEy
-    MzJhODg0MjRmNTE0NTE5MDAyOWMzZWI0Y2M2NWIyMWY1MDVjOTY=
+    NjgxM2JjZGZlYjhlOGQzOGZhYTc1NTc0MWQzOTViNDg4OTFkOGM5YzRlZGYy
+    OGNmMmVlY2Q2NTExZWYxOTA0MmQxOTUwM2FiM2JjNzc1NDg4YWJhNjkwZmJk
+    NTAxYzM3OWU1ZGY4MWVjNmRlNzkyZDI3NWVkMDg4NmY2YjcxOWU=

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+1.0.0 - 2013-12-27
+==================
+
+* Changed API to make a `Redic::Pool` object interchangeable with `Redic`. This
+  makes `Redic::Pool` compatible with Ohm out of the box, so you can do:
+
+        Ohm.redis = Redic::Pool.new(ENV["REDIS_URL"], size: 10)
+
 0.1.0 - 2013-12-18
 ==================
 

data/README.md

@@ -1,7 +1,7 @@
 Redic::Pool
 ===========
 
-A Redis connection pool using [Redis](https://github.com/amakawa/redic).
+A Redis connection pool using [Redic](https://github.com/amakawa/redic).
 
 Usage
 -----

data/lib/redic/pool.rb

@@ -2,12 +2,16 @@ require "connection_pool"
 require "redic"
 
 class Redic::Pool
-  VERSION = "0.1.0"
+  VERSION = "1.0.0"
 
+  attr :url
   attr :pool
 
   def initialize(url, options = {})
+    @url = url
     @pool = ConnectionPool.new(size: options.fetch(:size, 10)) { Redic.new(url) }
+
+    @id = "redic-pool-#{object_id}"
   end
 
   def call(*args)
@@ -16,7 +20,18 @@ class Redic::Pool
     end
   end
 
-  def with(&block)
-    @pool.with(&block)
+  def queue(*args)
+    Thread.current[@id] || (Thread.current[@id] = [])
+    Thread.current[@id] << args
+  end
+
+  def commit
+    @pool.with do |client|
+      Thread.current[@id].each do |args|
+        client.queue(*args)
+      end
+
+      client.commit
+    end
   end
 end

data/test/ohm_test.rb

@@ -0,0 +1,45 @@
+require_relative "prelude"
+
+require "ohm"
+
+class Post < Ohm::Model
+  attribute :title
+end
+
+setup do
+  Ohm.redis = Redic::Pool.new("redis://localhost:9999")
+end
+
+test "Pool - basic" do
+  threads = Array.new(10) do |i|
+    Thread.new(i) do |i|
+      10.times do |j|
+        Post.create(title: "Foo #{i} #{j}").id
+      end
+    end
+  end
+
+  threads.each(&:join)
+
+  clients = Parsers.info(Ohm.redis.call("INFO", "clients")).fetch("connected_clients")
+
+  assert_equal(clients, "10")
+
+  teardown(Ohm.redis)
+
+  Ohm.redis = Redic::Pool.new("redis://localhost:9999")
+
+  threads = Array.new(10) do |i|
+    Thread.new(i) do |i|
+      10.times do |j|
+        Post.all.to_a
+      end
+    end
+  end
+
+  threads.each(&:join)
+
+  clients = Parsers.info(Ohm.redis.call("INFO", "clients")).fetch("connected_clients")
+
+  assert_equal(clients, "10")
+end

data/test/pool_test.rb

@@ -1,30 +1,4 @@
-require "cutest"
-
-$VERBOSE = 1
-
-module Parsers
-  def self.info(reply)
-    Hash[reply.lines.grep(/^[^#]/).map { |line| line.chomp.split(":", 2) }]
-  end
-end
-
-require_relative "../lib/redic/pool"
-
-at_exit do
-  if $redis
-    Process.kill(:TERM, $redis)
-  end
-
-  Process.waitpid
-end
-
-$redis = spawn("redis-server --dir /tmp --dbfilename '' --port 9999 --logfile /dev/null")
-
-sleep(0.5)
-
-def teardown(r)
-  r.pool.shutdown { |c| c.call("QUIT") }
-end
+require_relative "prelude"
 
 setup do
   Redic::Pool.new("redis://localhost:9999", size: 10)
@@ -51,15 +25,13 @@ end
 test "MULTI return value with WATCH" do |r|
   r.call("DEL", "foo")
 
-  r.with do |c|
-    c.call("WATCH", "foo", "bar")
+  r.call("WATCH", "foo", "bar")
 
-    c.queue("MULTI")
-    c.queue("SET", "foo", "bar")
-    c.queue("EXEC")
+  r.queue("MULTI")
+  r.queue("SET", "foo", "bar")
+  r.queue("EXEC")
 
-    assert_equal(c.commit.last, ["OK"])
-  end
+  assert_equal(r.commit.last, ["OK"])
 
   assert_equal(r.call("GET", "foo"), "bar")
 
@@ -69,47 +41,20 @@ end
 test "Pipelining" do |r|
   r.call("DEL", "foo")
 
-  catch(:out) do
-    r.with do |c|
-      c.queue("SET", "foo", "bar")
-      throw(:out)
-    end
-  end
+  r.queue("SET", "foo", "bar")
 
   assert_equal nil, r.call("GET", "foo")
 
   teardown(r)
 end
 
-test "Pipelining with nesting" do |r|
-  r.call("DEL", "foo")
-
-  r.with do |c1|
-    c1.queue("DEL", "foo")
-
-    r.with do |c2|
-      c2.queue("SET", "foo", "bar")
-    end
-
-    c1.commit
-  end
-
-  assert_equal "bar", r.call("GET", "foo")
-
-  teardown(r)
-end
-
 test "Pipelining contention" do |r|
   threads = Array.new(100) do
     Thread.new do
       10.times do
-        r.with do |c|
-          c.call("SET", "foo", "bar")
+        r.call("SET", "foo", "bar")
 
-          r.with do |c|
-            c.call("DEL", "foo")
-          end
-        end
+        r.call("DEL", "foo")
       end
     end
   end
@@ -117,11 +62,9 @@ test "Pipelining contention" do |r|
   threads += Array.new(100) do
     Thread.new do
       10.times do
-        r.with do |c|
-          c.queue("SET", "foo", "bar")
-          c.queue("DEL", "foo")
-          c.commit
-        end
+        r.queue("SET", "foo", "bar")
+        r.queue("DEL", "foo")
+        r.commit
       end
     end
   end
@@ -135,3 +78,7 @@ test "Pipelining contention" do |r|
 
   teardown(r)
 end
+
+test "URL" do |r|
+  assert_equal("redis://localhost:9999", r.url)
+end

data/test/prelude.rb

@@ -0,0 +1,27 @@
+require "cutest"
+
+$VERBOSE = 1
+
+module Parsers
+  def self.info(reply)
+    Hash[reply.lines.grep(/^[^#]/).map { |line| line.chomp.split(":", 2) }]
+  end
+end
+
+require_relative "../lib/redic/pool"
+
+at_exit do
+  if $redis
+    Process.kill(:TERM, $redis)
+  end
+
+  Process.waitpid
+end
+
+$redis = spawn("redis-server --dir /tmp --dbfilename '' --port 9999 --logfile /dev/null")
+
+sleep(0.5)
+
+def teardown(r)
+  r.pool.shutdown { |c| c.call("QUIT") }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redic-pool
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Damian Janowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2013-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -66,7 +66,9 @@ files:
 - lib/redic/pool.rb
 - rakefile
 - redic-pool.gemspec
+- test/ohm_test.rb
 - test/pool_test.rb
+- test/prelude.rb
 homepage: https://github.com/djanowski/redic-pool
 licenses:
 - Unlicense
@@ -92,4 +94,6 @@ signing_key:
 specification_version: 4
 summary: A Redis connection pool using Redic.
 test_files:
+- test/ohm_test.rb
 - test/pool_test.rb
+- test/prelude.rb