action_push_native 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 597ea29826dc73cb9a6215038924dae218c5b415e754657ea01fa543420eb9ee
-  data.tar.gz: 1a058af0f6d383e2fe3b7ce0832c27f35d6f2e86026adce2871a4394c98644b8
+  metadata.gz: 1136dcc9cab40bcc1e6c8432841981cea0f21f8dc7ac70735cc595f7d79cf6a6
+  data.tar.gz: b397de4ce3970c7c255271e184eaa49d1e15518a43c801c07397a37985f88fb8
 SHA512:
-  metadata.gz: 1d667e9975da93ba1a4e998103af3b5c0258c763d50931e5658c2c76f9d59db85ef43711a87ca8f86d82cb531f7e0cc907d1fed25a22ad4eaa33777f642c73c6
-  data.tar.gz: 6dcb6f3230a3df117044353b2d04b8ce9130e886bde3ab96ef1b93371eb906346d073efaa3185594722d52d32280b6ad4b06e2d476cab23838dcfb7edff9ed65
+  metadata.gz: 5802271587c60f66a7aab9a99f37fa715feddb61dd6e4881fac825e2e517a6104d6144b8998125195f1742ea66152731ede28fdb792eb04db2a7ec3f8b1a3873
+  data.tar.gz: 4044a51c31d921df83f7c451d6416d689a93f2ca8cac55ff0f50a45b186de4697f717f39d581738d69012091a61d881f5ddfadd615f2a62709d962fa2fcd56c2

data/app/jobs/action_push_native/notification_job.rb

@@ -40,7 +40,7 @@ module ActionPushNative
 
     with_options retry_options do
       retry_on TimeoutError, wait: 1.minute
-      retry_on ConnectionError, HTTPX::PoolTimeoutError, attempts: 20
+      retry_on ConnectionError, ConnectionPoolTimeoutError, attempts: 20
 
       # Altough unexpected, these are short-lived errors that can be retried most of the times.
       retry_on ForbiddenError, BadRequestError

data/lib/action_push_native/errors.rb

@@ -3,6 +3,7 @@
 module ActionPushNative
   class TimeoutError < StandardError; end
   class ConnectionError < StandardError; end
+  class ConnectionPoolTimeoutError < StandardError; end
 
   class BadRequestError < StandardError; end
   class ForbiddenError < StandardError; end

data/lib/action_push_native/service/apns.rb

@@ -5,9 +5,6 @@ module ActionPushNative
     class Apns
       include NetworkErrorHandling
 
-      # Per-application HTTPX session
-      cattr_accessor :httpx_sessions
-
       def initialize(config)
         @config = config
       end
@@ -59,9 +56,11 @@ module ActionPushNative
           payload.compact
         end
 
+        HTTPX_SESSIONS_KEY = :action_push_native_apns_httpx_sessions
+
         def httpx_session
-          self.class.httpx_sessions ||= {}
-          self.class.httpx_sessions[config] ||= HttpxSession.new(config)
+          ActiveSupport::IsolatedExecutionState[HTTPX_SESSIONS_KEY] ||= {}
+          ActiveSupport::IsolatedExecutionState[HTTPX_SESSIONS_KEY][config] ||= HttpxSession.new(config)
         end
 
         def handle_error(response)

data/lib/action_push_native/service/fcm.rb

@@ -5,9 +5,6 @@ module ActionPushNative
     class Fcm
       include NetworkErrorHandling
 
-      # Per-application HTTPX session
-      cattr_accessor :httpx_sessions
-
       def initialize(config)
         @config = config
       end
@@ -20,9 +17,11 @@ module ActionPushNative
       private
         attr_reader :config
 
+        HTTPX_SESSIONS_KEY = :action_push_native_fcm_httpx_sessions
+
         def httpx_session
-          self.class.httpx_sessions ||= {}
-          self.class.httpx_sessions[config] ||= HttpxSession.new(config)
+          ActiveSupport::IsolatedExecutionState[HTTPX_SESSIONS_KEY] ||= {}
+          ActiveSupport::IsolatedExecutionState[HTTPX_SESSIONS_KEY][config] ||= HttpxSession.new(config)
         end
 
         def payload_from(notification)

data/lib/action_push_native/service/network_error_handling.rb

@@ -3,6 +3,8 @@ module ActionPushNative::Service::NetworkErrorHandling
 
   def handle_network_error(error)
     case error
+    when HTTPX::PoolTimeoutError
+      raise ActionPushNative::ConnectionPoolTimeoutError, error.message
     when Errno::ETIMEDOUT, HTTPX::TimeoutError
       raise ActionPushNative::TimeoutError, error.message
     when Errno::ECONNRESET, Errno::ECONNABORTED, Errno::ECONNREFUSED, Errno::EHOSTUNREACH,

data/lib/action_push_native/version.rb

@@ -1,3 +1,3 @@
 module ActionPushNative
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/generators/action_push_native/install/templates/config/push.yml.tt

@@ -11,7 +11,7 @@ shared:
     topic: your.bundle.identifier
 
     # Set this to the number of threads used to process notifications (default: 5).
-    # When the pool size is too small a HTTPX::PoolTimeoutError error will be raised.
+    # When the pool size is too small a ConnectionPoolTimeoutError will be raised.
     # connection_pool_size: 5
 
     # Change the request timeout (default: 30).
@@ -21,7 +21,7 @@ shared:
     # Please note that anything built directly from Xcode and loaded on your phone will have
     # the app generate DEVELOPMENT tokens, while everything else (TestFlight, Apple Store, ...)
     # will be considered as PRODUCTION environment.
-    # connect_to_development_server: <%%# Rails.env.development? %>
+    # connect_to_development_server: <%%= Rails.env.development? %>
 
   # Use bin/rails credentials:edit to set the fcm secrets (as action_push_native:fcm:encryption_key)
   google:
@@ -33,7 +33,7 @@ shared:
     project_id: your_project_id
 
     # Set this to the number of threads used to process notifications (default: 5).
-    # When the pool size is too small a HTTPX::PoolTimeoutError error will be raised.
+    # When the pool size is too small a ConnectionPoolTimeoutError will be raised.
     # connection_pool_size: 5
 
     # Change the request timeout (default: 15).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_push_native
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jacopo Beschi
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Send push notifications to mobile apps
 test_files: []