rpush 2.3.2-java → 2.4.0-java

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

@@ -30,7 +30,7 @@ describe Rpush::Client::ActiveRecord::Apns::Notification do
   it "should default the expiry to 1 day" do
     expect(notification.expiry).to eq 1.day.to_i
   end
-end
+end if active_record?
 
 describe Rpush::Client::ActiveRecord::Apns::Notification, "when assigning the device token" do
   it "should strip spaces from the given string" do
@@ -42,7 +42,7 @@ describe Rpush::Client::ActiveRecord::Apns::Notification, "when assigning the de
     notification = Rpush::Client::ActiveRecord::Apns::Notification.new(device_token: "<omg>")
     expect(notification.device_token).to eq "omg"
   end
-end
+end if active_record?
 
 describe Rpush::Client::ActiveRecord::Apns::Notification, "as_json" do
   it "should include the alert if present" do
@@ -92,7 +92,7 @@ describe Rpush::Client::ActiveRecord::Apns::Notification, "as_json" do
     notification.data = { omg: { ilike: :hashes } }
     expect(notification.as_json["omg"]["ilike"]).to eq "hashes"
   end
-end
+end if active_record?
 
 describe Rpush::Client::ActiveRecord::Apns::Notification, 'MDM' do
   let(:magic) { 'abc123' }
@@ -108,7 +108,7 @@ describe Rpush::Client::ActiveRecord::Apns::Notification, 'MDM' do
     notification.mdm = magic
     expect(notification.as_json.key?('aps')).to be_falsey
   end
-end
+end if active_record?
 
 describe Rpush::Client::ActiveRecord::Apns::Notification, 'content-available' do
   let(:notification) { Rpush::Client::ActiveRecord::Apns::Notification.new }
@@ -140,7 +140,7 @@ describe Rpush::Client::ActiveRecord::Apns::Notification, 'content-available' do
     expect(notification.as_json['aps']['content-available']).to eq 1
     expect(notification.as_json['hi']).to eq 'mom'
   end
-end
+end if active_record?
 
 describe Rpush::Client::ActiveRecord::Apns::Notification, 'url-args' do
   let(:notification) { Rpush::Client::ActiveRecord::Apns::Notification.new }
@@ -153,7 +153,7 @@ describe Rpush::Client::ActiveRecord::Apns::Notification, 'url-args' do
   it 'does not include url-args in the payload if not set' do
     expect(notification.as_json['aps'].key?('url-args')).to be_falsey
   end
-end
+end if active_record?
 
 describe Rpush::Client::ActiveRecord::Apns::Notification, 'category' do
   let(:notification) { Rpush::Client::ActiveRecord::Apns::Notification.new }
@@ -166,7 +166,7 @@ describe Rpush::Client::ActiveRecord::Apns::Notification, 'category' do
   it 'does not include category in the payload if not set' do
     expect(notification.as_json['aps'].key?('category')).to be_falsey
   end
-end
+end if active_record?
 
 describe Rpush::Client::ActiveRecord::Apns::Notification, 'to_binary' do
   let(:notification) { Rpush::Client::ActiveRecord::Apns::Notification.new }
@@ -206,7 +206,7 @@ describe Rpush::Client::ActiveRecord::Apns::Notification, 'to_binary' do
     notification.app = Rpush::Client::ActiveRecord::Apns::App.new(name: 'my_app', environment: 'development', certificate: TEST_CERT)
     expect(notification.to_binary).to eq "\x02\x00\x00\x00\x99\x01\x00 \xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\x02\x00a{\"aps\":{\"alert\":\"Don't panic Mr Mainwaring, don't panic!\",\"badge\":3,\"sound\":\"1.aiff\"},\"hi\":\"mom\"}\x03\x00\x04\x00\x00\x04\xD2\x04\x00\x04\x00\x01Q\x80\x05\x00\x01\n"
   end
-end
+end if active_record?
 
 describe Rpush::Client::ActiveRecord::Apns::Notification, "bug #31" do
   it 'does not confuse a JSON looking string as JSON' do
@@ -221,7 +221,7 @@ describe Rpush::Client::ActiveRecord::Apns::Notification, "bug #31" do
     notification.alert = "{\"one\":2}"
     expect(notification.alert).to eq('one' => 2)
   end
-end
+end if active_record?
 
 describe Rpush::Client::ActiveRecord::Apns::Notification, "bug #35" do
   it "should limit payload size to 256 bytes but not the entire packet" do
@@ -235,7 +235,7 @@ describe Rpush::Client::ActiveRecord::Apns::Notification, "bug #35" do
     expect(notification.payload.bytesize).to be < 256
     expect(notification).to be_valid
   end
-end
+end if active_record?
 
 describe Rpush::Client::ActiveRecord::Apns::Notification, "multi_json usage" do
   describe Rpush::Client::ActiveRecord::Apns::Notification, "alert" do
@@ -253,4 +253,4 @@ describe Rpush::Client::ActiveRecord::Apns::Notification, "multi_json usage" do
       notification.alert
     end
   end
-end
+end if active_record?

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

@@ -27,4 +27,4 @@ describe Rpush::Client::ActiveRecord::App do
       expect { app.valid? }.to raise_error(NameError)
     end
   end
-end
+end if active_record?

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

@@ -31,4 +31,4 @@ describe Rpush::Client::ActiveRecord::Gcm::Notification do
     notification.expiry = 100
     expect(notification.as_json['time_to_live']).to eq 100
   end
-end
+end if active_record?

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

@@ -18,4 +18,4 @@ describe Rpush::Client::ActiveRecord::Notification do
     expect(notification.app).to be_valid
     expect(notification).to be_valid
   end
-end
+end if active_record?

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

@@ -18,4 +18,4 @@ describe Rpush::Client::ActiveRecord::Wpns::Notification do
     notification.valid?
     expect(notification.errors[:data]).to include("can't be blank")
   end
-end
+end if active_record?

data/spec/unit/configuration_spec.rb

@@ -43,4 +43,11 @@ describe Rpush::Configuration do
     Rpush.config.redis_options = { hi: :mom }
     expect(Modis.redis_options).to eq(hi: :mom)
   end
+
+  it 'deprecates feedback_poll=' do
+    expect(Rpush::Deprecation).to receive(:warn).with(/feedback_poll= is deprecated/)
+    expect do
+      Rpush.config.feedback_poll = 123
+    end.to change { Rpush.config.apns.feedback_receiver.frequency }.to(123)
+  end
 end

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

@@ -4,7 +4,7 @@ require 'rpush/daemon/store/active_record'
 describe Rpush::Daemon::Apns::FeedbackReceiver, 'check_for_feedback' do
   let(:host) { 'feedback.push.apple.com' }
   let(:port) { 2196 }
-  let(:poll) { 60 }
+  let(:frequency) { 60 }
   let(:certificate) { double }
   let(:password) { double }
   let(:app) { double(name: 'my_app', password: password, certificate: certificate, environment: 'production') }
@@ -12,11 +12,11 @@ describe Rpush::Daemon::Apns::FeedbackReceiver, 'check_for_feedback' do
   let(:logger) { double(error: nil, info: nil) }
   let(:receiver) { Rpush::Daemon::Apns::FeedbackReceiver.new(app) }
   let(:feedback) { double }
-  let(:sleeper) { double(Rpush::Daemon::InterruptibleSleep, sleep: nil, start: nil, stop: nil) }
+  let(:sleeper) { double(Rpush::Daemon::InterruptibleSleep, sleep: nil, stop: nil) }
   let(:store) { double(Rpush::Daemon::Store::ActiveRecord, create_apns_feedback: feedback, release_connection: nil) }
 
   before do
-    Rpush.config.feedback_poll = poll
+    Rpush.config.apns.feedback_receiver.frequency = frequency
     allow(Rpush::Daemon::InterruptibleSleep).to receive_messages(new: sleeper)
     allow(Rpush).to receive_messages(logger: logger)
     allow(Rpush::Daemon::TcpConnection).to receive_messages(new: connection)
@@ -33,8 +33,8 @@ describe Rpush::Daemon::Apns::FeedbackReceiver, 'check_for_feedback' do
     end
   end
 
-  it 'initializes the sleeper with the feedback polling duration' do
-    expect(Rpush::Daemon::InterruptibleSleep).to receive(:new).with(poll).and_return(sleeper)
+  it 'initializes the sleeper with the feedback polling frequency' do
+    expect(Rpush::Daemon::InterruptibleSleep).to receive_messages(new: sleeper)
     Rpush::Daemon::Apns::FeedbackReceiver.new(app)
   end
 

data/spec/unit/daemon/feeder_spec.rb

@@ -4,7 +4,7 @@ describe Rpush::Daemon::Feeder do
   let!(:app) { Rpush::Apns::App.create!(name: 'my_app', environment: 'development', certificate: TEST_CERT) }
   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(:interruptible_sleeper) { double(sleep: nil, stop: nil) }
   let(:store) { double(Rpush::Daemon::Store::ActiveRecord, deliverable_notifications: [notification], release_connection: nil) }
 
   before do
@@ -86,7 +86,7 @@ describe Rpush::Daemon::Feeder do
 
   describe 'wakeup' do
     it 'interrupts sleep' do
-      expect(interruptible_sleeper).to receive(:wakeup)
+      expect(interruptible_sleeper).to receive(:stop)
       Rpush::Daemon::Feeder.start
       Rpush::Daemon::Feeder.wakeup
     end

data/spec/unit/daemon/proc_title_spec.rb

@@ -0,0 +1,11 @@
+require 'unit_spec_helper'
+
+describe Rpush::Daemon::ProcTitle do
+  it 'sets the process title' do
+    Rpush.config.embedded = false
+    Rpush.config.push = false
+    allow(Rpush::Daemon::AppRunner).to receive_messages(total_dispatchers: 2, total_queued: 10)
+    expect(Process).to receive(:setproctitle).with('rpush | 10 queued | 2 dispatchers')
+    Rpush::Daemon::ProcTitle.update
+  end
+end

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

@@ -132,4 +132,4 @@ describe Rpush::Daemon::Store::ActiveRecord::Reconnectable do
       end
     end
   end
-end
+end if active_record?

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

@@ -13,16 +13,34 @@ describe Rpush::Daemon::Store::ActiveRecord do
     allow(Time).to receive_messages(now: time)
   end
 
-  it 'can update a notification' do
+  it 'updates an notification' do
     expect(notification).to receive(:save!)
     store.update_notification(notification)
   end
 
-  it 'can update a app' do
+  it 'updates an app' do
     expect(app).to receive(:save!)
     store.update_app(app)
   end
 
+  it 'finds an app by ID' do
+    expect(store.app(app.id)).to eq(app)
+  end
+
+  it 'finds all apps' do
+    app
+    expect(store.all_apps).to eq([app])
+  end
+
+  it 'translates an Integer notification ID' do
+    expect(store.translate_integer_notification_id(notification.id)).to eq(notification.id)
+  end
+
+  it 'returns the pending notification count' do
+    notification
+    expect(store.pending_delivery_count).to eq(1)
+  end
+
   it 'can release a connection' do
     expect(ActiveRecord::Base.connection).to receive(:close)
     store.release_connection
@@ -43,7 +61,6 @@ describe Rpush::Daemon::Store::ActiveRecord do
 
     it 'loads notifications in batches' do
       Rpush.config.batch_size = 5000
-      Rpush.config.push = false
       relation = double.as_null_object
       expect(relation).to receive(:limit).with(5000)
       allow(relation).to receive_messages(to_a: [])
@@ -51,14 +68,6 @@ describe Rpush::Daemon::Store::ActiveRecord do
       store.deliverable_notifications(Rpush.config.batch_size)
     end
 
-    it 'does not load notification in batches if in push mode' do
-      Rpush.config.push = true
-      relation = double.as_null_object
-      expect(relation).not_to receive(:limit)
-      allow(Rpush::Notification).to receive_messages(ready_for_delivery: relation)
-      store.deliverable_notifications(Rpush.config.batch_size)
-    end
-
     it 'loads an undelivered notification without deliver_after set' do
       notification.update_attributes!(delivered: false, deliver_after: nil)
       expect(store.deliverable_notifications(Rpush.config.batch_size)).to eq [notification]
@@ -345,4 +354,4 @@ describe Rpush::Daemon::Store::ActiveRecord do
       expect(new_notification.new_record?).to be_falsey
     end
   end
-end
+end if active_record?

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

@@ -0,0 +1,339 @@
+require 'unit_spec_helper'
+require 'rpush/daemon/store/mongoid'
+
+describe Rpush::Daemon::Store::Mongoid do
+  let(:app) { Rpush::Client::Mongoid::Apns::App.create!(name: 'my_app', environment: 'development', certificate: TEST_CERT) }
+  let(:notification) { Rpush::Client::Mongoid::Apns::Notification.create!(device_token: "a" * 64, app: app) }
+  let(:store) { Rpush::Daemon::Store::Mongoid.new }
+  let(:time) { Time.now.utc }
+  let(:logger) { double(Rpush::Logger, error: nil, internal_logger: nil) }
+
+  before do
+    allow(Rpush).to receive_messages(logger: logger)
+    allow(Time).to receive_messages(now: time)
+  end
+
+  it 'updates an notification' do
+    expect(notification).to receive(:save!)
+    store.update_notification(notification)
+  end
+
+  it 'updates an app' do
+    expect(app).to receive(:save!)
+    store.update_app(app)
+  end
+
+  it 'finds an app by ID' do
+    expect(store.app(app.id)).to eq(app)
+  end
+
+  it 'finds all apps' do
+    expect(store.all_apps).to eq([app])
+  end
+
+  it 'translates an Integer notification ID' do
+    expect(store.translate_integer_notification_id(notification.integer_id)).to eq(notification.id)
+  end
+
+  it 'returns the pending notification count' do
+    notification
+    expect(store.pending_delivery_count).to eq(1)
+  end
+
+  describe 'deliverable_notifications' do
+    it 'loads notifications in batches' do
+      Rpush.config.batch_size = 5000
+      relation = double.as_null_object
+      expect(relation).to receive(:limit).with(5000)
+      allow(relation).to receive_messages(to_a: [])
+      allow(store).to receive_messages(ready_for_delivery: relation)
+      store.deliverable_notifications(Rpush.config.batch_size)
+    end
+
+    it 'loads an undelivered notification without deliver_after set' do
+      notification.update_attributes!(delivered: false, deliver_after: nil)
+      expect(store.deliverable_notifications(Rpush.config.batch_size)).to eq [notification]
+    end
+
+    it 'loads an notification with a deliver_after time in the past' do
+      notification.update_attributes!(delivered: false, deliver_after: 1.hour.ago)
+      expect(store.deliverable_notifications(Rpush.config.batch_size)).to eq [notification]
+    end
+
+    it 'does not load an notification with a deliver_after time in the future' do
+      notification.update_attributes!(delivered: false, deliver_after: 1.hour.from_now)
+      expect(store.deliverable_notifications(Rpush.config.batch_size)).to be_empty
+    end
+
+    it 'does not load a previously delivered notification' do
+      notification.update_attributes!(delivered: true, delivered_at: time)
+      expect(store.deliverable_notifications(Rpush.config.batch_size)).to be_empty
+    end
+
+    it "does not enqueue a notification that has previously failed delivery" do
+      notification.update_attributes!(delivered: false, failed: true)
+      expect(store.deliverable_notifications(Rpush.config.batch_size)).to be_empty
+    end
+  end
+
+  describe 'mark_retryable' do
+    it 'increments the retry count' do
+      expect do
+        store.mark_retryable(notification, time)
+      end.to change(notification, :retries).by(1)
+    end
+
+    it 'sets the deliver after timestamp' do
+      deliver_after = time + 10.seconds
+      expect do
+        store.mark_retryable(notification, deliver_after)
+      end.to change(notification, :deliver_after).to(deliver_after)
+    end
+
+    it 'saves the notification without validation' do
+      expect(notification).to receive(:save!).with(validate: false)
+      store.mark_retryable(notification, time)
+    end
+
+    it 'does not save the notification if persist: false' do
+      expect(notification).not_to receive(:save!)
+      store.mark_retryable(notification, time, persist: false)
+    end
+  end
+
+  describe 'mark_batch_retryable' do
+    let(:deliver_after) { time + 10.seconds }
+
+    it 'sets the attributes on the object for use in reflections' do
+      store.mark_batch_retryable([notification], deliver_after)
+      expect(notification.deliver_after).to eq deliver_after
+      expect(notification.retries).to eq 1
+    end
+
+    it 'increments the retired count' do
+      expect do
+        store.mark_batch_retryable([notification], deliver_after)
+        notification.reload
+      end.to change(notification, :retries).by(1)
+    end
+
+    it 'sets the deliver after timestamp' do
+      expect do
+        store.mark_batch_retryable([notification], deliver_after)
+        notification.reload
+      end.to change { notification.deliver_after.try(:utc).to_s }.to(deliver_after.utc.to_s)
+    end
+  end
+
+  describe 'mark_delivered' do
+    it 'marks the notification as delivered' do
+      expect do
+        store.mark_delivered(notification, time)
+      end.to change(notification, :delivered).to(true)
+    end
+
+    it 'sets the time the notification was delivered' do
+      expect do
+        store.mark_delivered(notification, time)
+        notification.reload
+      end.to change { notification.delivered_at.try(:utc).to_s }.to(time.to_s)
+    end
+
+    it 'saves the notification without validation' do
+      expect(notification).to receive(:save!).with(validate: false)
+      store.mark_delivered(notification, time)
+    end
+
+    it 'does not save the notification if persist: false' do
+      expect(notification).not_to receive(:save!)
+      store.mark_delivered(notification, time, persist: false)
+    end
+  end
+
+  describe 'mark_batch_delivered' do
+    it 'sets the attributes on the object for use in reflections' do
+      store.mark_batch_delivered([notification])
+      expect(notification.delivered_at).to eq time
+      expect(notification.delivered).to be_truthy
+    end
+
+    it 'marks the notifications as delivered' do
+      expect do
+        store.mark_batch_delivered([notification])
+        notification.reload
+      end.to change(notification, :delivered).to(true)
+    end
+
+    it 'sets the time the notifications were delivered' do
+      expect do
+        store.mark_batch_delivered([notification])
+        notification.reload
+      end.to change { notification.delivered_at.try(:utc).to_s }.to(time.to_s)
+    end
+  end
+
+  describe 'mark_failed' do
+    it 'marks the notification as not delivered' do
+      store.mark_failed(notification, nil, '', time)
+      expect(notification.delivered).to eq(false)
+    end
+
+    it 'marks the notification as failed' do
+      expect do
+        store.mark_failed(notification, nil, '', time)
+        notification.reload
+      end.to change(notification, :failed).to(true)
+    end
+
+    it 'sets the time the notification delivery failed' do
+      expect do
+        store.mark_failed(notification, nil, '', time)
+        notification.reload
+      end.to change { notification.failed_at.try(:utc).to_s }.to(time.to_s)
+    end
+
+    it 'sets the error code' do
+      expect do
+        store.mark_failed(notification, 42, '', time)
+      end.to change(notification, :error_code).to(42)
+    end
+
+    it 'sets the error description' do
+      expect do
+        store.mark_failed(notification, 42, 'Weeee', time)
+      end.to change(notification, :error_description).to('Weeee')
+    end
+
+    it 'saves the notification without validation' do
+      expect(notification).to receive(:save!).with(validate: false)
+      store.mark_failed(notification, nil, '', time)
+    end
+
+    it 'does not save the notification if persist: false' do
+      expect(notification).not_to receive(:save!)
+      store.mark_failed(notification, nil, '', time, persist: false)
+    end
+  end
+
+  describe 'mark_batch_failed' do
+    it 'sets the attributes on the object for use in reflections' do
+      store.mark_batch_failed([notification], 123, 'an error')
+      expect(notification.failed_at).to eq time
+      expect(notification.delivered_at).to be_nil
+      expect(notification.delivered).to eq(false)
+      expect(notification.failed).to be_truthy
+      expect(notification.error_code).to eq 123
+      expect(notification.error_description).to eq 'an error'
+    end
+
+    it 'marks the notification as not delivered' do
+      store.mark_batch_failed([notification], nil, '')
+      notification.reload
+      expect(notification.delivered).to be_falsey
+    end
+
+    it 'marks the notification as failed' do
+      expect do
+        store.mark_batch_failed([notification], nil, '')
+        notification.reload
+      end.to change(notification, :failed).to(true)
+    end
+
+    it 'sets the time the notification delivery failed' do
+      expect do
+        store.mark_batch_failed([notification], nil, '')
+        notification.reload
+      end.to change { notification.failed_at.try(:utc).to_s }.to(time.to_s)
+    end
+
+    it 'sets the error code' do
+      expect do
+        store.mark_batch_failed([notification], 42, '')
+        notification.reload
+      end.to change(notification, :error_code).to(42)
+    end
+
+    it 'sets the error description' do
+      expect do
+        store.mark_batch_failed([notification], 42, 'Weeee')
+        notification.reload
+      end.to change(notification, :error_description).to('Weeee')
+    end
+  end
+
+  describe 'create_apns_feedback' do
+    it 'creates the Feedback record' do
+      expect(Rpush::Client::Mongoid::Apns::Feedback).to receive(:create!).with(
+        failed_at: time, device_token: 'ab' * 32, app: app)
+      store.create_apns_feedback(time, 'ab' * 32, app)
+    end
+  end
+
+  describe 'create_gcm_notification' do
+    let(:data) { { data: true } }
+    let(:attributes) { { device_token: 'ab' * 32 } }
+    let(:registration_ids) { %w(123 456) }
+    let(:deliver_after) { time + 10.seconds }
+    let(:args) { [attributes, data, registration_ids, deliver_after, app] }
+
+    it 'sets the given attributes' do
+      new_notification = store.create_gcm_notification(*args)
+      expect(new_notification.device_token).to eq 'ab' * 32
+    end
+
+    it 'sets the given data' do
+      new_notification = store.create_gcm_notification(*args)
+      expect(new_notification.data).to eq(data: true)
+    end
+
+    it 'sets the given registration IDs' do
+      new_notification = store.create_gcm_notification(*args)
+      expect(new_notification.registration_ids).to eq registration_ids
+    end
+
+    it 'sets the deliver_after timestamp' do
+      new_notification = store.create_gcm_notification(*args)
+      expect(new_notification.deliver_after.utc.to_s).to eq deliver_after.to_s
+    end
+
+    it 'saves the new notification' do
+      new_notification = store.create_gcm_notification(*args)
+      expect(new_notification.new_record?).to be_falsey
+    end
+  end
+
+  describe 'create_adm_notification' do
+    let(:data) { { data: true } }
+    let(:attributes) { { app_id: app.id, collapse_key: 'ckey', delay_while_idle: true } }
+    let(:registration_ids) { %w(123 456) }
+    let(:deliver_after) { time + 10.seconds }
+    let(:args) { [attributes, data, registration_ids, deliver_after, app] }
+
+    it 'sets the given attributes' do
+      new_notification = store.create_adm_notification(*args)
+      expect(new_notification.app_id).to eq app.id
+      expect(new_notification.collapse_key).to eq 'ckey'
+      expect(new_notification.delay_while_idle).to be_truthy
+    end
+
+    it 'sets the given data' do
+      new_notification = store.create_adm_notification(*args)
+      expect(new_notification.data).to eq(data: true)
+    end
+
+    it 'sets the given registration IDs' do
+      new_notification = store.create_adm_notification(*args)
+      expect(new_notification.registration_ids).to eq registration_ids
+    end
+
+    it 'sets the deliver_after timestamp' do
+      new_notification = store.create_adm_notification(*args)
+      expect(new_notification.deliver_after.utc.to_s).to eq deliver_after.to_s
+    end
+
+    it 'saves the new notification' do
+      new_notification = store.create_adm_notification(*args)
+      expect(new_notification.new_record?).to be_falsey
+    end
+  end
+end if mongoid?