Allow configuring delivery methods with a config block

lib/noticed/base.rb

@@ -16,7 +16,9 @@ class Base
 
     class << self
       def deliver_by(name, options = {})
-        delivery_methods.push(name: name, options: options)
+        config = ActiveSupport::OrderedOptions.new.merge(options)
+        yield config if block_given?
+        delivery_methods.push(name: name, options: config)
         define_model_callbacks(name)
       end
 
@@ -129,7 +131,7 @@ def run_delivery_method(delivery_method, recipient:, enqueue:, record:)
     end
 
     def delivery_method_for(name, options)
-      if options[:class]
+      if options.has_key? :class
         options[:class].constantize
       else
         "Noticed::DeliveryMethods::#{name.to_s.camelize}".constantize

lib/noticed/delivery_methods/database.rb

@@ -21,7 +21,11 @@ def association_name
 
       def attributes
         if (method = options[:format])
-          notification.send(method)
+          if method.respond_to?(:call)
+            notification.instance_eval &method
+          else
+            notification.send(method)
+          end
         else
           {
             type: notification.class.name,

test/dummy/app/notifications/comment_notification.rb

@@ -1,15 +1,22 @@
 class CommentNotification < Noticed::Base
-  deliver_by :database, format: :attributes_for_database
+  deliver_by :database do |config|
+    config.format = Proc.new do
+      {
+        account_id: 1,
+        type: self.class.name,
+        params: params
+      }
+    end
+  end
+
   deliver_by :action_cable
-  deliver_by :email, mailer: "UserMailer"
-  deliver_by :discord, class: "DiscordNotification"
 
-  def attributes_for_database
-    {
-      account_id: 1,
-      type: self.class.name,
-      params: params
-    }
+  deliver_by :email do |config|
+    config.mailer = "UserMailer"
+  end
+
+  deliver_by :discord do |config|
+    config.class = "DiscordNotification"
   end
 
   def url