padrino-mailer 0.9.9 → 0.9.10

data/README.rdoc

@@ -33,6 +33,7 @@ Next, we should define a custom mailer extended from <tt>Padrino::Mailer::Base</
       type    'html'                # optional, defaults to plain/text
       charset 'windows-1252'        # optional, defaults to utf-8
       via     :sendmail             # optional, to smtp if defined otherwise sendmail
+      template 'sample_mailer/foo'  # optional, defaults to views/sample_mailer/registration_email.erb
     end
   end
 
@@ -55,7 +56,7 @@ or if you like the method_missing approach:
 And that will then deliver the email according the the configured options. This is really all you need to send emails.
 
 Be sure to check out the
-{Padrino Mailer}[http://wiki.github.com/padrino/padrino-framework/padrino-mailer] guide for more details on usage.
+{Padrino Mailer}[http://www.padrinorb.com/guides/padrino-mailer] guide for more details on usage.
 
 == Copyright
 

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'rake'
 
-GEM_VERSION = File.read(File.dirname(__FILE__) + '/VERSION')
+require File.expand_path("../../padrino-core/lib/padrino-core/version.rb", __FILE__)
 
 begin
   require 'jeweler'
@@ -13,7 +13,8 @@ begin
     gem.homepage = "http://github.com/padrino/padrino-framework/tree/master/padrino-mailer"
     gem.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
     gem.rubyforge_project = 'padrino-mailer'
-    gem.add_runtime_dependency     "padrino-core",  "= #{GEM_VERSION}"
+    gem.version = Padrino.version
+    gem.add_runtime_dependency     "padrino-core",  "= #{Padrino.version}"
     gem.add_runtime_dependency     "tmail",         ">= 1.2"
     gem.add_development_dependency "shoulda",       ">= 2.10.3"
     gem.add_development_dependency "haml",          ">= 2.2.1"
@@ -49,16 +50,4 @@ rescue LoadError
   end
 end
 
-# task :test => :check_dependencies
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "padrino-mailer #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+task :default => :test

data/lib/padrino-mailer/base.rb

@@ -21,7 +21,7 @@ module Padrino
       # Returns the available mail fields when composing a message
       #
       def self.mail_fields
-        [:to, :cc, :bcc, :reply_to, :from, :subject, :content_type, :charset, :via, :attachments]
+        [:to, :cc, :bcc, :reply_to, :from, :subject, :content_type, :charset, :via, :attachments, :template]
       end
 
       @@views_path = []
@@ -45,9 +45,9 @@ module Padrino
       # Assigns the body key to the mail attributes either with the rendered body from a template or the given string value
       #
       def body(body_value)
-        template = template_path
-        raise "Template for '#{@mail_name}' could not be located in views path!" unless template
-        @mail_attributes[:body] = Tilt.new(template).render(self, body_value.symbolize_keys) if body_value.is_a?(Hash)
+        final_template = template_path
+        raise "Template for '#{@mail_name}' could not be located in views path!" unless final_template
+        @mail_attributes[:body] = Tilt.new(final_template).render(self, body_value.symbolize_keys) if body_value.is_a?(Hash)
         @mail_attributes[:body] = body_value if body_value.is_a?(String)
       end
 
@@ -55,8 +55,8 @@ module Padrino
       # Returns the path to the email template searched for using glob pattern
       #
       def template_path
-        self.views_path.each do |path|
-          template = Dir[File.join(path, self.class.name.underscore.split("/").last, "#{@mail_name}.*")].first
+        self.views_path.each do |view_path|
+          template = Dir[File.join(view_path, template_pattern)].first
           return template if template
         end
       end
@@ -89,6 +89,14 @@ module Padrino
       def self.method_missing(method_sym, *arguments, &block)
         method_sym.to_s =~ /deliver_(.*)/ ? self.deliver($1, *arguments) : super(method_sym, *arguments, &block)
       end
+
+      private
+
+        # Returns the glob pattern of the template file to locate and render
+        def template_pattern
+          @_pattern ||= (@mail_attributes[:template].present? ? "#{@mail_attributes[:template]}.*" :
+                         File.join(self.class.name.underscore.split("/").last, "#{@mail_name}.*"))
+        end
     end # Base
   end # Mailer
-end # Padrino
+end # Padrino

data/padrino-mailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-mailer}
-  s.version = "0.9.9"
+  s.version = "0.9.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2010-03-29}
+  s.date = %q{2010-04-22}
   s.description = %q{Mailer system for padrino allowing easy delivery of application emails}
   s.email = %q{padrinorb@gmail.com}
   s.extra_rdoc_files = [
@@ -21,7 +21,6 @@ Gem::Specification.new do |s|
      "LICENSE",
      "README.rdoc",
      "Rakefile",
-     "VERSION",
      "lib/padrino-mailer.rb",
      "lib/padrino-mailer/base.rb",
      "lib/padrino-mailer/delivery.rb",
@@ -31,6 +30,7 @@ Gem::Specification.new do |s|
      "test/fixtures/mailer_app/views/demo_mailer/sample_mail.erb",
      "test/fixtures/mailer_app/views/sample_mailer/anniversary_message.erb",
      "test/fixtures/mailer_app/views/sample_mailer/birthday_message.erb",
+     "test/fixtures/mailer_app/views/sample_mailer/foo_message.erb",
      "test/helper.rb",
      "test/test_base.rb",
      "test/test_mail_object.rb",
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<padrino-core>, ["= 0.9.9"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.9.10"])
       s.add_runtime_dependency(%q<tmail>, [">= 1.2"])
       s.add_development_dependency(%q<shoulda>, [">= 2.10.3"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
       s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
     else
-      s.add_dependency(%q<padrino-core>, ["= 0.9.9"])
+      s.add_dependency(%q<padrino-core>, ["= 0.9.10"])
       s.add_dependency(%q<tmail>, [">= 1.2"])
       s.add_dependency(%q<shoulda>, [">= 2.10.3"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
@@ -65,7 +65,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<webrat>, [">= 0.5.1"])
     end
   else
-    s.add_dependency(%q<padrino-core>, ["= 0.9.9"])
+    s.add_dependency(%q<padrino-core>, ["= 0.9.10"])
     s.add_dependency(%q<tmail>, [">= 1.2"])
     s.add_dependency(%q<shoulda>, [">= 2.10.3"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])

data/test/fixtures/mailer_app/app.rb

@@ -17,7 +17,6 @@ class MailerDemo < Sinatra::Base
   register Padrino::Mailer
 
   class SampleMailer < Padrino::Mailer::Base
-
     def birthday_message(name, age)
       subject "Happy Birthday!"
       to   'john@fake.com'
@@ -33,6 +32,15 @@ class MailerDemo < Sinatra::Base
       body 'names' => names, 'years_married' => years_married
       content_type 'text/html'
     end
+
+    def welcome_message(name)
+      template 'sample_mailer/foo_message'
+      subject "Welcome Message!"
+      to   'john@fake.com'
+      from 'noreply@custom.com'
+      body 'name' => name
+      via  :smtp
+    end
   end
 
   post "/deliver/plain" do
@@ -40,6 +48,11 @@ class MailerDemo < Sinatra::Base
     result ? "mail delivered" : 'mail not delivered'
   end
 
+  post "/deliver/custom" do
+    result = SampleMailer.deliver_welcome_message("Bobby")
+    result ? "mail delivered" : 'mail not delivered'
+  end
+
   post "/deliver/html" do
     result = SampleMailer.deliver_anniversary_message("Joey & Charlotte", 16)
     result ? "mail delivered" : 'mail not delivered'

data/test/fixtures/mailer_app/views/sample_mailer/foo_message.erb

@@ -0,0 +1 @@
+Hello to <%= name %>

data/test/test_padrino_mailer.rb

@@ -19,8 +19,17 @@ class TestPadrinoMailer < Test::Unit::TestCase
       assert_equal 'mail delivered', last_response.body
     end
 
+    should 'be able to deliver emails with custom view' do
+      assert_email_sent(:template => 'sample_mailer/foo_message', :to => 'john@fake.com',
+                        :from => 'noreply@custom.com', :via => :smtp,
+                        :subject => "Welcome Message!", :body => "Hello to Bobby")
+      visit '/deliver/custom', :post
+      assert_equal 'mail delivered', last_response.body
+    end
+
     should 'be able to deliver html emails' do
-      assert_email_sent(:to => 'julie@fake.com', :from => 'noreply@anniversary.com', :content_type => 'text/html', :via => :smtp,
+      assert_email_sent(:to => 'julie@fake.com', :from => 'noreply@anniversary.com',
+                        :content_type => 'text/html', :via => :smtp,
                         :subject => "Happy anniversary!", :body => "<p>Yay Joey & Charlotte!</p>\n<p>You have been married 16 years</p>")
       visit '/deliver/html', :post
       assert_equal 'mail delivered', last_response.body
@@ -29,8 +38,8 @@ class TestPadrinoMailer < Test::Unit::TestCase
 
   protected
 
-  def assert_email_sent(mail_attributes)
-    delivery_attributes = mail_attributes.merge(:smtp => MailerDemo.smtp_settings)
-    Padrino::Mailer::MailObject.any_instance.expects(:send_mail).with(delivery_attributes).once.returns(true)
-  end
+    def assert_email_sent(mail_attributes)
+      delivery_attributes = mail_attributes.merge(:smtp => MailerDemo.smtp_settings)
+      Padrino::Mailer::MailObject.any_instance.expects(:send_mail).with(delivery_attributes).once.returns(true)
+    end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 9
-  version: 0.9.9
+  - 10
+  version: 0.9.10
 platform: ruby
 authors: 
 - Padrino Team
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-29 00:00:00 -07:00
+date: 2010-04-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,8 +30,8 @@ dependencies:
         segments: 
         - 0
         - 9
-        - 9
-        version: 0.9.9
+        - 10
+        version: 0.9.10
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -131,7 +131,6 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - lib/padrino-mailer.rb
 - lib/padrino-mailer/base.rb
 - lib/padrino-mailer/delivery.rb
@@ -141,6 +140,7 @@ files:
 - test/fixtures/mailer_app/views/demo_mailer/sample_mail.erb
 - test/fixtures/mailer_app/views/sample_mailer/anniversary_message.erb
 - test/fixtures/mailer_app/views/sample_mailer/birthday_message.erb
+- test/fixtures/mailer_app/views/sample_mailer/foo_message.erb
 - test/helper.rb
 - test/test_base.rb
 - test/test_mail_object.rb

data/VERSION

@@ -1 +0,0 @@
-0.9.9