rpush 5.4.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1166c47df63fee1cfaaa6e869d382923c65a0e3cae24ca36bc73d1736590dcac
-  data.tar.gz: d97ca83af8fb3959ca5d782d65af6e8f0bfddbc5b928753dcc3439f497a84edc
+  metadata.gz: 409c28bf9f63343232e1c7db56f8d7131acc70b4828032059f37eab3a4606e6c
+  data.tar.gz: 3f07d7e79828fa43ab5ed73a9b19183a9f4ac9e5a3d8891f1ecfec42c7375c03
 SHA512:
-  metadata.gz: 4ea1ec176522f0a766718a0de5c7840504d137eb93db1bcd8e76c47975f450e60f61c818726c9ec0b62a50885e201570c4807c2e97e4597f710d6c4143a95c0b
-  data.tar.gz: bec1191493bc5540e3c329cf39cb717b8c8fe86217c03d4461f4be275cead69c5e0c52e8c6525767b4899379aed8b4dbbe688beeb384628ea569c941d3305835
+  metadata.gz: 400a7241c337ff9874767be4ee051d1494676665bd17e9b3acb2e3ce8efae236971a138888da6c0172e0c649276e97f4d639430733bad345e7980d408e8c3436
+  data.tar.gz: e81b66da807a2bc8a386a12825aed37c452672be899b69ff633d65b80548903669e7d63b3b1eec899633557a489157e8083ed562b2665c017566df9ad220c151

data/CHANGELOG.md

@@ -1,5 +1,64 @@
 # Changelog
 
+## [v7.0.1](https://github.com/rpush/rpush/tree/v7.0.1) (2022-03-02)
+
+[Full Changelog](https://github.com/rpush/rpush/compare/v7.0.0...v7.0.1)
+
+**Merged pull requests:**
+
+- Fix deprecation warnings from the redis gem [\#636](https://github.com/rpush/rpush/pull/636) ([sharang-d](https://github.com/sharang-d))
+
+## [Unreleased](https://github.com/rpush/rpush/tree/HEAD)
+
+[Full Changelog](https://github.com/rpush/rpush/compare/v7.0.0...HEAD)
+
+## [v7.0.0](https://github.com/rpush/rpush/tree/HEAD)
+
+[Full Changelog](https://github.com/rpush/rpush/compare/v6.0.1...v7.0.0)
+
+**Merged pull requests:**
+
+- Test with Ruby 3.1 [\#632](https://github.com/rpush/rpush/pull/632) ([aried3r](https://github.com/aried3r))
+- Resolves Rails 7 Time.now.to\_s deprecation warning [\#630](https://github.com/rpush/rpush/pull/630) ([gregblake](https://github.com/gregblake))
+- Adds Rails 7 Support [\#629](https://github.com/rpush/rpush/pull/629) ([gregblake](https://github.com/gregblake))
+- Test with Rails 7.0.0.alpha2 [\#626](https://github.com/rpush/rpush/pull/626) ([aried3r](https://github.com/aried3r))
+
+**Breaking:**
+
+- Drop support for Ruby 2.3 [\#631](https://github.com/rpush/rpush/pull/631) ([aried3r](https://github.com/aried3r))
+
+## [v6.0.1](https://github.com/rpush/rpush/tree/v6.0.1) (2021-10-08)
+
+[Full Changelog](https://github.com/rpush/rpush/compare/v6.0.0...v6.0.1)
+
+**Merged pull requests:**
+
+- Don't limit webpush registration keys [\#624](https://github.com/rpush/rpush/pull/624) ([treyrich](https://github.com/treyrich))
+- Add Prometheus Exporter plugin link to README [\#617](https://github.com/rpush/rpush/pull/617) ([maxsz](https://github.com/maxsz))
+- Reference current interface in config template [\#569](https://github.com/rpush/rpush/pull/569) ([benlangfeld](https://github.com/benlangfeld))
+- Default the Rails environment to RAILS\_ENV if set [\#562](https://github.com/rpush/rpush/pull/562) ([benlangfeld](https://github.com/benlangfeld))
+
+## [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)
@@ -24,7 +24,7 @@ Rpush aims to be the *de facto* gem for sending push notifications in Ruby. Its
 
 * Use [**ActiveRecord**](https://github.com/rpush/rpush/wiki/Using-ActiveRecord) or [**Redis**](https://github.com/rpush/rpush/wiki/Using-Redis) for storage.
 * Plugins for [**Bugsnag**](https://github.com/rpush/rpush-plugin-bugsnag),
-[**Sentry**](https://github.com/rpush/rpush-plugin-sentry), [**StatsD**](https://github.com/rpush/rpush-plugin-statsd) or [write your own](https://github.com/rpush/rpush/wiki/Writing-a-Plugin).
+[**Sentry**](https://github.com/rpush/rpush-plugin-sentry), [**StatsD**](https://github.com/rpush/rpush-plugin-statsd). Third party plugins: [**Prometheus Exporter**](https://github.com/equinux/rpush-plugin-prometheus-exporter). Or [write your own](https://github.com/rpush/rpush/wiki/Writing-a-Plugin).
 * Seamless integration with your projects, including **Rails**.
 * Run as a [daemon](https://github.com/rpush/rpush#as-a-daemon), inside a [job queue](https://github.com/rpush/rpush/wiki/Push-API), on the [command-line](https://github.com/rpush/rpush#on-the-command-line) or [embedded](https://github.com/rpush/rpush/wiki/Embedding-API) in another process.
 * Scales vertically (threading) and horizontally (multiple processes).
@@ -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.rb

@@ -46,10 +46,7 @@ Rpush.reflect do |on|
   # Called when a notification is queued internally for delivery.
   # The internal queue for each app runner can be inspected:
   #
-  # Rpush::Daemon::AppRunner.runners.each do |app_id, runner|
-  #   runner.app
-  #   runner.queue_size
-  # end
+  # Rpush::Daemon::AppRunner.status
   #
   # on.notification_enqueued do |notification|
   # end

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'
@@ -70,7 +58,11 @@ class Rpush200Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migrat
 
   def self.adapter_name
     env = (defined?(Rails) && Rails.env) ? Rails.env : 'development'
-    Hash[ActiveRecord::Base.configurations[env].map { |k,v| [k.to_sym,v] }][:adapter]
+    if ActiveRecord::VERSION::MAJOR > 6
+      ActiveRecord::Base.configurations.configs_for(env_name: env).first.configuration_hash[:adapter]
+    else
+      Hash[ActiveRecord::Base.configurations[env].map { |k,v| [k.to_sym,v] }][:adapter]
+    end
   end
 
   def self.postgresql?

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