rpush 5.0.0 → 6.0.0

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

@@ -26,6 +26,10 @@ Rpush.configure do |config|
   # Define a custom logger.
   # config.logger = MyLogger.new
 
+  # By default in foreground mode logs are directed both to the logger and to stdout.
+  # If the logger goes to stdout, you can disable foreground logging to avoid duplication.
+  # config.foreground_logging = false
+
   # config.apns.feedback_receiver.enabled = true
   # config.apns.feedback_receiver.frequency = 60
 

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,11 +1,11 @@
-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
   end
 
   def self.down
-    change_column :rpush_notifications, :device_token, :string, { null: true, limit: 64 }
-    change_column :rpush_feedback, :device_token, :string, { null: true, limit: 64 }
+    change_column :rpush_notifications, :device_token, :string, null: true, limit: 64
+    change_column :rpush_feedback, :device_token, :string, null: true, limit: 64
   end
 end

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/cli.rb

@@ -14,7 +14,7 @@ module Rpush
     end
 
     class_option :config, type: :string, aliases: '-c', default: default_config_path
-    class_option 'rails-env', type: :string, aliases: '-e', default: 'development'
+    class_option 'rails-env', type: :string, aliases: '-e', default: ENV.fetch('RAILS_ENV', 'development')
 
     option :foreground, type: :boolean, aliases: '-f', default: false
     option 'pid-file', type: :string, aliases: '-p'

data/lib/rpush/client/active_model.rb

@@ -3,11 +3,12 @@ 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/binary_notification_validator'
 require 'rpush/client/active_model/apns/device_token_format_validator'
 require 'rpush/client/active_model/apns/app'
 require 'rpush/client/active_model/apns/notification'
+require 'rpush/client/active_model/apns/notification_payload_size_validator'
 
 require 'rpush/client/active_model/apns2/app'
 require 'rpush/client/active_model/apns2/notification'
@@ -32,3 +33,6 @@ require 'rpush/client/active_model/wns/notification'
 require 'rpush/client/active_model/pushy/app'
 require 'rpush/client/active_model/pushy/notification'
 require 'rpush/client/active_model/pushy/time_to_live_validator'
+
+require 'rpush/client/active_model/webpush/app'
+require 'rpush/client/active_model/webpush/notification'

data/lib/rpush/client/active_model/adm/data_validator.rb

@@ -5,7 +5,7 @@ module Rpush
         class DataValidator < ::ActiveModel::Validator
           def validate(record)
             return unless record.collapse_key.nil? && record.data.nil?
-            record.errors[:data] << 'must be set unless collapse_key is specified'
+            record.errors.add :data, 'must be set unless collapse_key is specified'
           end
         end
       end

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/device_token_format_validator.rb

@@ -4,8 +4,8 @@ module Rpush
       module Apns
         class DeviceTokenFormatValidator < ::ActiveModel::Validator
           def validate(record)
-            return if record.device_token =~ /^[a-z0-9]\w+$/i
-            record.errors[:device_token] << "is invalid"
+            return if record.device_token =~ /\A[a-z0-9]\w+\z/i
+            record.errors.add :device_token, "is invalid"
           end
         end
       end

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

@@ -7,15 +7,23 @@ module Rpush
           APNS_PRIORITY_IMMEDIATE = 10
           APNS_PRIORITY_CONSERVE_POWER = 5
           APNS_PRIORITIES = [APNS_PRIORITY_IMMEDIATE, APNS_PRIORITY_CONSERVE_POWER]
+          MAX_PAYLOAD_BYTESIZE = 2048
+
+          module ClassMethods
+            def max_payload_bytesize
+              MAX_PAYLOAD_BYTESIZE
+            end
+          end
 
           def self.included(base)
+            base.extend ClassMethods
             base.instance_eval do
               validates :device_token, presence: true
               validates :badge, numericality: true, allow_nil: true
               validates :priority, inclusion: { in: APNS_PRIORITIES }, allow_nil: true
 
               validates_with Rpush::Client::ActiveModel::Apns::DeviceTokenFormatValidator
-              validates_with Rpush::Client::ActiveModel::Apns::BinaryNotificationValidator
+              validates_with Rpush::Client::ActiveModel::Apns::NotificationPayloadSizeValidator
 
               base.const_set('APNS_DEFAULT_EXPIRY', APNS_DEFAULT_EXPIRY) unless base.const_defined?('APNS_DEFAULT_EXPIRY')
               base.const_set('APNS_PRIORITY_IMMEDIATE', APNS_PRIORITY_IMMEDIATE) unless base.const_defined?('APNS_PRIORITY_IMMEDIATE')
@@ -44,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/apns/notification_payload_size_validator.rb

@@ -0,0 +1,15 @@
+module Rpush
+  module Client
+    module ActiveModel
+      module Apns
+        class NotificationPayloadSizeValidator < ::ActiveModel::Validator
+          def validate(record)
+            limit = record.class.max_payload_bytesize
+            return unless record.payload.bytesize > limit
+            record.errors.add :base, "APN notification cannot be larger than #{limit} bytes. Try condensing your alert and device attributes."
+          end
+        end
+      end
+    end
+  end
+end

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/apns2/notification.rb

@@ -3,6 +3,20 @@ module Rpush
     module ActiveModel
       module Apns2
         include Rpush::Client::ActiveModel::Apns
+
+        module Notification
+          MAX_PAYLOAD_BYTESIZE = 4096
+
+          module ClassMethods
+            def max_payload_bytesize
+              MAX_PAYLOAD_BYTESIZE
+            end
+          end
+
+          def self.included(base)
+            base.extend ClassMethods
+          end
+        end
       end
     end
   end