action_push_native 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb63f1d3b677a29544c2691f401106285c40a3d2ef023f58c814d0afbb6ac500
-  data.tar.gz: 1a14922fd7f365aa860634cdd590da4047f03bf3ce6b200a91a103c6b17b04f0
+  metadata.gz: 221069cb3459cd2c07eaa4d7a3d2c98c741f2817a15a47cf27e8bc4ea6dd93fb
+  data.tar.gz: 5719b281f487a336d96100213946fa41ce8115a573cb1888cfe0eb4422c97bb6
 SHA512:
-  metadata.gz: 78149ea68432d42200e2fe22cfb8d676b96acfebfcf169a17bc4b78dbd1c48eb7b082718ed1e382529e4fea0a505622319f487136e80ecef5b4ef8b169a280eb
-  data.tar.gz: 2f479abecd271700608b73ecd4ebba476449774dae7349951af959709886b7164f9896b88f91d04e093884ee53e953b3cc1719728d55b9591866280129c79184
+  metadata.gz: d308c3a5d4a6d721bfe60a09d4f3dc0fdce3c7058ecfc82ed7dfd050b10b121adeadbd89ed48b843bd53a52a62b53fc958d6fd5191b666c83441d8ae51735e62
+  data.tar.gz: b782ef4aac0fca069a82415cdb278c1fb5d162a3608f8cede1404934dd859583b7a54b55880925c1e12016e776b734dab352ebbb8ba31b2e95cbf1c3a31c9d3e

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/app/models/action_push_native/device.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 module ActionPushNative
-  class Device < ApplicationRecord
+  class Device < Record
     include ActiveSupport::Rescuable
 
     rescue_from(TokenError) { destroy! }
 
     belongs_to :owner, polymorphic: true, optional: true
 
-    enum :platform, { apple: "apple", google: "google" }
+    enum :platform, { apple: "apple", google: "google" }, validate: true
 
     def push(notification)
        notification.token = token

data/app/models/action_push_native/record.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module ActionPushNative
+  class Record < ActiveRecord::Base
+    self.abstract_class = true
+  end
+end
+
+ActiveSupport.run_load_hooks :action_push_native_record, ActionPushNative::Record

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

@@ -4,7 +4,7 @@ module ActionPushNative::Service::NetworkErrorHandling
   def handle_network_error(error)
     case error
     when HTTPX::PoolTimeoutError
-      raise error
+      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.1"
+  VERSION = "0.3.1"
 end

data/lib/action_push_native.rb

@@ -27,7 +27,7 @@ module ActionPushNative
   end
 
   def self.config_for(platform, notification)
-    platform_config = Rails.application.config_for(:push)[platform.to_sym]
+    platform_config = config[platform.to_sym]
     raise "ActionPushNative: '#{platform}' platform is not configured" unless platform_config.present?
 
     if notification.application.present?
@@ -38,6 +38,13 @@ module ActionPushNative
     end
   end
 
+  def self.config
+    path = Rails.application.paths["config/push"].existent.first
+    raise "ActionPushNative: config/push.yml not found" unless path
+
+    Rails.application.config_for(Pathname.new(path))
+  end
+
   def self.deprecator
     @deprecator ||= ActiveSupport::Deprecation.new
   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.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Jacopo Beschi
@@ -105,6 +105,7 @@ files:
 - Rakefile
 - app/jobs/action_push_native/notification_job.rb
 - app/models/action_push_native/device.rb
+- app/models/action_push_native/record.rb
 - db/migrate/20250610075650_create_action_push_native_device.rb
 - lib/action_push_native.rb
 - lib/action_push_native/configured_notification.rb
@@ -145,7 +146,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: []