rapns 3.0.1-java → 3.1.0-java

data/spec/unit/daemon/reflectable_spec.rb

@@ -0,0 +1,27 @@
+require 'unit_spec_helper'
+
+describe Rapns::Daemon::Reflectable do
+  class TestReflectable
+    include Rapns::Daemon::Reflectable
+  end
+
+  let(:logger) { stub(:error => nil) }
+  let(:test_reflectable) { TestReflectable.new }
+
+  before do
+    Rapns.reflections.stub(:__dispatch)
+    Rapns::Daemon.stub(:logger => logger)
+  end
+
+  it 'dispatches the given reflection' do
+    Rapns.reflections.should_receive(:__dispatch).with(:error)
+    test_reflectable.reflect(:error)
+  end
+
+  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)
+    test_reflectable.reflect(:error)
+  end
+end

data/spec/unit/daemon_spec.rb

@@ -5,7 +5,8 @@ describe Rapns::Daemon, "when starting" do
 
   let(:certificate) { stub }
   let(:password) { stub }
-  let(:config) { stub(:pid_file => nil, :push_poll => 2, :airbrake_notify => false, :foreground => true) }
+  let(:config) { stub(:pid_file => nil, :airbrake_notify => false,
+    :foreground => true, :embedded => false, :push => false) }
   let(:logger) { stub(:info => nil, :error => nil, :warn => nil) }
 
   before do
@@ -31,6 +32,35 @@ describe Rapns::Daemon, "when starting" do
     Rapns::Daemon.start
   end
 
+  it "does not fork into a daemon if the push option is true" do
+    config.stub(:push => true)
+    Rapns::Daemon.should_not_receive(:daemonize)
+    Rapns::Daemon.start
+  end
+
+  it "does not fork into a daemon if the embedded option is true" do
+    config.stub(:embedded => true)
+    Rapns::Daemon.should_not_receive(:daemonize)
+    Rapns::Daemon.start
+  end
+
+  it 'sets up setup signal traps' do
+    Rapns::Daemon.should_receive(:setup_signal_traps)
+    Rapns::Daemon.start
+  end
+
+  it 'does not setup signal traps when embedded' do
+    config.stub(:embedded => true)
+    Rapns::Daemon.should_not_receive(:setup_signal_traps)
+    Rapns::Daemon.start
+  end
+
+  it 'does not setup signal traps when in push mode' do
+    config.stub(:push => true)
+    Rapns::Daemon.should_not_receive(:setup_signal_traps)
+    Rapns::Daemon.start
+  end
+
   it "writes the process ID to the PID file" do
     Rapns::Daemon.should_receive(:write_pid_file)
     Rapns::Daemon.start
@@ -44,7 +74,7 @@ describe Rapns::Daemon, "when starting" do
   end
 
   it "starts the feeder" do
-    Rapns::Daemon::Feeder.should_receive(:start).with(2)
+    Rapns::Daemon::Feeder.should_receive(:start)
     Rapns::Daemon.start
   end
 
@@ -77,6 +107,22 @@ describe Rapns::Daemon, "when starting" do
     Rapns::Daemon.start
   end
 
+  it 'does not exit if Rapns has not been upgraded and is embedded' do
+    config.stub(:embedded => true)
+    Rapns::App.stub(:count).and_raise(ActiveRecord::StatementInvalid)
+    Rapns::Daemon.should_receive(:puts).any_number_of_times
+    Rapns::Daemon.should_not_receive(:exit)
+    Rapns::Daemon.start
+  end
+
+  it 'does not exit if Rapns has not been upgraded and is in push mode' do
+    config.stub(:push => true)
+    Rapns::App.stub(:count).and_raise(ActiveRecord::StatementInvalid)
+    Rapns::Daemon.should_receive(:puts).any_number_of_times
+    Rapns::Daemon.should_not_receive(:exit)
+    Rapns::Daemon.start
+  end
+
   it 'warns if rapns.yml still exists' do
     File.should_receive(:exists?).with('/rails_root/config/rapns/rapns.yml').and_return(true)
     logger.should_receive(:warn).with("Since 2.0.0 rapns uses command-line options and a Ruby based configuration file.\nPlease run 'rails g rapns' to generate a new configuration file into config/initializers.\nRemove config/rapns/rapns.yml to avoid this warning.\n")
@@ -97,13 +143,13 @@ describe Rapns::Daemon, "when being shutdown" do
   # These tests do not work on JRuby.
   unless defined? JRUBY_VERSION
     it "shuts down when signaled signaled SIGINT" do
-      Rapns::Daemon.setup_signal_hooks
+      Rapns::Daemon.setup_signal_traps
       Rapns::Daemon.should_receive(:shutdown)
       Process.kill("SIGINT", Process.pid)
     end
 
     it "shuts down when signaled signaled SIGTERM" do
-      Rapns::Daemon.setup_signal_hooks
+      Rapns::Daemon.setup_signal_traps
       Rapns::Daemon.should_receive(:shutdown)
       Process.kill("SIGTERM", Process.pid)
     end
@@ -111,29 +157,29 @@ describe Rapns::Daemon, "when being shutdown" do
 
   it "stops the feeder" do
     Rapns::Daemon::Feeder.should_receive(:stop)
-    Rapns::Daemon.send(:shutdown)
+    Rapns::Daemon.shutdown
   end
 
   it "stops the app runners" do
     Rapns::Daemon::AppRunner.should_receive(:stop)
-    Rapns::Daemon.send(:shutdown)
+    Rapns::Daemon.shutdown
   end
 
   it "removes the PID file if one was written" do
     File.stub(:exists?).and_return(true)
     File.should_receive(:delete).with("/rails_root/rapns.pid")
-    Rapns::Daemon.send(:shutdown)
+    Rapns::Daemon.shutdown
   end
 
   it "does not attempt to remove the PID file if it does not exist" do
     File.stub(:exists?).and_return(false)
     File.should_not_receive(:delete)
-    Rapns::Daemon.send(:shutdown)
+    Rapns::Daemon.shutdown
   end
 
   it "does not attempt to remove the PID file if one was not written" do
     config.stub(:pid_file).and_return(nil)
     File.should_not_receive(:delete)
-    Rapns::Daemon.send(:shutdown)
+    Rapns::Daemon.shutdown
   end
 end

data/spec/unit/embed_spec.rb

@@ -0,0 +1,44 @@
+require 'unit_spec_helper'
+
+describe Rapns, 'embed' do
+  before do
+    Rapns::Daemon.stub(:start)
+    Kernel.stub(:at_exit)
+  end
+
+  it 'sets the embedded config option to true' do
+    Rapns.embed
+    Rapns.config.embedded.should be_true
+  end
+
+  it 'starts the daemon' do
+    Rapns::Daemon.should_receive(:start)
+    Rapns.embed
+  end
+
+  it 'overrides the default config options with those given as a hash' do
+    Rapns.config.push_poll = 4
+    expect { Rapns.embed(:push_poll => 2) }.to change(Rapns.config, :push_poll).to(2)
+  end
+end
+
+describe Rapns, 'shutdown' do
+  it 'shuts down the daemon' do
+    Rapns::Daemon.should_receive(:shutdown)
+    Rapns.shutdown
+  end
+end
+
+describe Rapns, 'sync' do
+  it 'syncs the AppRunner' do
+    Rapns::Daemon::AppRunner.should_receive(:sync)
+    Rapns.sync
+  end
+end
+
+describe Rapns, 'debug' do
+  it 'debugs the AppRunner' do
+    Rapns::Daemon::AppRunner.should_receive(:debug)
+    Rapns.debug
+  end
+end

data/spec/unit/gcm/notification_spec.rb

@@ -12,10 +12,10 @@ describe Rapns::Gcm::Notification do
 
   it { should validate_presence_of :registration_ids }
 
-  it 'has a payload limit of 4096 bytes' do
+  it "has a 'data' payload limit of 4096 bytes" do
     notification.data = { :key => "a" * 4096 }
     notification.valid?.should be_false
-    notification.errors[:base].should == ["GCM notification payload cannot be larger than 4096 bytes."]
+    notification.errors[:base].should == ["GCM notification payload data cannot be larger than 4096 bytes."]
   end
 
   it 'allows assignment of many registration IDs' do
@@ -26,6 +26,12 @@ describe Rapns::Gcm::Notification do
     reloaded_notification.registration_ids.should == ['a', 'b']
   end
 
+  it 'num of registration Ids limit of 1000' do
+    notification.registration_ids = ['a']*(1000+1)
+    notification.valid?.should be_false
+    notification.errors[:base].should == ["GCM notification num of registration_ids cannot be larger than 1000."]
+  end
+
   it 'allows assignment of a single registration ID' do
     notification.app = app
     notification.registration_ids = 'a'
@@ -52,4 +58,4 @@ describe Rapns::Gcm::Notification do
     notification.collapse_key = 'sync'
     notification.as_json['time_to_live'].should == 100
   end
-end
+end

data/spec/unit/push_spec.rb

@@ -0,0 +1,28 @@
+require 'unit_spec_helper'
+
+describe Rapns, 'push' do
+    before do
+    Rapns::Daemon.stub(:start)
+    Rapns::Daemon.stub(:shutdown)
+  end
+
+  it 'sets the push config option to true' do
+    Rapns.push
+    Rapns.config.push.should be_true
+  end
+
+  it 'starts the daemon' do
+    Rapns::Daemon.should_receive(:start)
+    Rapns.push
+  end
+
+  it 'shuts down the daemon' do
+    Rapns::Daemon.should_receive(:shutdown).with(true)
+    Rapns.push
+  end
+
+  it 'overrides the default config options with those given as a hash' do
+    Rapns.config.push_poll = 4
+    expect { Rapns.push(:push_poll => 2) }.to change(Rapns.config, :push_poll).to(2)
+  end
+end

data/spec/unit/reflection_spec.rb

@@ -0,0 +1,34 @@
+ require 'unit_spec_helper'
+
+describe Rapns do
+  it 'yields reflections for configuration' do
+    did_yield = false
+    Rapns.reflect { |on| did_yield = true }
+    did_yield.should be_true
+  end
+
+  it 'returns all reflections' do
+    Rapns.reflections.should be_kind_of(Rapns::Reflections)
+  end
+end
+
+# :apns_feedback, :notification_enqueued, :notification_delivered,
+#       :notification_failed, :notification_will_retry, :apns_connection_lost,
+#       :error
+
+describe Rapns::Reflections do
+  it 'dispatches the given reflection' do
+    did_yield = false
+    Rapns.reflect do |on|
+      on.error { did_yield = true }
+    end
+    Rapns.reflections.__dispatch(:error)
+    did_yield.should be_true
+  end
+
+  it 'raises an error when trying to dispatch and unknown reflection' do
+    expect do
+      Rapns.reflections.__dispatch(:unknown)
+    end.to raise_error(Rapns::Reflections::NoSuchReflectionError)
+  end
+end

data/spec/unit_spec_helper.rb

@@ -81,65 +81,7 @@ end
 # the certificate, and this is private to Apple. So if the app
 # has a certificate and a private key in it, the only way to find
 # out if it really is valid is to connect to Apple's servers.
-#
-TEST_CERT = <<EOF
-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-----
-EOF
+
+path = File.join(File.dirname(__FILE__), 'support')
+TEST_CERT = File.read(File.join(path, 'cert_without_password.pem'))
+TEST_CERT_WITH_PASSWORD = File.read(File.join(path, 'cert_with_password.pem'))

metadata

@@ -2,14 +2,14 @@
 name: rapns
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 3.0.1
+  version: 3.1.0
 platform: java
 authors:
 - Ian Leitch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-16 00:00:00.000000000 Z
+date: 2013-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -81,7 +81,7 @@ dependencies:
     none: false
   prerelease: false
   type: :runtime
-description: Professional grade APNs and GCM daemon
+description: Professional grade APNs and GCM for Ruby
 email:
 - port001@gmail.com
 executables:
@@ -130,23 +130,30 @@ files:
 - lib/rapns/daemon/gcm/delivery_handler.rb
 - lib/rapns/daemon/interruptible_sleep.rb
 - lib/rapns/daemon/logger.rb
+- lib/rapns/daemon/reflectable.rb
 - lib/rapns/deprecatable.rb
 - lib/rapns/deprecation.rb
+- lib/rapns/embed.rb
 - lib/rapns/gcm/app.rb
 - lib/rapns/gcm/expiry_collapse_key_mutual_inclusion_validator.rb
 - lib/rapns/gcm/notification.rb
-- lib/rapns/gcm/payload_size_validator.rb
+- lib/rapns/gcm/payload_data_size_validator.rb
+- lib/rapns/gcm/registration_ids_count_validator.rb
 - lib/rapns/multi_json_helper.rb
 - lib/rapns/notification.rb
 - lib/rapns/patches.rb
 - lib/rapns/patches/rails/3.1.0/postgresql_adapter.rb
 - lib/rapns/patches/rails/3.1.1/postgresql_adapter.rb
+- lib/rapns/push.rb
+- lib/rapns/reflection.rb
 - lib/rapns/version.rb
 - lib/tasks/cane.rake
 - lib/tasks/test.rake
 - config/database.yml
 - spec/acceptance/gcm_upgrade_spec.rb
 - spec/acceptance_spec_helper.rb
+- spec/support/cert_with_password.pem
+- spec/support/cert_without_password.pem
 - spec/support/simplecov_helper.rb
 - spec/support/simplecov_quality_formatter.rb
 - spec/unit/apns/app_spec.rb
@@ -172,13 +179,17 @@ files:
 - spec/unit/daemon/gcm/delivery_spec.rb
 - spec/unit/daemon/interruptible_sleep_spec.rb
 - spec/unit/daemon/logger_spec.rb
+- spec/unit/daemon/reflectable_spec.rb
 - spec/unit/daemon_spec.rb
 - spec/unit/deprecatable_spec.rb
 - spec/unit/deprecation_spec.rb
+- spec/unit/embed_spec.rb
 - spec/unit/gcm/app_spec.rb
 - spec/unit/gcm/notification_spec.rb
 - spec/unit/notification_shared.rb
 - spec/unit/notification_spec.rb
+- spec/unit/push_spec.rb
+- spec/unit/reflection_spec.rb
 - spec/unit_spec_helper.rb
 - bin/rapns
 homepage: https://github.com/ileitch/rapns
@@ -206,11 +217,13 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key:
 specification_version: 3
-summary: Professional grade APNs and GCM daemon
+summary: Professional grade APNs and GCM for Ruby
 test_files:
 - config/database.yml
 - spec/acceptance/gcm_upgrade_spec.rb
 - spec/acceptance_spec_helper.rb
+- spec/support/cert_with_password.pem
+- spec/support/cert_without_password.pem
 - spec/support/simplecov_helper.rb
 - spec/support/simplecov_quality_formatter.rb
 - spec/unit/apns/app_spec.rb
@@ -236,11 +249,15 @@ test_files:
 - spec/unit/daemon/gcm/delivery_spec.rb
 - spec/unit/daemon/interruptible_sleep_spec.rb
 - spec/unit/daemon/logger_spec.rb
+- spec/unit/daemon/reflectable_spec.rb
 - spec/unit/daemon_spec.rb
 - spec/unit/deprecatable_spec.rb
 - spec/unit/deprecation_spec.rb
+- spec/unit/embed_spec.rb
 - spec/unit/gcm/app_spec.rb
 - spec/unit/gcm/notification_spec.rb
 - spec/unit/notification_shared.rb
 - spec/unit/notification_spec.rb
+- spec/unit/push_spec.rb
+- spec/unit/reflection_spec.rb
 - spec/unit_spec_helper.rb