rapns 3.0.0.beta.1 → 3.0.0.rc.1

data/spec/unit/daemon/app_runner_spec.rb

@@ -75,4 +75,55 @@ describe Rapns::Daemon::AppRunner, 'sync' do
     runner.should_receive(:stop)
     Rapns::Daemon::AppRunner.sync
   end
+
+  it 'logs an error if the app could not be started' do
+    Rapns::App.stub(:all => [app, new_app])
+    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::Daemon::AppRunner.sync
+  end
+end
+
+describe Rapns::Daemon::AppRunner, 'debug' do
+  let!(:app) { Rapns::Apns::App.create!(:name => 'test', :connections => 1,
+    :environment => 'development', :certificate => TEST_CERT) }
+  let(:logger) { stub(:info => nil) }
+
+  before 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::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::Daemon::AppRunner.debug
+  end
+end
+
+describe Rapns::Daemon::AppRunner, 'idle' do
+  let!(:app) { Rapns::Apns::App.create!(:name => 'test', :connections => 1,
+    :environment => 'development', :certificate => TEST_CERT) }
+  let(:logger) { stub(:info => nil) }
+
+  before 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::Daemon::AppRunner.sync
+  end
+
+  after { Rapns::Daemon::AppRunner.runners.clear }
+
+  it 'returns idle runners' do
+    runner = Rapns::Daemon::AppRunner.runners[app.id]
+    Rapns::Daemon::AppRunner.idle.should == [runner]
+  end
 end

data/spec/unit/daemon/database_reconnectable_spec.rb

@@ -30,6 +30,8 @@ describe Rapns::Daemon::DatabaseReconnectable do
       Mysql2::Error
     when 'jdbcpostgresql'
       ActiveRecord::JDBCError
+    when 'jdbcmysql'
+      ActiveRecord::JDBCError
     else
       raise "Please update #{__FILE__} for adapter #{$adapter}"
     end

data/spec/unit/daemon/delivery_error_spec.rb

@@ -4,10 +4,10 @@ describe Rapns::DeliveryError do
   let(:error) { Rapns::DeliveryError.new(4, 12, "Missing payload") }
 
   it "returns an informative message" do
-    error.message.should == "Unable to deliver notification 12, received error 4 (Missing payload)"
+    error.to_s.should == "Unable to deliver notification 12, received error 4 (Missing payload)"
   end
 
   it "returns the error code" do
     error.code.should == 4
   end
-end
+end

data/spec/unit/daemon/delivery_handler_shared.rb

@@ -1,4 +1,13 @@
 shared_examples_for 'an DeliveryHandler subclass' do
+  it 'logs all delivery errors' do
+    logger = stub
+    Rapns::Daemon.stub(:logger => logger)
+    error = StandardError.new
+    delivery_handler.stub(:deliver).and_raise(error)
+    Rapns::Daemon.logger.should_receive(:error).with(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)
@@ -16,4 +25,4 @@ shared_examples_for 'an DeliveryHandler subclass' do
       delivery_handler.send(:handle_next_notification)
     end
   end
-end
+end

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

@@ -8,8 +8,10 @@ describe Rapns::Daemon::Gcm::AppRunner do
   let(:app) { app_class.new }
   let(:runner) { Rapns::Daemon::Gcm::AppRunner.new(app) }
   let(:handler) { stub(:start => nil, :stop => nil, :queue= => nil) }
+  let(:logger) { stub(:info => nil) }
 
   before do
+    Rapns::Daemon.stub(:logger => logger)
     Rapns::Daemon::Gcm::DeliveryHandler.stub(:new => handler)
   end
-end
+end

data/spec/unit/daemon/logger_spec.rb

@@ -31,6 +31,14 @@ describe Rapns::Daemon::Logger do
     ActiveSupport::BufferedLogger.stub(:new).and_return(@buffered_logger)
     Rapns::Daemon.stub(:config => config)
     File.stub(:open => log)
+    STDERR.stub(:puts)
+  end
+
+  it "disables logging if the log file cannot be opened" do
+    File.stub(:open).and_raise(Errno::ENOENT)
+    STDERR.should_receive(:puts).with(/No such file or directory/)
+    STDERR.should_receive(:puts).with(/Logging disabled/)
+    Rapns::Daemon::Logger.new(:foreground => true)
   end
 
   it "should open the a log file in the Rails log directory" do
@@ -50,13 +58,13 @@ describe Rapns::Daemon::Logger do
 
   it "should print out the msg if running in the foreground" do
     logger = Rapns::Daemon::Logger.new(:foreground => true)
-    logger.should_receive(:puts).with(/hi mom/)
+    STDOUT.should_receive(:puts).with(/hi mom/)
     logger.info("hi mom")
   end
 
   it "should not print out the msg if not running in the foreground" do
     logger = Rapns::Daemon::Logger.new(:foreground => false)
-    logger.should_not_receive(:puts).with(/hi mom/)
+    STDOUT.should_not_receive(:puts).with(/hi mom/)
     logger.info("hi mom")
   end
 

data/spec/unit/daemon_spec.rb

@@ -9,6 +9,7 @@ describe Rapns::Daemon, "when starting" do
   let(:logger) { stub(:info => nil, :error => nil, :warn => nil) }
 
   before do
+    Rapns.stub(:config => config)
     Rapns::Daemon::Feeder.stub(:start)
     Rapns::Daemon::Logger.stub(:new).and_return(logger)
     Rapns::Daemon::AppRunner.stub(:sync => nil, :stop => nil)
@@ -21,65 +22,65 @@ describe Rapns::Daemon, "when starting" do
     config.stub(:foreground => false)
     ActiveRecord::Base.stub(:establish_connection)
     Rapns::Daemon.should_receive(:daemonize)
-    Rapns::Daemon.start(config)
+    Rapns::Daemon.start
   end
 
   it "does not fork into a daemon if the foreground option is true" do
     config.stub(:foreground => true)
     Rapns::Daemon.should_not_receive(:daemonize)
-    Rapns::Daemon.start(config)
+    Rapns::Daemon.start
   end
 
   it "writes the process ID to the PID file" do
     Rapns::Daemon.should_receive(:write_pid_file)
-    Rapns::Daemon.start(config)
+    Rapns::Daemon.start
   end
 
   it "logs an error if the PID file could not be written" do
     config.stub(:pid_file => '/rails_root/rapns.pid')
     File.stub(:open).and_raise(Errno::ENOENT)
     logger.should_receive(:error).with("Failed to write PID to '/rails_root/rapns.pid': #<Errno::ENOENT: No such file or directory>")
-    Rapns::Daemon.start(config)
+    Rapns::Daemon.start
   end
 
   it "starts the feeder" do
     Rapns::Daemon::Feeder.should_receive(:start).with(2)
-    Rapns::Daemon.start(config)
+    Rapns::Daemon.start
   end
 
   it "syncs apps" do
     Rapns::Daemon::AppRunner.should_receive(:sync)
-    Rapns::Daemon.start(config)
+    Rapns::Daemon.start
   end
 
   it "sets up the logger" do
     config.stub(:airbrake_notify => true)
     Rapns::Daemon::Logger.should_receive(:new).with(:foreground => true, :airbrake_notify => true)
-    Rapns::Daemon.start(config)
+    Rapns::Daemon.start
   end
 
   it "makes the logger accessible" do
-    Rapns::Daemon.start(config)
+    Rapns::Daemon.start
     Rapns::Daemon.logger.should == logger
   end
 
   it 'prints a warning if there are no apps' do
     Rapns::App.stub(:count => 0)
     logger.should_receive(:warn).any_number_of_times
-    Rapns::Daemon.start(config)
+    Rapns::Daemon.start
   end
 
   it 'prints a warning exists if rapns has not been upgraded' do
     Rapns::App.stub(:count).and_raise(ActiveRecord::StatementInvalid)
     Rapns::Daemon.should_receive(:puts).any_number_of_times
     Rapns::Daemon.should_receive(:exit).with(1)
-    Rapns::Daemon.start(config)
+    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 instead of a configuration file. Please remove config/rapns/rapns.yml.")
-    Rapns::Daemon.start(config)
+    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")
+    Rapns::Daemon.start
   end
 end
 
@@ -87,11 +88,27 @@ describe Rapns::Daemon, "when being shutdown" do
   let(:config) { stub(:pid_file => '/rails_root/rapns.pid') }
 
   before do
-    Rapns::Daemon.stub(:config => config, :puts => nil)
+    Rapns.stub(:config => config)
+    Rapns::Daemon.stub(:puts => nil)
     Rapns::Daemon::Feeder.stub(:stop)
     Rapns::Daemon::AppRunner.stub(:stop)
   end
 
+  # 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.should_receive(:shutdown)
+      Process.kill("SIGINT", Process.pid)
+    end
+
+    it "shuts down when signaled signaled SIGTERM" do
+      Rapns::Daemon.setup_signal_hooks
+      Rapns::Daemon.should_receive(:shutdown)
+      Process.kill("SIGTERM", Process.pid)
+    end
+  end
+
   it "stops the feeder" do
     Rapns::Daemon::Feeder.should_receive(:stop)
     Rapns::Daemon.send(:shutdown)
@@ -119,4 +136,4 @@ describe Rapns::Daemon, "when being shutdown" do
     File.should_not_receive(:delete)
     Rapns::Daemon.send(:shutdown)
   end
-end
+end

data/spec/unit_spec_helper.rb

@@ -3,7 +3,7 @@ ENV['RAILS_ENV'] = 'test'
 begin
   require './spec/support/simplecov_helper'
   include SimpleCovHelper
-  start_simple_cov('unit')
+  start_simple_cov("unit-#{RUBY_VERSION}")
 rescue LoadError
   puts "Coverage disabled."
 end
@@ -12,12 +12,8 @@ require 'active_record'
 
 jruby = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
 
-$adapter = ENV['ADAPTER'] ||
-  if jruby
-    'jdbcpostgresql'
-  else
-    'postgresql'
-  end
+$adapter = ENV['ADAPTER'] || 'postgresql'
+$adapter = 'jdbc' + $adapter if jruby
 
 DATABASE_CONFIG = YAML.load_file(File.expand_path("../config/database.yml", File.dirname(__FILE__)))
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rapns
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.1
+  version: 3.0.0.rc.1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2012-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -43,7 +43,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Easy to use, full featured APNs daemon for Rails 3
+description: Professional grade APNs and GCM daemon
 email:
 - port001@gmail.com
 executables:
@@ -61,12 +61,14 @@ files:
 - lib/generators/templates/create_rapns_apps.rb
 - lib/generators/templates/create_rapns_feedback.rb
 - lib/generators/templates/create_rapns_notifications.rb
+- lib/generators/templates/rapns.rb
 - lib/rapns.rb
 - lib/rapns/apns/app.rb
 - lib/rapns/apns/binary_notification_validator.rb
 - lib/rapns/apns/device_token_format_validator.rb
 - lib/rapns/apns/feedback.rb
 - lib/rapns/apns/notification.rb
+- lib/rapns/apns/required_fields_validator.rb
 - lib/rapns/app.rb
 - lib/rapns/configuration.rb
 - lib/rapns/daemon.rb
@@ -111,10 +113,12 @@ files:
 - spec/unit/apns/feedback_spec.rb
 - spec/unit/apns/notification_spec.rb
 - spec/unit/app_spec.rb
+- spec/unit/configuration_spec.rb
 - spec/unit/daemon/apns/app_runner_spec.rb
 - spec/unit/daemon/apns/connection_spec.rb
 - spec/unit/daemon/apns/delivery_handler_spec.rb
 - spec/unit/daemon/apns/delivery_spec.rb
+- spec/unit/daemon/apns/disconnection_error_spec.rb
 - spec/unit/daemon/apns/feedback_receiver_spec.rb
 - spec/unit/daemon/app_runner_shared.rb
 - spec/unit/daemon/app_runner_spec.rb
@@ -158,7 +162,7 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Easy to use, full featured APNs daemon for Rails 3
+summary: Professional grade APNs and GCM daemon
 test_files:
 - config/database.yml
 - spec/acceptance/gcm_upgrade_spec.rb
@@ -169,10 +173,12 @@ test_files:
 - spec/unit/apns/feedback_spec.rb
 - spec/unit/apns/notification_spec.rb
 - spec/unit/app_spec.rb
+- spec/unit/configuration_spec.rb
 - spec/unit/daemon/apns/app_runner_spec.rb
 - spec/unit/daemon/apns/connection_spec.rb
 - spec/unit/daemon/apns/delivery_handler_spec.rb
 - spec/unit/daemon/apns/delivery_spec.rb
+- spec/unit/daemon/apns/disconnection_error_spec.rb
 - spec/unit/daemon/apns/feedback_receiver_spec.rb
 - spec/unit/daemon/app_runner_shared.rb
 - spec/unit/daemon/app_runner_spec.rb