rpush 3.3.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3abc70a76bc7de39565ab73f4eef2b2466ff4dec4fe20ef57e10a9c4e6ff41f3
-  data.tar.gz: 42eb70527bd235e7c30b1dab4413d9368f68c129254704bb5af7698cb8cd6c68
+  metadata.gz: baf4ad12d47bddf231b3ea0ff7992cf8feab0816fc301cc43b4a41b9edeaa41e
+  data.tar.gz: 93a513bc8f4ab37880fb353044ad4c3349bded12906e71ffa1605380d920b2b1
 SHA512:
-  metadata.gz: 19b1eeb3bb0e71dd11cd26af20efdb610cdda31c720293578e57d19b82c406841fe33f8aa63d6e4dd5ecff8e18bbcc5a760159259cc78c37aa093a29a70d059a
-  data.tar.gz: 75a2fc1eb17241bbaa7fcf3577ef6ba27ac5701f3e4a5396b08f099097b9a686aae9b465c954272871ee33c6c65d4142b4183c5bb17f60e731a1f70e5328c97e
+  metadata.gz: 0a2165bea0a8f1f1d7f60e8a62693a0a3fce40acb00baba990578beb965d5c258fbe231305edfa04d9c83329e5f7b1da71d0772b6399f7f9ec6359ca5fb7a2c5
+  data.tar.gz: 6831ddac685c0f6264242d2ccfa6be41b4a6c4a414dfa4c84734134f911df756f7e6350ca13a54a25becfc6106426feae6ef4d372e36ff72537e5d9300bde836

data/CHANGELOG.md

@@ -1,16 +1,21 @@
-## HEAD
+# Changelog
 
-### Breaking Changes
+## Unreleased
 
-- None
+## 4.0.0 (2019-02-14)
 
-### Added
+### Changed
 
-- None
+- Stop logging all APNSp8 requests as warnings. [#474](https://github.com/rpush/rpush/pull/474) (by [@jhottenstein](https://github.com/jhottenstein) and [@rofreg](https://github.com/rofreg))
+
+### Removed
+
+- Support for Ruby 2.2
 
 ### Fixed
 
-- None
+- Fixed APNSp8 memory leak [#475](https://github.com/rpush/rpush/pull/475) (by [@jhottenstein](https://github.com/jhottenstein))
+- Fixed APNS2 memory leak. [#476](https://github.com/rpush/rpush/pull/476) (by [@jhottenstein](https://github.com/jhottenstein))
 
 ## 3.3.1 (2018-11-14)
 

data/README.md

@@ -269,6 +269,13 @@ $ cd /path/to/project
 $ rpush start
 ```
 
+#### As a foreground process
+
+```sh
+$ cd /path/to/project
+$ rpush start -f
+```
+
 #### On the command-line
 
 ```sh

data/lib/generators/templates/add_gcm.rb

@@ -50,7 +50,7 @@ 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::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 1
+    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")
@@ -100,7 +100,7 @@ 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::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 1
+    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

data/lib/generators/templates/add_rpush.rb

@@ -64,7 +64,7 @@ class AddRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0
     end
 
     def self.down
-      if ActiveRecord::VERSION::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 1
+      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
@@ -90,7 +90,7 @@ class AddRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0
     end
 
     def self.down
-      if ActiveRecord::VERSION::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 1
+      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
@@ -195,7 +195,7 @@ 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::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 1
+      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")
@@ -245,7 +245,7 @@ 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::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 1
+      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
@@ -322,7 +322,7 @@ 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::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 1
+      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
@@ -332,7 +332,7 @@ class AddRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0
         end
       end
 
-      if ActiveRecord::VERSION::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 1
+      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
@@ -364,7 +364,7 @@ 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::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 1
+      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
@@ -374,7 +374,7 @@ class AddRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0
         end
       end
 
-      if ActiveRecord::VERSION::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 1
+      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

data/lib/generators/templates/create_rapns_feedback.rb

@@ -10,7 +10,7 @@ class CreateRapnsFeedback < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Mi
   end
 
   def self.down
-    if ActiveRecord::VERSION::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 1
+    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

data/lib/generators/templates/create_rapns_notifications.rb

@@ -21,7 +21,7 @@ class CreateRapnsNotifications < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecor
   end
 
   def self.down
-    if ActiveRecord::VERSION::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 1
+    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

data/lib/generators/templates/rename_rapns_to_rpush.rb

@@ -18,7 +18,7 @@ class RenameRapnsToRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Mig
     rename_table :rapns_apps, :rpush_apps
     rename_table :rapns_feedback, :rpush_feedback
 
-    if ActiveRecord::VERSION::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 1
+    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
@@ -28,7 +28,7 @@ class RenameRapnsToRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Mig
       end
     end
 
-    if ActiveRecord::VERSION::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 1
+    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
@@ -60,7 +60,7 @@ 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::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 1
+    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
@@ -70,7 +70,7 @@ class RenameRapnsToRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Mig
       end
     end
 
-    if ActiveRecord::VERSION::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 1
+    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

data/lib/generators/templates/rpush_2_0_0_updates.rb

@@ -17,7 +17,7 @@ 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::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 1
+    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
@@ -52,7 +52,7 @@ 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::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 1
+    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

data/lib/rpush/cli.rb

@@ -153,7 +153,7 @@ module Rpush
     end
 
     def check_ruby_version
-      STDERR.puts(ANSI.yellow { 'WARNING: ' } + "You are using an old and unsupported version of Ruby.") if RUBY_VERSION < '2.2.2' && RUBY_ENGINE == 'ruby'
+      STDERR.puts(ANSI.yellow { 'WARNING: ' } + "You are using an old and unsupported version of Ruby.") if RUBY_VERSION < '2.3.0' && RUBY_ENGINE == 'ruby'
     end
 
     def underscore_option_names

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

@@ -15,8 +15,6 @@ module Rpush
         end
 
         def perform
-          @client.on(:error) { |err| mark_batch_retryable(Time.now + 10.seconds, err) }
-
           @batch.each_notification do |notification|
             prepare_async_post(notification)
           end

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

@@ -17,8 +17,6 @@ module Rpush
         end
 
         def perform
-          @client.on(:error) { |err| mark_batch_retryable(Time.now + 10.seconds, err) }
-
           @batch.each_notification do |notification|
             prepare_async_post(notification)
           end
@@ -43,7 +41,6 @@ module Rpush
           response = {}
 
           request = build_request(notification)
-          log_warn(request)
           http_request = @client.prepare_request(:post, request[:path],
             body:    request[:body],
             headers: request[:headers]

data/lib/rpush/daemon/dispatcher/apns_http2.rb

@@ -15,10 +15,7 @@ module Rpush
           @app = app
           @delivery_class = delivery_class
 
-          url = URLS[app.environment.to_sym]
-          @client = NetHttp2::Client.new(url,
-            ssl_context:     prepare_ssl_context,
-            connect_timeout: DEFAULT_TIMEOUT)
+          @client = create_http2_client(app)
         end
 
         def dispatch(payload)
@@ -31,6 +28,16 @@ module Rpush
 
         private
 
+        def create_http2_client(app)
+          url = URLS[app.environment.to_sym]
+          client = NetHttp2::Client.new(url, ssl_context: prepare_ssl_context, connect_timeout: DEFAULT_TIMEOUT)
+          client.on(:error) do |error|
+            log_error(error)
+            reflect(:error, error)
+          end
+          client
+        end
+
         def prepare_ssl_context
           @ssl_context ||= begin
             ctx = OpenSSL::SSL::SSLContext.new

data/lib/rpush/daemon/dispatcher/apnsp8_http2.rb

@@ -2,6 +2,8 @@ module Rpush
   module Daemon
     module Dispatcher
       class Apnsp8Http2
+        include Loggable
+        include Reflectable
 
         URLS = {
           production: 'https://api.push.apple.com',
@@ -14,19 +16,29 @@ module Rpush
           @app = app
           @delivery_class = delivery_class
 
-          url = URLS[app.environment.to_sym]
-          @client = NetHttp2::Client.new(url, connect_timeout: DEFAULT_TIMEOUT)
+          @client = create_http2_client(app)
           @token_provider = Rpush::Daemon::Apnsp8::Token.new(@app)
         end
 
         def dispatch(payload)
-
           @delivery_class.new(@app, @client, @token_provider, payload.batch).perform
         end
 
         def cleanup
           @client.close
         end
+
+        private
+
+        def create_http2_client(app)
+          url = URLS[app.environment.to_sym]
+          client = NetHttp2::Client.new(url, connect_timeout: DEFAULT_TIMEOUT)
+          client.on(:error) do |error|
+            log_error(error)
+            reflect(:error, error)
+          end
+          client
+        end
       end
     end
   end

data/lib/rpush/logger.rb

@@ -65,7 +65,7 @@ module Rpush
 
     def log(where, msg, inline = false, prefix = nil, io = STDOUT)
       if msg.is_a?(Exception)
-        formatted_backtrace = msg.backtrace.join("\n")
+        formatted_backtrace = msg.backtrace&.join("\n")
         msg = "#{msg.class.name}, #{msg.message}\n#{formatted_backtrace}"
       end
 

data/lib/rpush/version.rb

@@ -1,8 +1,8 @@
 module Rpush
   module VERSION
-    MAJOR = 3
-    MINOR = 3
-    TINY = 1
+    MAJOR = 4
+    MINOR = 0
+    TINY = 0
     PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".").freeze

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

@@ -49,12 +49,6 @@ describe Rpush::Client::ActiveRecord::Pushy::Notification do
         expect(subject.errors[:time_to_live]).to eq ['must be greater than 0']
       end
 
-      it 'should be integer' do
-        subject.time_to_live = 1.4
-        is_expected.not_to be_valid
-        expect(subject.errors[:time_to_live]).to eq ['must be an integer']
-      end
-
       it 'should be <= 1.year.seconds' do
         subject.time_to_live = 2.years.seconds.to_i
         is_expected.not_to be_valid

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpush
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Ian Leitch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-14 00:00:00.000000000 Z
+date: 2019-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -202,14 +202,14 @@ dependencies:
   name: modis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -618,15 +618,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: The push notification service for Ruby.