merb-mailer 0.9.3 → 0.9.4

data/README.textile

@@ -0,0 +1,282 @@
+h2. Overview.
+
+A plugin for the Merb framework that allows you to send email from Merb application.
+It separates email composition and sending into micro MVC: you may have mail controllers
+that compose complex emails, emails have their own views and models (models use MailFactory
+library and non-persistable).
+
+
+h2. Installation.
+
+(sudo) gem install merb-mailer
+
+It will install "mailfactory":http://mailfactory.rubyforge.org/ gem and "mime-types":http://mime-types.rubyforge.org/ that mailfactory depends on.
+
+
+h2. Configuration.
+
+In init.rb, include a dependency on 'merb-mailer'.With versions of Merb earlier than 0.9.3 Merb::Mailer may raise a NameError when configuration is put into
+after_app_loads block. Put it to the very end of your init file and it should work. This problem does not exist in Git HEAD.
+
+
+h3. Using SMTP.
+
+<pre><code class="ruby">
+  Merb::Mailer.config = {
+    :host   => 'smtp.yourserver.com',
+    :port   => '25',
+    :user   => 'user',
+    :pass   => 'pass',
+    :auth   => :plain # :plain, :login, :cram_md5, the default is no auth
+    :domain => "localhost.localdomain" # the HELO domain provided by the client to the server
+  }
+</code></pre>  
+
+  
+h3. Using Gmail SMTP.
+
+Configuration example for Gmail SMTP:
+
+<pre><code class="ruby">
+Merb::Mailer.config = {
+  :host   => 'smtp.gmail.com',
+  :port   => '587',
+  :user   => 'user@gmail.com',
+  :pass   => 'pass',
+  :auth   => :plain
+}
+</code></pre>  
+
+* require "smtp_tls":http://www.rubyinside.com/how-to-use-gmails-smtp-server-with-rails-394.html
+* Use :text option instead of :body when deliver.
+
+<pre><code class="ruby">
+m = Merb::Mailer.new :to      => 'foo@bar.com',
+                     :from    => 'bar@foo.com',
+                     :subject => 'Welcome to whatever!',
+                     :text    => partial(:sometemplate)
+m.deliver!
+</code></pre>
+
+h3. Using Sendmail.
+
+  Merb::Mailer.config = {:sendmail_path => '/somewhere/odd'}
+  Merb::Mailer.delivery_method = :sendmail
+
+
+
+h2. Sending mail from controllers.
+
+Merb mailer plugin has idea of separation of mailer logic from mailer templates
+to the point mailers in Merb have own tiny MVC architecture for emails.
+Your application controllers usually delegate email sending to mail controllers
+instead of doing it on their own.
+
+To send your mail using mail controller you use send_mail method that
+takes mail controller class, action name, mail parameters and action parameters.
+params hash with action parameters mentioned above is accessible in mail controller's
+action.
+
+<pre>
+<code class="ruby">
+def send_activation_email(person)
+	send_mail PeopleMailer, :activation, {
+		:from => "no-reply@example.com",
+		:to => person.email,
+		:subject => "Please activate your account"
+	}, {
+		:name => person.name
+	}
+end
+</code>
+</pre>
+
+Mail parameters you can specify:
+
+* :to
+* :from
+* :replyto
+* :subject
+* :body
+* :cc
+
+
+Example of Merb controller:
+<pre>
+<code class="ruby">
+class ProductDeliveryMailer < Merb::MailController
+  def notify_on_delivery
+	  @delivery_info = params[:details]
+		# you can access @delivery_info in rendered template
+    render_mail
+  end  
+end
+</code>
+</pre>
+
+Mail templates are kept under app/views/mail controller name/template name just like with regular controllers.
+Content types in template name may be either text or html, like in
+app/mailers/views/user_mailer/hello.text.erb for the mailer controller above:
+
+<pre>
+Hello <%= params[:name] %>
+</pre>
+
+render_mail works similarly to render method. It takes either action as Symbol or Hash of
+template paths. Most of the times naming templates the same as your actions works so you
+can just use
+
+<pre>
+<code class="ruby">
+class ResourceShortageMailer < Merb::MailController
+  def notify_on_disk_space_shortage
+    render_mail
+  end  
+end
+</code>
+</pre>
+
+and it will render app/mailers/views/resource_shortage_mailer/notify_on_disk_space_shortage.text.erb.
+
+If you need to specify template path explicitly, you can do it for both text and html:
+
+<pre>
+<code class="ruby">
+class ResourceShortageMailer < Merb::MailController
+  def notify_on_disk_space_shortage
+    render_mail :action => { :html => :hdd_space_shortage_detailed, :text => :hdd_space_shortage }
+  end  
+end
+</code>
+</pre>
+
+This will look for app/mailers/views/resource_shortage_mailer/hdd_space_shortage_detailed.html.erb for
+html and app/mailers/views/resource_shortage_mailer/hdd_space_shortage.text.erb for text.
+
+See "render_mail documentation":http://merbivore.com/documentation/merb-more/0.9.3/merb-mailer/index.html?a=M000019&name=render_mail
+for more examples, this method has a lot of options how you can use it.
+
+
+
+h2. Using Merb mailer to send emails outside of controllers.
+
+There are two ways of sending email with merb-mailer: using mail controllers and using just Merb::Mailer.
+Here is example of using Merb::Mailer to deliver emails from model hook.
+
+class Person
+	include DataMapper::Resource
+
+	after :create, :deliver_activation_notification
+
+  protected
+  
+  def deliver_activation_notification
+	  body_string = <<-EOS
+		  Please activate your account...
+		EOS
+	
+	  Merb::Mailer.new(
+		  :from    => "no-reply@webapp.com",
+			:to      => self.email,
+			:subject => "Activate your account",
+			:body    => body_string
+		).deliver!
+  end
+end
+
+In this example we deliver signup activation email from model hook.
+Keep in mind that Merb::Mailer is a thin wrapper around MailFactory that
+provides several ways of sending emails. You can access plain text email body
+with text method of mailer and html body with html method, respectively.
+
+
+
+h2. Testing mailers.
+
+A word of warning: merb-mailer does not raise exceptions when your template is not found.
+So if nothing gets rendered, check merb test environment log to make sure you have no
+warnings. If it is considered a bug, file a ticket to LightHouse.
+
+Make sure you use test sending method so emails won't be sent on each tests run.
+Add this line to your test file:
+
+<pre>
+<code class="ruby">
+Merb::Mailer.delivery_method = :test_send
+</code>
+</pre>
+
+Here is an example of helper to test mailers themselves:
+<pre>
+<code class="ruby">
+def describe_mail(mailer, template, &block)
+  describe "/#{mailer.to_s.downcase}/#{template}" do
+    before :each do
+      @mailer_class, @template = mailer, template
+      @assigns = {}
+    end
+
+    def deliver(send_params={}, mail_params={})
+      mail_params = {:from => "from@example.com", :to => "to@example.com", :subject => "Please activate your account"}.merge(mail_params)
+      @mailer_class.new(send_params).dispatch_and_deliver @template.to_sym, mail_params
+      @mail = Merb::Mailer.deliveries.last
+    end
+
+    instance_eval &block
+  end
+end
+</code>
+</pre>
+
+Mailer controller specs may look like this then:
+<pre>
+<code class="ruby">
+require File.join(File.dirname(__FILE__),'..','spec_helper')
+
+describe_mail UserMailer, :hello do
+  it "sends activation" do
+    deliver :name => "Jamie"
+    @mail.text.should == "Please activate your account, Jamie"
+  end
+end
+</code>
+</pre>
+
+Most of mail controller specs verify delivered email headers like
+to, subject or body. To access deliveries you use Merb::Mailer.deliveries
+array.
+
+It is recommended to clear it on test setup first:
+
+<pre>
+<code class="ruby">
+require File.join(File.dirname(__FILE__),'..','spec_helper')
+
+describe_mail UserMailer, :hello do
+  before :each do
+    Merb::Mailer.deliveries.clear
+	end
+end
+</code>
+</pre>
+
+To do actual matching you can create a helper like this:
+
+<pre>
+<code class="ruby">
+def last_delivered_email
+  Merb::Mailer.deliveries.last
+end
+</code>
+</pre>
+
+and use it like this:
+
+<pre>
+<code class="ruby">
+last_delivered_email.from.first.should == "no-reply@webapp.com"
+</code>
+</pre>
+
+Note that MailFactory that is used by merb-mailer under the covers returns headers
+as Arrays. This is why we used from.first in example above.

data/Rakefile

@@ -1,50 +1,62 @@
 require 'rubygems'
 require 'rake/gempackagetask'
+require "extlib"
+require 'merb-core/tasks/merb_rake_helper'
 require "spec/rake/spectask"
 
-PLUGIN = "merb-mailer"
-NAME = "merb-mailer"
-VERSION = "0.9.3"
-AUTHOR = "Yehuda Katz"
-EMAIL = "wycats@gmail.com"
-HOMEPAGE = "http://merb-plugins.rubyforge.org/merb-mailer/"
-SUMMARY = "Merb plugin that provides mailer functionality to Merb"
+##############################################################################
+# Package && release
+##############################################################################
+RUBY_FORGE_PROJECT  = "merb"
+PROJECT_URL         = "http://merbivore.com"
+PROJECT_SUMMARY     = "Merb plugin that provides mailer functionality to Merb"
+PROJECT_DESCRIPTION = PROJECT_SUMMARY
+
+GEM_AUTHOR = "Yehuda Katz"
+GEM_EMAIL  = "ykatz@engineyard.com"
+
+GEM_NAME    = "merb-mailer"
+PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
+GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.4") + PKG_BUILD
+
+RELEASE_NAME    = "REL #{GEM_VERSION}"
+
+require "extlib/tasks/release"
 
 spec = Gem::Specification.new do |s|
-  s.name = NAME
-  s.version = VERSION
+  s.rubyforge_project = RUBY_FORGE_PROJECT
+  s.name = GEM_NAME
+  s.version = GEM_VERSION
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
-  s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  s.add_dependency('merb-core', '>= 0.9.3')
-  s.add_dependency("mailfactory", ">= 1.2.3")
+  s.extra_rdoc_files = ["README.textile", "LICENSE", 'TODO']
+  s.summary = PROJECT_SUMMARY
+  s.description = PROJECT_DESCRIPTION
+  s.author = GEM_AUTHOR
+  s.email = GEM_EMAIL
+  s.homepage = PROJECT_URL
+  s.add_dependency('merb-core', '>= 0.9.4')
+  s.add_dependency('mailfactory', '>= 1.2.3')
   s.require_path = 'lib'
-  s.autorequire = PLUGIN
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
+  s.files = %w(LICENSE README.textile Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
-install_home = ENV['GEM_HOME'] ? "-i #{ENV['GEM_HOME']}" : ""
-
+desc "Install the gem"
 task :install => [:package] do
-  sh %{sudo gem install #{install_home} pkg/#{NAME}-#{VERSION} --no-update-sources}
+  sh %{#{sudo} gem install #{install_home} pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources}
 end
 
 namespace :jruby do
 
   desc "Run :package and install the resulting .gem with jruby"
   task :install => :package do
-    sh %{#{SUDO} jruby -S gem install #{install_home} pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri}
+    sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{GEM_NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
   end
-  
+
 end
 
 desc "Run all specs"

data/lib/generators/mailer_generator.rb

@@ -0,0 +1,34 @@
+module Merb::Generators
+  class MailerGenerator < NamespacedGenerator
+ 
+    def self.source_root
+      File.dirname(__FILE__) / 'templates' / 'mailer'
+    end
+    
+    desc <<-DESC
+      Generates a mailer
+    DESC
+    
+    option :testing_framework, :desc => 'Testing framework to use (one of: spec, test_unit)'
+    
+    first_argument :name, :required => true, :desc => "mailer name"
+    
+    template :mailer do
+      source('app/mailers/%file_name%_mailer.rb')
+      destination("app/mailers", base_path, "#{file_name}_mailer.rb")
+    end
+    
+    template :notify_on_event do
+      source('app/mailers/views/%file_name%_mailer/notify_on_event.text.erb')
+      destination("app/mailers/views", base_path, "#{file_name}_mailer/notify_on_event.text.erb")
+    end
+    
+    template :controller_spec, :testing_framework => :rspec do
+      source('spec/mailers/%file_name%_mailer_spec.rb')
+      destination("spec/mailers", base_path, "#{file_name}_mailer_spec.rb")
+    end
+ 
+  end
+ 
+  add :mailer, MailerGenerator
+end

data/lib/generators/templates/mailer/app/mailers/%file_name%_mailer.rb

@@ -0,0 +1,11 @@
+<% with_modules(modules) do -%>
+class <%= class_name %>Mailer < Merb::MailController
+
+  def notify_on_event
+    # use params[] passed to this controller to get data
+    # read more at http://wiki.merbivore.com/pages/mailers
+    render_mail
+  end
+  
+end
+<% end -%>

data/lib/generators/templates/mailer/app/mailers/views/%file_name%_mailer/notify_on_event.text.erb

@@ -0,0 +1 @@
+Sample template for plain text email.

data/lib/generators/templates/mailer/spec/mailers/%file_name%_mailer_spec.rb

@@ -0,0 +1,39 @@
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+# Move this to your spec_helper.rb.
+module MailControllerTestHelper
+  # Helper to clear mail deliveries.
+  def clear_mail_deliveries
+    Merb::Mailer.deliveries.clear
+  end
+
+  # Helper to access last delivered mail.
+  # In test mode merb-mailer puts email to
+  # collection accessible as Merb::Mailer.deliveries.
+  def last_delivered_mail
+    Merb::Mailer.deliveries.last
+  end
+
+  # Helper to deliver
+  def deliver(action, mail_params = {}, send_params = {})
+    <%= class_name %>Mailer.dispatch_and_deliver(action, { :from => "no-reply@webapp.com", :to => "recepient@person.com" }.merge(mail_params), send_params)
+    @delivery = last_delivered_mail
+  end
+end
+
+describe <%= class_name %>Mailer, "#notify_on_event email template" do
+  include MailControllerTestHelper
+  
+  before :each do
+    clear_mail_deliveries
+    
+    # instantiate some fixture objects
+  end
+    
+  it "includes welcome phrase in email text" do
+    violated "Mailer controller deserves to have specs, too."
+    
+    # <%= class_name %>Mailer.dispatch_and_deliver(:notify_on_event, {}, { :name => "merb-mailer user" })
+    # last_delivered_mail.text.should =~ /Hello, merb-mailer user!/
+  end
+end

data/lib/merb-mailer.rb

@@ -1,3 +1,6 @@
 require "merb-mailer/mailer"
 require "merb-mailer/mail_controller"
-require "merb-mailer/merb_controller"
+require "merb-mailer/mailer_mixin"
+
+Merb::Controller.send(:include, Merb::MailerMixin)
+Merb.add_generators(File.join(File.dirname(__FILE__), 'generators', 'mailer_generator'))

data/lib/merb-mailer/mail_controller.rb

@@ -71,6 +71,13 @@ module Merb
     attr_accessor :params, :mailer, :mail
     attr_reader   :session, :base_controller
 
+    cattr_accessor :_subclasses
+    self._subclasses = Set.new
+
+    # ==== Returns
+    # Array[Class]:: Classes that inherit from Merb::MailController.
+    def self.subclasses_list() _subclasses end
+
     # ==== Parameters
     # action<~to_s>:: The name of the action that will be rendered.
     # type<~to_s>::
@@ -84,6 +91,23 @@ module Merb
     def _template_location(action, type = nil, controller = controller_name)
       "#{controller}/#{action}.#{type}"
     end
+    
+    # The location to look for a template and mime-type. This is overridden 
+    # from AbstractController, which defines a version of this that does not 
+    # involve mime-types.
+    #
+    # ==== Parameters
+    # template<String>:: 
+    #    The absolute path to a template - without mime and template extension.
+    #    The mime-type extension is optional - it will be appended from the 
+    #    current content type if it hasn't been added already.
+    # type<~to_s>::
+    #    The mime-type of the template that will be rendered. Defaults to nil.
+    #
+    # @public
+    def _absolute_template_location(template, type)
+      template.match(/\.#{type.to_s.escape_regexp}$/) ? template : "#{template}.#{type}"
+    end
 
     # ==== Parameters
     # params<Hash>:: Configuration parameters for the MailController.
@@ -102,7 +126,7 @@ module Merb
     #   The Merb::MailController inheriting from the base class.  
     def self.inherited(klass)
       super
-      klass.class_eval %{self._template_root = Merb.dir_for(:mailer) / "views"}
+      klass._template_root = Merb.dir_for(:mailer) / "views" unless self._template_root
     end
 
     # Override filters halted to return nothing.

data/lib/merb-mailer/mailer.rb

@@ -3,7 +3,7 @@ begin
   require 'net/smtp'
 rescue LoadError
   Merb.logger.warn "You need to install the mailfactory gem to use Merb::Mailer"
-end  
+end
 
 class MailFactory
   attr_reader :html, :text
@@ -16,27 +16,29 @@ module Merb
   #
   #   Merb::Mailer.config = {
   #     :host   => 'smtp.yourserver.com',
-  #     :port   => '25',              
+  #     :port   => '25',
   #     :user   => 'user',
   #     :pass   => 'pass',
   #     :auth   => :plain # :plain, :login, :cram_md5, the default is no auth
-  #     :domain => "localhost.localdomain" # the HELO domain provided by the client to the server 
+  #     :domain => "localhost.localdomain" # the HELO domain provided by the client to the server
   #   }
-  # 
- 	#   or 
- 	# 
- 	#   Merb::Mailer.config = {:sendmail_path => '/somewhere/odd'}
+  #
+  #   or
+  #
+  #   Merb::Mailer.config = {:sendmail_path => '/somewhere/odd'}
   #   Merb::Mailer.delivery_method = :sendmail
   #
   # You could send mail manually like this (but it's better to use
   # a MailController instead).
-  # 
+  #
   #   m = Merb::Mailer.new :to => 'foo@bar.com',
   #                        :from => 'bar@foo.com',
   #                        :subject => 'Welcome to whatever!',
-  #                        :body => partial(:sometemplate)
-  #   m.deliver!                     
-
+  #                        :html => partial(:sometemplate)
+  #   m.deliver!
+  #
+  # You can use :text option to specify plain text email body
+  # and :html for HTML email body.
   class Mailer
 
     class_inheritable_accessor :config, :delivery_method, :deliveries
@@ -45,14 +47,14 @@ module Merb
 
     # Sends the mail using sendmail.
     def sendmail
-      sendmail = IO.popen("#{config[:sendmail_path]} #{@mail.to}", 'w+') 
+      sendmail = IO.popen("#{config[:sendmail_path]} #{@mail.to}", 'w+')
       sendmail.puts @mail.to_s
       sendmail.close
     end
 
     # Sends the mail using SMTP.
     def net_smtp
-      Net::SMTP.start(config[:host], config[:port].to_i, config[:domain], 
+      Net::SMTP.start(config[:host], config[:port].to_i, config[:domain],
                       config[:user], config[:pass], config[:auth]) { |smtp|
         smtp.send_message(@mail.to_s, @mail.from.first, @mail.to.to_s.split(/[,;]/))
       }
@@ -80,7 +82,7 @@ module Merb
     # ==== Raises
     # ArgumentError::
     #   file_or_files was not a File or an Array of File instances.
-    def attach(file_or_files, filename = file_or_files.is_a?(File) ? File.basename(file_or_files.path) : nil, 
+    def attach(file_or_files, filename = file_or_files.is_a?(File) ? File.basename(file_or_files.path) : nil,
       type = nil, headers = nil)
       if file_or_files.is_a?(Array)
         file_or_files.each {|k,v| @mail.add_attachment_as k, *v}
@@ -89,16 +91,16 @@ module Merb
         @mail.add_attachment_as(file_or_files, filename, type, headers)
       end
     end
-      
+
     # ==== Parameters
     # o<Hash{~to_s => Object}>:: Configuration commands to send to MailFactory.
     def initialize(o={})
-      self.config = {:sendmail_path => '/usr/sbin/sendmail'} if config.nil? 
+      self.config = {:sendmail_path => '/usr/sbin/sendmail'} if config.nil?
       o[:rawhtml] = o.delete(:html)
       m = MailFactory.new()
       o.each { |k,v| m.send "#{k}=", v }
       @mail = m
     end
-    
+
   end
 end

data/lib/merb-mailer/mailer_mixin.rb

@@ -0,0 +1,25 @@
+module Merb
+  module MailerMixin
+    
+    # Sends mail via a MailController (a tutorial can be found in the
+    # MailController docs).
+    #
+    # ==== Parameters
+    # klass<Class>:: The mailer class.
+    # method<~to_s>:: The method to call on the mailer.
+    # mail_params<Hash>::
+    #   Mailing parameters, e.g. :to and :cc. See
+    #   Merb::MailController#dispatch_and_deliver for details.
+    # send_params<Hash>::
+    #   Params to send to the mailer. Defaults to the params of the current
+    #   controller.
+    #
+    # ==== Examples
+    #   # Send an email via the FooMailer's bar method.
+    #   send_mail FooMailer, :bar, :from => "foo@bar.com", :to => "baz@bat.com"
+    def send_mail(klass, method, mail_params, send_params = nil)
+      klass.new(send_params || params, self).dispatch_and_deliver(method, mail_params)
+    end
+      
+  end
+end

data/spec/mailer_generator_spec.rb

@@ -0,0 +1,2 @@
+require 'merb-gen'
+require 'generators/mailer_generator'

data/spec/mailer_spec.rb

@@ -34,7 +34,7 @@ describe "a merb mailer" do
     delivery = TestMailer.deliveries.last
     delivery.to.should include("test@test.com")
     delivery.from.should include("foo@bar.com")
-    delivery.subject.should include("Test Subject")
+    delivery.subject.should include("=?utf-8?Q?Test_Subject=?=")
     delivery.body.should include("Test")
   end
   

metadata

@@ -1,28 +1,30 @@
 --- !ruby/object:Gem::Specification 
 name: merb-mailer
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Yehuda Katz
-autorequire: merb-mailer
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-05-04 00:00:00 -05:00
+date: 2008-08-13 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: merb-core
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: mailfactory
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -31,26 +33,40 @@ dependencies:
         version: 1.2.3
     version: 
 description: Merb plugin that provides mailer functionality to Merb
-email: wycats@gmail.com
+email: ykatz@engineyard.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.textile
 - LICENSE
 - TODO
 files: 
 - LICENSE
-- README
+- README.textile
 - Rakefile
 - TODO
+- lib/generators
+- lib/generators/mailer_generator.rb
+- lib/generators/templates
+- lib/generators/templates/mailer
+- lib/generators/templates/mailer/app
+- lib/generators/templates/mailer/app/mailers
+- lib/generators/templates/mailer/app/mailers/%file_name%_mailer.rb
+- lib/generators/templates/mailer/app/mailers/views
+- lib/generators/templates/mailer/app/mailers/views/%file_name%_mailer
+- lib/generators/templates/mailer/app/mailers/views/%file_name%_mailer/notify_on_event.text.erb
+- lib/generators/templates/mailer/spec
+- lib/generators/templates/mailer/spec/mailers
+- lib/generators/templates/mailer/spec/mailers/%file_name%_mailer_spec.rb
 - lib/merb-mailer
 - lib/merb-mailer/mail_controller.rb
 - lib/merb-mailer/mailer.rb
-- lib/merb-mailer/merb_controller.rb
+- lib/merb-mailer/mailer_mixin.rb
 - lib/merb-mailer.rb
 - spec/mail_controller_spec.rb
+- spec/mailer_generator_spec.rb
 - spec/mailer_spec.rb
 - spec/mailers
 - spec/mailers/views
@@ -68,7 +84,7 @@ files:
 - spec/mailers/views/test_mail_controller/third.html.erb
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://merb-plugins.rubyforge.org/merb-mailer/
+homepage: http://merbivore.com
 post_install_message: 
 rdoc_options: []
 
@@ -88,8 +104,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.0.1
+rubyforge_project: merb
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Merb plugin that provides mailer functionality to Merb

data/README

@@ -1,4 +0,0 @@
-merb-mailer
-===========
-
-A plugin for the Merb framework that provides ...

data/lib/merb-mailer/merb_controller.rb

@@ -1,21 +0,0 @@
-class Merb::Controller
-  # Sends mail via a MailController (a tutorial can be found in the
-  # MailController docs).
-  #
-  # ==== Parameters
-  # klass<Class>:: The mailer class.
-  # method<~to_s>:: The method to call on the mailer.
-  # mail_params<Hash>::
-  #   Mailing parameters, e.g. :to and :cc. See
-  #   Merb::MailController#dispatch_and_deliver for details.
-  # send_params<Hash>::
-  #   Params to send to the mailer. Defaults to the params of the current
-  #   controller.
-  #
-  # ==== Examples
-  #   # Send an email via the FooMailer's bar method.
-  #   send_mail FooMailer, :bar, :from => "foo@bar.com", :to => "baz@bat.com"
-  def send_mail(klass, method, mail_params, send_params = nil)
-    klass.new(send_params || params, self).dispatch_and_deliver(method, mail_params)
-  end
-end