rapns 3.1.0 → 3.2.0

data/lib/rapns/logger.rb

@@ -0,0 +1,66 @@
+module Rapns
+  class Logger
+    def initialize(options)
+      @options = options
+
+      begin
+        log = File.open(File.join(Rails.root, 'log', 'rapns.log'), 'a')
+        log.sync = true
+        @logger = ActiveSupport::BufferedLogger.new(log, Rails.logger.level)
+        @logger.auto_flushing = Rails.logger.respond_to?(:auto_flushing) ? Rails.logger.auto_flushing : true
+      rescue Errno::ENOENT, Errno::EPERM => e
+        @logger = nil
+        error(e)
+        error('Logging disabled.')
+      end
+    end
+
+    def info(msg)
+      log(:info, msg)
+    end
+
+    def error(msg, options = {})
+      airbrake_notify(msg) if notify_via_airbrake?(msg, options)
+      log(:error, msg, 'ERROR', STDERR)
+    end
+
+    def warn(msg)
+      log(:warn, msg, 'WARNING', STDERR)
+    end
+
+    private
+
+    def log(where, msg, prefix = nil, io = STDOUT)
+      if msg.is_a?(Exception)
+        formatted_backtrace = msg.backtrace.join("\n")
+        msg = "#{msg.class.name}, #{msg.message}\n#{formatted_backtrace}"
+      end
+
+      formatted_msg = "[#{Time.now.to_s(:db)}] "
+      formatted_msg << "[#{prefix}] " if prefix
+      formatted_msg << msg
+
+      if io == STDERR
+        io.puts formatted_msg
+      elsif @options[:foreground]
+        io.puts formatted_msg
+      end
+
+      @logger.send(where, formatted_msg) if @logger
+    end
+
+    def airbrake_notify(e)
+      return unless @options[:airbrake_notify] == true
+
+      if defined?(Airbrake)
+        Airbrake.notify_or_ignore(e)
+      elsif defined?(HoptoadNotifier)
+        HoptoadNotifier.notify_or_ignore(e)
+      end
+    end
+
+    def notify_via_airbrake?(msg, options)
+      msg.is_a?(Exception) && options[:airbrake_notify] != false
+    end
+  end
+end

data/lib/rapns/push.rb

@@ -6,7 +6,11 @@ module Rapns
     options.each { |k, v| config.send("#{k}=", v) }
     config.push = true
     Rapns.config.update(config)
-    Rapns::Daemon.start
-    Rapns::Daemon.shutdown(true)
+
+    Upgraded.check(:exit => false)
+    Rapns::Daemon::AppRunner.sync
+    Rapns::Daemon::Feeder.start
+    Rapns::Daemon::AppRunner.wait
+    Rapns::Daemon::AppRunner.stop
   end
 end

data/lib/rapns/upgraded.rb

@@ -0,0 +1,31 @@
+module Rapns
+  module Upgraded
+    def self.check(options = {})
+      count = 0
+
+      begin
+        count = Rapns::App.count
+      rescue ActiveRecord::StatementInvalid
+        puts "!!!! RAPNS NOT STARTED !!!!"
+        puts
+        puts "As of version v2.0.0 apps are configured in the database instead of rapns.yml."
+        puts "Please run 'rails g rapns' to generate the new migrations and create your app."
+        puts "See https://github.com/ileitch/rapns for further instructions."
+        puts
+        exit 1 if options[:exit]
+      end
+
+      if count == 0
+        Rapns.logger.warn("You have not created an app yet. See https://github.com/ileitch/rapns for instructions.")
+      end
+
+      if File.exists?(File.join(Rails.root, 'config', 'rapns', 'rapns.yml'))
+        Rapns.logger.warn(<<-EOS)
+Since 2.0.0 rapns uses command-line options and a Ruby based configuration file.
+Please run 'rails g rapns' to generate a new configuration file into config/initializers.
+Remove config/rapns/rapns.yml to avoid this warning.
+        EOS
+      end
+    end
+  end
+end

data/lib/rapns/version.rb

@@ -1,3 +1,3 @@
 module Rapns
-  VERSION = '3.1.0'
+  VERSION = '3.2.0'
 end

data/lib/rapns.rb

@@ -4,6 +4,7 @@ require 'multi_json'
 require 'rapns/version'
 require 'rapns/deprecation'
 require 'rapns/deprecatable'
+require 'rapns/logger'
 require 'rapns/multi_json_helper'
 require 'rapns/notification'
 require 'rapns/app'
@@ -11,6 +12,8 @@ require 'rapns/configuration'
 require 'rapns/reflection'
 require 'rapns/embed'
 require 'rapns/push'
+require 'rapns/apns_feedback'
+require 'rapns/upgraded'
 
 require 'rapns/apns/binary_notification_validator'
 require 'rapns/apns/device_token_format_validator'
@@ -30,4 +33,13 @@ module Rapns
     require 'rapns/daemon'
     require 'rapns/patches'
   end
+
+  def self.logger
+    @logger ||= Logger.new(:foreground => Rapns.config.foreground,
+                           :airbrake_notify => Rapns.config.airbrake_notify)
+  end
+
+  def self.logger=(logger)
+    @logger = logger
+  end
 end

data/spec/acceptance_spec_helper.rb

@@ -8,7 +8,7 @@ Bundler.require(:default)
 TMP_DIR = '/tmp'
 RAILS_DIR = File.join(TMP_DIR, 'rapns_test')
 if ENV['TRAVIS']
-  TRAVIS_BRANCH = 'gcm'
+  TRAVIS_BRANCH = 'master'
   RAPNS_ROOT = 'git://github.com/ileitch/rapns.git'
 else
   RAPNS_ROOT = File.expand_path(__FILE__ + '/../../')
@@ -48,7 +48,7 @@ end
 def cmd(str, echo = true)
   puts "* #{str.strip}" if echo
   retval = Bundler.with_clean_env { `#{str}` }
-  puts retval.strip if echo
+  puts retval.strip if echo && retval.strip != ""
   retval
 end
 

data/spec/unit/apns/feedback_spec.rb

@@ -1,9 +1,6 @@
 require "unit_spec_helper"
 
 describe Rapns::Apns::Feedback do
-  it { should validate_presence_of(:device_token) }
-  it { should validate_presence_of(:failed_at) }
-
   it "should validate the format of the device_token" do
     notification = Rapns::Apns::Feedback.new(:device_token => "{$%^&*()}")
     notification.valid?.should be_false

data/spec/unit/apns/notification_spec.rb

@@ -4,9 +4,6 @@ require 'unit/notification_shared.rb'
 describe Rapns::Apns::Notification do
   it_should_behave_like 'an Notification subclass'
 
-  it { should validate_presence_of(:device_token) }
-  it { should validate_numericality_of(:badge) }
-
   let(:notification_class) { Rapns::Apns::Notification }
   let(:notification) { notification_class.new }
   let(:data_setter) { 'attributes_for_device=' }

data/spec/unit/apns_feedback_spec.rb

@@ -0,0 +1,16 @@
+require 'unit_spec_helper'
+
+describe Rapns, 'apns_feedback' do
+  let!(:app) { Rapns::Apns::App.create!(:name => 'test', :environment => 'production', :certificate => TEST_CERT) }
+  let(:receiver) { stub(:check_for_feedback => nil) }
+
+  before do
+    Rapns::Daemon::Apns::FeedbackReceiver.stub(:new => receiver)
+  end
+
+  it 'checks feedback for each app' do
+    Rapns::Daemon::Apns::FeedbackReceiver.should_receive(:new).with(app, 0).and_return(receiver)
+    receiver.should_receive(:check_for_feedback)
+    Rapns.apns_feedback
+  end
+end

data/spec/unit/app_spec.rb

@@ -1,8 +1,6 @@
-require "unit_spec_helper"
+require 'unit_spec_helper'
 
 describe Rapns::App do
-  it { should validate_numericality_of(:connections) }
-
   it 'validates the uniqueness of name within type and environment' do
     Rapns::Apns::App.create!(:name => 'test', :environment => 'production', :certificate => TEST_CERT)
     app = Rapns::Apns::App.new(:name => 'test', :environment => 'production', :certificate => TEST_CERT)

data/spec/unit/daemon/apns/app_runner_spec.rb

@@ -10,19 +10,17 @@ describe Rapns::Daemon::Apns::AppRunner do
   let(:runner) { Rapns::Daemon::Apns::AppRunner.new(app) }
   let(:handler) { stub(:start => nil, :stop => nil, :queue= => nil) }
   let(:receiver) { stub(:start => nil, :stop => nil) }
-  let(:config) { {:feedback_poll => 60 } }
+  let(:config) { stub(:feedback_poll => 60, :push => false) }
   let(:logger) { stub(:info => nil) }
 
   before do
-    Rapns::Daemon.stub(:logger => logger)
+    Rapns.stub(:logger => logger, :config => config)
     Rapns::Daemon::Apns::DeliveryHandler.stub(:new => handler)
     Rapns::Daemon::Apns::FeedbackReceiver.stub(:new => receiver)
-    Rapns::Daemon.stub(:config => config)
   end
 
   it 'instantiates a new feedback receiver when started' do
-    Rapns::Daemon::Apns::FeedbackReceiver.should_receive(:new).with(app, 'feedback.sandbox.push.apple.com',
-                                                                    2196, 60)
+    Rapns::Daemon::Apns::FeedbackReceiver.should_receive(:new).with(app, 60)
     runner.start
   end
 
@@ -36,4 +34,10 @@ describe Rapns::Daemon::Apns::AppRunner do
     receiver.should_receive(:stop)
     runner.stop
   end
+
+  it 'does not check for feedback when in push mode' do
+    config.stub(:push => true)
+    Rapns::Daemon::Apns::FeedbackReceiver.should_not_receive(:new)
+    runner.start
+  end
 end

data/spec/unit/daemon/apns/connection_spec.rb

@@ -20,7 +20,7 @@ describe Rapns::Daemon::Apns::Connection do
     OpenSSL::X509::Certificate.stub(:new => x509_certificate)
     TCPSocket.stub(:new => tcp_socket)
     OpenSSL::SSL::SSLSocket.stub(:new => ssl_socket)
-    Rapns::Daemon.stub(:logger => logger)
+    Rapns.stub(:logger => logger)
   end
 
   it "reads the number of bytes from the SSL socket" do
@@ -236,7 +236,7 @@ describe Rapns::Daemon::Apns::Connection do
     it 'logs the the connection is idle' do
       Rapns::Daemon::Apns::Connection.stub(:idle_period => 0.1)
       sleep 0.2
-      Rapns::Daemon.logger.should_receive(:info).with('[Connection 0] Idle period exceeded, reconnecting...')
+      Rapns.logger.should_receive(:info).with('[Connection 0] Idle period exceeded, reconnecting...')
       connection.write('blah')
     end
   end

data/spec/unit/daemon/apns/delivery_handler_spec.rb

@@ -4,12 +4,12 @@ require File.dirname(__FILE__) + '/../delivery_handler_shared.rb'
 describe Rapns::Daemon::Apns::DeliveryHandler do
   it_should_behave_like 'an DeliveryHandler subclass'
 
-  let(:host) { 'localhost' }
+  let(:host) { 'gateway.push.apple.com' }
   let(:port) { 2195 }
   let(:certificate) { stub }
   let(:password) { stub }
-  let(:app) { stub(:password => password, :certificate => certificate, :name => 'MyApp')}
-  let(:delivery_handler) { Rapns::Daemon::Apns::DeliveryHandler.new(app, host, port) }
+  let(:app) { stub(:password => password, :certificate => certificate, :name => 'MyApp', :environment => 'production')}
+  let(:delivery_handler) { Rapns::Daemon::Apns::DeliveryHandler.new(app) }
   let(:connection) { stub('Connection', :select => false, :write => nil, :reconnect => nil, :close => nil, :connect => nil) }
   let(:notification) { stub }
   let(:http) { stub(:shutdown => nil)}
@@ -24,18 +24,18 @@ describe Rapns::Daemon::Apns::DeliveryHandler do
 
   it "instantiates a new connection" do
     Rapns::Daemon::Apns::Connection.should_receive(:new).with(app, host, port)
-    Rapns::Daemon::Apns::DeliveryHandler.new(app, host, port)
+    delivery_handler.start
+    delivery_handler.stop
   end
 
-  it 'performs delivery of an notification' do
-    Rapns::Daemon::Apns::Delivery.should_receive(:perform).with(app, connection, notification)
+  it "connects the socket" do
+    connection.should_receive(:connect)
     delivery_handler.start
     delivery_handler.stop
   end
 
-  it "connects the socket when instantiated" do
-    connection.should_receive(:connect)
-    Rapns::Daemon::Apns::DeliveryHandler.new(app, host, port)
+  it 'performs delivery of an notification' do
+    Rapns::Daemon::Apns::Delivery.should_receive(:perform).with(app, connection, notification)
     delivery_handler.start
     delivery_handler.stop
   end
@@ -45,4 +45,9 @@ describe Rapns::Daemon::Apns::DeliveryHandler do
     delivery_handler.start
     delivery_handler.stop
   end
+
+  it 'does not attempt to close the connection if the connection was not established' do
+    connection.should_not_receive(:close)
+    delivery_handler.stop
+  end
 end

data/spec/unit/daemon/apns/delivery_spec.rb

@@ -16,8 +16,7 @@ describe Rapns::Daemon::Apns::Delivery do
   end
 
   before do
-    Rapns.stub(:config => config)
-    Rapns::Daemon.stub(:logger => logger)
+    Rapns.stub(:config => config, :logger => logger)
   end
 
   it "sends the binary version of the notification" do
@@ -143,7 +142,7 @@ describe Rapns::Daemon::Apns::Delivery do
     end
 
     it "logs that the connection is being reconnected" do
-      Rapns::Daemon.logger.should_receive(:error).with("[MyApp] Error received, reconnecting...")
+      Rapns.logger.should_receive(:error).with("[MyApp] Error received, reconnecting...")
       perform
     end
 

data/spec/unit/daemon/apns/feedback_receiver_spec.rb

@@ -6,15 +6,15 @@ describe Rapns::Daemon::Apns::FeedbackReceiver, 'check_for_feedback' do
   let(:poll) { 60 }
   let(:certificate) { stub }
   let(:password) { stub }
-  let(:app) { stub(:name => 'my_app', :password => password, :certificate => certificate) }
+  let(:app) { stub(:name => 'my_app', :password => password, :certificate => certificate, :environment => 'production') }
   let(:connection) { stub(:connect => nil, :read => nil, :close => nil) }
   let(:logger) { stub(:error => nil, :info => nil) }
-  let(:receiver) { Rapns::Daemon::Apns::FeedbackReceiver.new(app, host, port, poll) }
+  let(:receiver) { Rapns::Daemon::Apns::FeedbackReceiver.new(app, poll) }
   let(:feedback) { stub }
 
   before do
     receiver.stub(:interruptible_sleep)
-    Rapns::Daemon.logger = logger
+    Rapns.stub(:logger => logger)
     Rapns::Daemon::Apns::Connection.stub(:new => connection)
     Rapns::Apns::Feedback.stub(:create! => feedback)
     receiver.instance_variable_set("@stop", false)
@@ -53,7 +53,7 @@ describe Rapns::Daemon::Apns::FeedbackReceiver, 'check_for_feedback' do
 
   it 'logs the feedback' do
     stub_connection_read_with_tuple
-    Rapns::Daemon.logger.should_receive(:info).with("[my_app] [FeedbackReceiver] Delivery failed at 2011-12-10 16:08:45 UTC for 834f786655eb9f84614a05ad7d00af31e5cfe93ac3ea078f1da44d2a4eb0ce17.")
+    Rapns.logger.should_receive(:info).with("[my_app] [FeedbackReceiver] Delivery failed at 2011-12-10 16:08:45 UTC for 834f786655eb9f84614a05ad7d00af31e5cfe93ac3ea078f1da44d2a4eb0ce17.")
     receiver.check_for_feedback
   end
 
@@ -66,7 +66,7 @@ describe Rapns::Daemon::Apns::FeedbackReceiver, 'check_for_feedback' do
   it 'logs errors' do
     error = StandardError.new('bork!')
     connection.stub(:read).and_raise(error)
-    Rapns::Daemon.logger.should_receive(:error).with(error)
+    Rapns.logger.should_receive(:error).with(error)
     receiver.check_for_feedback
   end
 
@@ -118,7 +118,7 @@ describe Rapns::Daemon::Apns::FeedbackReceiver, 'check_for_feedback' do
     error = StandardError.new('bork!')
     stub_connection_read_with_tuple
     callback = Proc.new { raise error }
-    Rapns::Daemon.logger.should_receive(:error).with(error)
+    Rapns.logger.should_receive(:error).with(error)
     Rapns::Deprecation.silenced do
       Rapns.config.on_apns_feedback &callback
     end

data/spec/unit/daemon/app_runner_spec.rb

@@ -17,7 +17,7 @@ describe Rapns::Daemon::AppRunner, 'deliver' do
   let(:logger) { stub(:error => nil) }
 
   before do
-    Rapns::Daemon.stub(:logger => logger)
+    Rapns.stub(:logger => logger)
     Rapns::Daemon::AppRunner.runners[1] = runner
   end
 
@@ -48,6 +48,7 @@ describe Rapns::Daemon::AppRunner, 'sync' do
     Rapns::Daemon::DeliveryQueue.stub(:new => queue)
     Rapns::Daemon::AppRunner.runners[app.id] = runner
     Rapns::App.stub(:all => [app])
+    Rapns.stub(:logger => logger)
   end
 
   after { Rapns::Daemon::AppRunner.runners.clear }
@@ -81,7 +82,7 @@ describe Rapns::Daemon::AppRunner, 'sync' do
     new_runner = stub
     Rapns::Daemon::Apns::AppRunner.should_receive(:new).with(new_app).and_return(new_runner)
     new_runner.stub(:start).and_raise(StandardError)
-    Rapns::Daemon.logger.should_receive(:error).any_number_of_times
+    Rapns.logger.should_receive(:error).any_number_of_times
     Rapns::Daemon::AppRunner.sync
   end
 end
@@ -95,14 +96,14 @@ describe Rapns::Daemon::AppRunner, 'debug' do
     Rapns::Daemon.stub(:config => {})
     Rapns::Daemon::Apns::FeedbackReceiver.stub(:new => stub.as_null_object)
     Rapns::Daemon::Apns::Connection.stub(:new => stub.as_null_object)
-    Rapns::Daemon.stub(:logger => logger)
+    Rapns.stub(:logger => logger)
     Rapns::Daemon::AppRunner.sync
   end
 
   after { Rapns::Daemon::AppRunner.runners.clear }
 
   it 'prints debug app states to the log' do
-    Rapns::Daemon.logger.should_receive(:info).with("\ntest:\n  handlers: 1\n  queued: 0\n  idle: true\n")
+    Rapns.logger.should_receive(:info).with("\ntest:\n  handlers: 1\n  queued: 0\n  idle: true\n")
     Rapns::Daemon::AppRunner.debug
   end
 end
@@ -113,10 +114,9 @@ describe Rapns::Daemon::AppRunner, 'idle' do
   let(:logger) { stub(:info => nil) }
 
   before do
-    Rapns::Daemon.stub(:config => {})
+    Rapns.stub(:logger => logger)
     Rapns::Daemon::Apns::FeedbackReceiver.stub(:new => stub.as_null_object)
     Rapns::Daemon::Apns::Connection.stub(:new => stub.as_null_object)
-    Rapns::Daemon.stub(:logger => logger)
     Rapns::Daemon::AppRunner.sync
   end
 
@@ -127,3 +127,23 @@ describe Rapns::Daemon::AppRunner, 'idle' do
     Rapns::Daemon::AppRunner.idle.should == [runner]
   end
 end
+
+describe Rapns::Daemon::AppRunner, 'wait' do
+  let!(:app) { Rapns::Apns::App.create!(:name => 'test', :connections => 1,
+    :environment => 'development', :certificate => TEST_CERT) }
+  let(:logger) { stub(:info => nil) }
+
+  before do
+    Rapns.stub(:logger => logger)
+    Rapns::Daemon::Apns::FeedbackReceiver.stub(:new => stub.as_null_object)
+    Rapns::Daemon::Apns::Connection.stub(:new => stub.as_null_object)
+    Rapns::Daemon::AppRunner.sync
+  end
+
+  after { Rapns::Daemon::AppRunner.runners.clear }
+
+  it 'waits until all runners are idle' do
+    Rapns::Daemon::AppRunner.runners.count.should == 1
+    Timeout.timeout(5) { Rapns::Daemon::AppRunner.wait }
+  end
+end

data/spec/unit/daemon/database_reconnectable_spec.rb

@@ -32,6 +32,8 @@ describe Rapns::Daemon::DatabaseReconnectable do
       ActiveRecord::JDBCError
     when 'jdbcmysql'
       ActiveRecord::JDBCError
+    when 'jdbch2'
+      ActiveRecord::JDBCError
     else
       raise "Please update #{__FILE__} for adapter #{$adapter}"
     end
@@ -41,7 +43,7 @@ describe Rapns::Daemon::DatabaseReconnectable do
 
   before do
     @logger = mock("Logger", :info => nil, :error => nil, :warn => nil)
-    Rapns::Daemon.stub(:logger).and_return(@logger)
+    Rapns.stub(:logger).and_return(@logger)
 
     ActiveRecord::Base.stub(:clear_all_connections!)
     ActiveRecord::Base.stub(:establish_connection)
@@ -49,17 +51,17 @@ describe Rapns::Daemon::DatabaseReconnectable do
   end
 
   it "should log the error raised" do
-    Rapns::Daemon.logger.should_receive(:error).with(error)
+    Rapns.logger.should_receive(:error).with(error)
     test_double.perform
   end
 
   it "should log that the database is being reconnected" do
-    Rapns::Daemon.logger.should_receive(:warn).with("Lost connection to database, reconnecting...")
+    Rapns.logger.should_receive(:warn).with("Lost connection to database, reconnecting...")
     test_double.perform
   end
 
   it "should log the reconnection attempt" do
-    Rapns::Daemon.logger.should_receive(:warn).with("Attempt 1")
+    Rapns.logger.should_receive(:warn).with("Attempt 1")
     test_double.perform
   end
 
@@ -92,12 +94,12 @@ describe Rapns::Daemon::DatabaseReconnectable do
     end
 
     it "should log the 2nd attempt" do
-      Rapns::Daemon.logger.should_receive(:warn).with("Attempt 2")
+      Rapns.logger.should_receive(:warn).with("Attempt 2")
       test_double.perform
     end
 
     it "should log errors raised when the reconnection is not successful without notifying airbrake" do
-      Rapns::Daemon.logger.should_receive(:error).with(error, :airbrake_notify => false)
+      Rapns.logger.should_receive(:error).with(error, :airbrake_notify => false)
       test_double.perform
     end
 
@@ -106,4 +108,4 @@ describe Rapns::Daemon::DatabaseReconnectable do
       test_double.perform
     end
   end
-end
+end

data/spec/unit/daemon/delivery_handler_shared.rb

@@ -1,15 +1,15 @@
 shared_examples_for 'an DeliveryHandler subclass' do
   it 'logs all delivery errors' do
     logger = stub
-    Rapns::Daemon.stub(:logger => logger)
+    Rapns.stub(:logger => logger)
     error = StandardError.new
     delivery_handler.stub(:deliver).and_raise(error)
-    Rapns::Daemon.logger.should_receive(:error).with(error)
+    Rapns.logger.should_receive(:error).with(error)
     delivery_handler.send(:handle_next_notification)
   end
 
   it 'reflects an exception' do
-    Rapns::Daemon.stub(:logger => stub(:error => nil))
+    Rapns.stub(:logger => stub(:error => nil))
     error = StandardError.new
     delivery_handler.stub(:deliver).and_raise(error)
     delivery_handler.should_receive(:reflect).with(:error, error)

data/spec/unit/daemon/feeder_spec.rb

@@ -11,6 +11,7 @@ describe Rapns::Daemon::Feeder do
     Rapns.stub(:config => config)
     Rapns::Daemon::Feeder.stub(:stop? => true)
     Rapns::Daemon::AppRunner.stub(:idle => [stub(:app => app)])
+    Rapns.stub(:logger => logger)
   end
 
   def start
@@ -102,7 +103,7 @@ describe Rapns::Daemon::Feeder do
   it "logs errors" do
     e = StandardError.new("bork")
     Rapns::Notification.stub(:ready_for_delivery).and_raise(e)
-    Rapns::Daemon.logger.should_receive(:error).with(e)
+    Rapns.logger.should_receive(:error).with(e)
     start
   end
 

data/spec/unit/daemon/gcm/app_runner_spec.rb

@@ -11,7 +11,7 @@ describe Rapns::Daemon::Gcm::AppRunner do
   let(:logger) { stub(:info => nil) }
 
   before do
-    Rapns::Daemon.stub(:logger => logger)
+    Rapns.stub(:logger => logger)
     Rapns::Daemon::Gcm::DeliveryHandler.stub(:new => handler)
   end
 end

data/spec/unit/daemon/gcm/delivery_spec.rb

@@ -15,7 +15,7 @@ describe Rapns::Daemon::Gcm::Delivery do
 
   before do
     Time.stub(:now => now)
-    Rapns::Daemon.stub(:logger => logger)
+    Rapns.stub(:logger => logger)
   end
 
   describe 'an 200 response' do
@@ -38,7 +38,7 @@ describe Rapns::Daemon::Gcm::Delivery do
 
     it 'logs that the notification was delivered' do
       response.stub(:body => JSON.dump({ 'failure' => 0 }))
-      logger.should_receive(:info).with("[MyApp] 1 sent to xyz")
+      logger.should_receive(:info).with("[MyApp] #{notification.id} sent to xyz")
       perform
     end
 
@@ -93,7 +93,7 @@ describe Rapns::Daemon::Gcm::Delivery do
       end
 
       it 'logs that the notification will be retried' do
-        Rapns::Daemon.logger.should_receive(:warn).with("All recipients unavailable. Notification #{notification.id} will be retired after 2012-10-14 00:00:02 (retry 1).")
+        Rapns.logger.should_receive(:warn).with("All recipients unavailable. Notification #{notification.id} will be retired after 2012-10-14 00:00:02 (retry 1).")
         perform
       end
     end
@@ -146,7 +146,7 @@ describe Rapns::Daemon::Gcm::Delivery do
           { 'error' => 'NotRegistered' },
           { 'error' => 'Unavailable' }
         ]}}
-      let(:error_description) { "Failed to deliver to recipients 0, 1, 2. Errors: Unavailable, NotRegistered, Unavailable. 0, 2 will be retried as notification 2." }
+      let(:error_description) { "Failed to deliver to recipients 0, 1, 2. Errors: Unavailable, NotRegistered, Unavailable. 0, 2 will be retried as notification #{notification.id + 1}." }
       it_should_behave_like 'an notification with some delivery failures'
     end
   end
@@ -160,7 +160,7 @@ describe Rapns::Daemon::Gcm::Delivery do
           { 'message_id' => '1:000' },
           { 'error' => 'InternalServerError' }
         ]}}
-    let(:error_description) { "Failed to deliver to recipients 0, 2. Errors: Unavailable, InternalServerError. 0, 2 will be retried as notification 2." }
+    let(:error_description) { "Failed to deliver to recipients 0, 2. Errors: Unavailable, InternalServerError. 0, 2 will be retried as notification #{notification.id + 1}." }
     it_should_behave_like 'an notification with some delivery failures'
   end
 
@@ -168,7 +168,7 @@ describe Rapns::Daemon::Gcm::Delivery do
     before { response.stub(:code => 503) }
 
     it 'logs a warning that the notification will be retried.' do
-      logger.should_receive(:warn).with("GCM responded with an Service Unavailable Error. Notification 1 will be retired after 2012-10-14 00:00:02 (retry 1).")
+      logger.should_receive(:warn).with("GCM responded with an Service Unavailable Error. Notification #{notification.id} will be retired after 2012-10-14 00:00:02 (retry 1).")
       perform
     end
 
@@ -205,7 +205,7 @@ describe Rapns::Daemon::Gcm::Delivery do
     end
 
     it 'logs a warning that the notification has been re-queued.' do
-      Rapns::Daemon.logger.should_receive(:warn).with("GCM responded with an Internal Error. Notification #{notification.id} will be retired after #{(now + 2 ** 3).strftime("%Y-%m-%d %H:%M:%S")} (retry 3).")
+      Rapns.logger.should_receive(:warn).with("GCM responded with an Internal Error. Notification #{notification.id} will be retired after #{(now + 2 ** 3).strftime("%Y-%m-%d %H:%M:%S")} (retry 3).")
       perform
     end
 

data/spec/unit/daemon/reflectable_spec.rb

@@ -10,7 +10,7 @@ describe Rapns::Daemon::Reflectable do
 
   before do
     Rapns.reflections.stub(:__dispatch)
-    Rapns::Daemon.stub(:logger => logger)
+    Rapns.stub(:logger => logger)
   end
 
   it 'dispatches the given reflection' do
@@ -21,7 +21,7 @@ describe Rapns::Daemon::Reflectable do
   it 'logs errors raise by the reflection' do
     error = StandardError.new
     Rapns.reflections.stub(:__dispatch).and_raise(error)
-    Rapns::Daemon.logger.should_receive(:error).with(error)
+    Rapns.logger.should_receive(:error).with(error)
     test_reflectable.reflect(:error)
   end
 end