Support passing keyword arguments to mailer plugin mail/sendmail clas…

…s methods

CHANGELOG

@@ -1,5 +1,7 @@
 === master
 
+* Support passing keyword arguments to mailer plugin mail/sendmail class methods (jeremyevans)
+
 * Improve performance when using :assume_fixed_locals render plugin option, when using compiled methods and freezing the app (jeremyevans)
 
 * Add part plugin, with a simpler (and better performing when using :assume_fixed_locals) method for rendering with locals (jeremyevans)

lib/roda/plugins/mailer.rb

@@ -151,13 +151,19 @@ def mail(path, *args)
             mail
           end
         end
+        # :nocov:
+        ruby2_keywords(:mail) if respond_to?(:ruby2_keywords, true)
+        # :nocov:
 
         # Calls +mail+ with given arguments and immediately sends the resulting mail.
         def sendmail(*args)
           if m = mail(*args)
             m.deliver
           end
         end
+        # :nocov:
+        ruby2_keywords(:sendmail) if respond_to?(:ruby2_keywords, true)
+        # :nocov:
       end
 
       module RequestMethods

spec/plugin/mailer_spec.rb

@@ -75,6 +75,23 @@ def deliveries
     app.sendmail('/bar', 1, 2).body.must_be :==, '["bar", 1, 2]'
   end
 
+  it "supports keywords arguments to mail/sendmail methods, yielding them to the route blocks" do
+    instance_eval(<<-'RUBY', __FILE__, __LINE__ + 1)
+      app(:mailer) do |r|
+        instance_exec(&setup_email)
+        r.mail "foo" do |*args, **kw|
+          "foo#{args.inspect}#{kw.to_a.inspect}"
+        end
+        r.mail :d do |*args, **kw|
+          [args, kw.to_a].inspect
+        end
+      end
+    RUBY
+
+    app.mail('/foo', 1, a: 2).body.must_be :==, 'foo[1][[:a, 2]]'
+    app.sendmail('/bar', 1, a: 2).body.must_be :==, '[["bar", 1], [[:a, 2]]]'
+  end if RUBY_VERSION >= "2"
+
   it "supports no_mail! method for skipping mailing" do
     app(:mailer) do |r|
       instance_exec(&setup_email)