padrino-mailer 0.8.1 → 0.8.2

data/Rakefile

@@ -40,10 +40,11 @@ end
 
 begin
   require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
+  Rcov::RcovTask.new do |rcov|
+    rcov.libs << 'test'
+    rcov.pattern = 'test/**/test_*.rb'
+    rcov.verbose = true
+    rcov.rcov_opts << ['--exclude /Gems/1.8/gems/,padrino-core,padrino-cache,padrino-gen,padrino-helpers,padrino-admin']
   end
 rescue LoadError
   task :rcov do

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.8.2

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, :from, :subject, :type, :charset, :via, :attachments]
+        [:to, :cc, :bcc, :reply_to, :from, :subject, :type, :charset, :via, :attachments]
       end
 
       attr_accessor :mail_attributes
@@ -74,7 +74,7 @@ module Padrino
       # Returns true if a mail exists with the name being delivered
       # 
       def self.respond_to?(method_sym, include_private = false)
-        method_sym.to_s =~ /deliver_(.*)/ ? self.method_defined?($1) : super
+        method_sym.to_s =~ /deliver_(.*)/ ? self.method_defined?($1) : super(method_sym, include_private)
       end
 
       ##
@@ -82,7 +82,7 @@ module Padrino
       # being called i.e #deliver_birthday_message(22) invokes #birthday_message(22) to setup mail object
       # 
       def self.method_missing(method_sym, *arguments, &block)
-        method_sym.to_s =~ /deliver_(.*)/ ? self.deliver($1, *arguments) : super
+        method_sym.to_s =~ /deliver_(.*)/ ? self.deliver($1, *arguments) : super(method_sym, *arguments, &block)
       end
     end # Base
   end # Mailer

data/lib/padrino-mailer/delivery.rb

@@ -28,20 +28,36 @@ module Padrino
         end
 
         def build_tmail(options)
-          mail = TMail::Mail.new
-          mail.to = options[:to]
-          mail.from = options[:from] || 'padrino@unknown'
-          mail.subject = options[:subject]
-          mail.body = options[:body] || ""
-          mail.set_content_type 'text', options[:type] || 'plain', {'charset'=> options[:charset] || 'utf-8'}
-          (options[:attachments] || []).each do |name, body|
-            attachment = TMail::Mail.new
-            attachment.transfer_encoding = "base64"
-            attachment.body = Base64.encode64(body)
-            # attachment.set_content_type # TODO: if necessary
-            attachment.set_content_disposition "attachment", "filename" => name
-            mail.parts.push attachment
+          logger.error options.inspect
+          mail          = TMail::Mail.new
+          mail.to       = options[:to]
+          mail.cc       = options[:cc]   || ''
+          mail.bcc      = options[:bcc]  || ''
+          mail.from     = options[:from] || 'padrino@unknown'
+          mail.reply_to = options[:reply_to]
+          mail.subject  = options[:subject]
+
+          if options[:attachments]
+            # If message has attachment, then body must be sent as a message part
+            # or it will not be interpreted correctly by client.
+            body = TMail::Mail.new
+            body.body = options[:body] || ""
+            body.content_type = options[:content_type] || "text/plain"
+            mail.parts.push body
+            (options[:attachments] || []).each do |name, body|
+              attachment = TMail::Mail.new
+              attachment.transfer_encoding = "base64"
+              attachment.body = Base64.encode64(body)
+              content_type = MIME::Types.type_for(name).to_s
+              attachment.content_type = content_type unless content_type == ""
+              attachment.set_content_disposition "attachment", "filename" => name
+              mail.parts.push attachment
+            end
+          else
+            mail.content_type = options[:content_type] || "text/plain"
+            mail.body = options[:body] || ""
           end
+          mail.charset = options[:charset] || "UTF-8" # charset must be set after setting content_type
           mail
         end
 
@@ -62,7 +78,7 @@ module Padrino
         end
 
         def transport_via_sendmail(tmail, options={})
-          logger.debug "Sending email via sendmail: #{tmail}"
+          logger.debug "Sending email via sendmail:\n#{tmail}" if Kernel.respond_to?(:logger)
           IO.popen('-', 'w+') do |pipe|
             if pipe
               pipe.write(tmail.to_s)
@@ -73,7 +89,7 @@ module Padrino
         end
 
         def transport_via_smtp(tmail, options={:smtp => {}})
-          logger.debug "Sending email via smtp: #{tmail}"
+          logger.debug "Sending email via smtp:\n#{tmail}" if Kernel.respond_to?(:logger)
           default_options = {:smtp => { :host => 'localhost', :port => '25', :domain => 'localhost.localdomain' }}
           o = default_options[:smtp].merge(options[:smtp])
           smtp = Net::SMTP.new(o[:host], o[:port])

data/lib/padrino-mailer/mail_object.rb

@@ -36,18 +36,27 @@ module Padrino
       end
 
       protected
+        ##
         # Returns the delivery method to use for this mail object
+        # 
+        # ==== Examples
+        # 
         # @mo.delivery_method => :smtp || :sendmail
+        # 
         def delivery_method
           @mail_attributes[:via] || (@smtp_settings.present? ? :smtp : :sendmail)
         end
 
+        ##
         # Returns true if the mail object is going to be delivered using smtp
+        # 
         def using_smtp?
           delivery_method.to_s =~ /smtp/
         end
 
+        ##
         # Performs the actual email sending
+        # 
         def send_mail(delivery_attributes)
           Delivery.mail(delivery_attributes) && true
         end

data/padrino-mailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-mailer}
-  s.version = "0.8.1"
+  s.version = "0.8.2"
 
   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-02-14}
+  s.date = %q{2010-02-17}
   s.description = %q{Mailer system for padrino allowing easy delivery of application emails}
   s.email = %q{padrinorb@gmail.com}
   s.extra_rdoc_files = [
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sinatra>, [">= 0.9.2"])
-      s.add_runtime_dependency(%q<padrino-core>, ["= 0.8.1"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.8.2"])
       s.add_runtime_dependency(%q<tilt>, [">= 0.2"])
       s.add_runtime_dependency(%q<tmail>, [">= 1.2"])
       s.add_development_dependency(%q<shoulda>, [">= 2.10.3"])
@@ -59,7 +59,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
     else
       s.add_dependency(%q<sinatra>, [">= 0.9.2"])
-      s.add_dependency(%q<padrino-core>, ["= 0.8.1"])
+      s.add_dependency(%q<padrino-core>, ["= 0.8.2"])
       s.add_dependency(%q<tilt>, [">= 0.2"])
       s.add_dependency(%q<tmail>, [">= 1.2"])
       s.add_dependency(%q<shoulda>, [">= 2.10.3"])
@@ -70,7 +70,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0.9.2"])
-    s.add_dependency(%q<padrino-core>, ["= 0.8.1"])
+    s.add_dependency(%q<padrino-core>, ["= 0.8.2"])
     s.add_dependency(%q<tilt>, [">= 0.2"])
     s.add_dependency(%q<tmail>, [">= 1.2"])
     s.add_dependency(%q<shoulda>, [">= 2.10.3"])

data/test/test_mail_object.rb

@@ -2,20 +2,20 @@ require File.dirname(__FILE__) + '/helper'
 
 class TestMailObject < Test::Unit::TestCase
   include Padrino::Mailer
-  
+
   context 'for #deliver method' do
     should "send mail with attributes default to sendmail no smtp" do
-      mail_object = Padrino::Mailer::MailObject.new({:to => "test@john.com", :from => "sender@sent.com", :body => "Hello"}, {})
+      mail_object = Padrino::Mailer::MailObject.new(:to => "test@john.com", :from => "sender@sent.com", :body => "Hello")
       Delivery.expects(:mail).with(:to => "test@john.com", :from => "sender@sent.com", :body => "Hello", :via => :sendmail)
       mail_object.deliver
     end
-    
+
     should "send mail with attributes default to smtp if set" do
       mail_object = Padrino::Mailer::MailObject.new({:to => "test@john.com", :body => "Hello"}, { :host => 'smtp.gmail.com' })
       Delivery.expects(:mail).with(:to => "test@john.com", :body => "Hello", :via => :smtp, :smtp => { :host => 'smtp.gmail.com' })
       mail_object.deliver
     end
-    
+
     should "send mail with attributes use sendmail if explicit" do
       mail_object = Padrino::Mailer::MailObject.new({:to => "test@john.com", :via => :sendmail }, { :host => 'smtp.gmail.com' })
       Delivery.expects(:mail).with(:to => "test@john.com", :via => :sendmail)

data/test/test_mailer_base.rb

@@ -3,7 +3,10 @@ require File.dirname(__FILE__) + '/helper'
 class DemoMailer < Padrino::Mailer::Base
   def sample_mail
     from 'test@default.com'
+    cc 'foo@bar.com'
+    bcc 'bar@foo.com'
     to 'test@test.com'
+    reply_to 'foobar@foobar.com'
     body "Hello world!"
     via :sendmail
   end
@@ -17,7 +20,7 @@ end
 
 class TestMailerBase < Test::Unit::TestCase
   include Padrino::Mailer
-  
+
   context 'for defining email attributes' do
     DemoMailer.mail_fields.each do |field|
       should "support setting '#{field}' attribute" do
@@ -26,27 +29,28 @@ class TestMailerBase < Test::Unit::TestCase
         assert_equal({ field => "some_value" }, demo_mailer.mail_attributes)
       end
     end
-    
+
     should "allow defining text body" do
       demo_mailer = DemoMailer.new(:sample_mail)
       demo_mailer.body("Hello world!")
       assert_equal({ :body => "Hello world!" }, demo_mailer.mail_attributes)
     end
   end
-  
+
   context 'for retrieving template path' do
     should "return correct path" do
       demo_mailer = DemoMailer.new(:sample_mail)
       assert_match %r{demo_mailer/sample_mail.erb}, demo_mailer.template_path
     end
   end
-  
+
   context 'for #deliver class method' do
     should "perform the email delivery for sendmail" do
-      Delivery.expects(:mail).with(:from => 'test@default.com', :to => 'test@test.com', :body => "Hello world!", :via => :sendmail)
+      Delivery.expects(:mail).with(:from => 'test@default.com', :to => 'test@test.com', :body => "Hello world!", :via => :sendmail,
+                                   :cc => 'foo@bar.com', :bcc => 'bar@foo.com', :reply_to => 'foobar@foobar.com')
       DemoMailer.deliver(:sample_mail)
     end
-    
+
    should "perform the email delivery for smtp" do
       DemoMailer.smtp_settings = { :host => 'smtp.arcadic.com' }
       Delivery.expects(:mail).with(:from => 'test@default.com', :to => 'test@test.com', 
@@ -54,25 +58,25 @@ class TestMailerBase < Test::Unit::TestCase
       DemoMailer.deliver(:sample_mail_smtp)
     end
   end
-  
+
   context 'for #respond_to? class method' do
     should "respond as true for any delivery method calls for mails that exist" do
       assert DemoMailer.respond_to?(:deliver_sample_mail)
     end
-    
+
     should "respond as false for any delivery method calls for mails that don't exist" do
       assert_equal false, DemoMailer.respond_to?(:deliver_faker_mail)
     end
-    
+
     should "respond as true for any non-delivery methods that exist" do
       assert DemoMailer.respond_to?(:inspect)
     end
-    
+
     should "respond as false for any non-delivery methods that don't exist" do
       assert_equal false, DemoMailer.respond_to?(:fake_method)
     end
   end
-  
+
   context 'for #method_missing dynamic delivery' do
     should 'invoke deliver method with appropriate parameters' do
       DemoMailer.expects(:deliver).with("example_name", "test", 5)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-mailer
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-14 00:00:00 +01:00
+date: 2010-02-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.8.1
+        version: 0.8.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: tilt