noticed 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10b19f81b81ae5471493e73857b55fbb1086545cca11f58cd40935597a39b5a1
-  data.tar.gz: 6a3e5502295f8152f0d05b4150a7c272ec48595adb986c81112aea3d09fce891
+  metadata.gz: 5a62b2258520a1d287a6ab2ff9b73288e37ebd7d4b18994c0b13bcfb591e9440
+  data.tar.gz: ecf9a251b05942f6b32c3730b923d59e16e4eb9de169e361b1ce0cb2989750f1
 SHA512:
-  metadata.gz: ca14522f41fbbc56b6764fb818a7d283a49d94e31d1dfcddbe8042429612d6a7f41e42df53867bfc4175fd66fc7aa5079c116db3b62707b5f87ea884c5dd5a5f
-  data.tar.gz: c0b7e78c47afa9df9a642f18717aa15c9c37a1823110b05c9c6b82987f6de0791ca82437f4b7e552ced05c38274b16d90478b9af29999791c2bc66ddd29fe37b
+  metadata.gz: 75edf989bdb4bc2fd7ee445f2852107fdfd629696affeae51d7e3d407ebdd97669b5d11bf8bbc79d92c4dc22dfde7bddcdd528c6f52c0230e1b169ef716d95cb
+  data.tar.gz: d34cdd0a3e905188d6efe9852b1b199148e9b4e02e0677d446fbf48ab94fb98d6bc87bf9b7917280649b6182f5e7ef9e9d64af0cd43ef1db4ea45b23d4517225

data/README.md

@@ -51,6 +51,8 @@ Bulk delivery methods we support:
 [Watch Screencast](https://www.youtube.com/watch?v=SzX-aBEqnAc)
 
 ## 🚀 Installation
+Noticed requires Rails 7.1 or newer.
+
 Run the following command to add Noticed to your Gemfile:
 
 ```ruby
@@ -374,6 +376,20 @@ Each of these options are available for every delivery method (individual or bul
 * `config.if` — Intended for a lambda or method; runs after the `wait` if configured; cancels the delivery method if returns falsey
 * `config.unless`  — Intended for a lambda or method; runs after the `wait` if configured; cancels the delivery method if returns truthy
 
+Lambdas for `if` and `unless` are evaluated in the context of the Notification. A symbol calls a method on the Notifier and passes the notification:
+
+```ruby
+class MessageNotifier < Noticed::Event
+  deliver_by :email do |config|
+    config.if = :email_enabled?
+  end
+
+  def email_enabled?(notification)
+    notification.recipient.email_notifications?
+  end
+end
+```
+
 The following are evaluated in the context of the Notification so it can be customize to the recipient:
 
 * `config.wait` — (Should yield an `ActiveSupport::Duration`) Delays the job that runs this delivery method for the given duration of time

data/app/jobs/noticed/event_job.rb

@@ -6,11 +6,17 @@ module Noticed
         deliver_by.perform_later(event) if deliver_by.perform?(event)
       end
 
-      # Enqueue individual deliveries
-      event.notifications.each do |notification|
-        event.delivery_methods.each_value do |deliver_by|
-          deliver_by.perform_later(notification) if deliver_by.perform?(notification)
-        end
+      # Enqueue individual deliveries in batches so large recipient lists don't load into memory all at once
+      event.notifications.find_in_batches do |notifications|
+        ActiveJob.perform_all_later notifications.flat_map { |notification| delivery_jobs_for(event, notification) }
+      end
+    end
+
+    private
+
+    def delivery_jobs_for(event, notification)
+      event.delivery_methods.values.filter_map do |deliver_by|
+        deliver_by.job(notification) if deliver_by.perform?(notification)
       end
     end
   end

data/app/models/concerns/noticed/deliverable.rb

@@ -18,7 +18,7 @@ module Noticed
       end
 
       def bulk_deliver_by(name, options = {})
-        raise NameError, "#{name} has already been used for this Notifier." if bulk_delivery_methods.has_key?(name)
+        raise ArgumentError, "#{name} has already been used for this Notifier." if bulk_delivery_methods.has_key?(name)
 
         config = ActiveSupport::OrderedOptions.new.merge(options)
         yield config if block_given?
@@ -26,7 +26,7 @@ module Noticed
       end
 
       def deliver_by(name, options = {})
-        raise NameError, "#{name} has already been used for this Notifier." if delivery_methods.has_key?(name)
+        raise ArgumentError, "#{name} has already been used for this Notifier." if delivery_methods.has_key?(name)
 
         if name == :database
           Noticed.deprecator.warn <<-WARNING.squish
@@ -67,15 +67,17 @@ module Noticed
         if self < Ephemeral
           new(params: params)
         else
-          record = params.delete(:record)
-          new(params: params, record: record)
+          new(params: params.except(:record), record: params[:record])
         end
       end
 
       def deliver(recipients = nil, **options)
         new.deliver(recipients, **options)
       end
-      alias_method :deliver_later, :deliver
+
+      def deliver_later(...)
+        deliver(...)
+      end
     end
 
     # CommentNotifier.deliver(User.all)
@@ -96,16 +98,7 @@ module Noticed
         self.notifications_count = recipients_attributes.size
         save!
 
-        if Rails.gem_version >= Gem::Version.new("7.0.0.alpha1")
-          notifications.insert_all!(recipients_attributes, record_timestamps: true) if recipients_attributes.any?
-        else
-          time = Time.current
-          recipients_attributes.each do |attributes|
-            attributes[:created_at] = time
-            attributes[:updated_at] = time
-          end
-          notifications.insert_all!(recipients_attributes) if recipients_attributes.any?
-        end
+        notifications.insert_all!(recipients_attributes, record_timestamps: true) if recipients_attributes.any?
       end
 
       # Enqueue delivery job
@@ -113,14 +106,17 @@ module Noticed
 
       self
     end
-    alias_method :deliver_later, :deliver
+
+    def deliver_later(...)
+      deliver(...)
+    end
 
     def evaluate_recipients
       return unless _recipients
 
       if _recipients.respond_to?(:call, true)
         instance_exec(&_recipients)
-      elsif _recipients.is_a?(Symbol) && respond_to?(_recipients, true)
+      else
         send(_recipients)
       end
     end

data/app/models/concerns/noticed/notification_methods.rb

@@ -4,13 +4,15 @@ module Noticed
 
     class_methods do
       # Generate a Notification class each time a Notifier is defined
+      #
+      # Lookup must not inherit, otherwise a top-level ::Notification model in the host app would be used instead of Noticed::Notification
       def inherited(notifier)
         super
-        notifier.const_set :Notification, Class.new(const_defined?(:Notification) ? const_get(:Notification) : Noticed::Notification)
+        notifier.const_set :Notification, Class.new(const_defined?(:Notification, false) ? const_get(:Notification, false) : Noticed::Notification)
       end
 
       def notification_methods(&block)
-        const_get(:Notification).class_eval(&block)
+        const_get(:Notification, false).class_eval(&block)
       end
     end
   end

data/app/models/noticed/deliverable/deliver_by.rb

@@ -4,7 +4,7 @@ module Noticed
       attr_reader :name, :config, :bulk
 
       def initialize(name, config, bulk: false)
-        @name, @config, @bulk, = name, config, bulk
+        @name, @config, @bulk = name, config, bulk
       end
 
       def constant
@@ -14,16 +14,23 @@ module Noticed
 
       def validate!
         constant.required_option_names.each do |option|
-          raise ValidationError, "option `#{option}` must be set for `deliver_by :#{name}`" unless config[option].present?
+          raise ValidationError, "option `#{option}` must be set for `deliver_by :#{name}`" if config[option].nil?
         end
       end
 
+      # Builds the delivery job without enqueuing it, so jobs can be enqueued in bulk
+      def job(event_or_notification, options = {})
+        constant.new(name, event_or_notification).set(computed_options(options, event_or_notification))
+      end
+
       def perform_later(event_or_notification, options = {})
-        constant.set(computed_options(options, event_or_notification)).perform_later(name, event_or_notification)
+        job(event_or_notification, options).enqueue
       end
 
-      def ephemeral_perform_later(notifier, recipient, params, options = {})
-        constant.set(computed_options(options, recipient))
+      # Ephemeral notifiers aren't persisted, so the notifier name, recipient(s), and params are passed to the job instead.
+      # Options like `wait` are evaluated against `context` (the ephemeral Event or Notification), matching the persisted path.
+      def ephemeral_perform_later(notifier, recipient, params, options, context:)
+        constant.set(computed_options(options, context))
           .perform_later(name, "#{notifier}::Notification", recipient: recipient, params: params)
       end
 
@@ -52,11 +59,12 @@ module Noticed
 
       private
 
-      def computed_options(options, recipient)
-        options[:wait] ||= evaluate_option(:wait, recipient) if config.has_key?(:wait)
-        options[:wait_until] ||= evaluate_option(:wait_until, recipient) if config.has_key?(:wait_until)
-        options[:queue] ||= evaluate_option(:queue, recipient) if config.has_key?(:queue)
-        options[:priority] ||= evaluate_option(:priority, recipient) if config.has_key?(:priority)
+      def computed_options(options, context)
+        options = options.dup
+        options[:wait] ||= evaluate_option(:wait, context) if config.has_key?(:wait)
+        options[:wait_until] ||= evaluate_option(:wait_until, context) if config.has_key?(:wait_until)
+        options[:queue] ||= evaluate_option(:queue, context) if config.has_key?(:queue)
+        options[:priority] ||= evaluate_option(:priority, context) if config.has_key?(:priority)
         options
       end
     end

data/app/models/noticed/ephemeral.rb

@@ -6,7 +6,6 @@ module Noticed
     include Noticed::Translation
     include Rails.application.routes.url_helpers
 
-    attribute :record
     attribute :params, default: {}
 
     class Notification
@@ -27,27 +26,32 @@ module Noticed
       end
     end
 
-    # Dynamically define Notification on each Ephemeral Notifier
+    # Dynamically define Notification on each Ephemeral Notifier, inheriting from the parent Notifier's Notification
     def self.inherited(notifier)
       super
-      notifier.const_set :Notification, Class.new(Noticed::Ephemeral::Notification)
+      notifier.const_set :Notification, Class.new(const_defined?(:Notification, false) ? const_get(:Notification, false) : Noticed::Ephemeral::Notification)
     end
 
     def self.notification_methods(&block)
-      const_get(:Notification).class_eval(&block)
+      const_get(:Notification, false).class_eval(&block)
     end
 
-    def deliver(recipients = nil)
+    # EphemeralNotifier.with(message: "test").deliver(User.all, wait: 5.minutes)
+    def deliver(recipients = nil, **options)
       recipients ||= evaluate_recipients
       recipients = Array.wrap(recipients)
 
-      bulk_delivery_methods.each do |_, deliver_by|
-        deliver_by.ephemeral_perform_later(self.class.name, recipients, params)
+      validate!
+
+      bulk_delivery_methods.each_value do |deliver_by|
+        deliver_by.ephemeral_perform_later(self.class.name, recipients, params, options, context: self) if deliver_by.perform?(self)
       end
 
       recipients.each do |recipient|
-        delivery_methods.each do |_, deliver_by|
-          deliver_by.ephemeral_perform_later(self.class.name, recipient, params)
+        notification = self.class::Notification.new(recipient: recipient, event: self)
+
+        delivery_methods.each_value do |deliver_by|
+          deliver_by.ephemeral_perform_later(self.class.name, recipient, params, options, context: notification) if deliver_by.perform?(notification)
         end
       end
 

data/app/models/noticed/event.rb

@@ -8,20 +8,11 @@ module Noticed
     belongs_to :record, polymorphic: true, optional: true
     has_many :notifications, dependent: :delete_all
 
-    accepts_nested_attributes_for :notifications
-
     scope :newest_first, -> { order(created_at: :desc) }
 
     attribute :params, :json, default: {}
 
-    # Ephemeral notifiers cannot serialize params since they aren't ActiveRecord backed
-    if respond_to? :serialize
-      if Rails.gem_version >= Gem::Version.new("7.1.0.alpha")
-        serialize :params, coder: Coder
-      else
-        serialize :params, Coder
-      end
-    end
+    serialize :params, coder: Coder
   end
 end
 

data/lib/generators/noticed/install_generator.rb

@@ -2,11 +2,11 @@
 
 module Noticed
   module Generators
-    class ModelGenerator < Rails::Generators::Base
-      include Rails::Generators::ResourceHelpers
-
+    class InstallGenerator < Rails::Generators::Base
       source_root File.expand_path("../templates", __FILE__)
 
+      desc "Copies the Noticed migrations into your application."
+
       def create_migrations
         rails_command "railties:install:migrations FROM=noticed", inline: true
       end

data/lib/generators/noticed/templates/README

@@ -4,5 +4,5 @@
 Next steps:
 1. Run `rails db:migrate`
 2. Add `has_many :notifications, as: :recipient, dependent: :destroy, class_name: "Noticed::Notification"` to your User model(s).
-2. Add `has_many :notifications, as: :record, dependent: :destroy, class_name: "Noticed::Event"` to your model(s) that notifications reference.
-3. Generate notifiers with "rails g noticed:notifier"
+3. Add `has_many :notifications, as: :record, dependent: :destroy, class_name: "Noticed::Event"` to your model(s) that notifications reference.
+4. Generate notifiers with "rails g noticed:notifier"

data/lib/generators/noticed/templates/bulk_delivery_method.rb.tt

@@ -2,7 +2,7 @@ class BulkDeliveryMethods::<%= class_name %> < ApplicationBulkDeliveryMethod
   # To use this delivery method, specify the class option in your notifier.
   #
   #   class MyNotifer < ApplicationNotifier
-  #     bulk_deliver_by :<%= file_path %>, class: "<%= class_name %>"
+  #     bulk_deliver_by :<%= file_name %>, class: "BulkDeliveryMethods::<%= class_name %>"
   #   end
 
   # Specify required options for the deliver_by config block

data/lib/generators/noticed/templates/delivery_method.rb.tt

@@ -2,7 +2,7 @@ class DeliveryMethods::<%= class_name %> < ApplicationDeliveryMethod
   # To use this delivery method, specify the class option in your notifier.
   #
   #   class MyNotifer < ApplicationNotifier
-  #     deliver_by :<%= file_path %>, class: "<%= class_name %>"
+  #     deliver_by :<%= file_name %>, class: "DeliveryMethods::<%= class_name %>"
   #   end
 
   # Specify required options for the deliver_by config block

data/lib/noticed/api_client.rb

@@ -33,10 +33,10 @@ module Noticed
         request.body = body
       end
 
+      # Bodies aren't logged since they can contain credentials and access tokens
       logger.debug("POST #{url}")
-      logger.debug(request.body)
       response = http.request(request)
-      logger.debug("Response: #{response.code}: #{response.body.inspect}")
+      logger.debug("Response: #{response.code}")
 
       raise ResponseUnsuccessful.new(response, url, args) unless response.code.start_with?("20")
 

data/lib/noticed/bulk_delivery_method.rb

@@ -13,13 +13,10 @@ module Noticed
 
     def perform(delivery_method_name, event, recipient: nil, params: {}, overrides: {})
       # Ephemeral notifications
-      if event.is_a? String
-        @event = event.constantize.new_with_params(recipient, params)
-        @config = overrides
-      else
-        @event = event
-        @config = event.bulk_delivery_methods.fetch(delivery_method_name).config.merge(overrides)
-      end
+      @event = event.is_a?(String) ? event.constantize.new_with_params(recipient, params).event : event
+
+      # Look up config from Notifier and merge overrides
+      @config = @event.bulk_delivery_methods.fetch(delivery_method_name).config.merge(overrides)
 
       return false if config.has_key?(:if) && !evaluate_option(:if)
       return false if config.has_key?(:unless) && evaluate_option(:unless)
@@ -34,15 +31,15 @@ module Noticed
     end
 
     def fetch_constant(name)
-      option = config[name]
-      option.is_a?(String) ? option.constantize : evaluate_option(option)
+      option = evaluate_option(name)
+      option.is_a?(String) ? option.constantize : option
     end
 
     def evaluate_option(name)
       option = config[name]
 
       # Evaluate Proc within the context of the notifier
-      if option&.respond_to?(:call)
+      if option.respond_to?(:call)
         event.instance_exec(&option)
 
       # Call method if symbol and matching method

data/lib/noticed/bulk_delivery_methods/bluesky.rb

@@ -10,7 +10,6 @@ module Noticed
       # end
 
       def deliver
-        Rails.logger.debug(evaluate_option(:json))
         post_request(
           "https://#{host}/xrpc/com.atproto.repo.createRecord",
           headers: {"Authorization" => "Bearer #{token}"},

data/lib/noticed/bulk_delivery_methods/slack.rb

@@ -1,39 +1,7 @@
 module Noticed
   module BulkDeliveryMethods
     class Slack < BulkDeliveryMethod
-      DEFAULT_URL = "https://slack.com/api/chat.postMessage"
-
-      required_options :json
-
-      def deliver
-        headers = evaluate_option(:headers)
-        json = evaluate_option(:json)
-        response = post_request url, headers: headers, json: json
-
-        if raise_if_not_ok? && !success?(response)
-          raise ResponseUnsuccessful.new(response, url, {headers: headers, json: json})
-        end
-
-        response
-      end
-
-      def url
-        evaluate_option(:url) || DEFAULT_URL
-      end
-
-      def raise_if_not_ok?
-        value = evaluate_option(:raise_if_not_ok)
-        value.nil? || value
-      end
-
-      def success?(response)
-        if response.content_type == "application/json"
-          JSON.parse(response.body).dig("ok")
-        else
-          # https://api.slack.com/changelog/2016-05-17-changes-to-errors-for-incoming-webhooks
-          response.is_a?(Net::HTTPSuccess)
-        end
-      end
+      include SlackDelivery
     end
   end
 end

data/lib/noticed/bulk_delivery_methods/webhook.rb

@@ -1,19 +1,7 @@
 module Noticed
   module BulkDeliveryMethods
     class Webhook < BulkDeliveryMethod
-      required_options :url
-
-      def deliver
-        Rails.logger.debug(evaluate_option(:json))
-        post_request(
-          evaluate_option(:url),
-          basic_auth: evaluate_option(:basic_auth),
-          headers: evaluate_option(:headers),
-          json: evaluate_option(:json),
-          form: evaluate_option(:form),
-          body: evaluate_option(:body)
-        )
-      end
+      include WebhookDelivery
     end
   end
 end

data/lib/noticed/coder.rb

@@ -2,10 +2,16 @@ require "active_job/arguments"
 
 module Noticed
   class Coder
+    # Rails 8.2+ (globalid 1.4+) raises GlobalID::Locator::RecordNotFound for missing records
+    # instead of ActiveRecord::RecordNotFound
+    RECORD_NOT_FOUND_ERRORS = [ActiveRecord::RecordNotFound].tap do |errors|
+      errors << GlobalID::Locator::RecordNotFound if defined?(GlobalID::Locator::RecordNotFound)
+    end.freeze
+
     def self.load(data)
       return if data.nil?
       ActiveJob::Arguments.send(:deserialize_argument, data)
-    rescue ActiveRecord::RecordNotFound => error
+    rescue *RECORD_NOT_FOUND_ERRORS => error
       {noticed_error: error.message, original_params: data}
     end
 

data/lib/noticed/delivery_methods/action_push_native.rb

@@ -4,7 +4,7 @@ module Noticed
       required_options :devices, :format
 
       def deliver
-        notification = (!!evaluate_option(:silent)) ? notification_class.silent : notification_class
+        notification = evaluate_option(:silent) ? notification_class.silent : notification_class
 
         notification
           .with_apple(evaluate_option(:with_apple))
@@ -14,8 +14,9 @@ module Noticed
           .deliver_later_to(evaluate_option(:devices))
       end
 
+      # `notification_class` rather than `class` since `config.class` is reserved for overriding the delivery method
       def notification_class
-        fetch_constant(:class) || ApplicationPushNotification
+        fetch_constant(:notification_class) || ApplicationPushNotification
       end
     end
   end

data/lib/noticed/delivery_methods/discord.rb

@@ -1,6 +1,6 @@
 module Noticed
   module DeliveryMethods
-    class Discord < BulkDeliveryMethod
+    class Discord < DeliveryMethod
       required_options :json, :url
 
       def deliver

data/lib/noticed/delivery_methods/fcm.rb

@@ -34,8 +34,17 @@ module Noticed
         end
       end
 
+      # FCM returns 404 UNREGISTERED for tokens that are no longer valid. 400 INVALID_ARGUMENT is also
+      # returned for malformed payloads, so only treat it as a bad token when the error is about the token.
+      # https://firebase.google.com/docs/reference/fcm/rest/v1/ErrorCode
       def bad_token?(response)
-        response.code == "404" || response.code == "400"
+        response.code == "404" || (response.code == "400" && token_error?(response))
+      end
+
+      def token_error?(response)
+        JSON.parse(response.body).dig("error", "message").to_s.match?(/registration token/i)
+      rescue JSON::ParserError
+        false
       end
 
       def credentials
@@ -59,11 +68,14 @@ module Noticed
       end
 
       def access_token
+        @access_token ||= authorizer.fetch_access_token!["access_token"]
+      end
+
+      def authorizer
         @authorizer ||= (evaluate_option(:authorizer) || Google::Auth::ServiceAccountCredentials).make_creds(
           json_key_io: StringIO.new(credentials.to_json),
           scope: "https://www.googleapis.com/auth/firebase.messaging"
         )
-        @authorizer.fetch_access_token!["access_token"]
       end
     end
   end

data/lib/noticed/delivery_methods/ios.rb

@@ -3,29 +3,29 @@ require "apnotic"
 module Noticed
   module DeliveryMethods
     class Ios < DeliveryMethod
-      cattr_accessor :development_connection_pool, :production_connection_pool
-
       required_options :bundle_identifier, :key_id, :team_id, :apns_key, :device_tokens
 
+      # A connection is opened per delivery and closed afterwards. Long-lived connections
+      # get reset by Apple when idle, which stalls the next push for over a minute.
       def deliver
+        connection = new_connection
+
         evaluate_option(:device_tokens).each do |device_token|
           apn = Apnotic::Notification.new(device_token)
           format_notification(apn)
 
-          connection_pool = (!!evaluate_option(:development)) ? development_pool : production_pool
-          connection_pool.with do |connection|
-            response = connection.push(apn)
-            raise "Timeout sending iOS push notification" unless response
-            connection.close
+          response = connection.push(apn)
+          raise "Timeout sending iOS push notification" unless response
 
-            if bad_token?(response) && config[:invalid_token]
-              # Allow notification to cleanup invalid iOS device tokens
-              notification.instance_exec(device_token, &config[:invalid_token])
-            elsif !response.ok?
-              raise "Request failed #{response.body}"
-            end
+          if bad_token?(response) && config[:invalid_token]
+            # Allow notification to cleanup invalid iOS device tokens
+            notification.instance_exec(device_token, &config[:invalid_token])
+          elsif !response.ok?
+            raise "Request failed #{response.body}"
           end
         end
+      ensure
+        connection&.close
       end
 
       private
@@ -51,32 +51,16 @@ module Noticed
         response.status == "410" || (response.status == "400" && response.body["reason"] == "BadDeviceToken")
       end
 
-      def development_pool
-        self.class.development_connection_pool ||= new_connection_pool(development: true)
-      end
-
-      def production_pool
-        self.class.production_connection_pool ||= new_connection_pool(development: false)
-      end
-
-      def new_connection_pool(development:)
-        handler = proc do |connection|
-          connection.on(:error) do |exception|
-            Rails.logger.info "Apnotic exception raised: #{exception}"
-            if config[:error_handler].respond_to?(:call)
-              notification.instance_exec(exception, &config[:error_handler])
-            end
-          end
-        end
-
-        if development
-          Apnotic::ConnectionPool.development(connection_pool_options, pool_options, &handler)
-        else
-          Apnotic::ConnectionPool.new(connection_pool_options, pool_options, &handler)
+      def new_connection
+        connection = evaluate_option(:development) ? Apnotic::Connection.development(connection_options) : Apnotic::Connection.new(connection_options)
+        connection.on(:error) do |exception|
+          Rails.logger.info "Apnotic exception raised: #{exception}"
+          notification.instance_exec(exception, &config[:error_handler]) if config[:error_handler]
         end
+        connection
       end
 
-      def connection_pool_options
+      def connection_options
         {
           auth_method: :token,
           cert_path: StringIO.new(evaluate_option(:apns_key)),
@@ -84,10 +68,6 @@ module Noticed
           team_id: evaluate_option(:team_id)
         }
       end
-
-      def pool_options
-        {size: evaluate_option(:pool_size) || 5}
-      end
     end
   end
 end

data/lib/noticed/delivery_methods/slack.rb

@@ -1,39 +1,7 @@
 module Noticed
   module DeliveryMethods
     class Slack < DeliveryMethod
-      DEFAULT_URL = "https://slack.com/api/chat.postMessage"
-
-      required_options :json
-
-      def deliver
-        headers = evaluate_option(:headers)
-        json = evaluate_option(:json)
-        response = post_request url, headers: headers, json: json
-
-        if raise_if_not_ok? && !success?(response)
-          raise ResponseUnsuccessful.new(response, url, {headers: headers, json: json})
-        end
-
-        response
-      end
-
-      def url
-        evaluate_option(:url) || DEFAULT_URL
-      end
-
-      def raise_if_not_ok?
-        value = evaluate_option(:raise_if_not_ok)
-        value.nil? || value
-      end
-
-      def success?(response)
-        if response.content_type == "application/json"
-          JSON.parse(response.body).dig("ok")
-        else
-          # https://api.slack.com/changelog/2016-05-17-changes-to-errors-for-incoming-webhooks
-          response.is_a?(Net::HTTPSuccess)
-        end
-      end
+      include SlackDelivery
     end
   end
 end

data/lib/noticed/delivery_methods/webhook.rb

@@ -1,18 +1,7 @@
 module Noticed
   module DeliveryMethods
     class Webhook < DeliveryMethod
-      required_options :url
-
-      def deliver
-        post_request(
-          evaluate_option(:url),
-          basic_auth: evaluate_option(:basic_auth),
-          headers: evaluate_option(:headers),
-          json: evaluate_option(:json),
-          form: evaluate_option(:form),
-          body: evaluate_option(:body)
-        )
-      end
+      include WebhookDelivery
     end
   end
 end

data/lib/noticed/has_notifications.rb

@@ -5,7 +5,7 @@ module Noticed
     #
     #    class User < ApplicationRecord
     #      has_noticed_notifications
-    #      has_noticed_notifications param_name: :owner, destroy: false, model: "Notification"
+    #      has_noticed_notifications param_name: :owner, destroy: false, model_name: "Notification"
     #    end
     #
     #    @user.notifications_as_user
@@ -17,7 +17,7 @@ module Noticed
       def has_noticed_notifications(param_name: model_name.singular, **options)
         define_method :"notifications_as_#{param_name}" do
           model = options.fetch(:model_name, "Noticed::Event").constantize
-          case current_adapter
+          case model.connection_db_config.adapter
           when "postgresql", "postgis"
             model.where("params @> ?", Noticed::Coder.dump(param_name.to_sym => self).to_json)
           when "mysql2", "trilogy"
@@ -37,13 +37,5 @@ module Noticed
         end
       end
     end
-
-    def current_adapter
-      if ActiveRecord::Base.respond_to?(:connection_db_config)
-        ActiveRecord::Base.connection_db_config.adapter
-      else
-        ActiveRecord::Base.connection_config[:adapter]
-      end
-    end
   end
 end

data/lib/noticed/slack_delivery.rb

@@ -0,0 +1,42 @@
+module Noticed
+  # Shared between the individual and bulk Slack delivery methods
+  module SlackDelivery
+    extend ActiveSupport::Concern
+
+    DEFAULT_URL = "https://slack.com/api/chat.postMessage"
+
+    included do
+      required_options :json
+    end
+
+    def deliver
+      headers = evaluate_option(:headers)
+      json = evaluate_option(:json)
+      response = post_request url, headers: headers, json: json
+
+      if raise_if_not_ok? && !success?(response)
+        raise ResponseUnsuccessful.new(response, url, {headers: headers, json: json})
+      end
+
+      response
+    end
+
+    def url
+      evaluate_option(:url) || DEFAULT_URL
+    end
+
+    def raise_if_not_ok?
+      value = evaluate_option(:raise_if_not_ok)
+      value.nil? || value
+    end
+
+    def success?(response)
+      if response.content_type == "application/json"
+        JSON.parse(response.body).dig("ok")
+      else
+        # https://api.slack.com/changelog/2016-05-17-changes-to-errors-for-incoming-webhooks
+        response.is_a?(Net::HTTPSuccess)
+      end
+    end
+  end
+end

data/lib/noticed/translation.rb

@@ -12,11 +12,7 @@ module Noticed
     end
 
     def translate(key, **options)
-      if defined?(::ActiveSupport::HtmlSafeTranslation)
-        ActiveSupport::HtmlSafeTranslation.translate scope_translation_key(key), **options
-      else
-        I18n.translate scope_translation_key(key), **options
-      end
+      ActiveSupport::HtmlSafeTranslation.translate scope_translation_key(key), **options
     end
     alias_method :t, :translate
 

data/lib/noticed/version.rb

@@ -1,3 +1,3 @@
 module Noticed
-  VERSION = "3.0.0"
+  VERSION = "3.1.0"
 end

data/lib/noticed/webhook_delivery.rb

@@ -0,0 +1,21 @@
+module Noticed
+  # Shared between the individual and bulk Webhook delivery methods
+  module WebhookDelivery
+    extend ActiveSupport::Concern
+
+    included do
+      required_options :url
+    end
+
+    def deliver
+      post_request(
+        evaluate_option(:url),
+        basic_auth: evaluate_option(:basic_auth),
+        headers: evaluate_option(:headers),
+        json: evaluate_option(:json),
+        form: evaluate_option(:form),
+        body: evaluate_option(:body)
+      )
+    end
+  end
+end

data/lib/noticed.rb

@@ -14,7 +14,7 @@ module Noticed
   include ActiveSupport::Deprecation::DeprecatedConstantAccessor
 
   def self.deprecator # :nodoc:
-    @deprecator ||= ActiveSupport::Deprecation.new("3.0", "Noticed")
+    @deprecator ||= ActiveSupport::Deprecation.new("4.0", "Noticed")
   end
 
   deprecate_constant :Base, "Noticed::Event", deprecator: deprecator

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: noticed
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Chris Oliver
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
 description: Database, browser, realtime ActionCable, Email, SMS, Slack notifications,
   and more for Rails apps
 email:
@@ -82,12 +82,15 @@ files:
 - lib/noticed/has_notifications.rb
 - lib/noticed/notification_channel.rb
 - lib/noticed/required_options.rb
+- lib/noticed/slack_delivery.rb
 - lib/noticed/translation.rb
 - lib/noticed/version.rb
+- lib/noticed/webhook_delivery.rb
 homepage: https://github.com/excid3/noticed
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -102,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Notifications for Ruby on Rails applications
 test_files: []