merb-mailer 0.9.7 → 0.9.8

data/Generators

@@ -0,0 +1,4 @@
+scope 'merb-gen' do
+  dir = File.join(File.dirname(__FILE__), 'lib', 'generators/')
+  Merb.add_generators dir + 'mailer_generator'
+end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008 YOUR NAME
+Copyright (c) 2008 Yehuda Katz
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -17,7 +17,7 @@ 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.7") + PKG_BUILD
+GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.8") + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 
@@ -35,10 +35,10 @@ spec = Gem::Specification.new do |s|
   s.author = GEM_AUTHOR
   s.email = GEM_EMAIL
   s.homepage = PROJECT_URL
-  s.add_dependency('merb-core', '>= 0.9.7')
+  s.add_dependency('merb-core', '>= 0.9.8')
   s.add_dependency('mailfactory', '>= 1.2.3')
   s.require_path = 'lib'
-  s.files = %w(LICENSE README.textile Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
+  s.files = %w(LICENSE README.textile Rakefile TODO Generators) + Dir.glob("{lib,spec}/**/*")
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
@@ -46,21 +46,33 @@ Rake::GemPackageTask.new(spec) do |pkg|
 end
 
 desc "Install the gem"
-task :install => [:package] do
-  sh install_command(GEM_NAME, GEM_VERSION)
+task :install do
+  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
 end
 
-namespace :jruby do
+desc "Uninstall the gem"
+task :uninstall do
+  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
+end
 
-  desc "Run :package and install the resulting .gem with jruby"
-  task :install => :package do
-    sh jinstall_command(GEM_NAME, GEM_VERSION)
+desc "Create a gemspec file"
+task :gemspec do
+  File.open("#{GEM_NAME}.gemspec", "w") do |file|
+    file.puts spec.to_ruby
   end
-
 end
 
-desc "Run all specs"
-Spec::Rake::SpecTask.new("specs") do |t|
-  t.spec_opts = ["--format", "specdoc", "--colour"]
-  t.spec_files = Dir["spec/**/*_spec.rb"].sort
+desc "Run all examples (or a specific spec with TASK=xxxx)"
+Spec::Rake::SpecTask.new('spec') do |t|
+  t.spec_opts  = ["-cfs"]
+  t.spec_files = begin
+    if ENV["TASK"] 
+      ENV["TASK"].split(',').map { |task| "spec/**/#{task}_spec.rb" }
+    else
+      FileList['spec/**/*_spec.rb']
+    end
+  end
 end
+
+desc 'Default: run spec examples'
+task :default => 'spec'

data/lib/merb-mailer/mail_controller.rb

@@ -6,21 +6,21 @@ module Merb
   # * Create a MailController subclass with actions and templates.
   # * Call the MailController from another Controller via the send_mail method.
   #
-  # First, create a file in app/mailers that subclasses Merb::MailController. 
+  # First, create a file in app/mailers that subclasses Merb::MailController.
   # The actions in this controller will do nothing but render mail.
   #
   #   # app/mailers/article_mailer.rb
   #   class ArticleMailer < Merb::MailController
-  # 
+  #
   #     def notify
   #       @user = params[:user]
   #       render_mail
   #     end
-  # 
+  #
   #   end
   #
-  # You also can access the params hash for values passed with the 
-  # Controller.send_mail method. See also the documentation for 
+  # You also can access the params hash for values passed with the
+  # Controller.send_mail method. See also the documentation for
   # render_mail to see all the ways it can be called.
   #
   # Create a template in a subdirectory of app/mailers/views that corresponds
@@ -28,10 +28,10 @@ module Merb
   #
   #   # app/mailers/views/article_mailer/notify.text.erb
   #   Hey, <%= @user.name %>,
-  #   
+  #
   #   We're running a sale on dog bones!
   #
-  # Finally, call the Controller.send_mail method from a standard 
+  # Finally, call the Controller.send_mail method from a standard
   # Merb controller.
   #
   #   class Articles < Application
@@ -47,13 +47,13 @@ module Merb
   #       render
   #     end
   #
-  #   end  
+  #   end
   #
   # Note: If you don't pass a fourth argument to Controller.send_mail,
   # the controller's params will be sent to the MailController subclass
-  # as params. However, you can explicitly send a hash of objects that 
-  # will populate the params hash instead. In either case, you must 
-  # set instance variables in the MailController's actions if you 
+  # as params. However, you can explicitly send a hash of objects that
+  # will populate the params hash instead. In either case, you must
+  # set instance variables in the MailController's actions if you
   # want to use them in the MailController's views.
   #
   # The MailController class is very powerful. You can:
@@ -69,7 +69,7 @@ module Merb
     self._mailer_klass  = Merb::Mailer
 
     attr_accessor :params, :mailer, :mail
-    attr_reader   :session, :base_controller
+    attr_reader   :base_controller
 
     cattr_accessor :_subclasses
     self._subclasses = Set.new
@@ -91,15 +91,15 @@ 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 
+
+    # 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>:: 
+    # 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 
+    #    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.
@@ -115,15 +115,18 @@ module Merb
     def initialize(params = {}, controller = nil)
       @params = params
       @base_controller = controller
-      @session = (controller && controller.session) || {}
       super
     end
 
+    def session
+      self.base_controller.request.session rescue {}
+    end
+
     # Sets the template root to the default mailer view directory.
     #
     # ==== Parameters
     # klass<Class>::
-    #   The Merb::MailController inheriting from the base class.  
+    #   The Merb::MailController inheriting from the base class.
     def self.inherited(klass)
       super
       klass._template_root = Merb.dir_for(:mailer) / "views" unless self._template_root
@@ -169,7 +172,7 @@ module Merb
     # "foo", this is identical to render_mail :foo.
     #
     #   render_mail :foo
-    # 
+    #
     # checks for foo.html.ext and foo.text.ext and applies them as appropriate.
     #
     #   render_mail :action => {:html => :foo, :text => :bar}
@@ -210,13 +213,13 @@ module Merb
       @_missing_templates = false # used to make sure that at least one template was found
       # If the options are not a hash, normalize to an action hash
       options = {:action => {:html => options, :text => options}} if !options.is_a?(Hash)
-  
+
       # Take care of the options
       opts_hash = {}
       opts = options.dup
       actions = opts.delete(:action) if opts[:action].is_a?(Hash)
       templates = opts.delete(:template) if opts[:template].is_a?(Hash)
-  
+
       # Prepare the options hash for each format
       # We need to delete anything relating to the other format here
       # before we try to render the template.
@@ -225,7 +228,7 @@ module Merb
         opts_hash[fmt] ||= actions[fmt] if actions && actions[fmt]
         opts_hash[:template] = templates[fmt] if templates && templates[fmt]
       end
-        
+
       # Send the result to the mailer
       { :html => "rawhtml=", :text => "text="}.each do |fmt,meth|
         begin
@@ -249,14 +252,23 @@ module Merb
 
     # 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)
+    def url(name, *args)
+      return base_controller.url(name, *args) if base_controller
+      super
+    end
+
+    alias_method :relative_url, :url
+
+    # Mimic the behavior of absolute_url in AbstractController
+    # but use @base_controller.request
+    def absolute_url(name, *args)
+      return base_controller.absolute_url(name, *args) if base_controller
+      super
     end
 
     # Attaches a file or multiple files to an email. You call this from a
     # method in your MailController (including a before filter).
-    # 
+    #
     # ==== Parameters
     # file_or_files<File, Array[File]>:: File(s) to attach.
     # filename<String>::
@@ -268,17 +280,17 @@ module Merb
     # ==== Examples
     #   attach File.open("foo")
     #   attach [File.open("foo"), File.open("bar")]
-    # 
+    #
     # If you are passing an array of files, you should use an array of the
     # allowed parameters:
-    # 
+    #
     #   attach [[File.open("foo"), "bar", "text/html"], [File.open("baz"),
     #     "bat", "text/css"]
-    # 
+    #
     #  which would attach two files ("foo" and "baz" in the filesystem) as
     # "bar" and "bat" respectively. It would also set the mime-type as
     # "text/html" and "text/css" respectively.
-    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)
       @mailer.attach(file_or_files, filename, type, headers)
     end
@@ -302,7 +314,7 @@ module Merb
       @mailer         = self.class._mailer_klass.new(mail_params)
       @mail           = @mailer.mail
       @method         = method
-  
+
       # dispatch and render use params[:action], so set it
       self.action_name = method
 

data/lib/merb-mailer/mailer.rb

@@ -86,11 +86,11 @@ module Merb
       type = nil, headers = nil)
       if file_or_files.is_a?(Array)
         file_or_files.each do |v|
-	  if v.length < 2
-	    v << v.first.is_a?(File) ? File.basename(v.first.path) : nil
-	  end
-	  @mail.add_attachment_as *v
-	end
+      	  if v.length < 2
+      	    v << v.first.is_a?(File) ? File.basename(v.first.path) : nil
+      	  end
+      	  @mail.add_attachment_as *v
+      	end
       else
         raise ArgumentError, "You did not pass in a file. Instead, you sent a #{file_or_files.class}" if !file_or_files.is_a?(File)
         @mail.add_attachment_as(file_or_files, filename, type, headers)
@@ -100,7 +100,7 @@ module Merb
     # ==== 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 }

data/spec/mail_controller_spec.rb

@@ -1,7 +1,8 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 Spec::Runner.configure do |config|
-  config.include Merb::Test::RequestHelper  
+  config.include Merb::Test::RequestHelper
+  config.include Merb::Test::ControllerHelper
 end
 
 class Merb::Mailer
@@ -48,19 +49,32 @@ class TestMailController < Merb::MailController
   def ninth
     render_mail
   end
-  
+
   def tenth
     render_mail
   end
   
+  def generates_relative_url
+    render_mail
+  end
+
+  def generates_absolute_url
+    render_mail
+  end
+end
+
+
+Merb::Router.prepare do
+  match("/subprojects/:subproject").
+    to(:controller => "test_controller", :action => "whatever").
+    name(:merb_subproject)
 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
@@ -138,37 +152,20 @@ describe "A Merb Mail controller" 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
+  it "delegates relative url generation to base controller" do
+    controller = TestController.new(fake_request)
+    TestMailController.new({ :subproject => "core" }, controller).
+      dispatch_and_deliver :generates_relative_url, :from => "foo@bar.com", :to => "foo@bar.com"
+    
+    Merb::Mailer.deliveries.last.text.should == "TEXT\n/subprojects/core\nENDTEXT"
+  end
+
+  it "delegates absolute url generation to base controller" do
+    controller = TestController.new(fake_request)
+    TestMailController.new({ :subproject => "extlib" }, controller).
+      dispatch_and_deliver :generates_absolute_url, :from => "foo@bar.com", :to => "foo@bar.com"
+    
+    Merb::Mailer.deliveries.last.text.should == "TEXT\nhttp://merbivore.com/subprojects/extlib\nENDTEXT"
+  end
+end

data/spec/mailer_spec.rb

@@ -26,6 +26,12 @@ def setup_test_mailer klass = TestMailer
 end
 
 describe "a merb mailer" do
+
+  before(:each) do
+    TestMailer.deliveries.clear
+    TestSMTPMailer.deliveries.clear
+    TestSendmailMailer.deliveries.clear
+  end
   
   it "should be able to send test emails" do
     setup_test_mailer
@@ -34,7 +40,8 @@ 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("=?utf-8?Q?Test_Subject=?=")
+    delivery.subject.first.should =~ /utf-8/
+    delivery.subject.first.should =~ /Test_Subject/
     delivery.body.should include("Test")
   end
   

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

@@ -0,0 +1 @@
+<%= absolute_url(:merb_subproject, :subproject => params[:subproject], :host => "merbivore.com") %>

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

@@ -0,0 +1 @@
+<%= url(:merb_subproject, params[:subproject]) %>

data/spec/spec_helper.rb

@@ -1,7 +1,11 @@
-$TESTING=true
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require "rubygems"
 require "merb-core"
 require "merb-mailer"
 
-Merb.start :environment => 'test'
+Merb::Config.use do |c|
+  c[:session_store] = :memory
+end
+
+
+Merb.start :environment => 'test'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-mailer
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-10 00:00:00 +03:00
+date: 2008-10-06 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.7
+        version: 0.9.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: mailfactory
@@ -47,6 +47,7 @@ files:
 - README.textile
 - Rakefile
 - TODO
+- Generators
 - lib/generators
 - lib/generators/mailer_generator.rb
 - lib/generators/templates
@@ -78,6 +79,8 @@ files:
 - 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/generates_absolute_url.text.erb
+- spec/mailers/views/test_mail_controller/generates_relative_url.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