rapns 0.1.0 → 0.1.1

data/lib/rapns/daemon.rb

@@ -4,6 +4,7 @@ require "rapns/daemon/delivery_error"
 require "rapns/daemon/pool"
 require "rapns/daemon/connection_pool"
 require "rapns/daemon/connection"
+require "rapns/daemon/delivery_queue"
 require "rapns/daemon/delivery_handler"
 require "rapns/daemon/delivery_handler_pool"
 require "rapns/daemon/feeder"
@@ -29,7 +30,7 @@ module Rapns
       self.certificate = Certificate.new(configuration.certificate)
       certificate.load
 
-      self.delivery_queue = Queue.new
+      self.delivery_queue = DeliveryQueue.new
 
       self.delivery_handler_pool = DeliveryHandlerPool.new(configuration.connections)
       delivery_handler_pool.populate

data/lib/rapns/daemon/delivery_handler.rb

@@ -19,8 +19,8 @@ module Rapns
       protected
 
       def handle_next_notification
+        notification = Rapns::Daemon.delivery_queue.pop
         begin
-          notification = Rapns::Daemon.delivery_queue.pop
           return if notification == STOP
 
           Rapns::Daemon.connection_pool.claim_connection do |connection|
@@ -46,6 +46,8 @@ module Rapns
           end
         rescue StandardError => e
           Rapns::Daemon.logger.error(e)
+        ensure
+          Rapns::Daemon.delivery_queue.signal
         end
       end
     end

data/lib/rapns/daemon/delivery_queue.rb

@@ -0,0 +1,44 @@
+module Rapns
+  module Daemon
+    class DeliveryQueue
+      def initialize
+        @queue = Queue.new
+        @waiting_threads = []
+        @mutex = Mutex.new
+        @counter = 0
+      end
+
+      def push(obj)
+        @mutex.synchronize { @counter += 1 }
+        @queue.push(obj)
+      end
+
+      def pop
+        @queue.pop
+      end
+
+      def signal
+        @mutex.synchronize do
+          begin
+            @counter -= 1
+            if @counter <= 0
+              t = @waiting_threads.shift
+              t.wakeup if t
+            end
+          rescue ThreadError
+            retry
+          end
+        end
+      end
+
+      def wait
+        Thread.exclusive do
+          if @counter > 0
+            @waiting_threads << Thread.current
+            Thread.stop
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rapns/daemon/feeder.rb

@@ -16,6 +16,8 @@ module Rapns
           Rapns::Notification.ready_for_delivery.each do |notification|
             Rapns::Daemon.delivery_queue.push(notification)
           end
+
+          Rapns::Daemon.delivery_queue.wait
         rescue StandardError => e
           Rapns::Daemon.logger.error(e)
         end

data/lib/rapns/version.rb

@@ -1,3 +1,3 @@
 module Rapns
-  VERSION = "0.1.0"
+  VERSION = "0.1.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(Queue.new)
+    Rapns::Daemon.stub(:delivery_queue).and_return(Rapns::Daemon::DeliveryQueue.new)
     Rapns::Daemon.delivery_queue.push(@notification)
     @connection = mock("Connection", :connect => nil, :write => nil)
     Rapns::Daemon::Connection.stub(:new).and_return(@connection)

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)
     Rapns::Daemon.stub(:logger).and_return(@logger)
-    @queue = mock(:push => nil)
+    @queue = mock(:push => nil, :wait => nil)
     Rapns::Daemon.stub(:delivery_queue).and_return(@queue)
     Rapns::Daemon.stub(:configuration => mock("Configuration", :poll => 2))
   end
@@ -52,6 +52,11 @@ 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)
+    Rapns::Daemon::Feeder.enqueue_notifications
+  end
+
   it "should log errors" do
     e = StandardError.new("bork")
     Rapns::Notification.stub(:ready_for_delivery).and_raise(e)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rapns
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-30 00:00:00.000000000Z
+date: 2011-08-31 00:00:00.000000000Z
 dependencies: []
 description: Easy to use library for Apple's Push Notification Service with Rails
   3
@@ -33,6 +33,7 @@ files:
 - lib/rapns/daemon/delivery_error.rb
 - lib/rapns/daemon/delivery_handler.rb
 - lib/rapns/daemon/delivery_handler_pool.rb
+- lib/rapns/daemon/delivery_queue.rb
 - lib/rapns/daemon/feeder.rb
 - lib/rapns/daemon/logger.rb
 - lib/rapns/daemon/pool.rb