rapns 3.0.1 → 3.1.0

data/lib/rapns/daemon.rb

@@ -5,6 +5,7 @@ require 'openssl'
 
 require 'net/http/persistent'
 
+require 'rapns/daemon/reflectable'
 require 'rapns/daemon/interruptible_sleep'
 require 'rapns/daemon/delivery_error'
 require 'rapns/daemon/database_reconnectable'
@@ -37,9 +38,10 @@ module Rapns
     def self.start
       self.logger = Logger.new(:foreground => Rapns.config.foreground,
                                :airbrake_notify => Rapns.config.airbrake_notify)
-      setup_signal_hooks
 
-      unless Rapns.config.foreground
+      setup_signal_traps if trap_signals?
+
+      if daemonize?
         daemonize
         reconnect_database
       end
@@ -47,11 +49,22 @@ module Rapns
       write_pid_file
       ensure_upgraded
       AppRunner.sync
-      Feeder.start(Rapns.config.push_poll)
+      Feeder.start
+    end
+
+    def self.shutdown(quiet = false)
+      puts "\nShutting down..." unless quiet
+      Feeder.stop
+      AppRunner.stop
+      delete_pid_file
     end
 
     protected
 
+    def self.daemonize?
+      !(Rapns.config.foreground || Rapns.config.embedded || Rapns.config.push || defined?(JRUBY_VERSION))
+    end
+
     def self.ensure_upgraded
       count = 0
 
@@ -64,7 +77,7 @@ module Rapns
         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
+        exit 1 unless Rapns.config.embedded || Rapns.config.push
       end
 
       if count == 0
@@ -80,7 +93,11 @@ Remove config/rapns/rapns.yml to avoid this warning.
       end
     end
 
-    def self.setup_signal_hooks
+    def self.trap_signals?
+      !(Rapns.config.embedded || Rapns.config.push)
+    end
+
+    def self.setup_signal_traps
       @shutting_down = false
 
       Signal.trap('SIGHUP') { AppRunner.sync }
@@ -97,13 +114,6 @@ Remove config/rapns/rapns.yml to avoid this warning.
       shutdown
     end
 
-    def self.shutdown
-      puts "\nShutting down..."
-      Feeder.stop
-      AppRunner.stop
-      delete_pid_file
-    end
-
     def self.write_pid_file
       if !Rapns.config.pid_file.blank?
         begin
@@ -121,16 +131,17 @@ Remove config/rapns/rapns.yml to avoid this warning.
 
     # :nocov:
     def self.daemonize
-      exit if pid = fork
-      Process.setsid
-      exit if pid = fork
-
-      Dir.chdir '/'
-      File.umask 0000
-
-      STDIN.reopen '/dev/null'
-      STDOUT.reopen '/dev/null', 'a'
-      STDERR.reopen STDOUT
+      if RUBY_VERSION < "1.9"
+        exit if fork
+        Process.setsid
+        exit if fork
+        Dir.chdir "/"
+        STDIN.reopen "/dev/null"
+        STDOUT.reopen "/dev/null", "a"
+        STDERR.reopen "/dev/null", "a"
+      else
+        Process.daemon
+      end
     end
   end
 end

data/lib/rapns/embed.rb

@@ -0,0 +1,28 @@
+module Rapns
+  def self.embed(options = {})
+    Rapns.require_for_daemon
+
+    config = Rapns::ConfigurationWithoutDefaults.new
+    options.each { |k, v| config.send("#{k}=", v) }
+    config.embedded = true
+    Rapns.config.update(config)
+    Rapns::Daemon.start
+
+    Kernel.at_exit { shutdown }
+  end
+
+  def self.shutdown
+    return unless Rapns.config.embedded
+    Rapns::Daemon.shutdown
+  end
+
+  def self.sync
+    return unless Rapns.config.embedded
+    Rapns::Daemon::AppRunner.sync
+  end
+
+  def self.debug
+    return unless Rapns.config.embedded
+    Rapns::Daemon::AppRunner.debug
+  end
+end

data/lib/rapns/gcm/notification.rb

@@ -3,7 +3,8 @@ module Rapns
     class Notification < Rapns::Notification
       validates :registration_ids, :presence => true
       validates_with Rapns::Gcm::ExpiryCollapseKeyMutualInclusionValidator
-      validates_with Rapns::Gcm::PayloadSizeValidator
+      validates_with Rapns::Gcm::PayloadDataSizeValidator
+      validates_with Rapns::Gcm::RegistrationIdsCountValidator
 
       def registration_ids=(ids)
         ids = [ids] if ids && !ids.is_a?(Array)
@@ -26,6 +27,10 @@ module Rapns
 
         json
       end
+
+      def payload_data_size
+        multi_json_dump(as_json['data']).bytesize
+      end
     end
   end
-end
+end

data/lib/rapns/gcm/payload_data_size_validator.rb

@@ -0,0 +1,13 @@
+module Rapns
+  module Gcm
+    class PayloadDataSizeValidator < ActiveModel::Validator
+      LIMIT = 4096
+
+      def validate(record)
+        if record.payload_data_size > LIMIT
+          record.errors[:base] << "GCM notification payload data cannot be larger than #{LIMIT} bytes."
+        end
+      end
+    end
+  end
+end

data/lib/rapns/gcm/registration_ids_count_validator.rb

@@ -0,0 +1,13 @@
+module Rapns
+  module Gcm
+    class RegistrationIdsCountValidator < ActiveModel::Validator
+      LIMIT = 1000
+
+      def validate(record)
+        if record.registration_ids && record.registration_ids.size > LIMIT
+          record.errors[:base] << "GCM notification num of registration_ids cannot be larger than #{LIMIT}."
+        end
+      end
+    end
+  end
+end

data/lib/rapns/push.rb

@@ -0,0 +1,12 @@
+module Rapns
+  def self.push(options = {})
+    Rapns.require_for_daemon
+
+    config = Rapns::ConfigurationWithoutDefaults.new
+    options.each { |k, v| config.send("#{k}=", v) }
+    config.push = true
+    Rapns.config.update(config)
+    Rapns::Daemon.start
+    Rapns::Daemon.shutdown(true)
+  end
+end

data/lib/rapns/reflection.rb

@@ -0,0 +1,44 @@
+module Rapns
+  def self.reflect
+    yield reflections if block_given?
+  end
+
+  def self.reflections
+    @reflections ||= Reflections.new
+  end
+
+  class Reflections
+    class NoSuchReflectionError < StandardError; end
+
+    REFLECTIONS = [
+      :apns_feedback, :notification_enqueued, :notification_delivered,
+      :notification_failed, :notification_will_retry, :apns_connection_lost,
+      :error
+    ]
+
+    REFLECTIONS.each do |reflection|
+      class_eval(<<-RUBY, __FILE__, __LINE__)
+        def #{reflection}(*args, &blk)
+          raise "block required" unless block_given?
+          reflections[:#{reflection}] = blk
+        end
+      RUBY
+    end
+
+    def __dispatch(reflection, *args)
+      unless REFLECTIONS.include?(reflection.to_sym)
+        raise NoSuchReflectionError, reflection
+      end
+
+      if reflections[reflection]
+        reflections[reflection].call(*args)
+      end
+    end
+
+    private
+
+    def reflections
+      @reflections ||= {}
+    end
+  end
+end

data/lib/rapns/version.rb

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

data/lib/rapns.rb

@@ -8,6 +8,9 @@ require 'rapns/multi_json_helper'
 require 'rapns/notification'
 require 'rapns/app'
 require 'rapns/configuration'
+require 'rapns/reflection'
+require 'rapns/embed'
+require 'rapns/push'
 
 require 'rapns/apns/binary_notification_validator'
 require 'rapns/apns/device_token_format_validator'
@@ -17,7 +20,14 @@ require 'rapns/apns/feedback'
 require 'rapns/apns/app'
 
 require 'rapns/gcm/expiry_collapse_key_mutual_inclusion_validator'
-require 'rapns/gcm/payload_size_validator'
+require 'rapns/gcm/payload_data_size_validator'
+require 'rapns/gcm/registration_ids_count_validator'
 require 'rapns/gcm/notification'
 require 'rapns/gcm/app'
 
+module Rapns
+  def self.require_for_daemon
+    require 'rapns/daemon'
+    require 'rapns/patches'
+  end
+end

data/spec/support/cert_with_password.pem

@@ -0,0 +1,90 @@
+Bag Attributes
+    localKeyID: A4 1A DB 3E 3E 45 D9 C7 51 1E E6 DC 4E BC 29 19 E4 22 95 35
+subject=/C=AU/ST=Some-State/O=Internet Widgits Pty Ltd
+issuer=/C=UK/ST=Some-State/O=Internet Widgits Pty Ltd
+-----BEGIN CERTIFICATE-----
+MIIE/jCCAuYCAQEwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCVUsxEzARBgNV
+BAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0
+ZDAeFw0xMjEyMjgxMzU4NTdaFw0xNDEyMjgxMzU4NTdaMEUxCzAJBgNVBAYTAkFV
+MRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRz
+IFB0eSBMdGQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDYCSfYP0P7
+F+JbxUHYsl/9Plr2bFZGMBygqs5RWpw1X977p4FqcNtnRmGENQ/I5vE3KkAKCAlS
+gmus7CjB9/FVzoJq65cT3wBkcqAAzPgIQuI0UjP+rLktV84eUup7Pt6f/Bmt/fBj
+h3fvf80nBQcdK2ztu1xtTs7EsRgyudUDDEIUZw9ddK21RbCMYE0PFY0QapNVvevs
+8lDVUJX60bZqVqzhvlTzmEaBF+E66J/DhHuhcWZV588hVKjHMNED9Aq4PxRy78vI
+54v1buX2Y9C6dHfIzfu7zz0Zv5NAY1BZKpaglVGKArOrX+K6O7Bq+DwckTm1AbUf
+pQqi10ghveOtVrm4GXJ4OYW8ohdYKMFjzwhgTTr/NQ+EVlcZ+8AOPVPPJk0HgPu/
+eMNiLytvcSnB09OzIUAzcxOof2a1zfxn7aPzBTEC6kkoDJC/BDG8wxySUz0zRyyM
+jUN2+J1mBJZX1h1sM/4ycAzsX1EYm2II5GGJaFngiV45Qv7wTC7W31kvih7FsdUX
+rEYMkevB5AFPUtIvzevLUObLbPW4yWvU2CMcKLZdIaPTvtPMba91t1YOdufpPRDd
+HTmT42h0aUWDSrcWDAuZPPPqEIQNjRVCudtHtobZDeaUfvbx05CvypyuNFaPonuQ
+l5h0LpZWPetvfsrOlMxPm2kfVcxm8mWjzQIDAQABMA0GCSqGSIb3DQEBBQUAA4IC
+AQBiwdPfLU0kjbU1hM6grUHduLqOPDqLT5gefGRrL5fDqb86G08+Wz+Tnn1YmH+7
+rfiQhCrdi4zxRv6ZEaKZeEm/q1UMttuUdXuzd25BEEtav4R0POdR+H1q3trlS0ol
+EcWlAbRgVaT2tTyKGAW54fH8vZPqS6IP+mXIzfaOFECPEgAO8BL8t7hBDpkL4ASO
+HbU7ktYamsr6PAei3kXAnJ1thXyQqrhelwLrQJyM8RVOJYUgVbl6Fpdtgu7YQF5G
+kxTAfshSmDCQkf+tbUEs44rZ6BZ2TWnbXjQGkRntHcMCP/1rjsPPdX3oeZ7P3jMQ
+XER3drdm1mOiSdDUKbem9GzQ9Dx7WkwKNLYAZ+IWzVRACzGxnkxXyxOEFIgesDgg
+RIhczN+eLIR8iwcUxEVKFmmsbEIve3Uh1/NE6xGudbfZDNfhyOhiNYIBnQqVkk8l
+c3gw2UDR3lXTayiiXhK2l1etsyxtYncT3pgDsCe72RODrGKbASt3FzfBbalzN0GG
+9tiPSNtGqCch9q4eHfViUh9s3+8n4bknAYcwzQ96+gMEn8PUVtDBv9F8Kxffn/Jt
+XMWKX76nTVuAuCLkXxrKwc01lq8SeuvCH650xsv0LBvxj9h6vR34vHGrj0C3sH2E
+VQpelKNv8IEwkSiQcwDtU8H0jaPJNqmYlkrxasSrSeg6PA==
+-----END CERTIFICATE-----
+Bag Attributes
+    localKeyID: A4 1A DB 3E 3E 45 D9 C7 51 1E E6 DC 4E BC 29 19 E4 22 95 35
+Key Attributes: <No Attributes>
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,874F2C982467BF08
+
+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
+-----END RSA PRIVATE KEY-----

data/spec/support/cert_without_password.pem

@@ -0,0 +1,59 @@
+Bag Attributes
+    friendlyName: test certificate
+    localKeyID: 00 93 8F E4 A3 C3 75 64 3D 7E EA 14 0B 0A EA DD 15 85 8A D5
+subject=/CN=test certificate/O=Example/OU=Example/ST=QLD/C=AU/L=Example/emailAddress=user@example.com
+issuer=/CN=test certificate/O=Example/OU=Example/ST=QLD/C=AU/L=Example/emailAddress=user@example.com
+-----BEGIN CERTIFICATE-----
+MIID5jCCAs6gAwIBAgIBATALBgkqhkiG9w0BAQswgY0xGTAXBgNVBAMMEHRlc3Qg
+Y2VydGlmaWNhdGUxEDAOBgNVBAoMB0V4YW1wbGUxEDAOBgNVBAsMB0V4YW1wbGUx
+DDAKBgNVBAgMA1FMRDELMAkGA1UEBhMCQVUxEDAOBgNVBAcMB0V4YW1wbGUxHzAd
+BgkqhkiG9w0BCQEWEHVzZXJAZXhhbXBsZS5jb20wHhcNMTIwOTA5MDMxODMyWhcN
+MjIwOTA3MDMxODMyWjCBjTEZMBcGA1UEAwwQdGVzdCBjZXJ0aWZpY2F0ZTEQMA4G
+A1UECgwHRXhhbXBsZTEQMA4GA1UECwwHRXhhbXBsZTEMMAoGA1UECAwDUUxEMQsw
+CQYDVQQGEwJBVTEQMA4GA1UEBwwHRXhhbXBsZTEfMB0GCSqGSIb3DQEJARYQdXNl
+ckBleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKF+
+UDsN1sLen8g+97PNTiWju9+wkSv+H5rQlvb6YFLPx11YvqpK8ms6kFU1OmWeLfmh
+cpsT+bZtKupC7aGPoSG3RXzzf/YUMgs/ZSXA0idZHA6tkReAEzIX6jL5otfPWbaP
+luCTUoVMeP4u9ywk628zlqh9IQHC1Agl0R1xGCpULDk8kn1gPyEisl38wI5aDbzy
+6lYQGNUKOqt1xfVjtIFe/jyY/v0sxFjIJlRLcAFBuJx4sRV+PwRBkusOQtYwcwpI
+loMxJj+GQe66ueATW81aC4iOU66DAFFEuGzwIwm3bOilimGGQbGb92F339RfmSOo
+TPAvVhsakI3mzESb4lkCAwEAAaNRME8wDgYDVR0PAQH/BAQDAgeAMCAGA1UdJQEB
+/wQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAbBgNVHREEFDASgRB1c2VyQGV4YW1w
+bGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQA5UbNR+83ZdI2DiaB4dRmy0V5RDAqJ
+k9+QskcTV4gBTjsOBS46Dw1tI6iTrfTyjYJdnyH0Y2Y2YVWBnvtON41UCZak+4ed
+/IqyzU0dtfZ+frWa0RY4reyl80TwqnzyJfni0nDo4zGGvz70cxyaz2u1BWqwLjqb
+dh8Dxvt+aHW2MQi0iGKh/HNbgwVanR4+ubNwziK9sR1Rnq9MkHWtwBw16SXQG6ao
+SZKASWNaH8VL08Zz0E98cwd137UJkPsldCwJ8kHR5OzkcjPdXvnGD3d64yy2TC1Z
+Gy1Aazt98wPcTYBytlhK8Rvzg9OoY9QmsdpmWxz1ZCXECJNqCa3IKsqO
+-----END CERTIFICATE-----
+Bag Attributes
+    friendlyName: test certificate
+    localKeyID: 00 93 8F E4 A3 C3 75 64 3D 7E EA 14 0B 0A EA DD 15 85 8A D5
+Key Attributes: <No Attributes>
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAoX5QOw3Wwt6fyD73s81OJaO737CRK/4fmtCW9vpgUs/HXVi+
+qkryazqQVTU6ZZ4t+aFymxP5tm0q6kLtoY+hIbdFfPN/9hQyCz9lJcDSJ1kcDq2R
+F4ATMhfqMvmi189Zto+W4JNShUx4/i73LCTrbzOWqH0hAcLUCCXRHXEYKlQsOTyS
+fWA/ISKyXfzAjloNvPLqVhAY1Qo6q3XF9WO0gV7+PJj+/SzEWMgmVEtwAUG4nHix
+FX4/BEGS6w5C1jBzCkiWgzEmP4ZB7rq54BNbzVoLiI5TroMAUUS4bPAjCbds6KWK
+YYZBsZv3YXff1F+ZI6hM8C9WGxqQjebMRJviWQIDAQABAoIBAQCTiLIDQUFSBdAz
+QFNLD+S0vkCEuunlJuP4q1c/ir006l1YChsluBJ/o6D4NwiCjV+zDquEwVsALftm
+yH4PewfZpXT2Ef508T5GyEO/mchj6iSXxDkpHvhqay6qIyWBwwxSnBtaTzy0Soi+
+rmlhCtmLXbXld2sQEM1kJChGnWtWPtvSyrn+mapNPZviGRtgRNK+YsrAti1nUext
+2syO5mTdHf1D8GR7I98OaX6odREuSocEV9PzfapWZx2GK5tvRiS1skiug5ciieTd
+Am5/C+bb31h4drFslihLb5BRGO5SFQJvMJL2Sx1f19BCC4XikS01P4/zZbxQNq79
+kxEQuDGBAoGBANP4pIYZ5xshCkx7cTYqmxzWLClGKE2S7Oa8N89mtOwfmqT9AFun
+t9Us9Ukbi8BaKlKhGpQ1HlLf/KVcpyW0x2qLou6AyIWYH+/5VaR3graNgUnzpK9f
+1F5HoaNHbhlAoebqhzhASFlJI2aqUdQjdOv73z+s9szJU4gpILNwGDFnAoGBAMMJ
+j+vIxtG9J2jldyoXzpg5mbMXSj9u/wFLBVdjXWyOoiqVMMBto53RnoqAom7Ifr9D
+49LxRAT1Q3l4vs/YnM3ziMsIg2vQK1EbrLsY9OnD/kvPaLXOlNIOdfLM8UeVWZMc
+I4LPbbZrhv/7CC8RjbRhMoWWdGYPvxmvD6V4ZDY/AoGBALoI6OxA45Htx4okdNHj
+RstiNNPsnQaoQn6nBhxiubraafEPkzbd1fukP4pwQJELEUX/2sHkdL6rkqLW1GPF
+a5dZAiBsqpCFWNJWdBGqSfBJ9QSgbxLz+gDcwUH6OOi0zuNJRm/aCyVBiW5bYQHc
+NIvAPMk31ksZDtTbs7WIVdNVAoGBALZ1+KWNxKqs+fSBT5UahpUUtfy8miJz9a7A
+/3M8q0cGvSF3Rw+OwpW/aEGMi+l2OlU27ykFuyukRAac9m296RwnbF79TO2M5ylO
+6a5zb5ROXlWP6RbE96b4DlIidssQJqegmHwlEC+rsrVBpOtb0aThlYEyOxzMOGyP
+wOR9l8rDAoGADZ4TUHFM6VrvPlUZBkGbqiyXH9IM/y9JWk+22JQCEGnM6RFZemSs
+jxWqQiPAdJtb3xKryJSCMtFPH9azedoCrSgaMflJ1QgoXgpiKZyoEXWraVUggh/0
+CEavgZcTZ6SvMuayqJdGGB+zb1V8XwXMtCjApR/kTm47DjxO4DmpOPs=
+-----END RSA PRIVATE KEY-----

data/spec/unit/apns/app_spec.rb

@@ -7,9 +7,23 @@ describe Rapns::App do
     app.errors[:certificate].should == ['Certificate value must contain a certificate and a private key.']
   end
 
-  it 'validates a real certificate' do
+  it 'validates a certificate without a password' do
     app = Rapns::Apns::App.new :key => 'test', :environment => 'development', :certificate => TEST_CERT
     app.valid?
     app.errors[:certificate].should == []
   end
+
+  it 'validates a certificate with a password' do
+    app = Rapns::Apns::App.new :key => 'test', :environment => 'development',
+      :certificate => TEST_CERT_WITH_PASSWORD, :password => 'fubar'
+    app.valid?
+    app.errors[:certificate].should == []
+  end
+
+  it 'validates a certificate with an incorrect password' do
+    app = Rapns::Apns::App.new :key => 'test', :environment => 'development',
+      :certificate => TEST_CERT_WITH_PASSWORD, :password => 'incorrect'
+    app.valid?
+    app.errors[:certificate].should == ["Certificate value must contain a certificate and a private key."]
+  end
 end

data/spec/unit/apns/notification_spec.rb

@@ -128,10 +128,25 @@ describe Rapns::Apns::Notification, 'content-available' do
     notification.as_json['aps'].key?('content-available').should be_false
   end
 
-  it 'does not include convert-available as a non-aps attribute' do
+  it 'does not include content-available as a non-aps attribute' do
     notification.content_available = true
     notification.as_json.key?('content-available').should be_false
   end
+
+  it 'does not overwrite existing attributes for the device' do
+    notification.data = {:hi => :mom}
+    notification.content_available = true
+    notification.as_json['aps']['content-available'].should == 1
+    notification.as_json['hi'].should == 'mom'
+  end
+
+  it 'does not overwrite the content-available flag when setting attributes for the device' do
+    notification.content_available = true
+    notification.data = {:hi => :mom}
+    notification.as_json['aps']['content-available'].should == 1
+    notification.as_json['hi'].should == 'mom'
+  end
+
 end
 
 describe Rapns::Apns::Notification, "to_binary" do

data/spec/unit/configuration_spec.rb

@@ -15,7 +15,9 @@ describe Rapns::Configuration do
 
   it 'configures a feedback callback' do
     b = Proc.new {}
-    config.on_apns_feedback(&b)
+    Rapns::Deprecation.silenced do
+      config.on_apns_feedback(&b)
+    end
     config.apns_feedback_callback.should == b
   end
 
@@ -35,4 +37,11 @@ describe Rapns::Configuration do
     config.pid_file = '/tmp/rapns.pid'
     config.pid_file.should == '/tmp/rapns.pid'
   end
+
+  it 'does not allow foreground to be set to false if the platform is JRuby' do
+    config.foreground = true
+    stub_const('Rapns::Configuration::JRUBY_VERSION', '1.7.1')
+    config.foreground = false
+    config.foreground.should be_true
+  end
 end

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

@@ -11,7 +11,8 @@ describe Rapns::Daemon::Apns::Connection do
   let(:tcp_socket) { stub(:setsockopt => nil, :close => nil) }
   let(:ssl_socket) { stub(:sync= => nil, :connect => nil, :close => nil, :write => nil, :flush => nil) }
   let(:logger) { stub(:info => nil, :error => nil) }
-  let(:connection) { Rapns::Daemon::Apns::Connection.new('Connection 0', host, port, certificate, password) }
+  let(:app) { stub(:name => 'Connection 0', :certificate => certificate, :password => password)}
+  let(:connection) { Rapns::Daemon::Apns::Connection.new(app, host, port) }
 
   before do
     OpenSSL::SSL::SSLContext.stub(:new => ssl_context)
@@ -121,6 +122,14 @@ describe Rapns::Daemon::Apns::Connection do
       ssl_socket.stub(:write).and_raise(error_type)
     end
 
+    it 'reflects the connection has been lost' do
+      connection.should_receive(:reflect).with(:apns_connection_lost, app, kind_of(error_type))
+      begin
+        connection.write(nil)
+      rescue Rapns::Daemon::Apns::ConnectionError
+      end
+    end
+
     it "logs that the connection has been lost once only" do
       logger.should_receive(:error).with("[Connection 0] Lost connection to gateway.push.apple.com:2195 (#{error_type.name}), reconnecting...").once
       begin
@@ -231,4 +240,4 @@ describe Rapns::Daemon::Apns::Connection do
       connection.write('blah')
     end
   end
-end
+end

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

@@ -23,7 +23,7 @@ describe Rapns::Daemon::Apns::DeliveryHandler do
   end
 
   it "instantiates a new connection" do
-    Rapns::Daemon::Apns::Connection.should_receive(:new).with(app.name, host, port, certificate, password)
+    Rapns::Daemon::Apns::Connection.should_receive(:new).with(app, host, port)
     Rapns::Daemon::Apns::DeliveryHandler.new(app, host, port)
   end
 

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

@@ -37,6 +37,11 @@ describe Rapns::Daemon::Apns::Delivery do
     perform
   end
 
+  it 'reflects the notification was delivered' do
+    delivery.should_receive(:reflect).with(:notification_delivered, notification)
+    perform
+  end
+
   it "sets the time the notification was delivered" do
     now = Time.now
     Time.stub(:now).and_return(now)
@@ -83,6 +88,11 @@ describe Rapns::Daemon::Apns::Delivery do
       perform
     end
 
+    it 'reflects the notification delivery failed' do
+      delivery.should_receive(:reflect).with(:notification_failed, notification)
+      perform
+    end
+
     it "sets the notification failed_at timestamp" do
       now = Time.now
       Time.stub(:now).and_return(now)

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

@@ -10,12 +10,13 @@ describe Rapns::Daemon::Apns::FeedbackReceiver, 'check_for_feedback' do
   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(:feedback) { stub }
 
   before do
     receiver.stub(:interruptible_sleep)
     Rapns::Daemon.logger = logger
     Rapns::Daemon::Apns::Connection.stub(:new => connection)
-    Rapns::Apns::Feedback.stub(:create!)
+    Rapns::Apns::Feedback.stub(:create! => feedback)
     receiver.instance_variable_set("@stop", false)
   end
 
@@ -31,7 +32,7 @@ describe Rapns::Daemon::Apns::FeedbackReceiver, 'check_for_feedback' do
   end
 
   it 'instantiates a new connection' do
-    Rapns::Daemon::Apns::Connection.should_receive(:new).with("FeedbackReceiver:#{app.name}", host, port, certificate, password)
+    Rapns::Daemon::Apns::Connection.should_receive(:new).with(app, host, port)
     receiver.check_for_feedback
   end
 
@@ -52,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("[FeedbackReceiver:my_app] Delivery failed at 2011-12-10 16:08:45 UTC for 834f786655eb9f84614a05ad7d00af31e5cfe93ac3ea078f1da44d2a4eb0ce17")
+    Rapns::Daemon.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
 
@@ -90,11 +91,15 @@ describe Rapns::Daemon::Apns::FeedbackReceiver, 'check_for_feedback' do
     receiver.stop
   end
 
+  it 'reflects feedback was received' do
+    stub_connection_read_with_tuple
+    receiver.should_receive(:reflect).with(:apns_feedback, feedback)
+    receiver.check_for_feedback
+  end
+
   it 'calls the apns_feedback_callback when feedback is received and the callback is set' do
     stub_connection_read_with_tuple
     Rapns.config.apns_feedback_callback = Proc.new {}
-    feedback = Object.new
-    Rapns::Apns::Feedback.stub(:create! => feedback)
     Rapns.config.apns_feedback_callback.should_receive(:call).with(feedback)
     receiver.check_for_feedback
   end
@@ -103,7 +108,9 @@ describe Rapns::Daemon::Apns::FeedbackReceiver, 'check_for_feedback' do
     error = StandardError.new('bork!')
     stub_connection_read_with_tuple
     callback = Proc.new { raise error }
-    Rapns.config.on_apns_feedback &callback
+    Rapns::Deprecation.silenced do
+      Rapns.config.on_apns_feedback &callback
+    end
     expect { receiver.check_for_feedback }.not_to raise_error
   end
 
@@ -112,7 +119,9 @@ describe Rapns::Daemon::Apns::FeedbackReceiver, 'check_for_feedback' do
     stub_connection_read_with_tuple
     callback = Proc.new { raise error }
     Rapns::Daemon.logger.should_receive(:error).with(error)
-    Rapns.config.on_apns_feedback &callback
+    Rapns::Deprecation.silenced do
+      Rapns.config.on_apns_feedback &callback
+    end
     receiver.check_for_feedback
   end
 end

data/spec/unit/daemon/delivery_handler_shared.rb

@@ -8,6 +8,14 @@ shared_examples_for 'an DeliveryHandler subclass' do
     delivery_handler.send(:handle_next_notification)
   end
 
+  it 'reflects an exception' do
+    Rapns::Daemon.stub(:logger => stub(:error => nil))
+    error = StandardError.new
+    delivery_handler.stub(:deliver).and_raise(error)
+    delivery_handler.should_receive(:reflect).with(:error, error)
+    delivery_handler.send(:handle_next_notification)
+  end
+
   it "instructs the queue to wakeup the thread when told to stop" do
     thread = stub(:join => nil)
     Thread.stub(:new => thread)