rpush 8.0.0 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 563933a59960a39b083c6fa55d8300d1b92c29e332cb7ecded294ecc772965ef
-  data.tar.gz: dd9f6cba0c315d7398266a00a1c59cd121ad0167f1217e7781acb402d5ee12e9
+  metadata.gz: e4ab9013682357312b9f5050d6c466c62866f78c68cc0fcb72ad89ccdc4409e0
+  data.tar.gz: ab086d28a744140499a6434c5fcec99b6c77c4cd929163a02ac4d9d77f94bb99
 SHA512:
-  metadata.gz: ab9641db8c6e0b0f77b1655d00082d29abb8ef0e83eadc640460abbad6624c96b1641501b597de20cc8c5c9dc8d39ecc34673ad174e6e42f0e036168822c36f9
-  data.tar.gz: 6218b33d044790b48cc8f14b4d3d43cbef90a1189daf52b248db2052c45d36120b946412e449212726d63ccb8392640f2cebe4bc0d02c904aa688ae27cec3354
+  metadata.gz: 862a057ab8cce2f73eff784838302ac0128214e0f744ed108b91afb33dce0867f7e7f06e131a29b46f6f49be7cca4e809f317ed37c50d1512eaa480a8ad7532d
+  data.tar.gz: 2f2d5cd377c79a1ec1ada2677f5c409d58d27d40a90b899b7fd43b98f122148623a0a78ca17c862b18b38245fe2df9a2f1cc7c68f25dc8cbe3dfa48a1f779c1f

data/CHANGELOG.md

@@ -4,17 +4,23 @@
 
 **Merged pull requests:**
 
-* Support for FCMv1 [\#620](https://github.com/rpush/rpush/pull/620) ([mirkode](https://github.com/mirkode)), [\#660](https://github.com/rpush/rpush/pull/660) ([AnilRh](https://github.com/AnilRh)) and [\#673](https://github.com/rpush/rpush/pull/673) ([SixiS](https://github.com/SixiS), [Henridv](https://github.com/Henridv) & [benlangfeld](https://github.com/benlangfeld))
-* No longer silence content-available notifications for APNs. Reverts the following change from the v6.0.0 release. See https://github.com/rpush/rpush/issues/647.
-  * Fix silent APNS notifications for Apns2 and Apnsp8 [\#596](https://github.com/rpush/rpush/pull/596) ([shved270189](https://github.com/shved270189))
+[Full Changelog](https://github.com/rpush/rpush/compare/v9.0.0...HEAD)
+
+## [v9.0.0](https://github.com/rpush/rpush/tree/v9.0.0) (2024-09-09)
+
+**Merged pull requests:**
+
+* Support for Ruby 3.2 & 3.3 [\#679](https://github.com/rpush/rpush/pull/679) ([benlangfeld](https://github.com/benlangfeld))
 
 **Breaking:**
 
-* Dropped support for Ruby 2.4, 2.5, 2.6 and Rails 5.2.
+* Removed legacy APNSv1 implementation (Apple binary protocol) since this was shut down in 2021. [\#680](https://github.com/rpush/rpush/pull/680) ([benlangfeld](https://github.com/benlangfeld))
+* Removed legacy GCM implementation since this was shut down by Google in August 2024 and replaced by FCM (supported in RPush 8.0.0) [\#688](https://github.com/rpush/rpush/pull/688) ([benlangfeld](https://github.com/benlangfeld))
+* Drop support for Ruby 2.x [\#672](https://github.com/rpush/rpush/pull/672) ([benlangfeld](https://github.com/benlangfeld))
 
-[Full Changelog](https://github.com/rpush/rpush/compare/v8.0.0...HEAD)
+[Full Changelog](https://github.com/rpush/rpush/compare/v8.0.0...v9.0.0)
 
-## [v7.0.1](https://github.com/rpush/rpush/tree/v8.0.0) (2024-09-06)
+## [v8.0.0](https://github.com/rpush/rpush/tree/v8.0.0) (2024-09-06)
 
 **Merged pull requests:**
 

data/README.md

@@ -57,10 +57,9 @@ 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=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.
+If this is your first time using the APNs, you will need to generate either SSL certificates (for standard 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.
 
 ##### Apnsp8
 
@@ -83,7 +82,7 @@ n = Rpush::Apnsp8::Notification.new
 n.app = Rpush::Apnsp8::App.find_by_name("ios_app")
 n.device_token = "..." # hex string
 n.alert = "hi mom!"
-# n.alert = { title: "push title", subtitle: "more to say", body: "hi mom!" } 
+# n.alert = { title: "push title", subtitle: "more to say", body: "hi mom!" }
 n.data = { foo: :bar }
 n.save!
 ```
@@ -108,7 +107,7 @@ n = Rpush::Apns2::Notification.new
 n.app = Rpush::Apns2::App.find_by_name("ios_app")
 n.device_token = "..." # hex string
 n.alert = "hi mom!"
-# n.alert = { title: "push title", subtitle: "more to say", body: "hi mom!" } 
+# n.alert = { title: "push title", subtitle: "more to say", body: "hi mom!" }
 n.data = {
   headers: { 'apns-topic': "BUNDLE ID" }, # the bundle id of the app, like com.example.appname. Not necessary if set on the app (see above)
   foo: :bar
@@ -118,48 +117,24 @@ n.save!
 
 You should also implement the [ssl_certificate_will_expire](https://github.com/rpush/rpush/wiki/Reflection-API) reflection to monitor when your certificate is due to expire.
 
-##### Apns (legacy protocol)
-
-```ruby
-app = Rpush::Apns::App.new
-app.name = "ios_app"
-app.certificate = File.read("/path/to/sandbox.pem")
-app.environment = "development" # APNs environment.
-app.password = "certificate password"
-app.connections = 1
-app.save!
-```
-
-```ruby
-n = Rpush::Apns::Notification.new
-n.app = Rpush::Apns::App.find_by_name("ios_app")
-n.device_token = "..." # hex string
-n.alert = "hi mom!"
-# n.alert = { title: "push title", subtitle: "more to say", body: "hi mom!" } 
-n.data = { foo: :bar }
-n.save!
-```
-
 ##### Safari Push Notifications
 
 Using one of the notifications methods above, the `url_args` attribute is available for Safari Push Notifications.
 
 ##### Environment
 
-The app `environment` for any Apns* option is "development" for XCode installs, and "production" for app store and TestFlight. Note that for Apns2 you can now use one (production + sandbox) certificate (you don't need a separate "sandbox" or development certificate), but if you do generate a development/sandbox certificate it can only be used for "development". With Apnsp8 tokens, you can target either "development" or "production" environments.
+The app `environment` for any Apns* option is "development" for XCode installs, and "production" for app store and TestFlight. Note that you can now use one (production + sandbox) certificate (you don't need a separate "sandbox" or development certificate), but if you do generate a development/sandbox certificate it can only be used for "development". With Apnsp8 tokens, you can target either "development" or "production" environments.
 
 #### Firebase Cloud Messaging
 
-##### Firebase Cloud Messaging API (V1)
-
 You will need two params to make use of FCM via Rpush.
 - `firebase_project_id` - The `Project ID` in your Firebase Project Settings
 - `json_key` - The JSON key file for a service account with the `Firebase Admin SDK Administrator Service Agent` role.
 
-Create service account in the google cloud account attached to your firebase account:  
-https://console.cloud.google.com/iam-admin/serviceaccounts  
-Make sure it has Role `Firebase Admin SDK Administrator Service Agent`  
-Add + Download the json key for the service account.  
+Create service account in the google cloud account attached to your firebase account:
+https://console.cloud.google.com/iam-admin/serviceaccounts
+Make sure it has Role `Firebase Admin SDK Administrator Service Agent`
+Add + Download the json key for the service account.
 
 Once you have those two params, you can create an FCM app and send notifications.
 
@@ -180,37 +155,6 @@ n.data = {}.transform_values(&:to_s) # All values going in here have to be strin
 n.save!
 ```
 
-##### Cloud Messaging API (Legacy)
-
-**Note:** Deprecated on 2023/6/20 and scheduled to be disabled on 2024/6/20.
-
-FCM and GCM are – as of writing – compatible with each other. See also [this comment](https://github.com/rpush/rpush/issues/284#issuecomment-228330206) for further references.
-
-Please refer to the Firebase Console on where to find your `auth_key` (probably called _Server Key_ there). To verify you have the right key, use tools like [Postman](https://www.getpostman.com/), [HTTPie](https://httpie.org/), `curl` or similar before reporting a new issue. See also [this comment](https://github.com/rpush/rpush/issues/346#issuecomment-289218776).
-
-```ruby
-app = Rpush::Gcm::App.new
-app.name = "android_app"
-app.auth_key = "..."
-app.connections = 1
-app.save!
-```
-
-```ruby
-n = Rpush::Gcm::Notification.new
-n.app = Rpush::Gcm::App.find_by_name("android_app")
-n.registration_ids = ["..."]
-n.data = { message: "hi mom!" }
-n.priority = 'high'        # Optional, can be either 'normal' or 'high'
-n.content_available = true # Optional
-# Optional notification payload. See the reference below for more keys you can use!
-n.notification = { body: 'great match!',
-                   title: 'Portugal vs. Denmark',
-                   icon: 'myicon'
-                 }
-n.save!
-```
-
 FCM also requires you to respond to [Canonical IDs](https://github.com/rpush/rpush/wiki/Canonical-IDs).
 
 Check the [FCM reference](https://firebase.google.com/docs/cloud-messaging/http-server-ref#notification-payload-support) for what keys you can use and are available to you. **Note:** Not all are yet implemented in Rpush.
@@ -411,7 +355,6 @@ Rpush will deliver all pending notifications and then exit.
 
 ```ruby
 Rpush.push
-Rpush.apns_feedback
 ```
 
 See [Push API](https://github.com/rpush/rpush/wiki/Push-API) for more details.

data/lib/generators/templates/rpush.rb

@@ -30,9 +30,6 @@ Rpush.configure do |config|
   # 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
-
 end
 
 Rpush.reflect do |on|
@@ -76,10 +73,6 @@ Rpush.reflect do |on|
   # on.notification_id_will_retry do |app, notification_id, retry_after|
   # end
 
-  # Called when a TCP connection is lost and will be reconnected.
-  # on.tcp_connection_lost do |app, error|
-  # end
-
   # Called for each recipient which successfully receives a notification. This
   # can occur more than once for the same notification when there are multiple
   # recipients.
@@ -88,7 +81,7 @@ Rpush.reflect do |on|
 
   # Called for each recipient which fails to receive a notification. This
   # can occur more than once for the same notification when there are multiple
-  # recipients. (do not handle invalid registration IDs here)
+  # recipients. (do not handle invalid device tokens here)
   # on.fcm_failed_to_recipient do |notification, error|
   # end
 
@@ -100,23 +93,23 @@ Rpush.reflect do |on|
   # Called for each recipient which successfully receives a notification. This
   # can occur more than once for the same notification when there are multiple
   # recipients.
-  # on.gcm_delivered_to_recipient do |notification, registration_id|
+  # on.fcm_delivered_to_recipient do |notification, device_token|
   # end
 
   # Called for each recipient which fails to receive a notification. This
   # can occur more than once for the same notification when there are multiple
-  # recipients. (do not handle invalid registration IDs here)
-  # on.gcm_failed_to_recipient do |notification, error, registration_id|
+  # recipients. (do not handle invalid device tokens here)
+  # on.fcm_failed_to_recipient do |notification, error, device_token|
   # end
 
-  # Called when the GCM returns a canonical registration ID.
+  # Called when the FCM returns a canonical device token.
   # You will need to replace old_id with canonical_id in your records.
-  # on.gcm_canonical_id do |old_id, canonical_id|
+  # on.fcm_canonical_id do |old_id, canonical_id|
   # end
 
-  # Called when the GCM returns a failure that indicates an invalid registration id.
-  # You will need to delete the registration_id from your records.
-  # on.gcm_invalid_registration_id do |app, error, registration_id|
+  # Called when the FCM returns a failure that indicates an invalid device token.
+  # You will need to delete the device_token from your records.
+  # on.fcm_invalid_device_token do |app, error, device_token|
   # end
 
   # Called when an SSL certificate will expire within 1 month.

data/lib/rpush/client/active_model.rb

@@ -25,10 +25,6 @@ require 'rpush/client/active_model/fcm/notification_keys_in_allowed_list_validat
 require 'rpush/client/active_model/fcm/app'
 require 'rpush/client/active_model/fcm/notification'
 
-require 'rpush/client/active_model/gcm/expiry_collapse_key_mutual_inclusion_validator'
-require 'rpush/client/active_model/gcm/app'
-require 'rpush/client/active_model/gcm/notification'
-
 require 'rpush/client/active_model/wpns/app'
 require 'rpush/client/active_model/wpns/notification'
 

data/lib/rpush/client/active_record.rb

@@ -19,9 +19,6 @@ require 'rpush/client/active_record/apnsp8/app'
 require 'rpush/client/active_record/fcm/notification'
 require 'rpush/client/active_record/fcm/app'
 
-require 'rpush/client/active_record/gcm/notification'
-require 'rpush/client/active_record/gcm/app'
-
 require 'rpush/client/active_record/wpns/notification'
 require 'rpush/client/active_record/wpns/app'
 

data/lib/rpush/client/redis.rb

@@ -30,9 +30,6 @@ require 'rpush/client/redis/apnsp8/notification'
 require 'rpush/client/redis/fcm/app'
 require 'rpush/client/redis/fcm/notification'
 
-require 'rpush/client/redis/gcm/app'
-require 'rpush/client/redis/gcm/notification'
-
 require 'rpush/client/redis/adm/app'
 require 'rpush/client/redis/adm/notification'
 

data/lib/rpush/configuration.rb

@@ -16,27 +16,12 @@ module Rpush
     end
   end
 
-  CURRENT_ATTRS = [:push_poll, :embedded, :pid_file, :batch_size, :push, :client, :logger, :log_file, :foreground, :foreground_logging, :log_level, :plugin, :apns]
+  CURRENT_ATTRS = [:push_poll, :embedded, :pid_file, :batch_size, :push, :client, :logger, :log_file, :foreground, :foreground_logging, :log_level, :plugin]
   DEPRECATED_ATTRS = []
   CONFIG_ATTRS = CURRENT_ATTRS + DEPRECATED_ATTRS
 
   class ConfigurationError < StandardError; end
 
-  class ApnsFeedbackReceiverConfiguration < Struct.new(:frequency, :enabled) # rubocop:disable Style/StructInheritance
-    def initialize
-      super
-      self.enabled = true
-      self.frequency = 60
-    end
-  end
-
-  class ApnsConfiguration < Struct.new(:feedback_receiver) # rubocop:disable Style/StructInheritance
-    def initialize
-      super
-      self.feedback_receiver = ApnsFeedbackReceiverConfiguration.new
-    end
-  end
-
   class Configuration < Struct.new(*CONFIG_ATTRS) # rubocop:disable Style/StructInheritance
     include Deprecatable
 
@@ -55,8 +40,6 @@ module Rpush
       self.foreground = false
       self.foreground_logging = true
 
-      self.apns = ApnsConfiguration.new
-
       # Internal options.
       self.embedded = false
       self.push = false
@@ -106,7 +89,7 @@ module Rpush
       client_module = Rpush::Client.const_get(client.to_s.camelize)
       Rpush.send(:include, client_module) unless Rpush.ancestors.include?(client_module)
 
-      [:Apns, :Fcm, :Gcm, :Wpns, :Wns, :Adm, :Pushy, :Webpush].each do |service|
+      [:Apns, :Fcm, :Wpns, :Wns, :Adm, :Pushy, :Webpush].each do |service|
         Rpush.const_set(service, client_module.const_get(service)) unless Rpush.const_defined?(service)
       end
 

data/lib/rpush/daemon/service_config_methods.rb

@@ -3,8 +3,6 @@ module Rpush
     module ServiceConfigMethods
       DISPATCHERS = {
         http:       Rpush::Daemon::Dispatcher::Http,
-        tcp:        Rpush::Daemon::Dispatcher::Tcp,
-        apns_tcp:   Rpush::Daemon::Dispatcher::ApnsTcp,
         apns_http2: Rpush::Daemon::Dispatcher::ApnsHttp2,
         apnsp8_http2: Rpush::Daemon::Dispatcher::Apnsp8Http2
       }

data/lib/rpush/daemon/store/active_record.rb

@@ -138,26 +138,14 @@ module Rpush
           end
         end
 
-        def create_apns_feedback(failed_at, device_token, app)
-          with_database_reconnect_and_retry do
-            Rpush::Client::ActiveRecord::Apns::Feedback.create!(failed_at: failed_at,
-                                                                device_token: device_token, app_id: app.id)
-          end
-        end
-
         def create_fcm_notification(attrs, data, app)
           notification = Rpush::Client::ActiveRecord::Fcm::Notification.new
           create_fcm_like_notification(notification, attrs, data, app)
         end
 
-        def create_gcm_notification(attrs, data, registration_ids, deliver_after, app)
-          notification = Rpush::Client::ActiveRecord::Gcm::Notification.new
-          create_gcm_like_notification(notification, attrs, data, registration_ids, deliver_after, app)
-        end
-
         def create_adm_notification(attrs, data, registration_ids, deliver_after, app)
           notification = Rpush::Client::ActiveRecord::Adm::Notification.new
-          create_gcm_like_notification(notification, attrs, data, registration_ids, deliver_after, app)
+          create_adm_like_notification(notification, attrs, data, registration_ids, deliver_after, app)
         end
 
         def update_app(app)
@@ -209,7 +197,7 @@ module Rpush
           end
         end
 
-        def create_gcm_like_notification(notification, attrs, data, registration_ids, deliver_after, app) # rubocop:disable Metrics/ParameterLists
+        def create_adm_like_notification(notification, attrs, data, registration_ids, deliver_after, app) # rubocop:disable Metrics/ParameterLists
           with_database_reconnect_and_retry do
             notification.assign_attributes(attrs)
             notification.data = data

data/lib/rpush/daemon/store/interface.rb

@@ -4,8 +4,8 @@ module Rpush
       class Interface
         PUBLIC_METHODS = [:deliverable_notifications, :mark_retryable,
                           :mark_batch_retryable, :mark_delivered, :mark_batch_delivered,
-                          :mark_failed, :mark_batch_failed, :create_apns_feedback,
-                          :create_fcm_notification, :create_gcm_notification, :create_adm_notification,
+                          :mark_failed, :mark_batch_failed,
+                          :create_fcm_notification, :create_adm_notification,
                           :update_app, :update_notification, :release_connection,
                           :all_apps, :app, :mark_ids_failed, :mark_ids_retryable,
                           :reopen_log, :pending_delivery_count, :translate_integer_notification_id]

data/lib/rpush/daemon/store/redis.rb

@@ -88,23 +88,14 @@ module Rpush
           end
         end
 
-        def create_apns_feedback(failed_at, device_token, app)
-          Rpush::Client::Redis::Apns::Feedback.create!(failed_at: failed_at, device_token: device_token, app_id: app.id)
-        end
-
         def create_fcm_notification(attrs, data, app)
           notification = Rpush::Client::Redis::Fcm::Notification.new
           create_fcm_like_notification(notification, attrs, data, app)
         end
 
-        def create_gcm_notification(attrs, data, registration_ids, deliver_after, app)
-          notification = Rpush::Client::Redis::Gcm::Notification.new
-          create_gcm_like_notification(notification, attrs, data, registration_ids, deliver_after, app)
-        end
-
         def create_adm_notification(attrs, data, registration_ids, deliver_after, app)
           notification = Rpush::Client::Redis::Adm::Notification.new
-          create_gcm_like_notification(notification, attrs, data, registration_ids, deliver_after, app)
+          create_adm_like_notification(notification, attrs, data, registration_ids, deliver_after, app)
         end
 
         def update_app(app)
@@ -151,7 +142,7 @@ module Rpush
           notification
         end
 
-        def create_gcm_like_notification(notification, attrs, data, registration_ids, deliver_after, app) # rubocop:disable Metrics/ParameterLists
+        def create_adm_like_notification(notification, attrs, data, registration_ids, deliver_after, app) # rubocop:disable Metrics/ParameterLists
           notification.assign_attributes(attrs)
           notification.data = data
           notification.registration_ids = registration_ids

data/lib/rpush/daemon.rb

@@ -19,11 +19,8 @@ require 'rpush/daemon/batch'
 require 'rpush/daemon/queue_payload'
 require 'rpush/daemon/synchronizer'
 require 'rpush/daemon/app_runner'
-require 'rpush/daemon/tcp_connection'
 require 'rpush/daemon/dispatcher_loop'
 require 'rpush/daemon/dispatcher/http'
-require 'rpush/daemon/dispatcher/tcp'
-require 'rpush/daemon/dispatcher/apns_tcp'
 require 'rpush/daemon/dispatcher/apns_http2'
 require 'rpush/daemon/dispatcher/apnsp8_http2'
 require 'rpush/daemon/service_config_methods'
@@ -38,10 +35,6 @@ require 'rpush/daemon/rpc/client'
 
 require 'rpush/daemon/store/interface'
 
-require 'rpush/daemon/apns/delivery'
-require 'rpush/daemon/apns/feedback_receiver'
-require 'rpush/daemon/apns'
-
 require 'rpush/daemon/apns2/delivery'
 require 'rpush/daemon/apns2'
 
@@ -53,9 +46,6 @@ require 'rpush/daemon/fcm/delivery'
 require 'rpush/daemon/fcm'
 require 'rpush/daemon/google_credential_cache'
 
-require 'rpush/daemon/gcm/delivery'
-require 'rpush/daemon/gcm'
-
 require 'rpush/daemon/wpns/delivery'
 require 'rpush/daemon/wpns'
 

data/lib/rpush/reflection_collection.rb

@@ -5,10 +5,9 @@ module Rpush
     REFLECTIONS = [
       :apns_feedback, :notification_enqueued, :notification_delivered,
       :notification_failed, :notification_will_retry,
-      :gcm_delivered_to_recipient, :gcm_failed_to_recipient, :gcm_canonical_id, :gcm_invalid_registration_id,
       :fcm_delivered_to_recipient, :fcm_failed_to_recipient, :fcm_canonical_id, :fcm_invalid_device_token,
       :error, :adm_canonical_id, :adm_failed_to_recipient, :wns_invalid_channel,
-      :tcp_connection_lost, :ssl_certificate_will_expire, :ssl_certificate_revoked,
+      :ssl_certificate_will_expire, :ssl_certificate_revoked,
       :notification_id_will_retry, :notification_id_failed
     ]
 

data/lib/rpush/version.rb

@@ -1,6 +1,6 @@
 module Rpush
   module VERSION
-    MAJOR = 8
+    MAJOR = 9
     MINOR = 0
     TINY = 0
     PRE = nil

data/lib/rpush.rb

@@ -20,7 +20,6 @@ require 'rpush/reflectable'
 require 'rpush/plugin'
 require 'rpush/embed'
 require 'rpush/push'
-require 'rpush/apns_feedback'
 
 module Rpush
   def self.jruby?

data/spec/functional/cli_spec.rb

@@ -2,31 +2,57 @@ require 'functional_spec_helper'
 
 describe Rpush::CLI do
   def create_app
-    app = Rpush::Apns::App.new
+    app = Rpush::Apns2::App.new
     app.certificate = TEST_CERT
     app.name = 'test'
-    app.environment = 'sandbox'
+    app.environment = 'development'
+    app.bundle_id = 'com.example.app'
     app.save!
     app
   end
 
-  describe 'status' do
-    let(:tcp_socket) { double(TCPSocket, setsockopt: nil, close: nil) }
-    let(:ssl_socket) { double(OpenSSL::SSL::SSLSocket, :sync= => nil, connect: nil, write: nil, flush: nil, read: nil, close: nil) }
-    let(:io_double) { double(select: nil) }
+  let(:fake_client) {
+    double(
+      prepare_request: fake_http2_request,
+      close:           'ok',
+      call_async:      'ok',
+      join:            'ok',
+      on:              'ok'
+    )
+  }
+  let(:fake_http2_request) { double }
+  let(:fake_http_resp_headers) {
+    {
+      ":status" => "200",
+      "apns-id"=>"C6D65840-5E3F-785A-4D91-B97D305C12F6"
+    }
+  }
+  let(:fake_http_resp_body) { '' }
 
-    before do
-      create_app
-      stub_tcp_connection(tcp_socket, ssl_socket, io_double)
-      Rpush.embed
+  before do
+    create_app
+    Rpush.config.push_poll = 0.5
 
-      timeout do
-        Thread.pass until File.exist?(Rpush::Daemon::Rpc.socket_path)
-      end
-    end
+    allow(NetHttp2::Client).
+      to receive(:new).and_return(fake_client)
+    allow(fake_http2_request).
+      to receive(:on).with(:headers).
+      and_yield(fake_http_resp_headers)
+    allow(fake_http2_request).
+      to receive(:on).with(:body_chunk).
+      and_yield(fake_http_resp_body)
+    allow(fake_http2_request).
+      to receive(:on).with(:close).
+      and_yield
+
+    Rpush.embed
+  end
 
-    after { timeout { Rpush.shutdown } }
+  after do
+    timeout { Rpush.shutdown }
+  end
 
+  describe 'status' do
     it 'prints the status' do
       expect(subject).to receive(:configure_rpush) { true }
       expect(subject).to receive(:puts).with(/app_runners:/)

data/spec/functional/embed_spec.rb

@@ -1,49 +1,80 @@
 require 'functional_spec_helper'
 
 describe 'embedding' do
-  let(:timeout) { 10 }
-  let(:app) { Rpush::Apns::App.new }
-  let(:notification) { Rpush::Apns::Notification.new }
-  let(:tcp_socket) { double(TCPSocket, setsockopt: nil, close: nil) }
-  let(:ssl_socket) { double(OpenSSL::SSL::SSLSocket, :sync= => nil, connect: nil, write: nil, flush: nil, read: nil, close: nil) }
-  let(:io_double) { double(select: nil) }
-
-  before do
+  def create_app
+    app = Rpush::Apns2::App.new
     app.certificate = TEST_CERT
     app.name = 'test'
-    app.environment = 'sandbox'
+    app.environment = 'development'
+    app.bundle_id = 'com.example.app'
     app.save!
+    app
+  end
 
+  let(:fake_device_token) { 'a' * 108 }
+  let(:notification_data) { nil }
+
+  def create_notification(app)
+    notification = Rpush::Apns2::Notification.new
     notification.app = app
+    notification.sound = 'default'
     notification.alert = 'test'
-    notification.device_token = 'a' * 108
+    notification.device_token = fake_device_token
+    notification.data = notification_data
+    notification.content_available = 1
     notification.save!
-
-    stub_tcp_connection
+    notification
   end
 
-  def stub_tcp_connection
-    allow_any_instance_of(Rpush::Daemon::TcpConnection).to receive_messages(connect_socket: [tcp_socket, ssl_socket])
-    allow_any_instance_of(Rpush::Daemon::TcpConnection).to receive_messages(setup_ssl_context: double.as_null_object)
-    stub_const('Rpush::Daemon::TcpConnection::IO', io_double)
-    allow(Rpush::Daemon::Apns::FeedbackReceiver).to receive_messages(new: double.as_null_object)
-  end
+  let(:app) { create_app }
+  let(:notification) { create_notification(app) }
+
+  let(:fake_client) {
+    double(
+      prepare_request: fake_http2_request,
+      close:           'ok',
+      call_async:      'ok',
+      join:            'ok',
+      on:              'ok'
+    )
+  }
+  let(:fake_http2_request) { double }
+  let(:fake_http_resp_headers) {
+    {
+      ":status" => "200",
+      "apns-id"=>"C6D65840-5E3F-785A-4D91-B97D305C12F6"
+    }
+  }
+  let(:fake_http_resp_body) { '' }
 
   before do
-    Rpush.config.push_poll = 5
+    Rpush.config.push_poll = 0.5
+
+    allow(NetHttp2::Client).
+      to receive(:new).and_return(fake_client)
+    allow(fake_http2_request).
+      to receive(:on).with(:headers).
+      and_yield(fake_http_resp_headers)
+    allow(fake_http2_request).
+      to receive(:on).with(:body_chunk).
+      and_yield(fake_http_resp_body)
+    allow(fake_http2_request).
+      to receive(:on).with(:close).
+      and_yield
+
     Rpush.embed
   end
 
+  after do
+    timeout { Rpush.shutdown }
+  end
+
   it 'delivers a notification successfully' do
     expect do
-      Timeout.timeout(timeout) do
-        until notification.delivered
-          notification.reload
-          sleep 0.1
-        end
+      until notification.delivered
+        notification.reload
+        sleep 0.1
       end
     end.to change(notification, :delivered).to(true)
   end
-
-  after { Timeout.timeout(timeout) { Rpush.shutdown } }
 end