padrino-mailer 0.9.10 → 0.9.11

data/test/test_part.rb

@@ -0,0 +1,119 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+class TestPart < Test::Unit::TestCase
+
+  context "the part" do
+    should "use correctly parts" do
+      message = Mail::Message.new do
+        views   File.dirname(__FILE__) + '/fixtures/views/mailers'
+        to      'padrino@test.lindsaar.net'
+        subject "nested multipart"
+        from    "test@example.com"
+
+        text_part do
+          body 'plain text'
+        end
+
+        html_part do
+          render  'sample/foo'
+        end
+
+        part do
+          body 'other'
+        end
+      end
+
+      assert_not_nil message.html_part
+      assert_not_nil message.text_part
+      assert_equal 4, message.parts.length
+      assert_equal :plain, message.parts[0].content_type
+      assert_equal "plain text", message.parts[0].body.decoded
+      assert_equal :html, message.parts[1].content_type
+      assert_equal "This is a foo message in mailers/sample dir", message.parts[1].body.decoded
+      assert_equal :plain, message.parts[2].content_type
+      assert_equal "other", message.parts[2].body.decoded
+    end
+
+    should "works with multipart templates" do
+      message = Mail::Message.new do
+        views   File.dirname(__FILE__) + '/fixtures/views/mailers'
+        to      'padrino@test.lindsaar.net'
+        subject "nested multipart"
+        from    "test@example.com"
+
+        text_part do
+          render  'multipart/basic.text'
+        end
+
+        html_part do
+          render  'multipart/basic.html'
+        end
+      end
+
+      assert_not_nil message.html_part
+      assert_not_nil message.text_part
+      assert_equal 2, message.parts.length
+      assert_equal :plain, message.parts[0].content_type
+      assert_equal "plain text", message.parts[0].body.decoded
+      assert_equal :html, message.parts[1].content_type
+      assert_equal "text html", message.parts[1].body.decoded
+    end
+
+    should "works with less explict multipart templates" do
+      message = Mail::Message.new do
+        views   File.dirname(__FILE__) + '/fixtures/views/mailers'
+        to      'padrino@test.lindsaar.net'
+        subject "nested multipart"
+        from    "test@example.com"
+
+        text_part { render('multipart/basic.plain') }
+        html_part { render('multipart/basic.html')  }
+      end
+
+      assert_not_nil message.html_part
+      assert_not_nil message.text_part
+      assert_equal 2, message.parts.length
+      assert_equal :plain, message.parts[0].content_type
+      assert_equal "plain text", message.parts[0].body.decoded
+      assert_equal :html, message.parts[1].content_type
+      assert_equal "text html", message.parts[1].body.decoded
+    end
+
+    should "works with provides" do
+      message = Mail::Message.new do
+        views   File.dirname(__FILE__) + '/fixtures/views/mailers'
+        to      'padrino@test.lindsaar.net'
+        subject "nested multipart"
+        from    "test@example.com"
+        provides :plain, :html
+        render  'multipart/basic'
+      end
+
+      assert_equal 2, message.parts.length
+      assert_equal :plain, message.parts[0].content_type
+      assert_equal "plain text", message.parts[0].body.decoded
+      assert_equal :html, message.parts[1].content_type
+      assert_equal "text html", message.parts[1].body.decoded
+    end
+
+    # should "provide a way to instantiate a new part as you go down" do
+    #   message = Mail::Message.new do
+    #     to           'padrino@test.lindsaar.net'
+    #     subject      "nested multipart"
+    #     from         "test@example.com"
+    #     content_type "multipart/mixed"
+    #
+    #     part :content_type => "multipart/alternative", :content_disposition => "inline", :headers => { "foo" => "bar" } do |p|
+    #       p.part :content_type => "text/plain", :body => "test text\nline #2"
+    #       p.part :content_type => "text/html",  :body => "<b>test</b> HTML<br/>\nline #2"
+    #     end
+    #   end
+    #
+    #   assert_equal 2, message.parts.first.parts.length
+    #   assert_equal :plain, message.parts.first.parts[0].content_type
+    #   assert_equal "test text\nline #2", message.parts.first.parts[0].body.decoded
+    #   assert_equal :html, message.parts.first.parts[1].content_type
+    #   assert_equal "<b>test</b> HTML<br/>\nline #2", message.parts.first.parts[1].body.decoded
+    # end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 10
-  version: 0.9.10
+  - 11
+  version: 0.9.11
 platform: ruby
 authors: 
 - Padrino Team
@@ -17,106 +17,129 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-22 00:00:00 +02:00
+date: 2010-06-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: padrino-core
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         - 9
-        - 10
-        version: 0.9.10
+        - 11
+        version: 0.9.11
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: tmail
-  prerelease: false
+  name: mail
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
         - 2
-        version: "1.2"
+        - 2
+        - 0
+        version: 2.2.0
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: shoulda
-  prerelease: false
+  name: rake
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
-        - 10
-        - 3
-        version: 2.10.3
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
   type: :development
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: haml
-  prerelease: false
+  name: mocha
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
-        - 2
-        - 1
-        version: 2.2.1
+        - 0
+        - 9
+        - 8
+        version: 0.9.8
   type: :development
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: mocha
-  prerelease: false
+  name: rack-test
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 9
-        - 7
-        version: 0.9.7
+        - 5
+        - 0
+        version: 0.5.0
   type: :development
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rack-test
-  prerelease: false
+  name: webrat
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         - 5
-        - 0
-        version: 0.5.0
+        - 1
+        version: 0.5.1
   type: :development
+  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: webrat
-  prerelease: false
+  name: haml
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
-        - 5
-        - 1
-        version: 0.5.1
+        - 2
+        - 2
+        - 22
+        version: 2.2.22
   type: :development
+  prerelease: false
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 10
+        - 3
+        version: 2.10.3
+  type: :development
+  prerelease: false
+  version_requirements: *id008
 description: Mailer system for padrino allowing easy delivery of application emails
 email: padrinorb@gmail.com
 executables: []
@@ -131,20 +154,37 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- lib/padrino-mailer.rb
-- lib/padrino-mailer/base.rb
-- lib/padrino-mailer/delivery.rb
-- lib/padrino-mailer/mail_object.rb
 - padrino-mailer.gemspec
-- test/fixtures/mailer_app/app.rb
-- 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
+- lib/padrino-mailer/base.rb
+- lib/padrino-mailer/ext.rb
+- lib/padrino-mailer/helpers.rb
+- lib/padrino-mailer/mime.rb
+- lib/padrino-mailer.rb
+- test/fixtures/basic.erb
+- test/fixtures/layout.erb
+- test/fixtures/padrino_app/app.rb
+- test/fixtures/padrino_app/views/mailers/demo/sample_mail.erb
+- test/fixtures/padrino_app/views/mailers/sample/anniversary.erb
+- test/fixtures/padrino_app/views/mailers/sample/birthday.erb
+- test/fixtures/padrino_app/views/mailers/sample/foo_message.erb
+- test/fixtures/sinatra_app/app.rb
+- test/fixtures/sinatra_app/views/mailers/demo/sample_mail.erb
+- test/fixtures/sinatra_app/views/mailers/sample/anniversary.erb
+- test/fixtures/sinatra_app/views/mailers/sample/birthday.erb
+- test/fixtures/sinatra_app/views/mailers/sample/foo_message.erb
+- test/fixtures/views/mailers/alternate/foo.erb
+- test/fixtures/views/mailers/bar.erb
+- test/fixtures/views/mailers/i18n/hello.en.erb
+- test/fixtures/views/mailers/i18n/hello.it.erb
+- test/fixtures/views/mailers/layouts/sample.erb
+- test/fixtures/views/mailers/multipart/basic.html.erb
+- test/fixtures/views/mailers/multipart/basic.plain.erb
+- test/fixtures/views/mailers/sample/foo.erb
 - test/helper.rb
-- test/test_base.rb
-- test/test_mail_object.rb
+- test/test_email.rb
+- test/test_message.rb
 - test/test_padrino_mailer.rb
+- test/test_part.rb
 has_rdoc: true
 homepage: http://github.com/padrino/padrino-framework/tree/master/padrino-mailer
 licenses: []
@@ -155,6 +195,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -162,16 +203,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: padrino-mailer
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Mailer system for padrino

data/lib/padrino-mailer/delivery.rb

@@ -1,110 +0,0 @@
-require 'rubygems'
-require 'net/smtp'
-begin
-  require 'smtp_tls'
-rescue LoadError
-end
-require 'base64'
-require 'tmail'
-
-module Padrino
-  module Mailer
-    module Delivery
-
-      class << self
-
-        def mail(options)
-          raise(ArgumentError, ":to is required") unless options[:to]
-          via = options.delete(:via)
-          if via.nil?
-            transport build_tmail(options)
-          else
-            if via_options.include?(via.to_s)
-              send("transport_via_#{via}", build_tmail(options), options)
-            else
-              raise(ArgumentError, ":via must be either smtp or sendmail")
-            end
-          end
-        end
-
-        def build_tmail(options)
-          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
-
-        def sendmail_binary
-          @sendmail_binary ||= `which sendmail`.chomp
-        end
-
-        def transport(tmail)
-          if File.executable? sendmail_binary
-            transport_via_sendmail(tmail)
-          else
-            transport_via_smtp(tmail)
-          end
-        end
-
-        def via_options
-          %w(sendmail smtp)
-        end
-
-        def transport_via_sendmail(tmail, options={})
-          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)
-            else
-              exec(sendmail_binary, *tmail.to)
-            end
-          end
-        end
-
-        def transport_via_smtp(tmail, options={:smtp => {}})
-          logger.debug "Sending email via smtp:\n#{tmail}" if Kernel.respond_to?(:logger)
-          o = { :host => 'localhost', :port => '25', :domain => 'localhost.localdomain' }
-          o.merge!(options[:smtp]) if options[:smtp].is_a?(Hash)
-          smtp = Net::SMTP.new(o[:host], o[:port])
-          if o[:tls]
-            raise "You may need: gem install smtp_tls" unless smtp.respond_to?(:enable_starttls)
-            smtp.enable_starttls
-          end
-          if o.include?(:auth)
-            smtp.start(o[:domain], o[:user], o[:pass] || o[:password], o[:auth])
-          else
-            smtp.start(o[:domain])
-          end
-          smtp.send_message tmail.to_s, tmail.from, tmail.to
-          smtp.finish
-        end
-      end
-    end # Delivery
-  end # Mailer
-end # Padrino