mandrill_mailer 0.1.7 → 0.1.8

data/README.md

@@ -132,4 +132,7 @@ This would ensure that `course_url(course)` works as expected.
 
 The mailer and options passed to the `.test` method are yielded to the block.
 
-The `:email` option is the only required option, make sure to add at least this to your test object.
+The `:email` option is the only required option, make sure to add at least this to your test object.
+
+## TODO
+Either get rid of the mailchimp gem dependancy or hook into actionmailer like the mailchimp does to send normal emails.

data/lib/mandrill_mailer/template_mailer.rb

@@ -61,6 +61,10 @@ module MandrillMailer
     # include Rails.application.routes.url_helpers
     include ActionView::Helpers::NumberHelper
 
+
+    class InvalidEmail < StandardError; end
+    class InvalidMailerMethod < StandardError; end
+
     # Public: Defaults for the mailer. Currently the only option is from:
     #
     # options - The Hash options used to refine the selection (default: {}):
@@ -114,13 +118,13 @@ module MandrillMailer
     # Returns the duplicated String.
     def self.test(mailer_method, options={})
       unless options[:email]
-        raise Exception 'Please specify a :email option(email to send the test to)'
+        raise InvalidEmail.new 'Please specify a :email option(email to send the test to)'
       end
 
       if @@mailer_methods[mailer_method]
         @@mailer_methods[mailer_method].call(self.new, options)
       else
-        raise Exception "The mailer method: #{mailer_method} does not have test setup"
+        raise InvalidMailerMethod.new "The mailer method: #{mailer_method} does not have test setup"
       end
 
     end
@@ -240,7 +244,8 @@ module MandrillMailer
           end
         end
       else
-        Rails.application.routes.url_helpers.method(method).call(*args, host: MandrillMailer.config.default_url_options[:host])
+        options = args.extract_options!.merge({host: MandrillMailer.config.default_url_options[:host]})
+        Rails.application.routes.url_helpers.method(method).call(options)
       end
     end
 

data/lib/mandrill_mailer/version.rb

@@ -1,3 +1,3 @@
 module MandrillMailer
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mandrill_mailer
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport