noticed 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70482becaedf2461851b7c9f8f0afd9c37a2c4caa9c2d5622cf007b212988730
-  data.tar.gz: '023579ed0635603e27fe99473bb77b17bda4bce7a0ac9ad0533179a6570693c3'
+  metadata.gz: 6c98658561b5afec24269bdf1f1a8217b000dcf4db2abb5007319833141edbd9
+  data.tar.gz: 99503d35717b87ae0cdad18d475bba9715ecaa4b84fbec49ee3be94237388c45
 SHA512:
-  metadata.gz: 923f424527ae03b0a9cb24d3fc83f59b9b7d914d7b0f53db928cc9d12b6757ee20fa1a7b810735d2a1657f7ee8a5b7efdee03d69de5b73c8fa31dae6c5400dd0
-  data.tar.gz: 2fd06825b9afabd447c867b54c8e31207b7c180d32a5f1ff341b543cf90d1cf9f4a1b65d398e230789e51d9b40cce42e3ebd04611f5970e520e9086e3eeae85f
+  metadata.gz: 7a85e749ddd781f5296cee3a891ed7a928e2c2051c80b44375509e4d39741e3e251a3a23665e623070f8f4a1beae9340cf696f9be1f1f1f6bc97363825ad2ed7
+  data.tar.gz: 71ed6f70d6770bc47f733ff290cdf0aecdae8083438707f018d6a0f215ec2fa104d97382e9f8faefe51db3662158da675f0c74ee11c188aad0e4c5380d83938e

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

@@ -6,17 +6,7 @@ module Noticed
       class_attribute :bulk_delivery_methods, instance_writer: false, default: {}
       class_attribute :delivery_methods, instance_writer: false, default: {}
       class_attribute :required_param_names, instance_writer: false, default: []
-
-      attribute :params, 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
+      class_attribute :_recipients, instance_writer: false
     end
 
     class_methods do
@@ -50,6 +40,10 @@ module Noticed
         delivery_methods[name] = DeliverBy.new(name, config)
       end
 
+      def recipients(option = nil, &block)
+        self._recipients = block || option
+      end
+
       def required_params(*names)
         required_param_names.concat names
       end
@@ -90,6 +84,8 @@ module Noticed
     # CommentNotifier.deliver(User.all, wait: 5.minutes)
     # CommentNotifier.deliver(User.all, wait_until: 1.hour.from_now)
     def deliver(recipients = nil, enqueue_job: true, **options)
+      recipients ||= evaluate_recipients
+
       validate!
 
       transaction do
@@ -119,6 +115,16 @@ module Noticed
     end
     alias_method :deliver_later, :deliver
 
+    def evaluate_recipients
+      return unless _recipients
+
+      if _recipients.respond_to?(:call)
+        instance_exec(&_recipients)
+      elsif _recipients.is_a?(Symbol) && respond_to?(_recipients)
+        send(_recipients)
+      end
+    end
+
     def recipient_attributes_for(recipient)
       {
         type: "#{self.class.name}::Notification",

data/app/models/noticed/event.rb

@@ -11,5 +11,16 @@ module Noticed
     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
   end
 end

data/lib/generators/noticed/notifier_generator.rb

@@ -13,8 +13,12 @@ module Noticed
 
       desc "Generates a notification with the given NAME."
 
-      def generate_notification
+      def generate_abstract_class
+        return if File.exist?("app/notifiers/application_notifier.rb")
         template "application_notifier.rb", "app/notifiers/application_notifier.rb"
+      end
+
+      def generate_notification
         template "notifier.rb", "app/notifiers/#{file_path}_notifier.rb"
       end
 

data/lib/noticed/delivery_methods/email.rb

@@ -7,7 +7,7 @@ module Noticed
         mailer = fetch_constant(:mailer)
         email = evaluate_option(:method)
         args = evaluate_option(:args) || []
-        mail = mailer.with(params).send(email, *args)
+        mail = mailer.with(params).public_send(email, *args)
         (!!evaluate_option(:enqueue)) ? mail.deliver_later : mail.deliver_now
       end
 

data/lib/noticed/version.rb

@@ -1,3 +1,3 @@
 module Noticed
-  VERSION = "2.3.0"
+  VERSION = "2.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: noticed
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Chris Oliver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-23 00:00:00.000000000 Z
+date: 2024-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.10
+rubygems_version: 3.5.14
 signing_key:
 specification_version: 4
 summary: Notifications for Ruby on Rails applications