padrino-mailer 0.10.1 → 0.10.2

data/README.rdoc

@@ -100,4 +100,4 @@ The mailer also supports the attachment of files and various other options. Be s
 
 == Copyright
 
-Copyright (c) 2011 Padrino. See LICENSE for details.
+Copyright (c) 2011 Padrino. See LICENSE for details.

data/lib/padrino-mailer.rb

@@ -31,4 +31,4 @@ module Padrino
       alias :included :registered
     end
   end # Mailer
-end # Padrino
+end # Padrino

data/lib/padrino-mailer/base.rb

@@ -27,7 +27,7 @@ module Padrino
     class Base
       attr_accessor :delivery_settings, :app, :mailer_name, :messages
 
-      def initialize(app, name, &block) #:nodoc:
+      def initialize(app, name, &block) # @private
         @mailer_name = name
         @messages    = {}
         @defaults    = {}
@@ -78,4 +78,4 @@ module Padrino
       end
     end # Base
   end # Mailer
-end # Padrino
+end # Padrino

data/lib/padrino-mailer/ext.rb

@@ -1,5 +1,5 @@
-module Mail #:nodoc:
-  class Message #:nodoc:
+module Mail # @private
+  class Message # @private
     include Sinatra::Templates
     include Padrino::Rendering if defined?(Padrino::Rendering)
     attr_reader :template_cache
@@ -228,7 +228,7 @@ module Mail #:nodoc:
           part do |p|
             p.content_type(format)
             p.send(:render, engine, data, options, locals, &block)
-            add_multipart_alternate_header unless html_part.blank?
+            add_multipart_alternate_header if html_part.present? || provides.include?(:html)
           end
         end
         # Setup the body if we don't have provides
@@ -236,4 +236,4 @@ module Mail #:nodoc:
       end
 
   end # Message
-end # Mail
+end # Mail

data/lib/padrino-mailer/helpers.rb

@@ -1,7 +1,7 @@
 module Padrino
   module Mailer
     module Helpers
-      def self.included(base) #:nodoc:
+      def self.included(base) # @private
         base.extend(ClassMethods)
       end
 
@@ -35,7 +35,7 @@ module Padrino
       end
 
       module ClassMethods
-        def inherited(subclass) #:nodoc:
+        def inherited(subclass) # @private
           @_registered_mailers ||= {}
           super(subclass)
         end
@@ -124,4 +124,4 @@ module Padrino
       end
     end # Helpers
   end # Mailer
-end # Padrino
+end # Padrino

data/lib/padrino-mailer/mime.rb

@@ -39,4 +39,4 @@ module Padrino
       }
     end # Mime
   end # Mailer
-end # Padrino
+end # Padrino

data/padrino-mailer.gemspec

@@ -25,4 +25,4 @@ Gem::Specification.new do |s|
   s.add_dependency("padrino-core", Padrino.version)
   s.add_dependency("mail", "~> 2.3.0")
   s.add_dependency("tlsmail") if RUBY_VERSION == "1.8.6"
-end
+end

data/test/fixtures/basic.erb

@@ -1 +1 @@
-This is a body of text from a template
+This is a body of text from a template

data/test/fixtures/layout.erb

@@ -1 +1 @@
-Layout Basic <%= yield %>
+Layout Basic <%= yield %>

data/test/fixtures/padrino_app/app.rb

@@ -76,4 +76,4 @@ class PadrinoApp < Padrino::Application
 end
 
 Padrino.mount("PadrinoApp").to("/")
-Padrino.load!
+Padrino.load!

data/test/fixtures/padrino_app/views/mailers/demo/sample_mail.erb

@@ -1 +1 @@
-This is a sample message
+This is a sample message

data/test/fixtures/padrino_app/views/mailers/sample/anniversary.erb

@@ -1,2 +1,2 @@
 <p>Yay <%= names %>!</p>
-<p>You have been married <%= years_married %> years</p>
+<p>You have been married <%= years_married %> years</p>

data/test/fixtures/padrino_app/views/mailers/sample/birthday.erb

@@ -1,2 +1,2 @@
 Happy Birthday <%= name %>!
-You are turning <%= age %>
+You are turning <%= age %>

data/test/fixtures/padrino_app/views/mailers/sample/foo_message.erb

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

data/test/fixtures/padrino_app/views/mailers/sample/helper_message.erb

@@ -1 +1 @@
-<%= link_to name, "#" %>
+<%= link_to name, "#" %>

data/test/fixtures/sinatra_app/views/mailers/demo/sample_mail.erb

@@ -1 +1 @@
-This is a sample message
+This is a sample message

data/test/fixtures/sinatra_app/views/mailers/sample/anniversary.erb

@@ -1,2 +1,2 @@
 <p>Yay <%= names %>!</p>
-<p>You have been married <%= years_married %> years</p>
+<p>You have been married <%= years_married %> years</p>

data/test/fixtures/sinatra_app/views/mailers/sample/birthday.erb

@@ -1,2 +1,2 @@
 Happy Birthday <%= name %>!
-You are turning <%= age %>
+You are turning <%= age %>

data/test/fixtures/sinatra_app/views/mailers/sample/foo_message.erb

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

data/test/fixtures/views/mailers/alternate/foo.erb

@@ -1 +1 @@
-This is a foo message in mailers/alternate dir
+This is a foo message in mailers/alternate dir

data/test/fixtures/views/mailers/bar.erb

@@ -1 +1 @@
-This is a bar message in mailers dir
+This is a bar message in mailers dir

data/test/fixtures/views/mailers/i18n/hello.en.erb

@@ -1 +1 @@
-Hello World
+Hello World

data/test/fixtures/views/mailers/i18n/hello.it.erb

@@ -1 +1 @@
-Salve Mondo
+Salve Mondo

data/test/fixtures/views/mailers/layouts/sample.erb

@@ -1 +1 @@
-Layout Sample <%= yield %>
+Layout Sample <%= yield %>

data/test/fixtures/views/mailers/multipart/basic.html.erb

@@ -1 +1 @@
-text html
+text html

data/test/fixtures/views/mailers/multipart/basic.plain.erb

@@ -1 +1 @@
-plain text
+plain text

data/test/fixtures/views/mailers/sample/foo.erb

@@ -1 +1 @@
-This is a foo message in mailers/sample dir
+This is a foo message in mailers/sample dir

data/test/helper.rb

@@ -68,4 +68,4 @@ class Test::Unit::TestCase
     end
   end
   alias :response :last_response
-end
+end

data/test/test_email.rb

@@ -68,7 +68,7 @@ class TestEmail < Test::Unit::TestCase
       assert_equal ['padrino@me.com'],    email.from
       assert_equal ['padrino@you.com'],   email.to
       assert_equal 'Hello there Padrino', email.subject
-      assert_equal 'This is a body of text from a template', email.body.to_s
+      assert_equal 'This is a body of text from a template', email.body.to_s.chomp
     end
 
     should 'send emails with scoped mailer defaults' do
@@ -93,7 +93,7 @@ class TestEmail < Test::Unit::TestCase
       assert_equal ['padrino@from.com'],    email.from, "should have used default value"
       assert_equal ['padrino@different.com'],   email.to, "should have overwritten default value"
       assert_equal 'Hello there again Padrino', email.subject
-      assert_equal 'This is a foo message in mailers/alternate dir', email.body.to_s
+      assert_equal 'This is a foo message in mailers/alternate dir', email.body.to_s.chomp
     end
 
     should 'send emails with app mailer defaults' do
@@ -117,7 +117,7 @@ class TestEmail < Test::Unit::TestCase
       assert_equal ['padrino@from.com'],    email.from, "should have used default value"
       assert_equal ['padrino@different.com'],   email.to, "should have overwritten default value"
       assert_equal 'This is a test', email.subject
-      assert_equal 'This is a foo message in mailers/alternate dir', email.body.to_s
+      assert_equal 'This is a foo message in mailers/alternate dir', email.body.to_s.chomp
     end
 
     should 'send emails without layout' do
@@ -142,7 +142,7 @@ class TestEmail < Test::Unit::TestCase
       assert_equal ['padrino@me.com'],    email.from
       assert_equal ['padrino@you.com'],   email.to
       assert_equal 'Hello there Padrino', email.subject
-      assert_equal 'This is a foo message in mailers/alternate dir', email.body.to_s
+      assert_equal 'This is a foo message in mailers/alternate dir', email.body.to_s.chomp
       assert_match /TestMailer/, email.delivery_method.to_s
     end
 
@@ -158,4 +158,4 @@ class TestEmail < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/test_message.rb

@@ -14,7 +14,7 @@ class TestMessage < Test::Unit::TestCase
       assert_equal ['padrino@me.com'],       message.from
       assert_equal ['padrino@you.com'],      message.to
       assert_equal 'Hello there Padrino',    message.subject
-      assert_equal 'This is a body of text', message.body.to_s
+      assert_equal 'This is a body of text', message.body.to_s.chomp
     end
 
     should "raise an error if template was not found" do
@@ -40,7 +40,7 @@ class TestMessage < Test::Unit::TestCase
       assert_equal ['padrino@me.com'],    message.from
       assert_equal ['padrino@you.com'],   message.to
       assert_equal 'Hello there Padrino', message.subject
-      assert_equal 'Im Foo!',             message.body.to_s
+      assert_equal 'Im Foo!',             message.body.to_s.chomp
     end
 
     should "use views paths" do
@@ -55,7 +55,7 @@ class TestMessage < Test::Unit::TestCase
       assert_equal ['padrino@me.com'],    message.from
       assert_equal ['padrino@you.com'],   message.to
       assert_equal 'Hello there Padrino', message.subject
-      assert_equal 'This is a bar message in mailers dir', message.body.to_s
+      assert_equal 'This is a bar message in mailers dir', message.body.to_s.chomp
     end
 
     should "use views and mailers paths" do
@@ -70,7 +70,7 @@ class TestMessage < Test::Unit::TestCase
       assert_equal ['padrino@me.com'],    message.from
       assert_equal ['padrino@you.com'],   message.to
       assert_equal 'Hello there Padrino', message.subject
-      assert_equal 'This is a foo message in mailers/alternate dir', message.body.to_s
+      assert_equal 'This is a foo message in mailers/alternate dir', message.body.to_s.chomp
     end
 
     should "use layouts" do
@@ -85,7 +85,7 @@ class TestMessage < Test::Unit::TestCase
       assert_equal ['padrino@me.com'],    message.from
       assert_equal ['padrino@you.com'],   message.to
       assert_equal 'Hello there Padrino', message.subject
-      assert_equal 'Layout Sample This is a foo message in mailers/sample dir', message.body.to_s
+      assert_equal 'Layout Sample This is a foo message in mailers/sample dir', message.body.to_s.strip
     end
 
     should "use i18n" do
@@ -102,7 +102,7 @@ class TestMessage < Test::Unit::TestCase
       assert_equal ['padrino@me.com'],    message.from
       assert_equal ['padrino@you.com'],   message.to
       assert_equal 'Hello there Padrino', message.subject
-      assert_equal 'Hello World',         message.body.to_s
+      assert_equal 'Hello World',         message.body.to_s.chomp
 
       I18n.locale = :it
 
@@ -117,7 +117,7 @@ class TestMessage < Test::Unit::TestCase
       assert_equal ['padrino@me.com'],    message.from
       assert_equal ['padrino@you.com'],   message.to
       assert_equal 'Hello there Padrino', message.subject
-      assert_equal 'Salve Mondo',         message.body.to_s
+      assert_equal 'Salve Mondo',         message.body.to_s.chomp
     end
 
     should "auto lookup template for the given content_type" do
@@ -133,7 +133,7 @@ class TestMessage < Test::Unit::TestCase
       assert_equal ['padrino@me.com'],    message.from
       assert_equal ['padrino@you.com'],   message.to
       assert_equal 'Hello there Padrino', message.subject
-      assert_equal 'text html',           message.body.to_s
+      assert_equal 'text html',           message.body.to_s.chomp
 
       message = Mail::Message.new do
         views        File.dirname(__FILE__) + '/fixtures/views/mailers'
@@ -147,7 +147,7 @@ class TestMessage < Test::Unit::TestCase
       assert_equal ['padrino@me.com'],    message.from
       assert_equal ['padrino@you.com'],   message.to
       assert_equal 'Hello there Padrino', message.subject
-      assert_equal 'plain text',          message.body.to_s
+      assert_equal 'plain text',          message.body.to_s.chomp
     end
   end
-end
+end

data/test/test_padrino_mailer.rb

@@ -92,4 +92,4 @@ class TestPadrinoMailer < Test::Unit::TestCase
     end
     
   end
-end
+end

data/test/test_part.rb

@@ -29,7 +29,7 @@ class TestPart < Test::Unit::TestCase
       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 "This is a foo message in mailers/sample dir", message.parts[1].body.decoded.chomp
       assert_equal :plain, message.parts[2].content_type
       assert_equal "other", message.parts[2].body.decoded
     end
@@ -54,9 +54,9 @@ class TestPart < Test::Unit::TestCase
       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 "plain text", message.parts[0].body.decoded.chomp
       assert_equal :html, message.parts[1].content_type
-      assert_equal "text html", message.parts[1].body.decoded
+      assert_equal "text html", message.parts[1].body.decoded.chomp
     end
 
     should "works with less explict multipart templates" do
@@ -74,9 +74,9 @@ class TestPart < Test::Unit::TestCase
       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 "plain text", message.parts[0].body.decoded.chomp
       assert_equal :html, message.parts[1].content_type
-      assert_equal "text html", message.parts[1].body.decoded
+      assert_equal "text html", message.parts[1].body.decoded.chomp
     end
 
     should "works with provides" do
@@ -89,11 +89,12 @@ class TestPart < Test::Unit::TestCase
         render  'multipart/basic'
       end
 
+      assert_match /^multipart\/alternative/, message['content-type'].value
       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 "plain text", message.parts[0].body.decoded.chomp
       assert_equal :html, message.parts[1].content_type
-      assert_equal "text html", message.parts[1].body.decoded
+      assert_equal "text html", message.parts[1].body.decoded.chomp
     end
 
     # should "provide a way to instantiate a new part as you go down" do
@@ -116,4 +117,4 @@ class TestPart < Test::Unit::TestCase
     #   assert_equal "<b>test</b> HTML<br/>\nline #2", message.parts.first.parts[1].body.decoded
     # end
   end
-end
+end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-mailer
 version: !ruby/object:Gem::Version 
+  hash: 51
   prerelease: 
-  version: 0.10.1
+  segments: 
+  - 0
+  - 10
+  - 2
+  version: 0.10.2
 platform: ruby
 authors: 
 - Padrino Team
@@ -13,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-01 00:00:00 -07:00
+date: 2011-08-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +29,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.10.1
+        hash: 51
+        segments: 
+        - 0
+        - 10
+        - 2
+        version: 0.10.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -35,6 +45,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
         version: 2.3.0
   type: :runtime
   version_requirements: *id002
@@ -98,12 +113,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []