rpush 5.4.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1166c47df63fee1cfaaa6e869d382923c65a0e3cae24ca36bc73d1736590dcac
-  data.tar.gz: d97ca83af8fb3959ca5d782d65af6e8f0bfddbc5b928753dcc3439f497a84edc
+  metadata.gz: 7f8cbb341eafccf585f3967e5b1ef434a422f9a14175466060a978d2d4adbe4e
+  data.tar.gz: c8f767c447855b04a7e2d9e980a9408bdbafe11f6e84f711c0893122f2202cec
 SHA512:
-  metadata.gz: 4ea1ec176522f0a766718a0de5c7840504d137eb93db1bcd8e76c47975f450e60f61c818726c9ec0b62a50885e201570c4807c2e97e4597f710d6c4143a95c0b
-  data.tar.gz: bec1191493bc5540e3c329cf39cb717b8c8fe86217c03d4461f4be275cead69c5e0c52e8c6525767b4899379aed8b4dbbe688beeb384628ea569c941d3305835
+  metadata.gz: 3e6997a5008122ca85fed5a5f4eab96e0c6e585aa8fc4ab305c394608c10fb6bfdec2b79077e3098e137e173e65b0e7804038b5230013a51446d980ed2d6bb95
+  data.tar.gz: 5e6b265e5e034bebe78a30cdd4f2af63a08933777a58d86d1f8c6a73a2f4783fad7cba6f4b2181a08a79def81879594544979642dae8c3326de407205c6c4852

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## [Unreleased](https://github.com/rpush/rpush/tree/HEAD)
+
+[Full Changelog](https://github.com/rpush/rpush/compare/v5.4.0...HEAD)
+
+## [v6.0.0](https://github.com/rpush/rpush/tree/v6.0.0) (2021-05-21)
+
+[Full Changelog](https://github.com/rpush/rpush/compare/v5.4.0...v6.0.0)
+
+This release contains **breaking changes**, such as removing support for Rails versions older than 5.2.
+Please see the details in the PRs below.
+
+**Merged pull requests:**
+
+- Switch to GitHub Actions for CI [\#615](https://github.com/rpush/rpush/pull/615) ([aried3r](https://github.com/aried3r))
+- Prepare 6.0.0 release [\#613](https://github.com/rpush/rpush/pull/613) ([aried3r](https://github.com/aried3r))
+- Bump activesupport version to 5.2 or later [\#610](https://github.com/rpush/rpush/pull/610) ([biow0lf](https://github.com/biow0lf))
+- Fixed infinite loop issue with Apnsp8 delivery [\#608](https://github.com/rpush/rpush/pull/608) ([diminish7](https://github.com/diminish7))
+- Eliminate deprecation warning in Ruby 3.0 [\#602](https://github.com/rpush/rpush/pull/602) ([rofreg](https://github.com/rofreg))
+- Make ActiveRecord validations work with Apns2 client [\#601](https://github.com/rpush/rpush/pull/601) ([favrik](https://github.com/favrik))
+- Bump gemspec post\_install\_message [\#600](https://github.com/rpush/rpush/pull/600) ([fdoxyz](https://github.com/fdoxyz))
+- Remove references and checks for unsupported versions of Rails [\#599](https://github.com/rpush/rpush/pull/599) ([ericsaupe](https://github.com/ericsaupe))
+- Drop support for Rails 5.0 and 5.1 [\#597](https://github.com/rpush/rpush/pull/597) ([ericsaupe](https://github.com/ericsaupe))
+- Fix silent APNS notifications for Apns2 and Apnsp8 [\#596](https://github.com/rpush/rpush/pull/596) ([shved270189](https://github.com/shved270189))
+- Updates README to Apple's new EOL date for the APNs legacy binary protocol [\#595](https://github.com/rpush/rpush/pull/595) ([gregblake](https://github.com/gregblake))
+
 ## [v5.4.0](https://github.com/rpush/rpush/tree/v5.4.0) (2021-02-15)
 
 [Full Changelog](https://github.com/rpush/rpush/compare/v5.3.0...v5.4.0)

data/README.md

@@ -1,5 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/rpush.svg)](http://badge.fury.io/rb/rpush)
-[![Build Status](https://travis-ci.org/rpush/rpush.svg?branch=master)](https://travis-ci.org/rpush/rpush)
+[![RPush Test](https://github.com/rpush/rpush/actions/workflows/test.yml/badge.svg)](https://github.com/rpush/rpush/actions/workflows/test.yml)
 [![Test Coverage](https://codeclimate.com/github/rpush/rpush/badges/coverage.svg)](https://codeclimate.com/github/rpush/rpush)
 [![Code Climate](https://codeclimate.com/github/rpush/rpush/badges/gpa.svg)](https://codeclimate.com/github/rpush/rpush)
 [![Join the chat at https://gitter.im/rpush/rpush](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/rpush/rpush?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -58,7 +58,7 @@ There is a choice of two modes (and one legacy mode) using certificates or using
 * `Rpush::Apns2` This requires an annually renewable certificate. see https://developer.apple.com/documentation/usernotifications/setting_up_a_remote_notification_server/establishing_a_certificate-based_connection_to_apns
 * `Rpush::Apnsp8` This uses encrypted tokens and requires an encryption key id and encryption key (provide as a p8 file). (see https://developer.apple.com/documentation/usernotifications/setting_up_a_remote_notification_server/establishing_a_token-based_connection_to_apns)
 * `Rpush::Apns` There is also the original APNS (the original version using certificates with a binary underlying protocol over TCP directly rather than over Http/2).
-  Apple have [announced](https://developer.apple.com/news/?id=11042019a) that this is not supported after November 2020.
+  Apple have [announced](https://developer.apple.com/news/?id=c88acm2b) that this is not supported after March 31, 2021.
 
 If this is your first time using the APNs, you will need to generate either SSL certificates (for Apns2 or Apns) or an Encryption Key (p8) and an Encryption Key ID (for Apnsp8). See [Generating Certificates](https://github.com/rpush/rpush/wiki/Generating-Certificates) for instructions.
 

data/lib/generators/templates/add_adm.rb

@@ -1,4 +1,4 @@
-class AddAdm < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class AddAdm < ActiveRecord::Migration[5.0]
   module Rapns
     class Notification < ActiveRecord::Base
       self.table_name = 'rapns_notifications'

data/lib/generators/templates/add_alert_is_json_to_rapns_notifications.rb

@@ -1,4 +1,4 @@
-class AddAlertIsJsonToRapnsNotifications < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class AddAlertIsJsonToRapnsNotifications < ActiveRecord::Migration[5.0]
   def self.up
     add_column :rapns_notifications, :alert_is_json, :boolean, null: true, default: false
   end
@@ -6,4 +6,4 @@ class AddAlertIsJsonToRapnsNotifications < ActiveRecord::VERSION::MAJOR >= 5 ? A
   def self.down
     remove_column :rapns_notifications, :alert_is_json
   end
-end
+end

data/lib/generators/templates/add_app_to_rapns.rb

@@ -1,4 +1,4 @@
-class AddAppToRapns < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class AddAppToRapns < ActiveRecord::Migration[5.0]
   def self.up
     add_column :rapns_notifications, :app, :string, null: true
     add_column :rapns_feedback, :app, :string, null: true
@@ -8,4 +8,4 @@ class AddAppToRapns < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migratio
     remove_column :rapns_notifications, :app
     remove_column :rapns_feedback, :app
   end
-end
+end

data/lib/generators/templates/add_fail_after_to_rpush_notifications.rb

@@ -1,4 +1,4 @@
-class AddFailAfterToRpushNotifications < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class AddFailAfterToRpushNotifications < ActiveRecord::Migration[5.0]
   def self.up
     add_column :rpush_notifications, :fail_after, :timestamp, null: true
   end

data/lib/generators/templates/add_gcm.rb

@@ -1,4 +1,4 @@
-class AddGcm < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class AddGcm < ActiveRecord::Migration[5.0]
   module Rapns
     class App < ActiveRecord::Base
       self.table_name = 'rapns_apps'
@@ -50,18 +50,10 @@ class AddGcm < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0]
     change_column :rapns_notifications, :app_id, :integer, null: false
     remove_column :rapns_notifications, :app
 
-    if ActiveRecord.version >= Gem::Version.new('5.1')
-      if index_name_exists?(:rapns_notifications, "index_rapns_notifications_multi")
-        remove_index :rapns_notifications, name: "index_rapns_notifications_multi"
-      elsif index_name_exists?(:rapns_notifications, "index_rapns_notifications_on_delivered_failed_deliver_after")
-        remove_index :rapns_notifications, name: "index_rapns_notifications_on_delivered_failed_deliver_after"
-      end
-    else
-      if index_name_exists?(:rapns_notifications, "index_rapns_notifications_multi", true)
-        remove_index :rapns_notifications, name: "index_rapns_notifications_multi"
-      elsif index_name_exists?(:rapns_notifications, "index_rapns_notifications_on_delivered_failed_deliver_after", false)
-        remove_index :rapns_notifications, name: "index_rapns_notifications_on_delivered_failed_deliver_after"
-      end
+    if index_name_exists?(:rapns_notifications, "index_rapns_notifications_multi")
+      remove_index :rapns_notifications, name: "index_rapns_notifications_multi"
+    elsif index_name_exists?(:rapns_notifications, "index_rapns_notifications_on_delivered_failed_deliver_after")
+      remove_index :rapns_notifications, name: "index_rapns_notifications_on_delivered_failed_deliver_after"
     end
 
     add_index :rapns_notifications, [:app_id, :delivered, :failed, :deliver_after], name: "index_rapns_notifications_multi"
@@ -100,14 +92,8 @@ class AddGcm < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0]
       AddGcm::Rapns::Notification.update_all(['app = ?', app.key], ['app_id = ?', app.id])
     end
 
-    if ActiveRecord.version >= Gem::Version.new('5.1')
-      if index_name_exists?(:rapns_notifications, :index_rapns_notifications_multi)
-        remove_index :rapns_notifications, name: :index_rapns_notifications_multi
-      end
-    else
-      if index_name_exists?(:rapns_notifications, :index_rapns_notifications_multi, true)
-        remove_index :rapns_notifications, name: :index_rapns_notifications_multi
-      end
+    if index_name_exists?(:rapns_notifications, :index_rapns_notifications_multi)
+      remove_index :rapns_notifications, name: :index_rapns_notifications_multi
     end
 
     remove_column :rapns_notifications, :app_id

data/lib/generators/templates/add_rpush.rb

@@ -19,7 +19,7 @@
 # approach. The constituent parts of this migration have been executed
 # many times, by many people!
 
-class AddRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class AddRpush < ActiveRecord::Migration[5.0]
   def self.migrations
     [CreateRapnsNotifications, CreateRapnsFeedback,
      AddAlertIsJsonToRapnsNotifications, AddAppToRapns,
@@ -41,7 +41,7 @@ class AddRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0
     end
   end
 
-  class CreateRapnsNotifications < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+  class CreateRapnsNotifications < ActiveRecord::Migration[5.0]
     def self.up
       create_table :rapns_notifications do |t|
         t.integer   :badge,                 null: true
@@ -64,21 +64,15 @@ class AddRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0
     end
 
     def self.down
-      if ActiveRecord.version >= Gem::Version.new('5.1')
-        if index_name_exists?(:rapns_notifications, 'index_rapns_notifications_multi')
-          remove_index :rapns_notifications, name: 'index_rapns_notifications_multi'
-        end
-      else
-        if index_name_exists?(:rapns_notifications, 'index_rapns_notifications_multi', true)
-          remove_index :rapns_notifications, name: 'index_rapns_notifications_multi'
-        end
+      if index_name_exists?(:rapns_notifications, 'index_rapns_notifications_multi')
+        remove_index :rapns_notifications, name: 'index_rapns_notifications_multi'
       end
 
       drop_table :rapns_notifications
     end
   end
 
-  class CreateRapnsFeedback < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+  class CreateRapnsFeedback < ActiveRecord::Migration[5.0]
     def self.up
       create_table :rapns_feedback do |t|
         t.string    :device_token,          null: false, limit: 64
@@ -90,21 +84,15 @@ class AddRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0
     end
 
     def self.down
-      if ActiveRecord.version >= Gem::Version.new('5.1')
-        if index_name_exists?(:rapns_feedback, :index_rapns_feedback_on_device_token)
-          remove_index :rapns_feedback, name: :index_rapns_feedback_on_device_token
-        end
-      else
-        if index_name_exists?(:rapns_feedback, :index_rapns_feedback_on_device_token, true)
-          remove_index :rapns_feedback, name: :index_rapns_feedback_on_device_token
-        end
+      if index_name_exists?(:rapns_feedback, :index_rapns_feedback_on_device_token)
+        remove_index :rapns_feedback, name: :index_rapns_feedback_on_device_token
       end
 
       drop_table :rapns_feedback
     end
   end
 
-  class AddAlertIsJsonToRapnsNotifications < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+  class AddAlertIsJsonToRapnsNotifications < ActiveRecord::Migration[5.0]
     def self.up
       add_column :rapns_notifications, :alert_is_json, :boolean, null: true, default: false
     end
@@ -114,7 +102,7 @@ class AddRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0
     end
   end
 
-  class AddAppToRapns < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+  class AddAppToRapns < ActiveRecord::Migration[5.0]
     def self.up
       add_column :rapns_notifications, :app, :string, null: true
       add_column :rapns_feedback, :app, :string, null: true
@@ -126,7 +114,7 @@ class AddRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0
     end
   end
 
-  class CreateRapnsApps < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+  class CreateRapnsApps < ActiveRecord::Migration[5.0]
     def self.up
       create_table :rapns_apps do |t|
         t.string    :key,             null: false
@@ -143,7 +131,7 @@ class AddRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0
     end
   end
 
-  class AddGcm < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+  class AddGcm < ActiveRecord::Migration[5.0]
     module Rapns
       class App < ActiveRecord::Base
         self.table_name = 'rapns_apps'
@@ -195,18 +183,10 @@ class AddRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0
       change_column :rapns_notifications, :app_id, :integer, null: false
       remove_column :rapns_notifications, :app
 
-      if ActiveRecord.version >= Gem::Version.new('5.1')
-        if index_name_exists?(:rapns_notifications, "index_rapns_notifications_multi")
-          remove_index :rapns_notifications, name: "index_rapns_notifications_multi"
-        elsif index_name_exists?(:rapns_notifications, "index_rapns_notifications_on_delivered_failed_deliver_after")
-          remove_index :rapns_notifications, name: "index_rapns_notifications_on_delivered_failed_deliver_after"
-        end
-      else
-        if index_name_exists?(:rapns_notifications, "index_rapns_notifications_multi", true)
-          remove_index :rapns_notifications, name: "index_rapns_notifications_multi"
-        elsif index_name_exists?(:rapns_notifications, "index_rapns_notifications_on_delivered_failed_deliver_after", false)
-          remove_index :rapns_notifications, name: "index_rapns_notifications_on_delivered_failed_deliver_after"
-        end
+      if index_name_exists?(:rapns_notifications, "index_rapns_notifications_multi")
+        remove_index :rapns_notifications, name: "index_rapns_notifications_multi"
+      elsif index_name_exists?(:rapns_notifications, "index_rapns_notifications_on_delivered_failed_deliver_after")
+        remove_index :rapns_notifications, name: "index_rapns_notifications_on_delivered_failed_deliver_after"
       end
 
       add_index :rapns_notifications, [:app_id, :delivered, :failed, :deliver_after], name: "index_rapns_notifications_multi"
@@ -245,14 +225,8 @@ class AddRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0
         AddGcm::Rapns::Notification.where(app_id: app.id).update_all(app: app.key)
       end
 
-      if ActiveRecord.version >= Gem::Version.new('5.1')
-        if index_name_exists?(:rapns_notifications, :index_rapns_notifications_multi)
-          remove_index :rapns_notifications, name: :index_rapns_notifications_multi
-        end
-      else
-        if index_name_exists?(:rapns_notifications, :index_rapns_notifications_multi, true)
-          remove_index :rapns_notifications, name: :index_rapns_notifications_multi
-        end
+      if index_name_exists?(:rapns_notifications, :index_rapns_notifications_multi)
+        remove_index :rapns_notifications, name: :index_rapns_notifications_multi
       end
 
       remove_column :rapns_notifications, :app_id
@@ -261,7 +235,7 @@ class AddRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0
     end
   end
 
-  class AddWpns < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+  class AddWpns < ActiveRecord::Migration[5.0]
     module Rapns
       class Notification < ActiveRecord::Base
         self.table_name = 'rapns_notifications'
@@ -278,7 +252,7 @@ class AddRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0
     end
   end
 
-  class AddAdm < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+  class AddAdm < ActiveRecord::Migration[5.0]
     module Rapns
       class Notification < ActiveRecord::Base
         self.table_name = 'rapns_notifications'
@@ -302,7 +276,7 @@ class AddRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0
     end
   end
 
-  class RenameRapnsToRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+  class RenameRapnsToRpush < ActiveRecord::Migration[5.0]
     module Rpush
       class App < ActiveRecord::Base
         self.table_name = 'rpush_apps'
@@ -322,24 +296,12 @@ class AddRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0
       rename_table :rapns_apps, :rpush_apps
       rename_table :rapns_feedback, :rpush_feedback
 
-      if ActiveRecord.version >= Gem::Version.new('5.1')
-        if index_name_exists?(:rpush_notifications, :index_rapns_notifications_multi)
-          rename_index :rpush_notifications, :index_rapns_notifications_multi, :index_rpush_notifications_multi
-        end
-      else
-        if index_name_exists?(:rpush_notifications, :index_rapns_notifications_multi, true)
-          rename_index :rpush_notifications, :index_rapns_notifications_multi, :index_rpush_notifications_multi
-        end
+      if index_name_exists?(:rpush_notifications, :index_rapns_notifications_multi)
+        rename_index :rpush_notifications, :index_rapns_notifications_multi, :index_rpush_notifications_multi
       end
 
-      if ActiveRecord.version >= Gem::Version.new('5.1')
-        if index_name_exists?(:rpush_feedback, :index_rapns_feedback_on_device_token)
-          rename_index :rpush_feedback, :index_rapns_feedback_on_device_token, :index_rpush_feedback_on_device_token
-        end
-      else
-        if index_name_exists?(:rpush_feedback, :index_rapns_feedback_on_device_token, true)
-          rename_index :rpush_feedback, :index_rapns_feedback_on_device_token, :index_rpush_feedback_on_device_token
-        end
+      if index_name_exists?(:rpush_feedback, :index_rapns_feedback_on_device_token)
+        rename_index :rpush_feedback, :index_rapns_feedback_on_device_token, :index_rpush_feedback_on_device_token
       end
 
       update_type(RenameRapnsToRpush::Rpush::Notification, 'Rapns::Apns::Notification', 'Rpush::Apns::Notification')
@@ -364,24 +326,12 @@ class AddRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0
       update_type(RenameRapnsToRpush::Rpush::App, 'Rpush::Adm::App', 'Rapns::Adm::App')
       update_type(RenameRapnsToRpush::Rpush::App, 'Rpush::Wpns::App', 'Rapns::Wpns::App')
 
-      if ActiveRecord.version >= Gem::Version.new('5.1')
-        if index_name_exists?(:rpush_notifications, :index_rpush_notifications_multi)
-          rename_index :rpush_notifications, :index_rpush_notifications_multi, :index_rapns_notifications_multi
-        end
-      else
-        if index_name_exists?(:rpush_notifications, :index_rpush_notifications_multi, true)
-          rename_index :rpush_notifications, :index_rpush_notifications_multi, :index_rapns_notifications_multi
-        end
+      if index_name_exists?(:rpush_notifications, :index_rpush_notifications_multi)
+        rename_index :rpush_notifications, :index_rpush_notifications_multi, :index_rapns_notifications_multi
       end
 
-      if ActiveRecord.version >= Gem::Version.new('5.1')
-        if index_name_exists?(:rpush_feedback, :index_rpush_feedback_on_device_token)
-          rename_index :rpush_feedback, :index_rpush_feedback_on_device_token, :index_rapns_feedback_on_device_token
-        end
-      else
-        if index_name_exists?(:rpush_feedback, :index_rpush_feedback_on_device_token, true)
-          rename_index :rpush_feedback, :index_rpush_feedback_on_device_token, :index_rapns_feedback_on_device_token
-        end
+      if index_name_exists?(:rpush_feedback, :index_rpush_feedback_on_device_token)
+        rename_index :rpush_feedback, :index_rpush_feedback_on_device_token, :index_rapns_feedback_on_device_token
       end
 
       rename_table :rpush_notifications, :rapns_notifications
@@ -390,7 +340,7 @@ class AddRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0
     end
   end
 
-  class AddFailAfterToRpushNotifications < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+  class AddFailAfterToRpushNotifications < ActiveRecord::Migration[5.0]
     def self.up
       add_column :rpush_notifications, :fail_after, :timestamp, null: true
     end

data/lib/generators/templates/add_wpns.rb

@@ -1,4 +1,4 @@
-class AddWpns < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class AddWpns < ActiveRecord::Migration[5.0]
   module Rapns
     class Notification < ActiveRecord::Base
       self.table_name = 'rapns_notifications'

data/lib/generators/templates/create_rapns_apps.rb

@@ -1,4 +1,4 @@
-class CreateRapnsApps < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class CreateRapnsApps < ActiveRecord::Migration[5.0]
   def self.up
     create_table :rapns_apps do |t|
       t.string    :key,             null: false

data/lib/generators/templates/create_rapns_feedback.rb

@@ -1,4 +1,4 @@
-class CreateRapnsFeedback < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class CreateRapnsFeedback < ActiveRecord::Migration[5.0]
   def self.up
     create_table :rapns_feedback do |t|
       t.string    :device_token,          null: false, limit: 64
@@ -10,14 +10,8 @@ class CreateRapnsFeedback < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Mi
   end
 
   def self.down
-    if ActiveRecord.version >= Gem::Version.new('5.1')
-      if index_name_exists?(:rapns_feedback, :index_rapns_feedback_on_device_token)
-        remove_index :rapns_feedback, name: :index_rapns_feedback_on_device_token
-      end
-    else
-      if index_name_exists?(:rapns_feedback, :index_rapns_feedback_on_device_token, true)
-        remove_index :rapns_feedback, name: :index_rapns_feedback_on_device_token
-      end
+    if index_name_exists?(:rapns_feedback, :index_rapns_feedback_on_device_token)
+      remove_index :rapns_feedback, name: :index_rapns_feedback_on_device_token
     end
 
     drop_table :rapns_feedback

data/lib/generators/templates/create_rapns_notifications.rb

@@ -1,4 +1,4 @@
-class CreateRapnsNotifications < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class CreateRapnsNotifications < ActiveRecord::Migration[5.0]
   def self.up
     create_table :rapns_notifications do |t|
       t.integer   :badge,                 null: true
@@ -21,14 +21,8 @@ class CreateRapnsNotifications < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecor
   end
 
   def self.down
-    if ActiveRecord.version >= Gem::Version.new('5.1')
-      if index_name_exists?(:rapns_notifications, 'index_rapns_notifications_multi')
-        remove_index :rapns_notifications, name: 'index_rapns_notifications_multi'
-      end
-    else
-      if index_name_exists?(:rapns_notifications, 'index_rapns_notifications_multi', true)
-        remove_index :rapns_notifications, name: 'index_rapns_notifications_multi'
-      end
+    if index_name_exists?(:rapns_notifications, 'index_rapns_notifications_multi')
+      remove_index :rapns_notifications, name: 'index_rapns_notifications_multi'
     end
 
     drop_table :rapns_notifications

data/lib/generators/templates/rename_rapns_to_rpush.rb

@@ -1,4 +1,4 @@
-class RenameRapnsToRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class RenameRapnsToRpush < ActiveRecord::Migration[5.0]
   module Rpush
     class App < ActiveRecord::Base
       self.table_name = 'rpush_apps'
@@ -18,24 +18,12 @@ class RenameRapnsToRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Mig
     rename_table :rapns_apps, :rpush_apps
     rename_table :rapns_feedback, :rpush_feedback
 
-    if ActiveRecord.version >= Gem::Version.new('5.1')
-      if index_name_exists?(:rpush_notifications, :index_rapns_notifications_multi)
-        rename_index :rpush_notifications, :index_rapns_notifications_multi, :index_rpush_notifications_multi
-      end
-    else
-      if index_name_exists?(:rpush_notifications, :index_rapns_notifications_multi, true)
-        rename_index :rpush_notifications, :index_rapns_notifications_multi, :index_rpush_notifications_multi
-      end
+    if index_name_exists?(:rpush_notifications, :index_rapns_notifications_multi)
+      rename_index :rpush_notifications, :index_rapns_notifications_multi, :index_rpush_notifications_multi
     end
 
-    if ActiveRecord.version >= Gem::Version.new('5.1')
-      if index_name_exists?(:rpush_feedback, :index_rapns_feedback_on_device_token)
-        rename_index :rpush_feedback, :index_rapns_feedback_on_device_token, :index_rpush_feedback_on_device_token
-      end
-    else
-      if index_name_exists?(:rpush_feedback, :index_rapns_feedback_on_device_token, true)
-        rename_index :rpush_feedback, :index_rapns_feedback_on_device_token, :index_rpush_feedback_on_device_token
-      end
+    if index_name_exists?(:rpush_feedback, :index_rapns_feedback_on_device_token)
+      rename_index :rpush_feedback, :index_rapns_feedback_on_device_token, :index_rpush_feedback_on_device_token
     end
 
     update_type(RenameRapnsToRpush::Rpush::Notification, 'Rapns::Apns::Notification', 'Rpush::Apns::Notification')
@@ -60,24 +48,12 @@ class RenameRapnsToRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Mig
     update_type(RenameRapnsToRpush::Rpush::App, 'Rpush::Adm::App', 'Rapns::Adm::App')
     update_type(RenameRapnsToRpush::Rpush::App, 'Rpush::Wpns::App', 'Rapns::Wpns::App')
 
-    if ActiveRecord.version >= Gem::Version.new('5.1')
-      if index_name_exists?(:rpush_notifications, :index_rpush_notifications_multi)
-        rename_index :rpush_notifications, :index_rpush_notifications_multi, :index_rapns_notifications_multi
-      end
-    else
-      if index_name_exists?(:rpush_notifications, :index_rpush_notifications_multi, true)
-        rename_index :rpush_notifications, :index_rpush_notifications_multi, :index_rapns_notifications_multi
-      end
+    if index_name_exists?(:rpush_notifications, :index_rpush_notifications_multi)
+      rename_index :rpush_notifications, :index_rpush_notifications_multi, :index_rapns_notifications_multi
     end
 
-    if ActiveRecord.version >= Gem::Version.new('5.1')
-      if index_name_exists?(:rpush_feedback, :index_rpush_feedback_on_device_token)
-        rename_index :rpush_feedback, :index_rpush_feedback_on_device_token, :index_rapns_feedback_on_device_token
-      end
-    else
-      if index_name_exists?(:rpush_feedback, :index_rpush_feedback_on_device_token, true)
-        rename_index :rpush_feedback, :index_rpush_feedback_on_device_token, :index_rapns_feedback_on_device_token
-      end
+    if index_name_exists?(:rpush_feedback, :index_rpush_feedback_on_device_token)
+      rename_index :rpush_feedback, :index_rpush_feedback_on_device_token, :index_rapns_feedback_on_device_token
     end
 
     rename_table :rpush_notifications, :rapns_notifications

data/lib/generators/templates/rpush_2_0_0_updates.rb

@@ -1,4 +1,4 @@
-class Rpush200Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class Rpush200Updates < ActiveRecord::Migration[5.0]
   module Rpush
     class App < ActiveRecord::Base
       self.table_name = 'rpush_apps'
@@ -17,14 +17,8 @@ class Rpush200Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migrat
     add_column :rpush_notifications, :processing, :boolean, null: false, default: false
     add_column :rpush_notifications, :priority, :integer, null: true
 
-    if ActiveRecord.version >= Gem::Version.new('5.1')
-      if index_name_exists?(:rpush_notifications, :index_rpush_notifications_multi)
-        remove_index :rpush_notifications, name: :index_rpush_notifications_multi
-      end
-    else
-      if index_name_exists?(:rpush_notifications, :index_rpush_notifications_multi, true)
-        remove_index :rpush_notifications, name: :index_rpush_notifications_multi
-      end
+    if index_name_exists?(:rpush_notifications, :index_rpush_notifications_multi)
+      remove_index :rpush_notifications, name: :index_rpush_notifications_multi
     end
 
     add_index :rpush_notifications, [:delivered, :failed], name: 'index_rpush_notifications_multi', where: 'NOT delivered AND NOT failed'
@@ -52,14 +46,8 @@ class Rpush200Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migrat
     change_column :rpush_feedback, :app_id, :string
     rename_column :rpush_feedback, :app_id, :app
 
-    if ActiveRecord.version >= Gem::Version.new('5.1')
-      if index_name_exists?(:rpush_notifications, :index_rpush_notifications_multi)
-        remove_index :rpush_notifications, name: :index_rpush_notifications_multi
-      end
-    else
-      if index_name_exists?(:rpush_notifications, :index_rpush_notifications_multi, true)
-        remove_index :rpush_notifications, name: :index_rpush_notifications_multi
-      end
+    if index_name_exists?(:rpush_notifications, :index_rpush_notifications_multi)
+      remove_index :rpush_notifications, name: :index_rpush_notifications_multi
     end
 
     add_index :rpush_notifications, [:app_id, :delivered, :failed, :deliver_after], name: 'index_rpush_notifications_multi'

data/lib/generators/templates/rpush_2_1_0_updates.rb

@@ -1,4 +1,4 @@
-class Rpush210Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class Rpush210Updates < ActiveRecord::Migration[5.0]
   def self.up
     add_column :rpush_notifications, :url_args, :text, null: true
     add_column :rpush_notifications, :category, :string, null: true

data/lib/generators/templates/rpush_2_6_0_updates.rb

@@ -1,4 +1,4 @@
-class Rpush260Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class Rpush260Updates < ActiveRecord::Migration[5.0]
   def self.up
     add_column :rpush_notifications, :content_available, :boolean, default: false
   end

data/lib/generators/templates/rpush_2_7_0_updates.rb

@@ -1,4 +1,4 @@
-class Rpush270Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class Rpush270Updates < ActiveRecord::Migration[5.0]
   def self.up
     change_column :rpush_notifications, :alert, :text
     add_column :rpush_notifications, :notification, :text

data/lib/generators/templates/rpush_3_0_0_updates.rb

@@ -1,4 +1,4 @@
-class Rpush300Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class Rpush300Updates < ActiveRecord::Migration[5.0]
   def self.up
     add_column :rpush_notifications, :mutable_content, :boolean, default: false
     change_column :rpush_notifications, :sound, :string, default: nil

data/lib/generators/templates/rpush_3_0_1_updates.rb

@@ -1,4 +1,4 @@
-class Rpush301Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class Rpush301Updates < ActiveRecord::Migration[5.0]
   def self.up
     change_column_null :rpush_notifications, :mutable_content, false
     change_column_null :rpush_notifications, :content_available, false

data/lib/generators/templates/rpush_3_1_0_add_pushy.rb

@@ -1,4 +1,4 @@
-class Rpush310AddPushy < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class Rpush310AddPushy < ActiveRecord::Migration[5.0]
   def self.up
     add_column :rpush_notifications, :external_device_id, :string, null: true
   end

data/lib/generators/templates/rpush_3_1_1_updates.rb

@@ -1,4 +1,4 @@
-class Rpush311Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class Rpush311Updates < ActiveRecord::Migration[5.0]
   def self.up
     change_table :rpush_notifications do |t|
       t.remove_index name: 'index_rpush_notifications_multi'

data/lib/generators/templates/rpush_3_2_0_add_apns_p8.rb

@@ -1,4 +1,4 @@
-class Rpush320AddApnsP8 < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class Rpush320AddApnsP8 < ActiveRecord::Migration[5.0]
   def self.up
     add_column :rpush_apps, :apn_key, :string, null: true
     add_column :rpush_apps, :apn_key_id, :string, null: true

data/lib/generators/templates/rpush_3_2_4_updates.rb

@@ -1,4 +1,4 @@
-class Rpush324Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class Rpush324Updates < ActiveRecord::Migration[5.0]
   def self.up
     change_column :rpush_apps, :apn_key, :text, null: true
   end

data/lib/generators/templates/rpush_3_3_0_updates.rb

@@ -1,4 +1,4 @@
-class Rpush330Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class Rpush330Updates < ActiveRecord::Migration[5.0]
   def self.up
     add_column :rpush_notifications, :thread_id, :string, null: true
   end

data/lib/generators/templates/rpush_3_3_1_updates.rb

@@ -1,4 +1,4 @@
-class Rpush331Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class Rpush331Updates < ActiveRecord::Migration[5.0]
   def self.up
     change_column :rpush_notifications, :device_token, :string, null: true
     change_column :rpush_feedback, :device_token, :string, null: true

data/lib/generators/templates/rpush_4_1_0_updates.rb

@@ -1,4 +1,4 @@
-class Rpush410Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration["#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"] : ActiveRecord::Migration
+class Rpush410Updates < ActiveRecord::Migration["#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"]
   def self.up
     add_column :rpush_notifications, :dry_run, :boolean, null: false, default: false
   end

data/lib/generators/templates/rpush_4_1_1_updates.rb

@@ -1,4 +1,4 @@
-class Rpush411Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration["#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"] : ActiveRecord::Migration
+class Rpush411Updates < ActiveRecord::Migration["#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"]
   def self.up
     add_column :rpush_apps, :feedback_enabled, :boolean, default: true
   end

data/lib/generators/templates/rpush_4_2_0_updates.rb

@@ -1,4 +1,4 @@
-class Rpush420Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration["#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"] : ActiveRecord::Migration
+class Rpush420Updates < ActiveRecord::Migration["#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"]
   def self.up
     add_column :rpush_notifications, :sound_is_json, :boolean, null: true, default: false
   end

data/lib/rpush/client/active_model.rb

@@ -3,6 +3,7 @@ require 'active_model'
 require 'rpush/client/active_model/notification'
 require 'rpush/client/active_model/payload_data_size_validator'
 require 'rpush/client/active_model/registration_ids_count_validator'
+require 'rpush/client/active_model/certificate_private_key_validator'
 
 require 'rpush/client/active_model/apns/device_token_format_validator'
 require 'rpush/client/active_model/apns/app'

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

@@ -7,29 +7,13 @@ module Rpush
             base.instance_eval do
               validates :environment, presence: true, inclusion: { in: %w(development production sandbox) }
               validates :certificate, presence: true
-              validate :certificate_has_matching_private_key
+              validates_with Rpush::Client::ActiveModel::CertificatePrivateKeyValidator
             end
           end
 
           def service_name
             'apns'
           end
-
-          private
-
-          def certificate_has_matching_private_key
-            result = false
-            if certificate.present?
-              begin
-                x509 = OpenSSL::X509::Certificate.new(certificate)
-                pkey = OpenSSL::PKey::RSA.new(certificate, password)
-                result = x509 && pkey
-              rescue OpenSSL::OpenSSLError
-                errors.add :certificate, 'value must contain a certificate and a private key.'
-              end
-            end
-            result
-          end
         end
       end
     end

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

@@ -52,6 +52,10 @@ module Rpush
             self.data = (data || {}).merge(CONTENT_AVAILABLE_KEY => true)
           end
 
+          def content_available?
+            (self.data || {})[CONTENT_AVAILABLE_KEY]
+          end
+
           def as_json(options = nil) # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
             json = ActiveSupport::OrderedHash.new
 

data/lib/rpush/client/active_model/apns2/app.rb

@@ -3,7 +3,13 @@ module Rpush
     module ActiveModel
       module Apns2
         module App
-          extend Rpush::Client::ActiveModel::Apns::App
+          def self.included(base)
+            base.instance_eval do
+              validates :environment, presence: true, inclusion: { in: %w(development production sandbox) }
+              validates :certificate, presence: true
+              validates_with Rpush::Client::ActiveModel::CertificatePrivateKeyValidator
+            end
+          end
 
           def service_name
             'apns2'

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

@@ -0,0 +1,19 @@
+module Rpush
+  module Client
+    module ActiveModel
+      class CertificatePrivateKeyValidator < ::ActiveModel::Validator
+        def validate(record)
+          if record.certificate.present?
+            begin
+              x509 = OpenSSL::X509::Certificate.new(record.certificate)
+              pkey = OpenSSL::PKey::RSA.new(record.certificate, record.password)
+              x509 && pkey
+            rescue OpenSSL::OpenSSLError
+              record.errors.add :certificate, 'value must contain a certificate and a private key.'
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -112,6 +112,7 @@ module Rpush
           headers['apns-expiration'] = '0'
           headers['apns-priority'] = '10'
           headers['apns-topic'] = @app.bundle_id
+          headers['apns-push-type'] = 'background' if notification.content_available?
 
           headers.merge notification_data(notification)[HTTP2_HEADERS_KEY] || {}
         end

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

@@ -8,6 +8,7 @@ module Rpush
       class Delivery < Rpush::Daemon::Delivery
         RETRYABLE_CODES = [ 429, 500, 503 ]
         CLIENT_JOIN_TIMEOUT = 60
+        DEFAULT_MAX_CONCURRENT_STREAMS = 100
 
         def initialize(app, http2_client, token_provider, batch)
           @app = app
@@ -85,7 +86,11 @@ module Rpush
         def remote_max_concurrent_streams
           # 0x7fffffff is the default value from http-2 gem (2^31)
           if @client.remote_settings[:settings_max_concurrent_streams] == 0x7fffffff
-            0
+            # Ideally we'd fall back to `#local_settings` here, but `NetHttp2::Client`
+            # doesn't expose that attr from the `HTTP2::Client` it wraps. Instead, we
+            # chose a hard-coded value matching the default local setting from the
+            # `HTTP2::Client` class
+            DEFAULT_MAX_CONCURRENT_STREAMS
           else
             @client.remote_settings[:settings_max_concurrent_streams]
           end
@@ -144,6 +149,7 @@ module Rpush
           headers['apns-priority'] = '10'
           headers['apns-topic'] = @app.bundle_id
           headers['authorization'] = "bearer #{jwt_token}"
+          headers['apns-push-type'] = 'background' if notification.content_available?
 
           headers.merge notification_data(notification)[HTTP2_HEADERS_KEY] || {}
         end

data/lib/rpush/daemon/string_helpers.rb

@@ -2,7 +2,7 @@ module Rpush
   module Daemon
     module StringHelpers
       def pluralize(count, singular, plural = nil)
-        if count == 1 || count =~ /^1(\.0+)?$/
+        if count == 1
           word = singular
         else
           word = plural || singular.pluralize

data/lib/rpush/version.rb

@@ -1,7 +1,7 @@
 module Rpush
   module VERSION
-    MAJOR = 5
-    MINOR = 4
+    MAJOR = 6
+    MINOR = 0
     TINY = 0
     PRE = nil
 

data/spec/functional/apns2_spec.rb

@@ -79,7 +79,8 @@ describe 'APNs http2 adapter' do
           headers: {
             'apns-expiration' => '0',
             'apns-priority' => '10',
-            'apns-topic' => 'com.example.app'
+            'apns-topic' => 'com.example.app',
+            'apns-push-type' => 'background'
           }
         }
       )
@@ -113,7 +114,8 @@ describe 'APNs http2 adapter' do
             headers: {
               'apns-topic' => bundle_id,
               'apns-expiration' => '0',
-              'apns-priority' => '10'
+              'apns-priority' => '10',
+              'apns-push-type' => 'background'
             }
           }
         ).and_return(fake_http2_request)

data/spec/functional/retry_spec.rb

@@ -39,4 +39,4 @@ describe 'Retries' do
     notification.reload
     expect(notification.delivered).to eq(false)
   end
-end
+end if redis?

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ def client
   (ENV['CLIENT'] || :active_record).to_sym
 end
 
-if !ENV['TRAVIS'] || (ENV['TRAVIS'] && ENV['QUALITY'] == 'true')
+if !ENV['CI'] || (ENV['CI'] && ENV['QUALITY'] == 'true')
   begin
     require './spec/support/simplecov_helper'
     include SimpleCovHelper

data/spec/support/active_record_setup.rb

@@ -6,14 +6,15 @@ SPEC_ADAPTER = ENV['ADAPTER'] || 'postgresql'
 SPEC_ADAPTER = 'jdbc' + SPEC_ADAPTER if jruby
 
 require 'yaml'
-db_config = YAML.load_file(File.expand_path("config/database.yml", File.dirname(__FILE__)))
+db_config_path = File.expand_path("config/database.yml", File.dirname(__FILE__))
+db_config = YAML.load(ERB.new(File.read(db_config_path)).result)
 
 if db_config[SPEC_ADAPTER].nil?
   puts "No such adapter '#{SPEC_ADAPTER}'. Valid adapters are #{db_config.keys.join(', ')}."
   exit 1
 end
 
-if ENV['TRAVIS']
+if ENV['CI']
   db_config[SPEC_ADAPTER]['username'] = 'postgres'
 else
   require 'etc'
@@ -62,7 +63,7 @@ migrations = [
   Rpush420Updates
 ]
 
-unless ENV['TRAVIS']
+unless ENV['CI']
   migrations.reverse_each do |m|
     begin
       m.down

data/spec/support/config/database.yml

@@ -2,10 +2,10 @@
 
 postgresql:
   adapter: postgresql
-  database: rpush_test
-  host: localhost
-  username: postgres
-  password: ""
+  database: <%= ENV.fetch('POSTGRES_DB', 'rpush_test') %>
+  host: <%= ENV.fetch('POSTGRES_HOST', 'localhost') %>
+  username: <%= ENV.fetch('POSTGRES_USER', 'postgres') %>
+  password: <%= ENV.fetch('PGPASSWORD', '') %>
 
 jdbcpostgresql:
   adapter: jdbcpostgresql

data/spec/support/simplecov_helper.rb

@@ -10,7 +10,7 @@ module SimpleCovHelper
 
       formatters = [SimpleCov::Formatter::QualityFormatter]
 
-      if ENV['TRAVIS']
+      if ENV['CI']
         require 'codeclimate-test-reporter'
 
         if CodeClimate::TestReporter.run?

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

@@ -8,7 +8,7 @@ describe Rpush::Client::ActiveRecord::Apns::Notification do
 
   it "should validate the length of the binary conversion of the notification" do
     notification = described_class.new
-    notification.app = Rpush::Apns2::App.create(name: 'test', environment: 'development')
+    notification.app = Rpush::Apns2::App.create(name: 'test', environment: 'development', certificate: TEST_CERT)
     notification.device_token = "a" * 108
     notification.alert = ""
 

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

@@ -1,4 +1,5 @@
 require 'unit_spec_helper'
 
 describe Rpush::Client::ActiveRecord::Apns2::App do
+  it_behaves_like 'Rpush::Client::Apns::App'
 end if active_record?

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

@@ -8,7 +8,7 @@ describe Rpush::Client::ActiveRecord::Apns2::Notification do
 
   it "should validate the length of the binary conversion of the notification" do
     notification = described_class.new
-    notification.app = Rpush::Apns2::App.create(name: 'test', environment: 'development')
+    notification.app = Rpush::Apns2::App.create(name: 'test', environment: 'development', certificate: TEST_CERT)
     notification.device_token = "a" * 108
     notification.alert = ""
 

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

@@ -7,7 +7,7 @@ describe Rpush::Client::Redis::Apns::Notification do
 
   it "should validate the length of the binary conversion of the notification" do
     notification = described_class.new
-    notification.app = Rpush::Apns2::App.create(name: 'test', environment: 'development')
+    notification.app = Rpush::Apns2::App.create(name: 'test', environment: 'development', certificate: TEST_CERT)
     notification.device_token = "a" * 108
     notification.alert = ""
 

data/spec/unit/client/redis/apns2/notification_spec.rb

@@ -7,7 +7,7 @@ describe Rpush::Client::Redis::Apns2::Notification do
 
   it "should validate the length of the binary conversion of the notification" do
     notification = described_class.new
-    notification.app = Rpush::Apns2::App.create(name: 'test', environment: 'development')
+    notification.app = Rpush::Apns2::App.create(name: 'test', environment: 'development', certificate: TEST_CERT)
     notification.device_token = "a" * 108
     notification.alert = ""
 

data/spec/unit/client/shared/apns/notification.rb

@@ -165,6 +165,21 @@ shared_examples 'Rpush::Client::Apns::Notification' do
     end
   end
 
+  describe 'content_available?' do
+    context 'if not set' do
+      it 'should be false' do
+        expect(notification.content_available?).to be_falsey
+      end
+    end
+
+    context 'if set' do
+      it 'should be true' do
+        notification.content_available = true
+        expect(notification.content_available?).to be_truthy
+      end
+    end
+  end
+
   describe 'url-args' do
     it 'includes url-args in the payload' do
       notification.url_args = ['url-arg-1']

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

@@ -0,0 +1,53 @@
+require 'unit_spec_helper'
+
+describe Rpush::Daemon::Apnsp8::Delivery do
+  subject(:delivery) { described_class.new(app, http2_client, token_provider, batch) }
+
+  let(:app) { double(bundle_id: 'MY BUNDLE ID') }
+  let(:notification1) { double('Notification 1', data: {}, as_json: {}).as_null_object }
+  let(:notification2) { double('Notification 2', data: {}, as_json: {}).as_null_object }
+
+  let(:token_provider) { double(token: 'MY JWT TOKEN') }
+  let(:max_concurrent_streams) { 100 }
+  let(:remote_settings) { { settings_max_concurrent_streams: max_concurrent_streams } }
+  let(:http_request) { double(on: nil) }
+  let(:http2_client) do
+    double(
+      stream_count: 0,
+      call_async: nil,
+      join: nil,
+      prepare_request: http_request,
+      remote_settings: remote_settings
+    )
+  end
+
+  let(:batch) { double(mark_delivered: nil, all_processed: nil) }
+  let(:logger) { double(info: nil) }
+
+  before do
+    allow(batch).to receive(:each_notification) do |&blk|
+      [notification1, notification2].each(&blk)
+    end
+    allow(Rpush).to receive_messages(logger: logger)
+  end
+
+  describe '#perform' do
+    context 'with an HTTP2 client where max concurrent streams is not set' do
+      let(:max_concurrent_streams) { 0x7fffffff }
+
+      it 'does not fall into an infinite loop on notifications after the first' do
+        start = Time.now
+        thread = Thread.new { delivery.perform }
+
+        loop do
+          break unless thread.alive?
+
+          if Time.now - start > 0.5
+            thread.kill
+            fail 'Stuck in an infinite loop'
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpush
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Ian Leitch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-15 00:00:00.000000000 Z
+date: 2021-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -428,6 +428,7 @@ files:
 - lib/rpush/client/active_model/apns2/notification.rb
 - lib/rpush/client/active_model/apnsp8/app.rb
 - lib/rpush/client/active_model/apnsp8/notification.rb
+- lib/rpush/client/active_model/certificate_private_key_validator.rb
 - lib/rpush/client/active_model/gcm/app.rb
 - lib/rpush/client/active_model/gcm/expiry_collapse_key_mutual_inclusion_validator.rb
 - lib/rpush/client/active_model/gcm/notification.rb
@@ -650,6 +651,7 @@ files:
 - spec/unit/daemon/apns/certificate_expired_error_spec.rb
 - spec/unit/daemon/apns/delivery_spec.rb
 - spec/unit/daemon/apns/feedback_receiver_spec.rb
+- spec/unit/daemon/apnsp8/delivery_spec.rb
 - spec/unit/daemon/app_runner_spec.rb
 - spec/unit/daemon/batch_spec.rb
 - spec/unit/daemon/delivery_error_spec.rb
@@ -692,7 +694,7 @@ metadata:
   changelog_uri: https://github.com/rpush/rpush/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/rpush/rpush
 post_install_message: |
-  When upgrading, don't forget to run `bundle exec rpush init` to get all the latest migrations.
+  When upgrading Rpush, don't forget to run `bundle exec rpush init` to get all the latest migrations.
 
   For details on this specific release, refer to the CHANGELOG.md file.
   https://github.com/rpush/rpush/blob/master/CHANGELOG.md
@@ -803,6 +805,7 @@ test_files:
 - spec/unit/daemon/apns/certificate_expired_error_spec.rb
 - spec/unit/daemon/apns/delivery_spec.rb
 - spec/unit/daemon/apns/feedback_receiver_spec.rb
+- spec/unit/daemon/apnsp8/delivery_spec.rb
 - spec/unit/daemon/app_runner_spec.rb
 - spec/unit/daemon/batch_spec.rb
 - spec/unit/daemon/delivery_error_spec.rb