rapns 3.0.1-java → 3.1.0-java

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)

data/spec/unit/daemon/feeder_spec.rb

@@ -1,19 +1,27 @@
 require "unit_spec_helper"
 
 describe Rapns::Daemon::Feeder do
-  let(:config) { stub(:batch_size => 5000) }
+  let(:config) { stub(:batch_size => 5000, :push_poll => 0, :embedded => false,
+    :push => false) }
   let!(:app) { Rapns::Apns::App.create!(:name => 'my_app', :environment => 'development', :certificate => TEST_CERT) }
   let(:notification) { Rapns::Apns::Notification.create!(:device_token => "a" * 64, :app => app) }
   let(:logger) { stub }
 
   before do
-    Rapns::Daemon.stub(:logger => logger, :config => config)
-    Rapns::Daemon::Feeder.instance_variable_set("@stop", true)
+    Rapns.stub(:config => config)
+    Rapns::Daemon::Feeder.stub(:stop? => true)
     Rapns::Daemon::AppRunner.stub(:idle => [stub(:app => app)])
   end
 
   def start
-    Rapns::Daemon::Feeder.start(0)
+    Rapns::Daemon::Feeder.start
+  end
+
+  it "starts the loop in a new thread if embedded" do
+    config.stub(:embedded => true)
+    Thread.should_receive(:new).and_yield
+    Rapns::Daemon::Feeder.should_receive(:feed_forever)
+    start
   end
 
   it "checks for new notifications with the ability to reconnect the database" do
@@ -21,6 +29,13 @@ describe Rapns::Daemon::Feeder do
     start
   end
 
+  it 'enqueues notifications without looping if in push mode' do
+    config.stub(:push => true)
+    Rapns::Daemon::Feeder.should_not_receive(:feed_forever)
+    Rapns::Daemon::Feeder.should_receive(:enqueue_notifications)
+    start
+  end
+
   it 'loads notifications in batches' do
     relation = stub.as_null_object
     relation.should_receive(:limit).with(5000)
@@ -28,12 +43,27 @@ describe Rapns::Daemon::Feeder do
     start
   end
 
-  it "enqueue the notification" do
+  it 'does not load notification in batches if in push mode' do
+    config.stub(:push => true)
+    relation = stub.as_null_object
+    relation.should_not_receive(:limit)
+    Rapns::Notification.stub(:ready_for_delivery => relation)
+    start
+  end
+
+  it "enqueues the notification" do
     notification.update_attributes!(:delivered => false)
     Rapns::Daemon::AppRunner.should_receive(:enqueue).with(notification)
     start
   end
 
+  it 'reflects the notification has been enqueued' do
+    notification.update_attributes!(:delivered => false)
+    Rapns::Daemon::AppRunner.stub(:enqueue)
+    Rapns::Daemon::Feeder.should_receive(:reflect).with(:notification_enqueued, notification)
+    start
+  end
+
   it 'does not enqueue the notification if the app runner is still processing the previous batch' do
     Rapns::Daemon::AppRunner.should_not_receive(:enqueue)
     start
@@ -88,8 +118,9 @@ describe Rapns::Daemon::Feeder do
   end
 
   it "sleeps for the given period" do
+    config.stub(:push_poll => 2)
     Rapns::Daemon::Feeder.should_receive(:interruptible_sleep).with(2)
     Rapns::Daemon::Feeder.stub(:loop).and_yield
-    Rapns::Daemon::Feeder.start(2)
+    Rapns::Daemon::Feeder.start
   end
 end

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

@@ -7,9 +7,10 @@ describe Rapns::Daemon::Gcm::Delivery do
   let(:response) { stub(:code => 200, :header => {}) }
   let(:http) { stub(:shutdown => nil, :request => response)}
   let(:now) { Time.parse('2012-10-14 00:00:00') }
+  let(:delivery) { Rapns::Daemon::Gcm::Delivery.new(app, http, notification) }
 
   def perform
-    Rapns::Daemon::Gcm::Delivery.perform(app, http, notification)
+    delivery.perform
   end
 
   before do
@@ -29,6 +30,12 @@ describe Rapns::Daemon::Gcm::Delivery do
       end.to change(notification, :delivered).to(true)
     end
 
+    it 'reflects the notification was delivered' do
+      response.stub(:body => JSON.dump({ 'failure' => 0 }))
+      delivery.should_receive(:reflect).with(:notification_delivered, notification)
+      perform
+  end
+
     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")
@@ -105,6 +112,11 @@ describe Rapns::Daemon::Gcm::Delivery do
         notification.error_description.should == error_description
       end
 
+      it 'reflects the notification delivery failed' do
+        delivery.should_receive(:reflect).with(:notification_failed, notification)
+        perform rescue Rapns::DeliveryError
+      end
+
       it 'creates a new notification for the unavailable devices' do
         notification.update_attributes(:registration_ids => ['id_0', 'id_1', 'id_2'], :data => {'one' => 1}, :collapse_key => 'thing', :delay_while_idle => true)
         perform rescue Rapns::DeliveryError
@@ -179,6 +191,11 @@ describe Rapns::Daemon::Gcm::Delivery do
         perform
       end.to change(notification, :deliver_after).to(now + 2 ** 1)
     end
+
+    it 'reflects the notification will be retried' do
+      delivery.should_receive(:reflect).with(:notification_will_retry, notification)
+      perform
+    end
   end
 
   describe 'an 500 response' do
@@ -198,6 +215,11 @@ describe Rapns::Daemon::Gcm::Delivery do
         notification.reload
       end.to change(notification, :deliver_after).to(now + 2 ** 3)
     end
+
+    it 'reflects the notification will be retried' do
+      delivery.should_receive(:reflect).with(:notification_will_retry, notification)
+      perform
+    end
   end
 
   describe 'an 401 response' do
@@ -219,6 +241,11 @@ describe Rapns::Daemon::Gcm::Delivery do
       notification.error_code.should == 400
       notification.error_description.should == 'GCM failed to parse the JSON request. Possibly an rapns bug, please open an issue.'
     end
+
+    it 'reflects the notification delivery failed' do
+      delivery.should_receive(:reflect).with(:notification_failed, notification)
+      perform rescue Rapns::DeliveryError
+    end
   end
 
   describe 'an un-handled response' do
@@ -232,5 +259,10 @@ describe Rapns::Daemon::Gcm::Delivery do
       notification.error_code.should == 418
       notification.error_description.should == "I'm a Teapot"
     end
+
+    it 'reflects the notification delivery failed' do
+      delivery.should_receive(:reflect).with(:notification_failed, notification)
+      perform rescue Rapns::DeliveryError
+    end
   end
 end