Support mailers with args and kwargs

Closes #564 and closes #565

Author: excid3

docs/delivery_methods/email.md

@@ -8,6 +8,7 @@ deliver_by :email do |config|
   config.method = :receipt
   config.params = ->{ params }
   config.args = ->{ [1, 2, 3] }
+  config.kwargs = ->{ {body: "Hey there", subject: "Thanks for joining"} }
 
   # Enqueues a separate job for sending the email using deliver_later.
   # Deliveries already happen in jobs so this is typically unnecessary.
@@ -31,6 +32,12 @@ end
 
 - `args` - _Optional_
 
+  The arguments for the `method` if it uses **positional arguments** (eg: `def hello(a, b, c=1)`)
+
+- `kwargs` - _Optional_
+
+  The arguments for the `method` if it uses **keyword arguments** (eg: `def hello(a:, b:, c: 1)`)
+
 - `enqueue: false` - _Optional_
 
   Use `deliver_later` to queue email delivery with ActiveJob. This is `false` by default as each delivery method is already a separate job.

lib/noticed/delivery_methods/email.rb

@@ -7,7 +7,9 @@ def deliver
         mailer = fetch_constant(:mailer)
         email = evaluate_option(:method)
         args = evaluate_option(:args) || []
-        mail = mailer.with(params).public_send(email, *args)
+        kwargs = evaluate_option(:kwargs) || {}
+        mail = mailer.with(params).public_send(email, *args, **kwargs)
+
         (!!evaluate_option(:enqueue)) ? mail.deliver_later : mail.deliver_now
       end
 

test/delivery_methods/email_test.rb

@@ -8,7 +8,7 @@ class EmailTest < ActiveSupport::TestCase
     @notification = noticed_notifications(:one)
   end
 
-  test "sends email" do
+  test "sends email (with args)" do
     set_config(
       mailer: "UserMailer",
       method: "new_comment",
@@ -21,6 +21,76 @@ class EmailTest < ActiveSupport::TestCase
     end
   end
 
+  test "sends email (with kwargs)" do
+    set_config(
+      mailer: "UserMailer",
+      method: "greeting",
+      params: -> { {foo: :bar} },
+      kwargs: -> { {body: "Custom"} }
+    )
+
+    assert_emails(1) do
+      @delivery_method.deliver
+    end
+  end
+
+  test "sends email (with kwargs, replacing default argument)" do
+    set_config(
+      mailer: "UserMailer",
+      method: "greeting",
+      params: -> { {foo: :bar} },
+      kwargs: -> { {body: "Custom", subject: "Testing"} }
+    )
+
+    assert_emails(1) do
+      @delivery_method.deliver
+    end
+  end
+
+  test "raises the underlying ArgumentError if kwargs are missing" do
+    set_config(
+      mailer: "UserMailer",
+      method: "greeting",
+      params: -> { {foo: :bar} },
+      kwargs: -> { {baz: 123} }
+    )
+
+    error = assert_raises ArgumentError do
+      @delivery_method.deliver
+    end
+
+    assert_equal "missing keyword: :body", error.message
+  end
+
+  test "raises the underlying ArgumentError if unknown kwargs are given" do
+    set_config(
+      mailer: "UserMailer",
+      method: "greeting",
+      params: -> { {foo: :bar} },
+      kwargs: -> { {body: "Test", baz: 123} }
+    )
+
+    error = assert_raises ArgumentError do
+      @delivery_method.deliver
+    end
+
+    assert_equal "unknown keyword: :baz", error.message
+  end
+
+  test "accepts both args and kwargs" do
+    set_config(
+      mailer: "UserMailer",
+      method: "greeting",
+      params: -> { {foo: :bar} },
+      args: -> { ["hey"] },
+      kwargs: -> { {body: "Test"} }
+    )
+
+    assert_emails(1) do
+      @delivery_method.deliver
+    end
+  end
+
   test "enqueues email" do
     set_config(
       mailer: "UserMailer",

test/dummy/app/mailers/user_mailer.rb

@@ -3,6 +3,10 @@ def new_comment(*args)
     mail(body: "new comment")
   end
 
+  def greeting(message = "message", body:, subject: "Hello")
+    mail(body: body, subject: subject)
+  end
+
   def receipt
     mail(body: "receipt")
   end