fairway 0.1.3 → 0.1.4

data/Gemfile

@@ -4,6 +4,7 @@ source :rubygems
 gemspec
 
 group :test do
+  gem "debugger"
   gem "sidekiq"
   gem "rspec"
 end

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    fairway (0.1.2)
+    fairway (0.1.3)
       activesupport
-      hiredis
       redis
       redis-namespace (>= 1.3.0)
 
@@ -16,10 +15,16 @@ GEM
     celluloid (0.12.4)
       facter (>= 1.6.12)
       timers (>= 1.0.0)
+    columnize (0.3.6)
     connection_pool (1.0.0)
+    debugger (1.6.0)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.1)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.2)
     diff-lcs (1.1.3)
     facter (1.6.17)
-    hiredis (0.4.5)
     i18n (0.6.1)
     multi_json (1.5.0)
     redis (3.0.4)
@@ -45,6 +50,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  debugger
   fairway!
   rspec
   sidekiq

data/fairway.gemspec

@@ -19,6 +19,5 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency("activesupport")
   gem.add_dependency("redis")
-  gem.add_dependency("hiredis")
   gem.add_dependency("redis-namespace", ">= 1.3.0")
 end

data/lib/fairway/config.rb

@@ -33,18 +33,28 @@ module Fairway
     end
 
     def redis
-      @redis ||= Redis::Namespace.new(@namespace, redis: raw_redis)
+      @redis ||= pool { Redis::Namespace.new(@namespace, redis: raw_redis) }
     end
 
     def scripts
-      @scripts ||= Scripts.new(raw_redis, @namespace)
+      @scripts ||= begin
+        Scripts.new(pool { raw_redis }, @namespace)
+      end
     end
 
-  private
+    private
 
-    def raw_redis
-      @raw_redis ||= Redis.new(@redis_options.merge(hiredis: true))
+    def pool(&block)
+      pool_size    = @redis_options[:pool]    || 1
+      pool_timeout = @redis_options[:timeout] || 5
+
+      ConnectionPool.new(size: pool_size, timeout: pool_timeout) do
+        yield
+      end
     end
 
+    def raw_redis
+      Redis.new(@redis_options)
+    end
   end
 end

data/lib/fairway/connection.rb

@@ -26,9 +26,11 @@ module Fairway
     end
 
     def subscribe(channel_pattern, &block)
-      redis.psubscribe(channel_pattern) do |on|
-        on.pmessage do |pattern, channel, message|
-          block.call(channel, message)
+      redis do |conn|
+        conn.psubscribe(channel_pattern) do |on|
+          on.pmessage do |pattern, channel, message|
+            block.call(channel, message)
+          end
         end
       end
     end

data/lib/fairway/facet.rb

@@ -10,14 +10,18 @@ module Fairway
     end
 
     def length
-      each_queue do |queue|
-        redis.llen(facet_key(queue))
-      end.sum
+      redis.with do |conn|
+        each_queue do |queue|
+          conn.llen(facet_key(queue))
+        end.sum
+      end
     end
 
     def priority
-      each_queue do |queue|
-        (redis.hget(priority_key(queue), name) || 1).to_i
+      redis.with do |conn|
+        each_queue do |queue|
+          (conn.hget(priority_key(queue), name) || 1).to_i
+        end
       end
     end
 

data/lib/fairway/queue.rb

@@ -8,17 +8,21 @@ module Fairway
     end
 
     def active_facets
-      facet_names = unique_queues.map do |queue|
-        redis.smembers("#{queue}:active_facets")
-      end.flatten.uniq
+      redis.with do |conn|
+        facet_names = unique_queues.map do |queue|
+          conn.smembers("#{queue}:active_facets")
+        end.flatten.uniq
       
-      facet_names.map do |name|
-        Facet.new(self, name)
+        facet_names.map do |name|
+          Facet.new(self, name)
+        end
       end
     end
 
     def length
-      redis.mget(unique_queues.map{|q| "#{q}:length" }).map(&:to_i).sum
+      redis.with do |conn|
+        conn.mget(unique_queues.map{|q| "#{q}:length" }).map(&:to_i).sum
+      end
     end
 
     def peek

data/lib/fairway/scripts.rb

@@ -7,29 +7,43 @@ module Fairway
       @script_shas ||= {}
     end
 
+    attr_reader :redis
+
     def initialize(redis, namespace)
-      @redis = redis
+      @redis     = redis
       @namespace = namespace
     end
 
     def register_queue(name, channel)
-      @redis.hset(registered_queues_key, name, channel)
+      redis.with do |conn|
+        conn.hset(registered_queues_key, name, channel)
+      end
     end
 
     def unregister_queue(name)
-      @redis.hdel(registered_queues_key, name)
+      redis.with do |conn|
+        conn.hdel(registered_queues_key, name)
+      end
     end
 
     def registered_queues
-      @redis.hgetall(registered_queues_key)
+      redis.with do |conn|
+        conn.hgetall(registered_queues_key)
+      end
     end
 
     def method_missing(method_name, *args)
       loaded = false
-      @redis.evalsha(script_sha(method_name), [namespace], args)
+
+      redis.with do |conn|
+        conn.evalsha(script_sha(method_name), [namespace], args)
+      end
     rescue Redis::CommandError => ex
       if ex.message.include?("NOSCRIPT") && !loaded
-        @redis.script(:load, script_source(method_name))
+        redis.with do |conn|
+          conn.script(:load, script_source(method_name))
+        end
+
         loaded = true
         retry
       else

data/lib/fairway/version.rb

@@ -1,3 +1,3 @@
 module Fairway
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/fairway.rb

@@ -2,7 +2,6 @@ require "fairway/version"
 
 require "active_support/core_ext"
 require "redis"
-require "hiredis"
 require "redis-namespace"
 
 require "fairway/config"

data/spec/lib/fairway/channeled_connection_spec.rb

@@ -13,7 +13,7 @@ module Fairway
         message[:topic]
       end
     end
-    let(:redis)  { config.redis }
+    let(:redis)   { config.redis }
     let(:message) { { facet: 1, topic: "event:helloworld" } }
 
     it "delegates non existant methods to parent connection" do
@@ -33,8 +33,11 @@ module Fairway
           config.register_queue("myqueue", ".*:helloworld")
           config.register_queue("yourqueue", "event:.*world")
           connection.deliver(message)
-          redis.llen("myqueue:1").should == 1
-          redis.llen("yourqueue:1").should == 1
+
+          redis.with do |conn|
+            conn.llen("myqueue:1").should == 1
+            conn.llen("yourqueue:1").should == 1
+          end
         end
       end
 
@@ -45,25 +48,36 @@ module Fairway
 
         it "adds message to the environment facet for the queue" do
           connection.deliver(message)
-          redis.llen("myqueue:1").should == 1
-          redis.lindex("myqueue:1", 0).should == message.to_json
+
+          redis.with do |conn|
+            conn.llen("myqueue:1").should == 1
+            conn.lindex("myqueue:1", 0).should == message.to_json
+          end
         end
 
         it "adds facet to list of active facets" do
           connection.deliver(message)
-          redis.smembers("myqueue:active_facets").should == ["1"]
+
+          redis.with do |conn|
+            conn.smembers("myqueue:active_facets").should == ["1"]
+          end
         end
 
         it "pushes facet onto facet queue" do
           connection.deliver(message)
-          redis.llen("myqueue:facet_queue").should == 1
-          redis.lindex("myqueue:facet_queue", 0).should == "1"
+
+          redis.with do |conn|
+            conn.llen("myqueue:facet_queue").should == 1
+            conn.lindex("myqueue:facet_queue", 0).should == "1"
+          end
         end
 
         it "doesn't push onto to facet queue if currently active" do
-          redis.sadd("myqueue:active_facets", "1")
-          connection.deliver(message)
-          redis.llen("myqueue:facet_queue").should == 0
+          redis.with do |conn|
+            conn.sadd("myqueue:active_facets", "1")
+            connection.deliver(message)
+            conn.llen("myqueue:facet_queue").should == 0
+          end
         end
       end
 
@@ -74,12 +88,18 @@ module Fairway
 
         it "doesn't add message to the queue" do
           connection.deliver(message)
-          redis.llen("myqueue:1").should == 0
+
+          redis.with do |conn|
+            conn.llen("myqueue:1").should == 0
+          end
         end
 
         it "doesn't add facet to list of active facets" do
           connection.deliver(message)
-          redis.smembers("myqueue:active_facets").should == []
+          
+          redis.with do |conn|
+            conn.smembers("myqueue:active_facets").should == []
+          end
         end
       end
     end

data/spec/lib/fairway/config_spec.rb

@@ -23,12 +23,27 @@ module Fairway
       end
     end
 
-    it "allows setting of redis connection options" do
+    it "allows redis config" do
       Config.new do |config|
         config.redis = { host: "127.0.0.1", port: 6379 }
       end
     end
 
+    it "allows setting of connection pooling" do
+      config = Config.new do |config|
+        config.redis = { pool: 10 }
+      end
+
+      config.redis.instance_variable_get("@size").should == 10
+    end
+
+    it "defaults to pool of 1" do
+      config = Config.new do |config|
+      end
+
+      config.redis.instance_variable_get("@size").should == 1
+    end
+
     it "allows setting of redis namespace" do
       config = Config.new do |config|
         config.namespace = "ns"

data/spec/lib/fairway/connection_spec.rb

@@ -8,14 +8,16 @@ module Fairway
 
     describe "#initialize" do
       it "registers queues from the config" do
-        Fairway.config.register_queue("myqueue", ".*")
-        Fairway.config.redis.hgetall("registered_queues").should == {}
+        redis.with do |conn|
+          Fairway.config.register_queue("myqueue", ".*")
+          conn.hgetall("registered_queues").should == {}
 
-        Connection.new(Fairway.config)
+          Connection.new(Fairway.config)
 
-        Fairway.config.redis.hgetall("registered_queues").should == {
-          "myqueue" => ".*"
-        }
+          conn.hgetall("registered_queues").should == {
+            "myqueue" => ".*"
+          }
+        end
       end
 
       context "when an existing queue definition does not match" do
@@ -25,7 +27,9 @@ module Fairway
 
     describe "#queues" do
       it "returns a Queue for every currently registered queue" do
-        Fairway.config.redis.hset("registered_queues", "name", "channel")
+        redis.with do |conn|
+          conn.hset("registered_queues", "name", "channel")
+        end
 
         connection.queues.should == [
           Queue.new(connection, "name")
@@ -57,25 +61,36 @@ module Fairway
 
         it "adds message to the environment facet for the queue" do
           connection.deliver(message)
-          redis.llen("myqueue:1").should == 1
-          redis.lindex("myqueue:1", 0).should == message.to_json
+
+          redis.with do |conn|
+            conn.llen("myqueue:1").should == 1
+            conn.lindex("myqueue:1", 0).should == message.to_json
+          end
         end
 
         it "adds facet to list of active facets" do
           connection.deliver(message)
-          redis.smembers("myqueue:active_facets").should == ["1"]
+
+          redis.with do |conn|
+            conn.smembers("myqueue:active_facets").should == ["1"]
+          end
         end
 
         it "pushes facet onto facet queue" do
           connection.deliver(message)
-          redis.llen("myqueue:facet_queue").should == 1
-          redis.lindex("myqueue:facet_queue", 0).should == "1"
+
+          redis.with do |conn|
+            conn.llen("myqueue:facet_queue").should == 1
+            conn.lindex("myqueue:facet_queue", 0).should == "1"
+          end
         end
 
         it "doesn't push onto to facet queue if currently active" do
-          redis.sadd("myqueue:active_facets", "1")
-          connection.deliver(message)
-          redis.llen("myqueue:facet_queue").should == 0
+          redis.with do |conn|
+            conn.sadd("myqueue:active_facets", "1")
+            connection.deliver(message)
+            conn.llen("myqueue:facet_queue").should == 0
+          end
         end
       end
 
@@ -88,7 +103,11 @@ module Fairway
           connection.deliver(message)
           connection.unregister_queue("myqueue")
           connection.deliver(message)
-          redis.llen("myqueue:1").should == 1
+
+
+          redis.with do |conn|
+            conn.llen("myqueue:1").should == 1
+          end
         end
       end
     end

data/spec/lib/fairway/queue_spec.rb

@@ -294,7 +294,9 @@ module Fairway
         connection.deliver(message2)
         connection.deliver(message1)
 
-        connection.redis.del("myqueue:facet_pool")
+        connection.redis.with do |conn|
+          conn.del("myqueue:facet_pool")
+        end
 
         queue.pull.should == ["myqueue", message1.to_json]
         queue.pull.should == ["myqueue", message2.to_json]
@@ -328,11 +330,13 @@ module Fairway
       it "removes any redis keys related to the queue" do
         connection.deliver(message)
 
-        connection.redis.keys("myqueue:*").length.should > 0
+        connection.redis.with do |conn|
+          conn.keys("myqueue:*").length.should > 0
 
-        queue.destroy
+          queue.destroy
 
-        connection.redis.keys("myqueue:*").length.should == 0
+          conn.keys("myqueue:*").length.should == 0
+        end
       end
 
       context "multiple queues" do
@@ -359,13 +363,15 @@ module Fairway
         end
 
         it "removes any redis keys related both queues" do
-          connection.redis.keys("myqueue1:*").length.should > 0
-          connection.redis.keys("myqueue2:*").length.should > 0
+          connection.redis.with do |conn|
+            conn.keys("myqueue1:*").length.should > 0
+            conn.keys("myqueue2:*").length.should > 0
 
-          queue.destroy
+            queue.destroy
 
-          connection.redis.keys("myqueue1:*").length.should == 0
-          connection.redis.keys("myqueue2:*").length.should == 0
+            conn.keys("myqueue1:*").length.should == 0
+            conn.keys("myqueue2:*").length.should == 0
+          end
         end
       end
     end

data/spec/lib/fairway/scripts_spec.rb

@@ -2,6 +2,8 @@ require "spec_helper"
 
 module Fairway
   describe Scripts do
+    let(:redis) { Fairway::Config.new.redis }
+
     describe "#initialize" do
       it "requires a redis client" do
         lambda {
@@ -11,36 +13,45 @@ module Fairway
     end
 
     describe "#register_queue" do
-      let(:scripts) { Scripts.new(Redis.new, "foo") }
+      let(:scripts) { Scripts.new(redis, "foo") }
 
       it "adds the queue and channel to the hash of registered queues" do
         scripts.register_queue("name", "channel")
-        Redis.new.hgetall("foo:registered_queues").should == { "name" => "channel" }
+
+        redis.with do |conn|
+          conn.hgetall("foo:registered_queues").should == { "name" => "channel" }
+        end
       end
     end
 
     describe "#unregister_queue" do
-      let(:scripts) { Scripts.new(Redis.new, "foo") }
+      let(:scripts) { Scripts.new(redis, "foo") }
 
       it "removes the queue and channel from the hash of registered queues" do
         scripts.register_queue("name", "channel")
         scripts.unregister_queue("name")
-        Redis.new.hgetall("foo:registered_queues").should == {}
+
+        redis.with do |conn|
+          conn.hgetall("foo:registered_queues").should == {}
+        end
       end
     end
 
     describe "#registered_queues" do
-      let(:scripts) { Scripts.new(Redis.new, "foo") }
+      let(:scripts) { Scripts.new(redis, "foo") }
 
       it "returns hash of all registered queues and their channels" do
-        Redis.new.hset("foo:registered_queues", "first", "channel1")
-        Redis.new.hset("foo:registered_queues", "second", "channel2")
+        redis.with do |conn|
+          conn.hset("foo:registered_queues", "first", "channel1")
+          conn.hset("foo:registered_queues", "second", "channel2")
+        end
+
         scripts.registered_queues.should == { "first" => "channel1", "second" => "channel2" }
       end
     end
 
     describe "#method_missing" do
-      let(:scripts) { Scripts.new(Redis.new, "foo") }
+      let(:scripts) { Scripts.new(redis, "foo") }
 
       it "runs the script" do
         scripts.fairway_pull("namespace", "name")
@@ -48,7 +59,10 @@ module Fairway
 
       context "when the script does not exist" do
         it "loads the script" do
-          Redis.new.script(:flush)
+          redis.with do |conn|
+            conn.script(:flush)
+          end
+
           scripts.fairway_pull("namespace", "name")
         end
       end

data/spec/spec_helper.rb

@@ -27,10 +27,10 @@ RSpec.configure do |config|
       config.facet { |message| message[:facet] }
     end
 
-    Fairway::Config.new.redis.flushdb
+    Fairway::Config.new.redis.with{ |r| r.flushdb }
   end
 
   config.after(:each) do
-    Fairway::Config.new.redis.flushdb
+    Fairway::Config.new.redis.with{ |r| r.flushdb }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fairway
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-25 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -43,22 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: hiredis
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement