rpush 2.0.0.beta2 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09d2df386688b4c0ac01e8aab5e4c725257a3263
-  data.tar.gz: a7233c67417785808daf0e8d0f637d17b31a33b9
+  metadata.gz: 0b35cfade151c01d8fc40a3c2c600294eacfbfe0
+  data.tar.gz: e9da0a8194b7916eab23ad91b8158e48f506247f
 SHA512:
-  metadata.gz: 4e19a18011c6e4e06b84deb49b82172ebb580a71ba8aef64e7ba6dce9edfc8aa42273bc131643a1f174aa9a30429b9797617e0661f7005eb657f9d9f1daf0b76
-  data.tar.gz: 47c703cdd66bb3fd80327d991604d0ee573db02b4324023484a90ac5ce7793cd022906ea3b1f424c97390edf7e59e13649c41efc9f2de9cadf68859fbc937f01
+  metadata.gz: a5b4463d42d74de9fa8a68cdcc424b0990d7b6e34fae5a920875b042dba246a6901a4666ff2452d6ef37f1325232764537a41ed06b2f8dc318a84ef9ae3b368b
+  data.tar.gz: 0fc2176665da6cabbc9459bd35d1cb7b782771195fd882122808ccad7e35f9303675da12bf0c2c7617c17b4a8bdc271742a8ead20b790711b2d25f6fb5fe0657

data/CHANGELOG.md

@@ -10,6 +10,7 @@
   * The 'wakeup' config option has been removed.
   * The 'batch_storage_updates' config option has been deprecated, storage backends will now always batch updates where appropriate.
   * The rpush process title updates with number of queued notifications and number of dispatchers.
+  * Rpush::Apns::Feedback#app has been renamed to app_id and is now an Integer.
 
 ## 1.0.0 (Feb 9, 2014)
   * Renamed to Rpush (from Rapns). Version number reset to 1.0.0.

data/README.md

@@ -29,7 +29,7 @@ Add it to your Gemfile:
 gem 'rpush'
 ```
 
-Generate the migrations, rpush.yml and migrate:
+Generate the migrations, rpush.rb and migrate:
 
 ```
 rails g rpush

data/lib/generators/rpush_generator.rb

@@ -20,11 +20,11 @@ class RpushGenerator < Rails::Generators::Base
       add_rpush_migration('add_adm')
       add_rpush_migration('rename_rapns_to_rpush')
       add_rpush_migration('add_fail_after_to_rpush_notifications')
-      add_rpush_migration('add_processing_to_rpush_notifications')
     else
       add_rpush_migration('add_rpush')
-      add_rpush_migration('rpush_2_0_0_updates')
     end
+
+    add_rpush_migration('rpush_2_0_0_updates')
   end
 
    def copy_config

data/lib/generators/templates/rpush.rb

@@ -59,12 +59,22 @@ Rpush.reflect do |on|
   # on.notification_failed do |notification|
   # end
 
+  # Called when the notification delivery failed and only the notification ID
+  # is present in memory.
+  # on.notification_id_failed do |app, notification_id, error_code, error_description|
+  # end
+
   # Called when a notification will be retried at a later date.
   # Call 'deliver_after' on the notification for the next delivery date
   # and 'retries' for the number of times this notification has been retried.
   # on.notification_will_retry do |notification|
   # end
 
+  # Called when a notification will be retried and only the notification ID
+  # is present in memory.
+  # on.notification_id_will_retry do |app, notification_id, retry_after|
+  # end
+
   # Called when a TCP connection is lost and will be reconnected.
   # on.tcp_connection_lost do |app, error|
   # end
@@ -101,6 +111,15 @@ Rpush.reflect do |on|
   # on.adm_canonical_id do |old_id, canonical_id|
   # end
 
+  # Called when Failed to deliver to ADM. Check the 'reason' string for further
+  # explanations.
+  #
+  # If the reason is the string 'Unregistered', you should remove
+  # this registration id from your records.
+  # on.adm_failed_to_recipient do |notification, registration_id, reason|
+  # end
+
+
   # Called when an exception is raised.
   # on.error do |error|
   # end

data/lib/generators/templates/rpush_2_0_0_updates.rb

@@ -8,9 +8,20 @@ class Rpush200Updates < ActiveRecord::Migration
     end
 
     add_index :rpush_notifications, [:processing, :delivered, :failed, :deliver_after], name: 'index_rpush_notifications_multi'
+
+    rename_column :rpush_feedback, :app, :app_id
+
+    if postgresql?
+      execute('ALTER TABLE rpush_feedback ALTER COLUMN app_id TYPE integer USING (trim(app_id)::integer)')
+    else
+      change_column :rpush_feedback, :app_id, :integer
+    end
   end
 
   def self.down
+    change_column :rpush_feedback, :app_id, :string
+    rename_column :rpush_feedback, :app_id, :app
+
     if index_name_exists?(:rpush_notifications, :index_rpush_notifications_multi, true)
       remove_index :rpush_notifications, name: :index_rpush_notifications_multi
     end
@@ -20,4 +31,12 @@ class Rpush200Updates < ActiveRecord::Migration
     remove_column :rpush_notifications, :priority
     remove_column :rpush_notifications, :processing
   end
+
+  def self.adapter_name
+    ActiveRecord::Base.configurations[Rails.env]['adapter']
+  end
+
+  def self.postgresql?
+    adapter_name =~ /postgresql/
+  end
 end

data/lib/rpush/client/active_model/apns/notification.rb

@@ -38,7 +38,7 @@ module Rpush
             self.data = (data || {}).merge(CONTENT_AVAILABLE_KEY => true)
           end
 
-          def as_json
+          def as_json # rubocop:disable Metrics/PerceivedComplexity
             json = ActiveSupport::OrderedHash.new
 
             if data && data.key?(MDM_KEY)

data/lib/rpush/client/active_model/notification.rb

@@ -5,7 +5,7 @@ module Rpush
         def self.included(base)
           base.instance_eval do
             validates :expiry, numericality: true, allow_nil: true
-            validates :app_id, presence: true
+            validates :app, presence: true
           end
         end
 

data/lib/rpush/client/active_record/apns/feedback.rb

@@ -6,9 +6,11 @@ module Rpush
           self.table_name = 'rpush_feedback'
 
           if Rpush.attr_accessible_available?
-            attr_accessible :device_token, :failed_at, :app
+            attr_accessible :device_token, :failed_at, :app_id
           end
 
+          belongs_to :app, class_name: 'Rpush::Client::ActiveRecord::App'
+
           validates :device_token, presence: true
           validates :failed_at, presence: true
 

data/lib/rpush/client/redis/notification.rb

@@ -21,7 +21,7 @@ module Rpush
         attribute :badge, :integer
         attribute :device_token, :string
         attribute :sound, :string, default: 'default'
-        attribute :alert, :hash, strict: false
+        attribute :alert, [:string, :hash], strict: false
         attribute :data, :hash
         attribute :expiry, :integer, default: 1.day.to_i
         attribute :delivered, :boolean

data/lib/rpush/daemon/adm/delivery.rb

@@ -120,8 +120,11 @@ module Rpush
 
           return unless response_body.key?('reason')
 
-          log_warn("bad_request: #{current_registration_id} (#{response_body['reason']})")
-          @failed_registration_ids[current_registration_id] = response_body['reason']
+          reason = response_body['reason']
+          log_warn("bad_request: #{current_registration_id} (#{reason})")
+          @failed_registration_ids[current_registration_id] = reason
+
+          reflect(:adm_failed_to_recipient, @notification, current_registration_id, reason)
         end
 
         def unauthorized(response)

data/lib/rpush/daemon/app_runner.rb

@@ -98,7 +98,7 @@ module Rpush
 
       def enqueue(notifications)
         if service.batch_deliveries?
-          batch_size = (notifications.size / num_dispatcher_loops).ceil
+          batch_size = (notifications.size / num_dispatcher_loops.to_f).ceil
           notifications.in_groups_of(batch_size, false).each do |batch_notifications|
             batch = Batch.new(batch_notifications)
             queue.push(QueuePayload.new(batch))

data/lib/rpush/daemon/dispatcher/apns_tcp.rb

@@ -3,6 +3,7 @@ module Rpush
     module Dispatcher
       class ApnsTcp < Rpush::Daemon::Dispatcher::Tcp
         include Loggable
+        include Reflectable
 
         SELECT_TIMEOUT = 10
         ERROR_TUPLE_BYTES = 6
@@ -85,17 +86,24 @@ module Rpush
 
         def handle_disconnect
           log_error('The APNs disconnected without returning an error. Marking all notifications delivered via this connection as failed.')
-          Rpush::Daemon.store.mark_ids_failed(delivered_buffer, nil, 'The APNs disconnected without returning an error. This may indicate you are using an invalid certificate.', Time.now)
+          reason = 'The APNs disconnected without returning an error. This may indicate you are using an invalid certificate.'
+          Rpush::Daemon.store.mark_ids_failed(delivered_buffer, nil, reason, Time.now)
+          delivered_buffer.each { |id| reflect(:notification_id_failed, @app, id, nil, reason) }
         end
 
         def handle_error(code, notification_id)
           failed_pos = delivered_buffer.index(notification_id)
           description = APNS_ERRORS[code.to_i] || "Unknown error code #{code.inspect}. Possible Rpush bug?"
           Rpush::Daemon.store.mark_ids_failed([notification_id], code, description, Time.now)
+          reflect(:notification_id_failed, @app, notification_id, code, description)
 
           if failed_pos
             retry_ids = delivered_buffer[(failed_pos + 1)..-1]
-            Rpush::Daemon.store.mark_ids_retryable(retry_ids, Time.now) if retry_ids.size > 0
+            if retry_ids.size > 0
+              now = Time.now
+              Rpush::Daemon.store.mark_ids_retryable(retry_ids, now)
+              retry_ids.each { |id| reflect(:notification_id_will_retry, @app, id, now) }
+            end
           elsif delivered_buffer.size > 0
             log_error("Delivery sequence unknown for notifications following #{notification_id}.")
           end

data/lib/rpush/daemon/store/active_record/reconnectable.rb

@@ -22,7 +22,7 @@ module Rpush
         module Reconnectable
           ADAPTER_ERRORS = [::ActiveRecord::StatementInvalid, PGError, PG::Error,
                             Mysql::Error, Mysql2::Error, ::ActiveRecord::JDBCError,
-                            SQLite3::Exception]
+                            SQLite3::Exception, ::ActiveRecord::ConnectionTimeoutError]
 
           def with_database_reconnect_and_retry
             ::ActiveRecord::Base.connection_pool.with_connection do

data/lib/rpush/daemon/store/active_record.rb

@@ -119,7 +119,7 @@ module Rpush
         def create_apns_feedback(failed_at, device_token, app)
           with_database_reconnect_and_retry do
             Rpush::Client::ActiveRecord::Apns::Feedback.create!(failed_at: failed_at,
-                                                                device_token: device_token, app: app)
+                                                                device_token: device_token, app_id: app.id)
           end
         end
 

data/lib/rpush/daemon/store/redis.rb

@@ -79,7 +79,7 @@ module Rpush
         end
 
         def create_apns_feedback(failed_at, device_token, app)
-          Rpush::Client::Redis::Apns::Feedback.create!(failed_at: failed_at, device_token: device_token, app: app)
+          Rpush::Client::Redis::Apns::Feedback.create!(failed_at: failed_at, device_token: device_token, app_id: app.id)
         end
 
         def create_gcm_notification(attrs, data, registration_ids, deliver_after, app) # rubocop:disable ParameterLists

data/lib/rpush/daemon.rb

@@ -67,8 +67,8 @@ module Rpush
       shutdown_lock.synchronize { true }
     end
 
-    def self.shutdown(quiet = false)
-      puts "\nShutting down..." unless quiet
+    def self.shutdown
+      puts "\nShutting down..."
 
       shutdown_lock.synchronize do
         Feeder.stop

data/lib/rpush/reflection.rb

@@ -14,7 +14,9 @@ module Rpush
       :apns_feedback, :notification_enqueued, :notification_delivered,
       :notification_failed, :notification_will_retry, :gcm_delivered_to_recipient,
       :gcm_failed_to_recipient, :gcm_canonical_id, :gcm_invalid_registration_id,
-      :error, :adm_canonical_id, :tcp_connection_lost, :ssl_certificate_will_expire
+      :error, :adm_canonical_id, :adm_failed_to_recipient,
+      :tcp_connection_lost, :ssl_certificate_will_expire,
+      :notification_id_will_retry, :notification_id_failed
     ]
 
     DEPRECATIONS = {}

data/lib/rpush/version.rb

@@ -1,3 +1,3 @@
 module Rpush
-  VERSION = '2.0.0.beta2'
+  VERSION = '2.0.0.rc1'
 end

data/lib/rpush.rb

@@ -4,7 +4,7 @@ require 'active_support/all'
 module Rpush
   def self.attr_accessible_available?
     require 'rails'
-    ::Rails::VERSION::STRING < '4'
+    ::Rails::VERSION::STRING < '4' || defined?(::ActiveRecord::MassAssignmentSecurity)
   end
 end
 

data/lib/tasks/quality.rake

@@ -11,24 +11,25 @@ begin
   end
 
   namespace :spec do
-    task :cane => ['spec', 'cane_quality']
+    task cane: %w(spec cane_quality)
   end
 rescue LoadError
   warn "cane not available."
 
   namespace :spec do
-    task :cane => ['spec']
+    task cane: ['spec']
   end
 end
 
 begin
   require 'rubocop/rake_task'
-  RuboCop::RakeTask.new
+  t = RuboCop::RakeTask.new
+  t.options << '-D'
 rescue LoadError
   warn 'rubocop not available.'
-  task :rubocop => ['spec']
+  task rubocop: ['spec']
 end
 
 namespace :spec do
-  task quality: ['cane', 'rubocop']
+  task quality: %w(cane rubocop)
 end

data/lib/tasks/test.rake

@@ -4,11 +4,7 @@ namespace :test do
 
     def cmd(str, clean_env = true)
       puts "* #{str}"
-      retval = if clean_env
-        Bundler.with_clean_env { `#{str}` }
-      else
-        `#{str}`
-      end
+      retval = clean_env ? Bundler.with_clean_env { `#{str}` } : `#{str}`
       puts retval.strip
       retval
     end

data/spec/functional/apns_spec.rb

@@ -5,9 +5,7 @@ describe 'APNs' do
   let(:app) { create_app }
   let!(:notification) { create_notification }
   let(:tcp_socket) { double(TCPSocket, setsockopt: nil, close: nil) }
-  let(:ssl_socket) do double(OpenSSL::SSL::SSLSocket, :sync= => nil, connect: nil,
-                                                      write: nil, flush: nil, read: nil, close: nil)
-  end
+  let(:ssl_socket) { double(OpenSSL::SSL::SSLSocket, :sync= => nil, connect: nil, write: nil, flush: nil, read: nil, close: nil) }
   let(:io_double) { double(select: nil) }
 
   before do
@@ -92,8 +90,10 @@ describe 'APNs' do
     tuple = "N\xE3\x84\r\x00 \x83OxfU\xEB\x9F\x84aJ\x05\xAD}\x00\xAF1\xE5\xCF\xE9:\xC3\xEA\a\x8F\x1D\xA4M*N\xB0\xCE\x17"
     allow(ssl_socket).to receive(:read).and_return(tuple, nil)
     Rpush.apns_feedback
-    feedback = Rpush::Apns::Feedback.all
-    feedback.should_not be_empty
+    feedback = Rpush::Apns::Feedback.all.first
+    feedback.should_not be_nil
+    feedback.app_id.should eq(app.id)
+    feedback.device_token.should eq('834f786655eb9f84614a05ad7d00af31e5cfe93ac3ea078f1da44d2a4eb0ce17')
   end
 
   describe 'delivery failures' do

data/spec/functional/embed_spec.rb

@@ -5,9 +5,7 @@ describe 'embedding' do
   let(:app) { Rpush::Apns::App.new }
   let(:notification) { Rpush::Apns::Notification.new }
   let(:tcp_socket) { double(TCPSocket, setsockopt: nil, close: nil) }
-  let(:ssl_socket) do double(OpenSSL::SSL::SSLSocket, :sync= => nil, connect: nil,
-                                                      write: nil, flush: nil, read: nil, close: nil)
-  end
+  let(:ssl_socket) { double(OpenSSL::SSL::SSLSocket, :sync= => nil, connect: nil, write: nil, flush: nil, read: nil, close: nil) }
   let(:io_double) { double(select: nil) }
 
   before do

data/spec/functional/new_app_spec.rb

@@ -4,9 +4,7 @@ describe 'New app loading' do
   let(:timeout) { 10 }
   let(:app) { create_app }
   let(:tcp_socket) { double(TCPSocket, setsockopt: nil, close: nil) }
-  let(:ssl_socket) do double(OpenSSL::SSL::SSLSocket, :sync= => nil, connect: nil,
-                                                      write: nil, flush: nil, read: nil, close: nil)
-  end
+  let(:ssl_socket) { double(OpenSSL::SSL::SSLSocket, :sync= => nil, connect: nil, write: nil, flush: nil, read: nil, close: nil) }
   let(:io_double) { double(select: nil) }
 
   before do

data/spec/unit/client/active_record/notification_spec.rb

@@ -12,4 +12,10 @@ describe Rpush::Client::ActiveRecord::Notification do
     notification.registration_ids = 'a'
     notification.registration_ids.should eq ['a']
   end
+
+  it 'saves its parent App if required' do
+    notification.app = Rpush::Client::ActiveRecord::App.new(name: "aname")
+    expect(notification.app).to be_valid
+    expect(notification).to be_valid
+  end
 end

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

@@ -80,6 +80,14 @@ describe Rpush::Daemon::Adm::Delivery do
       logger.should_receive(:warn).with("[MyApp] bad_request: xyz (InvalidRegistrationId)")
       expect { perform }.to raise_error
     end
+
+    it 'reflects' do
+      response.stub(body: JSON.dump('registrationID' => 'canonical123', 'reason' => 'Unregistered'))
+      notification.stub(registration_ids: ['1'])
+      delivery.should_receive(:reflect).with(:adm_failed_to_recipient, notification, '1', 'Unregistered')
+      expect { perform }.to raise_error
+    end
+
   end
 
   describe 'a 401 (Unauthorized) response' do

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

@@ -14,9 +14,7 @@ describe Rpush::Daemon::Apns::FeedbackReceiver, 'check_for_feedback' do
   let(:receiver) { Rpush::Daemon::Apns::FeedbackReceiver.new(app) }
   let(:feedback) { double }
   let(:sleeper) { double(Rpush::Daemon::InterruptibleSleep, sleep: nil, start: nil, stop: nil) }
-  let(:store) do double(Rpush::Daemon::Store::ActiveRecord,
-                        create_apns_feedback: feedback, release_connection: nil)
-  end
+  let(:store) { double(Rpush::Daemon::Store::ActiveRecord, create_apns_feedback: feedback, release_connection: nil) }
 
   before do
     Rpush.config.feedback_poll = poll

data/spec/unit/daemon/app_runner_spec.rb

@@ -78,8 +78,9 @@ describe Rpush::Daemon::AppRunner, 'start_app' do
 end
 
 describe Rpush::Daemon::AppRunner, 'debug' do
-  let(:app) do double(Rpush::AppRunnerSpecService::App, id: 1, name: 'test', connections: 1,
-                                                        environment: 'development', certificate: TEST_CERT, service_name: 'app_runner_spec_service')
+  let(:app) do
+    double(Rpush::AppRunnerSpecService::App, id: 1, name: 'test', connections: 1,
+      environment: 'development', certificate: TEST_CERT, service_name: 'app_runner_spec_service')
   end
   let(:logger) { double(Rpush::Logger, info: nil) }
   let(:store) { double(all_apps: [app], release_connection: nil) }
@@ -99,9 +100,9 @@ describe Rpush::Daemon::AppRunner, 'debug' do
 end
 
 describe Rpush::Daemon::AppRunner do
-  let(:app) do double(Rpush::AppRunnerSpecService::App, environment: :sandbox,
-                                                        connections: 1, service_name: 'app_runner_spec_service',
-                                                        name: 'test')
+  let(:app) do
+    double(Rpush::AppRunnerSpecService::App, environment: :sandbox,
+      connections: 1, service_name: 'app_runner_spec_service', name: 'test')
   end
   let(:runner) { Rpush::Daemon::AppRunner.new(app) }
   let(:logger) { double(Rpush::Logger, info: nil) }
@@ -151,6 +152,20 @@ describe Rpush::Daemon::AppRunner do
       runner.should_receive(:reflect).with(:notification_enqueued, notification)
       runner.enqueue([notification])
     end
+
+    describe 'a service that batches deliveries' do
+      before do
+        runner.send(:service).stub(batch_deliveries?: true)
+      end
+
+      describe '1 notification with more than one dispatcher loop' do
+        it 'does not raise ArgumentError: invalid slice size' do
+          # https://github.com/rpush/rpush/issues/57
+          runner.stub(:num_dispatcher_loops).and_return(2)
+          runner.enqueue([notification])
+        end
+      end
+    end
   end
 
   describe 'stop' do

data/spec/unit/daemon/feeder_spec.rb

@@ -5,9 +5,7 @@ describe Rpush::Daemon::Feeder do
   let(:notification) { Rpush::Apns::Notification.create!(device_token: "a" * 64, app: app) }
   let(:logger) { double }
   let(:interruptible_sleeper) { double(sleep: nil, stop: nil, start: nil) }
-  let(:store) do double(Rpush::Daemon::Store::ActiveRecord,
-                        deliverable_notifications: [notification], release_connection: nil)
-  end
+  let(:store) { double(Rpush::Daemon::Store::ActiveRecord, deliverable_notifications: [notification], release_connection: nil) }
 
   before do
     Rpush.configure do |config|

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

@@ -224,28 +224,30 @@ describe Rpush::Daemon::Gcm::Delivery do
     end
 
     describe 'all deliveries failed with some as Unavailable or InternalServerError' do
-      let(:body) do{
-        'failure' => 3,
-        'success' => 0,
-        'results' => [
-          { 'error' => 'Unavailable' },
-          { 'error' => 'InvalidDataKey' },
-          { 'error' => 'Unavailable' }
-        ] }
+      let(:body) do
+        { 'failure' => 3,
+          'success' => 0,
+          'results' => [
+            { 'error' => 'Unavailable' },
+            { 'error' => 'InvalidDataKey' },
+            { 'error' => 'Unavailable' }
+          ]
+        }
       end
       let(:error_description) { /#{Regexp.escape("Failed to deliver to recipients 0, 1, 2. Errors: Unavailable, InvalidDataKey, Unavailable. 0, 2 will be retried as notification")} [\d]+\./ }
       it_should_behave_like 'a notification with some delivery failures'
     end
 
     describe 'some deliveries failed with Unavailable or InternalServerError' do
-      let(:body) do{
-        'failure' => 2,
-        'success' => 1,
-        'results' => [
-          { 'error' => 'Unavailable' },
-          { 'message_id' => '1:000' },
-          { 'error' => 'InternalServerError' }
-        ] }
+      let(:body) do
+        { 'failure' => 2,
+          'success' => 1,
+          'results' => [
+            { 'error' => 'Unavailable' },
+            { 'message_id' => '1:000' },
+            { 'error' => 'InternalServerError' }
+          ]
+        }
       end
       let(:error_description) { /#{Regexp.escape("Failed to deliver to recipients 0, 2. Errors: Unavailable, InternalServerError. 0, 2 will be retried as notification")} [\d]+\./ }
       it_should_behave_like 'a notification with some delivery failures'

data/spec/unit/daemon/store/active_record/reconnectable_spec.rb

@@ -43,7 +43,8 @@ describe Rpush::Daemon::Store::ActiveRecord::Reconnectable do
   end
 
   let(:error) { adapter_error_class.new("db down!") }
-  let(:test_double) { TestDouble.new(error, 1) }
+  let(:timeout) { ActiveRecord::ConnectionTimeoutError.new("db lazy!") }
+  let(:test_doubles) { [TestDouble.new(error, 1), TestDouble.new(timeout, 1)]  }
 
   before do
     @logger = double("Logger", info: nil, error: nil, warn: nil)
@@ -51,37 +52,37 @@ describe Rpush::Daemon::Store::ActiveRecord::Reconnectable do
 
     ActiveRecord::Base.stub(:clear_all_connections!)
     ActiveRecord::Base.stub(:establish_connection)
-    test_double.stub(:sleep)
+    test_doubles.each { |td| allow(td).to receive(:sleep) }
   end
 
   it "should log the error raised" do
     Rpush.logger.should_receive(:error).with(error)
-    test_double.perform
+    test_doubles.each(&:perform)
   end
 
   it "should log that the database is being reconnected" do
     Rpush.logger.should_receive(:warn).with("Lost connection to database, reconnecting...")
-    test_double.perform
+    test_doubles.each(&:perform)
   end
 
   it "should log the reconnection attempt" do
     Rpush.logger.should_receive(:warn).with("Attempt 1")
-    test_double.perform
+    test_doubles.each(&:perform)
   end
 
   it "should clear all connections" do
     ActiveRecord::Base.should_receive(:clear_all_connections!)
-    test_double.perform
+    test_doubles.each(&:perform)
   end
 
   it "should establish a new connection" do
     ActiveRecord::Base.should_receive(:establish_connection)
-    test_double.perform
+    test_doubles.each(&:perform)
   end
 
   it "should test out the new connection by performing a count" do
-    Rpush::Client::ActiveRecord::Notification.should_receive(:count)
-    test_double.perform
+    Rpush::Client::ActiveRecord::Notification.should_receive(:count).twice
+    test_doubles.each(&:perform)
   end
 
   context "when the reconnection attempt is not successful" do
@@ -97,19 +98,38 @@ describe Rpush::Daemon::Store::ActiveRecord::Reconnectable do
       Rpush::Client::ActiveRecord::Notification.instance_variable_set("@error", error)
     end
 
-    it "should log the 2nd attempt" do
-      Rpush.logger.should_receive(:warn).with("Attempt 2")
-      test_double.perform
-    end
+    describe "error behaviour" do
+      it "should log the 2nd attempt" do
+        Rpush.logger.should_receive(:warn).with("Attempt 2")
+        test_doubles[0].perform
+      end
 
-    it "should log errors raised when the reconnection is not successful" do
-      Rpush.logger.should_receive(:error).with(error)
-      test_double.perform
+      it "should log errors raised when the reconnection is not successful" do
+        Rpush.logger.should_receive(:error).with(error)
+        test_doubles[0].perform
+      end
+
+      it "should sleep to avoid thrashing when the database is down" do
+        expect(test_doubles[0]).to receive(:sleep).with(2)
+        test_doubles[0].perform
+      end
     end
 
-    it "should sleep to avoid thrashing when the database is down" do
-      test_double.should_receive(:sleep).with(2)
-      test_double.perform
+    describe "timeout behaviour" do
+      it "should log the 2nd attempt" do
+        Rpush.logger.should_receive(:warn).with("Attempt 2")
+        test_doubles[1].perform
+      end
+
+      it "should log errors raised when the reconnection is not successful" do
+        Rpush.logger.should_receive(:error).with(error)
+        test_doubles[1].perform
+      end
+
+      it "should sleep to avoid thrashing when the database is down" do
+        expect(test_doubles[1]).to receive(:sleep).with(2)
+        test_doubles[1].perform
+      end
     end
   end
 end

data/spec/unit/daemon/store/active_record_spec.rb

@@ -273,7 +273,7 @@ describe Rpush::Daemon::Store::ActiveRecord do
   describe 'create_apns_feedback' do
     it 'creates the Feedback record' do
       Rpush::Client::ActiveRecord::Apns::Feedback.should_receive(:create!).with(
-        failed_at: time, device_token: 'ab' * 32, app: app)
+        failed_at: time, device_token: 'ab' * 32, app_id: app.id)
       store.create_apns_feedback(time, 'ab' * 32, app)
     end
   end

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

@@ -2,10 +2,7 @@ require 'unit_spec_helper'
 
 describe Rpush::Daemon::Wpns::Delivery do
   let(:app) { Rpush::Wpns::App.create!(name: "MyApp") }
-  let(:notification) do Rpush::Wpns::Notification.create!(app: app, alert: "test",
-                                                          uri: "http://some.example/",
-                                                          deliver_after: Time.now)
-  end
+  let(:notification) { Rpush::Wpns::Notification.create!(app: app, alert: "test", uri: "http://some.example/", deliver_after: Time.now) }
   let(:logger) { double(error: nil, info: nil, warn: nil) }
   let(:response) { double(code: 200, header: {}) }
   let(:http) { double(shutdown: nil, request: response) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpush
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Ian Leitch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json