rapns 0.2.0 → 0.2.1

data/lib/rapns/daemon/delivery_handler.rb

@@ -47,7 +47,7 @@ module Rapns
         rescue StandardError => e
           Rapns::Daemon.logger.error(e)
         ensure
-          Rapns::Daemon.delivery_queue.signal_waiters_if_empty
+          Rapns::Daemon.delivery_queue.handler_available
         end
       end
     end

data/lib/rapns/daemon/delivery_queue.rb

@@ -1,9 +1,10 @@
 module Rapns
   module Daemon
     class DeliveryQueue
-      def initialize
+      def initialize(num_handlers)
+        @num_handlers = num_handlers
         @queue = Queue.new
-        @waiting_threads = []
+        @feeder_threads = []
         @mutex = Mutex.new
       end
 
@@ -15,23 +16,29 @@ module Rapns
         @queue.pop
       end
 
-      def signal_waiters_if_empty
+      def handler_available
         @mutex.synchronize do
-          begin
-            if @queue.size == 0
-              t = @waiting_threads.shift
-              t.wakeup if t
-            end
-          rescue ThreadError
-            retry
-          end
+          signal_feeder if handler_available?
+        end
+      end
+
+      def handler_available?
+        @queue.size < @num_handlers
+      end
+
+      def signal_feeder
+        begin
+          t = @feeder_threads.shift
+          t.wakeup if t
+        rescue ThreadError
+          retry
         end
       end
 
-      def wait_until_empty
+      def wait_for_available_handler
         Thread.exclusive do
-          if @queue.size > 0
-            @waiting_threads << Thread.current
+          if @queue.size >= @num_handlers
+            @feeder_threads << Thread.current
             Thread.stop
           end
         end

data/lib/rapns/daemon/feeder.rb

@@ -20,7 +20,7 @@ module Rapns
             Rapns::Daemon.delivery_queue.push(notification)
           end
 
-          Rapns::Daemon.delivery_queue.wait_until_empty
+          Rapns::Daemon.delivery_queue.wait_for_available_handler
         rescue ActiveRecord::StatementInvalid, *ADAPTER_ERRORS => e
           Rapns::Daemon.logger.error(e)
           reconnect

data/lib/rapns/daemon.rb

@@ -34,7 +34,7 @@ module Rapns
       self.certificate = Certificate.new(configuration.certificate)
       certificate.load
 
-      self.delivery_queue = DeliveryQueue.new
+      self.delivery_queue = DeliveryQueue.new(configuration.connections)
 
       unless foreground?
         daemonize

data/lib/rapns/version.rb

@@ -1,3 +1,3 @@
 module Rapns
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/rapns/daemon/delivery_handler_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Rapns::Daemon::DeliveryHandler do
   before do
     @notification = Rapns::Notification.create!(:device_token => "a" * 64)
-    Rapns::Daemon.stub(:delivery_queue).and_return(Rapns::Daemon::DeliveryQueue.new)
+    Rapns::Daemon.stub(:delivery_queue).and_return(Rapns::Daemon::DeliveryQueue.new(1))
     Rapns::Daemon.delivery_queue.push(@notification)
     @connection = mock("Connection", :connect => nil, :write => nil)
     Rapns::Daemon::Connection.stub(:new).and_return(@connection)
@@ -59,8 +59,8 @@ describe Rapns::Daemon::DeliveryHandler do
     @delivery_handler.send(:handle_next_notification)
   end
 
-  it "should signal the feeder if the delivery queue is empty" do
-    Rapns::Daemon.delivery_queue.should_receive(:signal_waiters_if_empty)
+  it "should notify the delivery queue a handler is now available" do
+    Rapns::Daemon.delivery_queue.should_receive(:handler_available)
     @delivery_handler.send(:handle_next_notification)
   end
 

data/spec/rapns/daemon/feeder_spec.rb

@@ -6,7 +6,7 @@ describe Rapns::Daemon::Feeder do
     @notification = Rapns::Notification.create!(:device_token => "a" * 64)
     @logger = mock("Logger", :info => nil, :error => nil, :warn => nil)
     Rapns::Daemon.stub(:logger).and_return(@logger)
-    @queue = mock(:push => nil, :wait_until_empty => nil)
+    @queue = mock(:push => nil, :wait_for_available_handler => nil)
     Rapns::Daemon.stub(:delivery_queue).and_return(@queue)
     Rapns::Daemon.stub(:configuration => mock("Configuration", :poll => 2))
   end
@@ -52,8 +52,8 @@ describe Rapns::Daemon::Feeder do
     Rapns::Daemon::Feeder.enqueue_notifications
   end
 
-  it "should wait for the delivery queue to be emptied" do
-    Rapns::Daemon.delivery_queue.should_receive(:wait_until_empty)
+  it "should wait for a delivery handler to become available" do
+    Rapns::Daemon.delivery_queue.should_receive(:wait_for_available_handler)
     Rapns::Daemon::Feeder.enqueue_notifications
   end
 

data/spec/rapns/daemon_spec.rb

@@ -60,6 +60,11 @@ describe Rapns::Daemon, "when starting" do
     Rapns::Daemon.start("development", {})
   end
 
+  it "should initialize the delivery queue with the number of connection as its signal point" do
+    Rapns::Daemon::DeliveryQueue.should_receive(:new).with(3)
+    Rapns::Daemon.start("development", {})
+  end
+
   it "should make the connection pool accessible" do
     Rapns::Daemon.start("development", {})
     Rapns::Daemon.connection_pool.should == @connection_pool

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rapns
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-09 00:00:00.000000000Z
+date: 2011-10-14 00:00:00.000000000Z
 dependencies: []
 description: Easy to use library for Apple's Push Notification Service with Rails
   3