noticed 1.5.1 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff995fcfa939d664a292e883fb4b6b40bb1510c75411bb18d9bee4787f3ccb3a
-  data.tar.gz: c4945ef3d031a3c6565a56826e6538a1e11f4133dc4b8aba5c97e52279e69e0e
+  metadata.gz: 90b43c50384068092455c10cd6686fc46cd766121c0ea5cf593bbc4c8306e8de
+  data.tar.gz: 23edb385b0c9981dd9c292c8f4c15ce6fadd9abb131adc1eb6440ab39c5fa186
 SHA512:
-  metadata.gz: 5f087a2e98dbe9c746b334721f5a1807e8cff6373cb2e342ce24abecbc1365f90f93a1282adfba37e8c72f432975354dbd68ff58bc099ec1a02579cce6394caf
-  data.tar.gz: d4ae42066070141132d248d9c76dcbb4b84c19b3c19a2c652e0bdcefb59517719ccbba0a120bd439a4b89f0f6425dc8df0a5f5f5cf9ed633ea8cb32b6e2f9975
+  metadata.gz: 9a5d92df6618d53f8be91ca71bdf6dfc6ff0b66279662a5690c6efaa162939f2ae4fe1868956427ff10a83fa77329c16c96af3faef9e2fa48e441f1478c91ed0
+  data.tar.gz: 6d485a661fe14b24811479615e125cb4bf2794808dd28b39c102e677b1a1e99a0f22807acbc75a728442764f521c498ffa884998e243dacad5ea9e4e4cd2ca19

data/lib/noticed/base.rb

@@ -81,6 +81,8 @@ module Noticed
     def run_delivery(recipient, enqueue: true)
       delivery_methods = self.class.delivery_methods.dup
 
+      self.recipient = recipient
+
       # Run database delivery inline first if it exists so other methods have access to the record
       if (index = delivery_methods.find_index { |m| m[:name] == :database })
         delivery_method = delivery_methods.delete_at(index)

data/lib/noticed/delivery_methods/ios.rb

@@ -9,7 +9,7 @@ module Noticed
         raise ArgumentError, "bundle_identifier is missing" if bundle_identifier.blank?
         raise ArgumentError, "key_id is missing" if key_id.blank?
         raise ArgumentError, "team_id is missing" if team_id.blank?
-        raise ArgumentError, "Could not find APN cert at '#{cert_path}'" unless File.exist?(cert_path)
+        raise ArgumentError, "Could not find APN cert at '#{cert_path}'" unless valid_cert_path?
 
         device_tokens.each do |device_token|
           connection_pool.with do |connection|
@@ -78,7 +78,7 @@ module Noticed
           end
         end
 
-        if options[:development]
+        if development?
           Apnotic::ConnectionPool.development(connection_pool_options, pool_options, &handler)
         else
           Apnotic::ConnectionPool.new(connection_pool_options, pool_options, &handler)
@@ -142,6 +142,25 @@ module Noticed
         end
       end
 
+      def development?
+        option = options[:development]
+        case option
+        when Symbol
+          !!notification.send(option)
+        else
+          !!option
+        end
+      end
+
+      def valid_cert_path?
+        case cert_path
+        when File, StringIO
+          cert_path.size > 0
+        else
+          File.exist?(cert_path)
+        end
+      end
+
       def pool_options
         {
           size: options.fetch(:pool_size, 5)

data/lib/noticed/model.rb

@@ -1,5 +1,13 @@
 module Noticed
   module Model
+    DATABASE_ERROR_CLASS_NAMES = lambda {
+      classes = [ActiveRecord::NoDatabaseError]
+      classes << ActiveRecord::ConnectionNotEstablished
+      classes << Mysql2::Error if defined?(::Mysql2)
+      classes << PG::ConnectionBad if defined?(::PG)
+      classes
+    }.call.freeze
+
     extend ActiveSupport::Concern
 
     included do
@@ -32,7 +40,9 @@ module Noticed
         else
           Noticed::TextCoder
         end
-      rescue ActiveRecord::NoDatabaseError
+      rescue *DATABASE_ERROR_CLASS_NAMES => _error
+        warn("Noticed was unable to bootstrap correctly as the database is unavailable.")
+
         Noticed::TextCoder
       end
     end

data/lib/noticed/version.rb

@@ -1,3 +1,3 @@
 module Noticed
-  VERSION = "1.5.1"
+  VERSION = "1.5.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: noticed
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.5
 platform: ruby
 authors:
 - Chris Oliver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-15 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails