rpush 2.3.2-java → 2.4.0-java

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

@@ -0,0 +1,365 @@
+require 'unit_spec_helper'
+require 'rpush/daemon/store/redis'
+
+describe Rpush::Daemon::Store::Redis do
+  let(:app) { Rpush::Client::Redis::Apns::App.create!(name: 'my_app', environment: 'development', certificate: TEST_CERT) }
+  let(:notification) { Rpush::Client::Redis::Apns::Notification.create!(device_token: "a" * 64, app: app) }
+  let(:store) { Rpush::Daemon::Store::Redis.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
+    app
+    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
+
+  describe 'deliverable_notifications' do
+    it 'loads notifications in batches' do
+      Rpush.config.batch_size = 100
+      allow(store).to receive_messages(pending_notification_ids: [1, 2, 3, 4])
+      expect(Rpush::Client::Redis::Notification).to receive(:find).exactly(4).times
+      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
+      notification = store.deliverable_notifications(Rpush.config.batch_size).first
+      store.mark_retryable(notification, 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
+      notification = store.deliverable_notifications(Rpush.config.batch_size).first
+      store.mark_delivered(notification, Time.now)
+      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
+      notification = store.deliverable_notifications(Rpush.config.batch_size).first
+      store.mark_failed(notification, 0, "failed", Time.now)
+      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_ids_retryable' do
+    let(:deliver_after) { time + 10.seconds }
+
+    it 'sets the deliver after timestamp' do
+      expect do
+        store.mark_ids_retryable([notification.id], deliver_after)
+        notification.reload
+      end.to change { notification.deliver_after.try(:utc).to_s }.to(deliver_after.utc.to_s)
+    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_ids_failed' do
+    it 'marks the notification as failed' do
+      expect do
+        store.mark_ids_failed([notification.id], nil, '', Time.now)
+        notification.reload
+      end.to change(notification, :failed).to(true)
+    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::Redis::Apns::Feedback).to receive(:create!).with(
+        failed_at: time, device_token: 'ab' * 32, app_id: app.id)
+      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 redis?

data/spec/unit/embed_spec.rb

@@ -19,8 +19,10 @@ describe Rpush, 'embed' do
   end
 
   it 'overrides the default config options with those given as a hash' do
-    Rpush.config.push_poll = 4
-    expect { Rpush.embed(push_poll: 2) }.to change(Rpush.config, :push_poll).to(2)
+    Rpush::Deprecation.muted do
+      Rpush.config.push_poll = 4
+      expect { Rpush.embed(push_poll: 2) }.to change(Rpush.config, :push_poll).to(2)
+    end
   end
 end
 

data/spec/unit/logger_spec.rb

@@ -5,11 +5,11 @@ module Rails
 end
 
 describe Rpush::Logger do
-  let(:log) { double(:sync= => true) }
+  let(:log) { double(:sync= => true, :level= => nil) }
 
   before do
     @logger_class = defined?(ActiveSupport::BufferedLogger) ? ActiveSupport::BufferedLogger : ActiveSupport::Logger
-    @logger = double(@logger_class.name, info: nil, error: nil, level: 0, auto_flushing: true, :auto_flushing= => nil)
+    @logger = double(@logger_class.name, info: nil, error: nil, level: 0, :level= => nil, auto_flushing: true, :auto_flushing= => nil)
     allow(@logger_class).to receive(:new).and_return(@logger)
     allow(Rails).to receive_messages(logger: @logger)
     allow(File).to receive_messages(open: log)
@@ -41,7 +41,7 @@ describe Rpush::Logger do
   end
 
   it 'uses the user-defined logger' do
-    my_logger = double
+    my_logger = double(:level= => nil)
     Rpush.config.logger = my_logger
     logger = Rpush::Logger.new
     expect(my_logger).to receive(:info)
@@ -51,7 +51,7 @@ describe Rpush::Logger do
 
   it 'uses ActiveSupport::BufferedLogger if a user-defined logger is not set' do
     if ActiveSupport.const_defined?('BufferedLogger')
-      expect(ActiveSupport::BufferedLogger).to receive(:new).with(log, Rails.logger.level)
+      expect(ActiveSupport::BufferedLogger).to receive(:new).with(log)
       Rpush::Logger.new
     end
   end
@@ -59,7 +59,16 @@ describe Rpush::Logger do
   it 'uses ActiveSupport::Logger if BufferedLogger does not exist' do
     stub_const('ActiveSupport::Logger', double)
     allow(ActiveSupport).to receive_messages(:const_defined? => false)
-    expect(ActiveSupport::Logger).to receive(:new).with(log, Rails.logger.level)
+    expect(ActiveSupport::Logger).to receive(:new).with(log).and_return(log)
+    Rpush::Logger.new
+  end
+
+  it 'sets the log level on the logger' do
+    stub_const('ActiveSupport::Logger', double)
+    allow(ActiveSupport).to receive_messages(:const_defined? => false)
+    expect(ActiveSupport::Logger).to receive(:new).with(log).and_return(log)
+    Rpush.config.log_level = ::Logger::Severity::ERROR
+    expect(log).to receive(:level=).with(::Logger::Severity::ERROR)
     Rpush::Logger.new
   end
 

data/spec/unit/notification_shared.rb

@@ -18,7 +18,7 @@ shared_examples_for "an Notification subclass" do
 
     it "raises an ArgumentError if something other than a Hash is assigned" do
       expect do
-        notification.data = Array.new
+        notification.data = []
       end.to raise_error(ArgumentError, "must be a Hash")
     end
 

data/spec/unit/push_spec.rb

@@ -33,7 +33,9 @@ describe Rpush, 'push' do
   end
 
   it 'overrides the default config options with those given as a hash' do
-    Rpush.config.batch_size = 20
-    expect { Rpush.push(batch_size: 10) }.to change(Rpush.config, :batch_size).to(10)
+    Rpush::Deprecation.muted do
+      Rpush.config.batch_size = 20
+      expect { Rpush.push(batch_size: 10) }.to change(Rpush.config, :batch_size).to(10)
+    end
   end
 end

data/spec/unit_spec_helper.rb

@@ -13,9 +13,9 @@ RSpec.configure do |config|
   config.before(:each) do
     Modis.with_connection do |redis|
       redis.keys('rpush:*').each { |key| redis.del(key) }
-    end
+    end if redis?
 
-    if unit_example?(self.class.metadata)
+    if active_record? && unit_example?(self.class.metadata)
       connection = ActiveRecord::Base.connection
 
       if rails4?
@@ -29,7 +29,7 @@ RSpec.configure do |config|
   end
 
   config.after(:each) do
-    if unit_example?(self.class.metadata)
+    if active_record? && unit_example?(self.class.metadata)
       connection = ActiveRecord::Base.connection
 
       if rails4?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpush
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.4.0
 platform: java
 authors:
 - Ian Leitch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-31 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +139,7 @@ files:
 - CHANGELOG.md
 - LICENSE
 - README.md
+- bin/rpush
 - lib/generators/rpush_config_generator.rb
 - lib/generators/rpush_migration_generator.rb
 - lib/generators/templates/add_adm.rb
@@ -186,6 +187,18 @@ files:
 - lib/rpush/client/active_record/notification.rb
 - lib/rpush/client/active_record/wpns/app.rb
 - lib/rpush/client/active_record/wpns/notification.rb
+- lib/rpush/client/mongoid.rb
+- lib/rpush/client/mongoid/adm/app.rb
+- lib/rpush/client/mongoid/adm/notification.rb
+- lib/rpush/client/mongoid/apns/app.rb
+- lib/rpush/client/mongoid/apns/feedback.rb
+- lib/rpush/client/mongoid/apns/notification.rb
+- lib/rpush/client/mongoid/app.rb
+- lib/rpush/client/mongoid/gcm/app.rb
+- lib/rpush/client/mongoid/gcm/notification.rb
+- lib/rpush/client/mongoid/notification.rb
+- lib/rpush/client/mongoid/wpns/app.rb
+- lib/rpush/client/mongoid/wpns/notification.rb
 - lib/rpush/client/redis.rb
 - lib/rpush/client/redis/adm/app.rb
 - lib/rpush/client/redis/adm/notification.rb
@@ -230,6 +243,7 @@ files:
 - lib/rpush/daemon/store/active_record.rb
 - lib/rpush/daemon/store/active_record/reconnectable.rb
 - lib/rpush/daemon/store/interface.rb
+- lib/rpush/daemon/store/mongoid.rb
 - lib/rpush/daemon/store/redis.rb
 - lib/rpush/daemon/string_helpers.rb
 - lib/rpush/daemon/synchronizer.rb
@@ -264,6 +278,8 @@ files:
 - spec/support/cert_with_password.pem
 - spec/support/cert_without_password.pem
 - spec/support/config/database.yml
+- spec/support/config/mongoid.yml
+- spec/support/mongoid_setup.rb
 - spec/support/simplecov_helper.rb
 - spec/support/simplecov_quality_formatter.rb
 - spec/tmp/.gitkeep
@@ -293,11 +309,14 @@ files:
 - spec/unit/daemon/dispatcher_loop_spec.rb
 - spec/unit/daemon/feeder_spec.rb
 - spec/unit/daemon/gcm/delivery_spec.rb
+- spec/unit/daemon/proc_title_spec.rb
 - spec/unit/daemon/retryable_error_spec.rb
 - spec/unit/daemon/service_config_methods_spec.rb
 - spec/unit/daemon/signal_handler_spec.rb
 - spec/unit/daemon/store/active_record/reconnectable_spec.rb
 - spec/unit/daemon/store/active_record_spec.rb
+- spec/unit/daemon/store/mongoid_spec.rb
+- spec/unit/daemon/store/redis_spec.rb
 - spec/unit/daemon/tcp_connection_spec.rb
 - spec/unit/daemon/wpns/delivery_spec.rb
 - spec/unit/daemon_spec.rb
@@ -312,7 +331,6 @@ files:
 - spec/unit/reflection_collection_spec.rb
 - spec/unit/rpush_spec.rb
 - spec/unit_spec_helper.rb
-- bin/rpush
 homepage: https://github.com/rpush/rpush
 licenses:
 - MIT
@@ -333,7 +351,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
 summary: The push notification service for Ruby.
@@ -353,6 +371,8 @@ test_files:
 - spec/support/cert_with_password.pem
 - spec/support/cert_without_password.pem
 - spec/support/config/database.yml
+- spec/support/config/mongoid.yml
+- spec/support/mongoid_setup.rb
 - spec/support/simplecov_helper.rb
 - spec/support/simplecov_quality_formatter.rb
 - spec/tmp/.gitkeep
@@ -382,11 +402,14 @@ test_files:
 - spec/unit/daemon/dispatcher_loop_spec.rb
 - spec/unit/daemon/feeder_spec.rb
 - spec/unit/daemon/gcm/delivery_spec.rb
+- spec/unit/daemon/proc_title_spec.rb
 - spec/unit/daemon/retryable_error_spec.rb
 - spec/unit/daemon/service_config_methods_spec.rb
 - spec/unit/daemon/signal_handler_spec.rb
 - spec/unit/daemon/store/active_record/reconnectable_spec.rb
 - spec/unit/daemon/store/active_record_spec.rb
+- spec/unit/daemon/store/mongoid_spec.rb
+- spec/unit/daemon/store/redis_spec.rb
 - spec/unit/daemon/tcp_connection_spec.rb
 - spec/unit/daemon/wpns/delivery_spec.rb
 - spec/unit/daemon_spec.rb