merb-mailer 0.9.2 → 0.9.3

data/Rakefile

@@ -4,7 +4,7 @@ require "spec/rake/spectask"
 
 PLUGIN = "merb-mailer"
 NAME = "merb-mailer"
-VERSION = "0.9.2"
+VERSION = "0.9.3"
 AUTHOR = "Yehuda Katz"
 EMAIL = "wycats@gmail.com"
 HOMEPAGE = "http://merb-plugins.rubyforge.org/merb-mailer/"
@@ -21,26 +21,28 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency('merb-core', '>= 0.9.2')
+  s.add_dependency('merb-core', '>= 0.9.3')
   s.add_dependency("mailfactory", ">= 1.2.3")
   s.require_path = 'lib'
   s.autorequire = PLUGIN
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs}/**/*")
+  s.files = %w(LICENSE README 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']}" : ""
+
 task :install => [:package] do
-  sh %{sudo gem install pkg/#{NAME}-#{VERSION} --no-update-sources}
+  sh %{sudo gem install #{install_home} pkg/#{NAME}-#{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 pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri}
+    sh %{#{SUDO} jruby -S gem install #{install_home} pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri}
   end
   
 end

data/lib/merb-mailer/mail_controller.rb

@@ -222,6 +222,13 @@ module Merb
       @mail
     end
 
+    # Mimic the behavior of absolute_url in AbstractController
+    # but use @base_controller.request
+    def absolute_url(name, rparams={})
+      req = @base_controller.request
+      uri =  req.protocol + req.host + url(name, rparams)
+    end
+
     # Attaches a file or multiple files to an email. You call this from a
     # method in your MailController (including a before filter).
     # 
@@ -325,4 +332,4 @@ module Merb
 
 
   end
-end
+end

data/spec/mail_controller_spec.rb

@@ -0,0 +1,174 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+Spec::Runner.configure do |config|
+  config.include Merb::Test::RequestHelper  
+end
+
+class Merb::Mailer
+  self.delivery_method = :test_send
+end
+
+Merb.push_path(:mailer, File.join(File.dirname(__FILE__), "mailers"))
+
+class TestMailController < Merb::MailController
+  
+  def first
+    render_mail
+  end
+  
+  def second
+    render_mail
+  end
+  
+  def third
+    render_mail :text => :first, :html => :third
+  end
+  
+  def fourth
+    render_mail :text => "FOURTH_TEXT", :html => "FOURTH_HTML", :layout => :none
+  end
+  
+  def fifth
+    render_mail :action => {:text => :first, :html => :third}
+  end
+  
+  def sixth
+    render_mail :action => {:text => :first}, :html => "SIXTH_HTML"
+  end
+  
+  def seventh
+    render_mail :text => :first, :html => "SEVENTH_HTML"
+  end
+  
+  def eighth
+    @testing = "TEST"
+    render_mail
+  end
+  
+  def ninth
+    render_mail
+  end
+  
+  def tenth
+    render_mail
+  end
+  
+end
+
+class TestController < Merb::Controller
+  
+  def one
+    send_mail TestMailController, :ninth, {:from => "foo@bar.com", :to => "foo@bar.com"}, {:x => "ONE_CONTROLLER"}
+  end
+  
+end
+
+describe "A Merb Mail controller" do
+  
+  def deliver(action)
+    TestMailController.dispatch_and_deliver action, :from => "foo@bar.com", :to => "foo@bar.com"
+    @delivery = Merb::Mailer.deliveries.last
+  end
+
+  undef :call_action if defined?(call_action)
+  def call_action(action)
+    dispatch_to(TestController, action)
+    @delivery = Merb::Mailer.deliveries.last  
+  end
+  
+  it "should render files in its directory by default" do
+    deliver :first
+    @delivery.text.should == "TEXT\nFIRST\nENDTEXT"
+  end
+  
+  it "should render files in its directory without a mimetype extension by default" do
+    deliver :second
+    @delivery.text.should == "TEXT\nSECOND\nENDTEXT"
+  end
+  
+  it "should be able to accept a :text => :sym, :html => :sym render_mail" do
+    deliver :third
+    @delivery.text.should == "TEXT\nFIRST\nENDTEXT"
+    @delivery.html.should == "BASIC\nTHIRDHTML\nLAYOUT"
+  end
+  
+  it "should be able to accept a :text => STRING, :html => STRING render_mail" do
+    deliver :fourth
+    $DEBUGGER = true
+    @delivery.text.should == "FOURTH_TEXT"
+    @delivery.html.should == "FOURTH_HTML"    
+    $DEBUGGER = false
+  end
+  
+  it "should be able to accept an :action => {:text => :sym, :html => :sym}" do
+    deliver :fifth
+    @delivery.text.should == "TEXT\nFIRST\nENDTEXT"
+    @delivery.html.should == "BASIC\nTHIRDHTML\nLAYOUT"    
+  end
+  
+  it "should be able to accept a mix of action and :html => STRING" do
+    deliver :sixth
+    @delivery.text.should == "TEXT\nFIRST\nENDTEXT"
+    @delivery.html.should == "SIXTH_HTML"    
+  end
+  
+  it "should be able to accept a mix of :text => :sym and :html => STRING" do
+    deliver :seventh
+    @delivery.text.should == "TEXT\nFIRST\nENDTEXT"
+    @delivery.html.should == "SEVENTH_HTML"    
+  end
+  
+  it "should hold onto instance variables" do
+    deliver :eighth
+    @delivery.html.should == "BASIC\nTEST\nLAYOUT"    
+  end
+  
+  it "should have access to the params sent by the calling controller" do
+    call_action :one
+    @delivery.html.should == "BASIC\nONE_CONTROLLER\nLAYOUT"    
+  end
+  
+  it "should not raise an error if there are no templates" do
+    lambda do
+      deliver :tenth    
+    end.should_not raise_error
+  end
+  
+  it "should log an error if there are no templates available" do
+    Merb.logger.should_receive(:error).once
+    deliver :tenth
+  end
+  
+end
+
+# describe "Merb::MailController with url generation" do
+#   
+#   it_should_behave_like "class with general url generation"
+#   it_should_behave_like "non routeable controller with url mixin"
+#   
+#   def new_url_controller(route, params = {:action => 'show', :controller => 'Test'})
+#     request = OpenStruct.new
+#     request.route = route
+#     request.params = params
+#     response = OpenStruct.new
+#     response.read = ""
+#     
+#     @controller = Merb::Controller.build(request, response)
+#     TestMailController.new(params, @controller)
+#   end
+#   
+#   it "should raise an error if no controller is specified and the base controller is not set" do
+#     c = new_url_controller(@default_route, {})    
+#     lambda do
+#       the_url = c.url(:action => "bar")
+#     end.should raise_error
+#   end
+#   
+#   it "should use the base controller when it is set to generate a url when no :controller option is specified" do
+#     c = new_url_controller(@defualt_route, :controller => "foo")
+#     lambda do
+#       the_url = c.url(:action => "bar")
+#       the_url.should == "/foo/bar"
+#     end.should_not raise_error    
+#   end
+# end

data/spec/mailer_spec.rb

@@ -0,0 +1,87 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+class TestMailer < Merb::Mailer
+  self.delivery_method = :test_send
+end
+
+class TestSMTPMailer < Merb::Mailer
+  self.delivery_method = :net_smtp
+  self.config = { :host     => 'smtp.yourserver.com',
+                  :port     => '25',              
+                  :user     => 'user',
+                  :pass     => 'pass',
+                  :auth     => :plain }
+                  
+end
+
+class TestSendmailMailer < Merb::Mailer
+  self.delivery_method = :sendmail
+end
+
+def setup_test_mailer klass = TestMailer
+  @m = klass.new :to      => "test@test.com",
+                 :from    => "foo@bar.com",
+                 :subject => "Test Subject",
+                 :body    => "Test"    
+end
+
+describe "a merb mailer" do
+  
+  it "should be able to send test emails" do
+    setup_test_mailer
+    @m.deliver!
+    TestMailer.deliveries.size.should == 1
+    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.body.should include("Test")
+  end
+  
+  it "should be able to accept attachments" do
+    setup_test_mailer
+    @m.attach File.open("README")
+    @m.deliver!
+    delivery = TestMailer.deliveries.last
+    delivery.instance_variable_get("@attachments").size.should == 1
+  end
+  
+  it "should be able to accept multiple attachments" do
+    setup_test_mailer
+    @m.attach [[File.open("README")], [File.open("LICENSE")]]
+    @m.deliver!
+    delivery = TestMailer.deliveries.last
+    delivery.instance_variable_get("@attachments").size.should == 2    
+  end
+  
+  it "should be able to send mails via SMTP" do
+    setup_test_mailer TestSMTPMailer
+    Net::SMTP.stub!(:start).and_return(true)
+    Net::SMTP.should_receive(:start).with("smtp.yourserver.com", 25, nil, "user", "pass", :plain)
+    @m.deliver!
+  end
+  
+  it "should send mails via SMTP with no auth" do
+    setup_test_mailer TestSMTPMailer
+    @m.config[:auth] = nil
+    Net::SMTP.stub!(:start).and_return(true)
+    Net::SMTP.should_receive(:start).with("smtp.yourserver.com", 25, nil, "user", "pass", nil)
+    @m.deliver!
+  end
+  
+  it "should be able to send mails via sendmail" do
+    sendmail = mock("/usr/sbin/sendmail", :null_object => true) 
+    setup_test_mailer TestSendmailMailer
+    IO.should_receive(:popen).with("/usr/sbin/sendmail #{@m.mail.to}", "w+").and_return(sendmail) 
+    @m.deliver!
+  end  
+  
+  it "should be able to use a different sendmail path" do 
+ 	  sendmail = mock("/somewhere/sendmail", :null_object => true) 
+ 	  setup_test_mailer TestSendmailMailer 
+ 	  @m.config[:sendmail_path] = '/somewhere/sendmail' 
+ 	  IO.should_receive(:popen).with("/somewhere/sendmail #{@m.mail.to}", "w+").and_return(sendmail) 
+ 	  @m.deliver! 
+ 	end
+  
+end

data/spec/mailers/views/layout/application.html.erb

@@ -0,0 +1,3 @@
+BASIC
+<%= catch_content :for_layout %>
+LAYOUT

data/spec/mailers/views/layout/application.text.erb

@@ -0,0 +1,3 @@
+TEXT
+<%= catch_content :for_layout %>
+ENDTEXT

data/spec/mailers/views/test_mail_controller/eighth.html.erb

@@ -0,0 +1 @@
+<%= @testing %>

data/spec/mailers/views/test_mail_controller/eighth.text.erb

@@ -0,0 +1 @@
+<%= @testing %>

data/spec/mailers/views/test_mail_controller/first.html.erb

@@ -0,0 +1 @@
+FIRST

data/spec/mailers/views/test_mail_controller/first.text.erb

@@ -0,0 +1 @@
+FIRST

data/spec/mailers/views/test_mail_controller/ninth.html.erb

@@ -0,0 +1 @@
+<%= params[:x] %>

data/spec/mailers/views/test_mail_controller/ninth.text.erb

@@ -0,0 +1 @@
+<%= params[:x] %>

data/spec/mailers/views/test_mail_controller/second.text.erb

@@ -0,0 +1 @@
+SECOND

data/spec/mailers/views/test_mail_controller/third.html.erb

@@ -0,0 +1 @@
+THIRDHTML

data/spec/spec_helper.rb

@@ -0,0 +1,7 @@
+$TESTING=true
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require "rubygems"
+require "merb-core"
+require "merb-mailer"
+
+Merb.start :environment => 'test'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-mailer
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire: merb-mailer
 bindir: bin
 cert_chain: []
 
-date: 2008-03-24 00:00:00 -05:00
+date: 2008-05-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: 0.9.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: mailfactory
@@ -50,6 +50,23 @@ files:
 - lib/merb-mailer/mailer.rb
 - lib/merb-mailer/merb_controller.rb
 - lib/merb-mailer.rb
+- spec/mail_controller_spec.rb
+- spec/mailer_spec.rb
+- spec/mailers
+- spec/mailers/views
+- spec/mailers/views/layout
+- spec/mailers/views/layout/application.html.erb
+- spec/mailers/views/layout/application.text.erb
+- spec/mailers/views/test_mail_controller
+- spec/mailers/views/test_mail_controller/eighth.html.erb
+- spec/mailers/views/test_mail_controller/eighth.text.erb
+- spec/mailers/views/test_mail_controller/first.html.erb
+- spec/mailers/views/test_mail_controller/first.text.erb
+- spec/mailers/views/test_mail_controller/ninth.html.erb
+- spec/mailers/views/test_mail_controller/ninth.text.erb
+- spec/mailers/views/test_mail_controller/second.text.erb
+- spec/mailers/views/test_mail_controller/third.html.erb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://merb-plugins.rubyforge.org/merb-mailer/
 post_install_message: