rpush 2.7.0 → 3.0.0.rc1

data/spec/unit/daemon/store/active_record/reconnectable_spec.rb

@@ -85,6 +85,36 @@ describe Rpush::Daemon::Store::ActiveRecord::Reconnectable do
     test_doubles.each(&:perform)
   end
 
+  context "should reconnect on" do
+    [
+        ::ActiveRecord::ConnectionNotEstablished,
+        ::ActiveRecord::ConnectionTimeoutError,
+        ::ActiveRecord::JDBCError,
+        ::ActiveRecord::StatementInvalid,
+        Mysql::Error,
+        Mysql2::Error,
+        PG::Error,
+        PGError,
+        SQLite3::Exception
+    ].each do |error_class|
+      let(:error) { error_class.new }
+
+      it error_class.name do
+        expect(ActiveRecord::Base).to receive(:establish_connection)
+        test_doubles.each(&:perform)
+      end
+    end
+  end
+
+  context "should not reconnect on" do
+    let(:error) { ActiveRecord::ActiveRecordError.new }
+
+    it "ActiveRecord::ActiveRecordError" do
+      expect(ActiveRecord::Base).not_to receive(:establish_connection)
+      expect { test_doubles.each(&:perform) }.to raise_error(ActiveRecord::ActiveRecordError)
+    end
+  end
+
   context "when the reconnection attempt is not successful" do
     before do
       class << Rpush::Client::ActiveRecord::Notification

data/spec/unit_spec_helper.rb

@@ -5,10 +5,6 @@ def unit_example?(metadata)
   metadata[:file_path] =~ %r{spec/unit}
 end
 
-def rails4?
-  ::Rails::VERSION::STRING >= '4'
-end
-
 RSpec.configure do |config|
   config.before(:each) do
     Modis.with_connection do |redis|
@@ -17,29 +13,14 @@ RSpec.configure do |config|
 
     if active_record? && unit_example?(self.class.metadata)
       connection = ActiveRecord::Base.connection
-
-      if rails4?
-        connection.begin_transaction joinable: false
-      else
-        connection.increment_open_transactions
-        connection.transaction_joinable = false
-        connection.begin_db_transaction
-      end
+      connection.begin_transaction joinable: false
     end
   end
 
   config.after(:each) do
     if active_record? && unit_example?(self.class.metadata)
       connection = ActiveRecord::Base.connection
-
-      if rails4?
-        connection.rollback_transaction if connection.transaction_open?
-      else
-        if connection.open_transactions != 0
-          connection.rollback_db_transaction
-          connection.decrement_open_transactions
-        end
-      end
+      connection.rollback_transaction if connection.transaction_open?
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpush
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 3.0.0.rc1
 platform: ruby
 authors:
 - Ian Leitch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-http2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +114,230 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.4.0
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  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: timecop
+  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: stackprof
+  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: modis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+- !ruby/object:Gem::Dependency
+  name: rpush-redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  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: cane
+  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: codeclimate-test-reporter
+  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: simplecov
+  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: rubocop
+  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
+    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: pg
+  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: mysql2
+  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: sqlite3
+  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'
 description: The push notification service for Ruby.
 email:
 - port001@gmail.com
@@ -130,6 +368,7 @@ files:
 - lib/generators/templates/rpush_2_1_0_updates.rb
 - lib/generators/templates/rpush_2_6_0_updates.rb
 - lib/generators/templates/rpush_2_7_0_updates.rb
+- lib/generators/templates/rpush_3_0_0_updates.rb
 - lib/rpush.rb
 - lib/rpush/apns_feedback.rb
 - lib/rpush/cli.rb
@@ -141,6 +380,8 @@ files:
 - 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/apns2/app.rb
+- lib/rpush/client/active_model/apns2/notification.rb
 - lib/rpush/client/active_model/gcm/app.rb
 - lib/rpush/client/active_model/gcm/expiry_collapse_key_mutual_inclusion_validator.rb
 - lib/rpush/client/active_model/gcm/notification.rb
@@ -157,6 +398,8 @@ files:
 - lib/rpush/client/active_record/apns/app.rb
 - lib/rpush/client/active_record/apns/feedback.rb
 - lib/rpush/client/active_record/apns/notification.rb
+- lib/rpush/client/active_record/apns2/app.rb
+- lib/rpush/client/active_record/apns2/notification.rb
 - lib/rpush/client/active_record/app.rb
 - lib/rpush/client/active_record/gcm/app.rb
 - lib/rpush/client/active_record/gcm/notification.rb
@@ -167,28 +410,14 @@ files:
 - lib/rpush/client/active_record/wns/raw_notification.rb
 - lib/rpush/client/active_record/wpns/app.rb
 - lib/rpush/client/active_record/wpns/notification.rb
-- lib/rpush/client/mongoid.rb
-- lib/rpush/client/mongoid/adm/app.rb
-- lib/rpush/client/mongoid/adm/notification.rb
-- lib/rpush/client/mongoid/apns/app.rb
-- lib/rpush/client/mongoid/apns/feedback.rb
-- lib/rpush/client/mongoid/apns/notification.rb
-- lib/rpush/client/mongoid/app.rb
-- lib/rpush/client/mongoid/gcm/app.rb
-- lib/rpush/client/mongoid/gcm/notification.rb
-- lib/rpush/client/mongoid/notification.rb
-- lib/rpush/client/mongoid/wns/app.rb
-- lib/rpush/client/mongoid/wns/badge_notification.rb
-- lib/rpush/client/mongoid/wns/notification.rb
-- lib/rpush/client/mongoid/wns/raw_notification.rb
-- lib/rpush/client/mongoid/wpns/app.rb
-- lib/rpush/client/mongoid/wpns/notification.rb
 - lib/rpush/client/redis.rb
 - lib/rpush/client/redis/adm/app.rb
 - lib/rpush/client/redis/adm/notification.rb
 - lib/rpush/client/redis/apns/app.rb
 - lib/rpush/client/redis/apns/feedback.rb
 - lib/rpush/client/redis/apns/notification.rb
+- lib/rpush/client/redis/apns2/app.rb
+- lib/rpush/client/redis/apns2/notification.rb
 - lib/rpush/client/redis/app.rb
 - lib/rpush/client/redis/gcm/app.rb
 - lib/rpush/client/redis/gcm/notification.rb
@@ -206,11 +435,14 @@ files:
 - lib/rpush/daemon/apns.rb
 - lib/rpush/daemon/apns/delivery.rb
 - lib/rpush/daemon/apns/feedback_receiver.rb
+- lib/rpush/daemon/apns2.rb
+- lib/rpush/daemon/apns2/delivery.rb
 - lib/rpush/daemon/app_runner.rb
 - lib/rpush/daemon/batch.rb
 - lib/rpush/daemon/constants.rb
 - lib/rpush/daemon/delivery.rb
 - lib/rpush/daemon/delivery_error.rb
+- lib/rpush/daemon/dispatcher/apns_http2.rb
 - lib/rpush/daemon/dispatcher/apns_tcp.rb
 - lib/rpush/daemon/dispatcher/http.rb
 - lib/rpush/daemon/dispatcher/tcp.rb
@@ -234,7 +466,6 @@ files:
 - lib/rpush/daemon/store/active_record.rb
 - lib/rpush/daemon/store/active_record/reconnectable.rb
 - lib/rpush/daemon/store/interface.rb
-- lib/rpush/daemon/store/mongoid.rb
 - lib/rpush/daemon/store/redis.rb
 - lib/rpush/daemon/string_helpers.rb
 - lib/rpush/daemon/synchronizer.rb
@@ -262,6 +493,7 @@ files:
 - lib/tasks/test.rake
 - spec/.rubocop.yml
 - spec/functional/adm_spec.rb
+- spec/functional/apns2_spec.rb
 - spec/functional/apns_spec.rb
 - spec/functional/cli_spec.rb
 - spec/functional/embed_spec.rb
@@ -276,8 +508,6 @@ files:
 - spec/support/cert_with_password.pem
 - spec/support/cert_without_password.pem
 - spec/support/config/database.yml
-- spec/support/config/mongoid.yml
-- spec/support/mongoid_setup.rb
 - spec/support/simplecov_helper.rb
 - spec/support/simplecov_quality_formatter.rb
 - spec/tmp/.gitkeep
@@ -315,7 +545,6 @@ files:
 - spec/unit/daemon/signal_handler_spec.rb
 - spec/unit/daemon/store/active_record/reconnectable_spec.rb
 - spec/unit/daemon/store/active_record_spec.rb
-- spec/unit/daemon/store/mongoid_spec.rb
 - spec/unit/daemon/store/redis_spec.rb
 - spec/unit/daemon/tcp_connection_spec.rb
 - spec/unit/daemon/wns/delivery_spec.rb
@@ -345,21 +574,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: The push notification service for Ruby.
 test_files:
 - spec/.rubocop.yml
 - spec/functional/adm_spec.rb
+- spec/functional/apns2_spec.rb
 - spec/functional/apns_spec.rb
 - spec/functional/cli_spec.rb
 - spec/functional/embed_spec.rb
@@ -374,8 +604,6 @@ test_files:
 - spec/support/cert_with_password.pem
 - spec/support/cert_without_password.pem
 - spec/support/config/database.yml
-- spec/support/config/mongoid.yml
-- spec/support/mongoid_setup.rb
 - spec/support/simplecov_helper.rb
 - spec/support/simplecov_quality_formatter.rb
 - spec/tmp/.gitkeep
@@ -413,7 +641,6 @@ test_files:
 - spec/unit/daemon/signal_handler_spec.rb
 - spec/unit/daemon/store/active_record/reconnectable_spec.rb
 - spec/unit/daemon/store/active_record_spec.rb
-- spec/unit/daemon/store/mongoid_spec.rb
 - spec/unit/daemon/store/redis_spec.rb
 - spec/unit/daemon/tcp_connection_spec.rb
 - spec/unit/daemon/wns/delivery_spec.rb