rpush 4.1.0 → 5.2.0

data/spec/unit/daemon/wns/post_request_spec.rb

@@ -30,6 +30,8 @@ describe Rpush::Daemon::Wns::PostRequest do
       expect(request.body).to include('<toast>')
       expect(request.body).to include('MyApp')
       expect(request.body).to include('Example notification')
+      # no priority header
+      expect { request.fetch('X-WNS-PRIORITY') }.to raise_error(KeyError)
     end
 
     context 'with launch' do
@@ -55,6 +57,29 @@ describe Rpush::Daemon::Wns::PostRequest do
       end
     end
 
+    context 'with priority' do
+      let(:notification) do
+        Rpush::Wns::Notification.create!(
+          app: app,
+          data: {
+            title: "MyApp",
+            body: "Example notification"
+          },
+          uri: "http://some.example/",
+          priority: 1
+        )
+      end
+
+      it 'creates a request characteristic for toast notification with priority' do
+        request = Rpush::Daemon::Wns::PostRequest.create(notification, 'token')
+        expect(request['X-WNS-Type']).to eq('wns/toast')
+        expect(request['Content-Type']).to eq('text/xml')
+        expect(request['X-WNS-PRIORITY']).to eq('1')
+        expect(request.body).to include('MyApp')
+        expect(request.body).to include('Example notification')
+      end
+    end
+
     context 'with sound' do
       let(:notification) do
         Rpush::Wns::Notification.create!(
@@ -95,6 +120,25 @@ describe Rpush::Daemon::Wns::PostRequest do
       expect(request['Content-Type']).to eq('application/octet-stream')
       expect(request.body).to eq("{\"foo\":\"foo\",\"bar\":\"bar\"}")
     end
+
+    context 'with priority' do
+      let(:notification) do
+        Rpush::Wns::RawNotification.create!(
+          app: app,
+          data: { foo: 'foo', bar: 'bar' },
+          uri: "http://some.example/",
+          priority: 3
+        )
+      end
+
+      it 'creates a request characteristic for raw notification with priority' do
+        request = Rpush::Daemon::Wns::PostRequest.create(notification, 'token')
+        expect(request['X-WNS-Type']).to eq('wns/raw')
+        expect(request['X-WNS-PRIORITY']).to eq('3')
+        expect(request['Content-Type']).to eq('application/octet-stream')
+        expect(request.body).to eq("{\"foo\":\"foo\",\"bar\":\"bar\"}")
+      end
+    end
   end
 
   context 'BadgeNotification' do
@@ -113,5 +157,25 @@ describe Rpush::Daemon::Wns::PostRequest do
       expect(request.body).to include('<badge')
       expect(request.body).to include('42')
     end
+
+    context 'with priority' do
+      let(:notification) do
+        Rpush::Wns::BadgeNotification.create!(
+          app: app,
+          uri: "http://some.example/",
+          badge: 42,
+          priority: 4
+        )
+      end
+
+      it 'creates a request characteristic for badge notification with priority' do
+        request = Rpush::Daemon::Wns::PostRequest.create(notification, 'token')
+        expect(request['X-WNS-Type']).to eq('wns/badge')
+        expect(request['X-WNS-PRIORITY']).to eq('4')
+        expect(request['Content-Type']).to eq('text/xml')
+        expect(request.body).to include('<badge')
+        expect(request.body).to include('42')
+      end
+    end
   end
 end

data/spec/unit_spec_helper.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 require 'rails'
 
+# load all shared example files
+Dir["./spec/unit/**/shared/**/*.rb"].sort.each { |f| require f }
+
 def unit_example?(metadata)
   metadata[:file_path] =~ %r{spec/unit}
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpush
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Ian Leitch
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-17 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -44,14 +44,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.18'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.18.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.18'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.18.3
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +78,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +121,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ansi
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -282,6 +288,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -377,6 +397,8 @@ files:
 - lib/generators/templates/rpush_3_3_0_updates.rb
 - lib/generators/templates/rpush_3_3_1_updates.rb
 - lib/generators/templates/rpush_4_1_0_updates.rb
+- lib/generators/templates/rpush_4_1_1_updates.rb
+- lib/generators/templates/rpush_4_2_0_updates.rb
 - lib/rpush.rb
 - lib/rpush/apns_feedback.rb
 - lib/rpush/cli.rb
@@ -385,9 +407,9 @@ files:
 - lib/rpush/client/active_model/adm/data_validator.rb
 - lib/rpush/client/active_model/adm/notification.rb
 - lib/rpush/client/active_model/apns/app.rb
-- lib/rpush/client/active_model/apns/binary_notification_validator.rb
 - lib/rpush/client/active_model/apns/device_token_format_validator.rb
 - lib/rpush/client/active_model/apns/notification.rb
+- lib/rpush/client/active_model/apns/notification_payload_size_validator.rb
 - lib/rpush/client/active_model/apns2/app.rb
 - lib/rpush/client/active_model/apns2/notification.rb
 - lib/rpush/client/active_model/apnsp8/app.rb
@@ -408,6 +430,7 @@ files:
 - lib/rpush/client/active_record.rb
 - lib/rpush/client/active_record/adm/app.rb
 - lib/rpush/client/active_record/adm/notification.rb
+- lib/rpush/client/active_record/apns/active_record_serializable_notification.rb
 - lib/rpush/client/active_record/apns/app.rb
 - lib/rpush/client/active_record/apns/feedback.rb
 - lib/rpush/client/active_record/apns/notification.rb
@@ -523,6 +546,7 @@ files:
 - spec/functional/apns_spec.rb
 - spec/functional/cli_spec.rb
 - spec/functional/embed_spec.rb
+- spec/functional/gcm_priority_spec.rb
 - spec/functional/gcm_spec.rb
 - spec/functional/new_app_spec.rb
 - spec/functional/pushy_spec.rb
@@ -544,16 +568,52 @@ files:
 - spec/unit/client/active_record/apns/app_spec.rb
 - spec/unit/client/active_record/apns/feedback_spec.rb
 - spec/unit/client/active_record/apns/notification_spec.rb
+- spec/unit/client/active_record/apns2/app_spec.rb
+- spec/unit/client/active_record/apns2/notification_spec.rb
 - spec/unit/client/active_record/app_spec.rb
 - spec/unit/client/active_record/gcm/app_spec.rb
 - spec/unit/client/active_record/gcm/notification_spec.rb
 - spec/unit/client/active_record/notification_spec.rb
 - spec/unit/client/active_record/pushy/app_spec.rb
 - spec/unit/client/active_record/pushy/notification_spec.rb
+- spec/unit/client/active_record/shared/app.rb
+- spec/unit/client/active_record/shared/notification.rb
 - spec/unit/client/active_record/wns/badge_notification_spec.rb
 - spec/unit/client/active_record/wns/raw_notification_spec.rb
 - spec/unit/client/active_record/wpns/app_spec.rb
 - spec/unit/client/active_record/wpns/notification_spec.rb
+- spec/unit/client/redis/adm/app_spec.rb
+- spec/unit/client/redis/adm/notification_spec.rb
+- spec/unit/client/redis/apns/app_spec.rb
+- spec/unit/client/redis/apns/feedback_spec.rb
+- spec/unit/client/redis/apns/notification_spec.rb
+- spec/unit/client/redis/apns2/app_spec.rb
+- spec/unit/client/redis/apns2/notification_spec.rb
+- spec/unit/client/redis/app_spec.rb
+- spec/unit/client/redis/gcm/app_spec.rb
+- spec/unit/client/redis/gcm/notification_spec.rb
+- spec/unit/client/redis/notification_spec.rb
+- spec/unit/client/redis/pushy/app_spec.rb
+- spec/unit/client/redis/pushy/notification_spec.rb
+- spec/unit/client/redis/wns/badge_notification_spec.rb
+- spec/unit/client/redis/wns/raw_notification_spec.rb
+- spec/unit/client/redis/wpns/app_spec.rb
+- spec/unit/client/redis/wpns/notification_spec.rb
+- spec/unit/client/shared/adm/app.rb
+- spec/unit/client/shared/adm/notification.rb
+- spec/unit/client/shared/apns/app.rb
+- spec/unit/client/shared/apns/feedback.rb
+- spec/unit/client/shared/apns/notification.rb
+- spec/unit/client/shared/app.rb
+- spec/unit/client/shared/gcm/app.rb
+- spec/unit/client/shared/gcm/notification.rb
+- spec/unit/client/shared/notification.rb
+- spec/unit/client/shared/pushy/app.rb
+- spec/unit/client/shared/pushy/notification.rb
+- spec/unit/client/shared/wns/badge_notification.rb
+- spec/unit/client/shared/wns/raw_notification.rb
+- spec/unit/client/shared/wpns/app.rb
+- spec/unit/client/shared/wpns/notification.rb
 - spec/unit/configuration_spec.rb
 - spec/unit/daemon/adm/delivery_spec.rb
 - spec/unit/daemon/apns/certificate_expired_error_spec.rb
@@ -572,6 +632,7 @@ files:
 - spec/unit/daemon/pushy/delivery_spec.rb
 - spec/unit/daemon/retryable_error_spec.rb
 - spec/unit/daemon/service_config_methods_spec.rb
+- spec/unit/daemon/shared/store.rb
 - spec/unit/daemon/signal_handler_spec.rb
 - spec/unit/daemon/store/active_record/reconnectable_spec.rb
 - spec/unit/daemon/store/active_record_spec.rb
@@ -585,7 +646,6 @@ files:
 - spec/unit/deprecation_spec.rb
 - spec/unit/embed_spec.rb
 - spec/unit/logger_spec.rb
-- spec/unit/notification_shared.rb
 - spec/unit/plugin_spec.rb
 - spec/unit/push_spec.rb
 - spec/unit/reflectable_spec.rb
@@ -595,7 +655,10 @@ files:
 homepage: https://github.com/rpush/rpush
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/rpush/rpush/issues
+  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.
 
@@ -615,8 +678,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: The push notification service for Ruby.
 test_files:
@@ -626,6 +689,7 @@ test_files:
 - spec/functional/apns_spec.rb
 - spec/functional/cli_spec.rb
 - spec/functional/embed_spec.rb
+- spec/functional/gcm_priority_spec.rb
 - spec/functional/gcm_spec.rb
 - spec/functional/new_app_spec.rb
 - spec/functional/pushy_spec.rb
@@ -647,16 +711,52 @@ test_files:
 - spec/unit/client/active_record/apns/app_spec.rb
 - spec/unit/client/active_record/apns/feedback_spec.rb
 - spec/unit/client/active_record/apns/notification_spec.rb
+- spec/unit/client/active_record/apns2/app_spec.rb
+- spec/unit/client/active_record/apns2/notification_spec.rb
 - spec/unit/client/active_record/app_spec.rb
 - spec/unit/client/active_record/gcm/app_spec.rb
 - spec/unit/client/active_record/gcm/notification_spec.rb
 - spec/unit/client/active_record/notification_spec.rb
 - spec/unit/client/active_record/pushy/app_spec.rb
 - spec/unit/client/active_record/pushy/notification_spec.rb
+- spec/unit/client/active_record/shared/app.rb
+- spec/unit/client/active_record/shared/notification.rb
 - spec/unit/client/active_record/wns/badge_notification_spec.rb
 - spec/unit/client/active_record/wns/raw_notification_spec.rb
 - spec/unit/client/active_record/wpns/app_spec.rb
 - spec/unit/client/active_record/wpns/notification_spec.rb
+- spec/unit/client/redis/adm/app_spec.rb
+- spec/unit/client/redis/adm/notification_spec.rb
+- spec/unit/client/redis/apns/app_spec.rb
+- spec/unit/client/redis/apns/feedback_spec.rb
+- spec/unit/client/redis/apns/notification_spec.rb
+- spec/unit/client/redis/apns2/app_spec.rb
+- spec/unit/client/redis/apns2/notification_spec.rb
+- spec/unit/client/redis/app_spec.rb
+- spec/unit/client/redis/gcm/app_spec.rb
+- spec/unit/client/redis/gcm/notification_spec.rb
+- spec/unit/client/redis/notification_spec.rb
+- spec/unit/client/redis/pushy/app_spec.rb
+- spec/unit/client/redis/pushy/notification_spec.rb
+- spec/unit/client/redis/wns/badge_notification_spec.rb
+- spec/unit/client/redis/wns/raw_notification_spec.rb
+- spec/unit/client/redis/wpns/app_spec.rb
+- spec/unit/client/redis/wpns/notification_spec.rb
+- spec/unit/client/shared/adm/app.rb
+- spec/unit/client/shared/adm/notification.rb
+- spec/unit/client/shared/apns/app.rb
+- spec/unit/client/shared/apns/feedback.rb
+- spec/unit/client/shared/apns/notification.rb
+- spec/unit/client/shared/app.rb
+- spec/unit/client/shared/gcm/app.rb
+- spec/unit/client/shared/gcm/notification.rb
+- spec/unit/client/shared/notification.rb
+- spec/unit/client/shared/pushy/app.rb
+- spec/unit/client/shared/pushy/notification.rb
+- spec/unit/client/shared/wns/badge_notification.rb
+- spec/unit/client/shared/wns/raw_notification.rb
+- spec/unit/client/shared/wpns/app.rb
+- spec/unit/client/shared/wpns/notification.rb
 - spec/unit/configuration_spec.rb
 - spec/unit/daemon/adm/delivery_spec.rb
 - spec/unit/daemon/apns/certificate_expired_error_spec.rb
@@ -675,6 +775,7 @@ test_files:
 - spec/unit/daemon/pushy/delivery_spec.rb
 - spec/unit/daemon/retryable_error_spec.rb
 - spec/unit/daemon/service_config_methods_spec.rb
+- spec/unit/daemon/shared/store.rb
 - spec/unit/daemon/signal_handler_spec.rb
 - spec/unit/daemon/store/active_record/reconnectable_spec.rb
 - spec/unit/daemon/store/active_record_spec.rb
@@ -688,7 +789,6 @@ test_files:
 - spec/unit/deprecation_spec.rb
 - spec/unit/embed_spec.rb
 - spec/unit/logger_spec.rb
-- spec/unit/notification_shared.rb
 - spec/unit/plugin_spec.rb
 - spec/unit/push_spec.rb
 - spec/unit/reflectable_spec.rb

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

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