padrino-mailer 0.9.6 → 0.9.7

data/README.rdoc

@@ -54,7 +54,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 
+Be sure to check out the
 {Padrino Mailer}[http://wiki.github.com/padrino/padrino-framework/padrino-mailer] guide for more details on usage.
 
 == Copyright

data/Rakefile

@@ -63,4 +63,4 @@ Rake::RDocTask.new do |rdoc|
   rdoc.title = "padrino-mailer #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
-end
+end

data/VERSION

@@ -1 +1 @@
-0.9.6
+0.9.7

data/lib/padrino-mailer.rb

@@ -10,15 +10,15 @@ Dir[File.dirname(__FILE__) + '/padrino-mailer/**/*.rb'].each { |file| require fi
 
 module Padrino
   ##
-  # This component uses an enhanced version of the excellent pony library (vendored) for a powerful but simple mailer 
+  # This component uses an enhanced version of the excellent pony library (vendored) for a powerful but simple mailer
   # system within Padrino (and Sinatra).
-  # There is full support for using an html content type as well as for file attachments. 
+  # There is full support for using an html content type as well as for file attachments.
   # The MailerPlugin has many similarities to ActionMailer but is much lighterweight and (arguably) easier to use.
-  # 
+  #
   module Mailer
     ##
     # Used Padrino::Application for register Padrino::Mailer::Base::views_path
-    # 
+    #
     def self.registered(app)
       Padrino::Mailer::Base::views_path << app.views
     end

data/lib/padrino-mailer/base.rb

@@ -2,9 +2,9 @@ module Padrino
   module Mailer
     ##
     # This is the abstract class that other mailers will inherit from in order to send mail
-    # 
+    #
     # You can set the default delivery settings through:
-    # 
+    #
     #   Padrino::Mailer::Base.smtp_settings = {
     #     :host   => 'smtp.yourserver.com',
     #     :port   => '25',
@@ -13,17 +13,20 @@ module Padrino
     #     :auth   => :plain # :plain, :login, :cram_md5, no auth by default
     #     :domain => "localhost.localdomain" # the HELO domain provided by the client to the server
     #   }
-    # 
+    #
     # and then all delivered mail will use these settings unless otherwise specified.
-    # 
+    #
     class Base
       ##
       # 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]
       end
 
+      @@views_path = []
+      cattr_accessor :smtp_settings
+      cattr_accessor :views_path
       attr_accessor :mail_attributes
 
       def initialize(mail_name=nil) #:nodoc:
@@ -33,14 +36,14 @@ module Padrino
 
       ##
       # Defines a method allowing mail attributes to be set into a hash for use when delivering
-      # 
+      #
       self.mail_fields.each do |field|
         define_method(field) { |value| @mail_attributes[field] = value }
       end
 
       ##
       # 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
@@ -50,7 +53,7 @@ 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
@@ -58,18 +61,14 @@ module Padrino
         end
       end
 
-      @@views_path = []
-      cattr_accessor :smtp_settings
-      cattr_accessor :views_path
-
       ##
       # Delivers the specified message for mail_name to the intended recipients
       # mail_name corresponds to the name of a defined method within the mailer class
-      # 
+      #
       # ==== Examples
-      # 
+      #
       #   SampleMailer.deliver(:birthday_message)
-      # 
+      #
       def self.deliver(mail_name, *args)
         mail_object = self.new(mail_name)
         mail_object.method(mail_name).call(*args)
@@ -78,7 +77,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, include_private)
       end
@@ -86,10 +85,10 @@ module Padrino
       ##
       # Handles method missing for a mailer class. Delivers a message based on the method
       # 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, *arguments, &block)
       end
     end # Base
   end # Mailer
-end # Padrino
+end # Padrino

data/lib/padrino-mailer/delivery.rb

@@ -107,4 +107,4 @@ module Padrino
       end
     end # Delivery
   end # Mailer
-end # Padrino
+end # Padrino

data/lib/padrino-mailer/mail_object.rb

@@ -3,20 +3,20 @@ module Padrino
     ##
     # This represents a particular mail object which will need to be sent
     # A mail_object requires the mail attributes and the delivery_settings
-    # 
+    #
     class MailObject
       ##
       # Initialize a new MailObject
-      # 
+      #
       # ==== Examples
-      # 
+      #
       #   Padrino::Mailer::MailObject.new(
       #     :subject => "Hey this is my subject",
-      #     :to => "info@padrinorb.org", 
-      #     :from => "foo@bar.com", 
+      #     :to => "info@padrinorb.org",
+      #     :from => "foo@bar.com",
       #     :body => "This is my body"
       #   ).deliver
-      # 
+      #
       def initialize(mail_attributes={}, smtp_settings={})
         @mail_attributes = mail_attributes.dup
         @smtp_settings = smtp_settings.dup if smtp_settings.present?
@@ -24,11 +24,11 @@ module Padrino
 
       ##
       # Constructs the delivery attributes for the message and then sends the mail
-      # 
+      #
       # ==== Examples
-      # 
+      #
       #   @mail_object.deliver
-      # 
+      #
       def deliver
         @mail_attributes.reverse_merge!(:via => self.delivery_method.to_sym)
         @mail_attributes.reverse_merge!(:smtp => @smtp_settings) if using_smtp?
@@ -38,28 +38,28 @@ module Padrino
       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
     end # MailObject
   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.6"
+  s.version = "0.9.7"
 
   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-15}
+  s.date = %q{2010-03-22}
   s.description = %q{Mailer system for padrino allowing easy delivery of application emails}
   s.email = %q{padrinorb@gmail.com}
   s.extra_rdoc_files = [
@@ -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.6"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.9.7"])
       s.add_runtime_dependency(%q<tilt>, [">= 0.6"])
       s.add_runtime_dependency(%q<tmail>, [">= 1.2"])
       s.add_development_dependency(%q<shoulda>, [">= 2.10.3"])
@@ -57,7 +57,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.6"])
+      s.add_dependency(%q<padrino-core>, ["= 0.9.7"])
       s.add_dependency(%q<tilt>, [">= 0.6"])
       s.add_dependency(%q<tmail>, [">= 1.2"])
       s.add_dependency(%q<shoulda>, [">= 2.10.3"])
@@ -67,7 +67,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<webrat>, [">= 0.5.1"])
     end
   else
-    s.add_dependency(%q<padrino-core>, ["= 0.9.6"])
+    s.add_dependency(%q<padrino-core>, ["= 0.9.7"])
     s.add_dependency(%q<tilt>, [">= 0.6"])
     s.add_dependency(%q<tmail>, [">= 1.2"])
     s.add_dependency(%q<shoulda>, [">= 2.10.3"])

data/test/fixtures/mailer_app/app.rb

@@ -17,7 +17,7 @@ class MailerDemo < Sinatra::Base
   register Padrino::Mailer
 
   class SampleMailer < Padrino::Mailer::Base
-    
+
     def birthday_message(name, age)
       subject "Happy Birthday!"
       to   'john@fake.com'

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

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

data/test/helper.rb

@@ -6,9 +6,9 @@ require 'rack/test'
 require 'webrat'
 
 # We try to load the vendored padrino-core if exist
-%w(core).each do |gem|
-  if File.exist?(File.dirname(__FILE__) + "/../../padrino-#{gem}/lib")
-    $:.unshift File.dirname(__FILE__) + "/../../padrino-#{gem}/lib"
+%w(core).each do |lib|
+  if File.exist?(File.dirname(__FILE__) + "/../../padrino-#{lib}/lib")
+    $:.unshift File.dirname(__FILE__) + "/../../padrino-#{lib}/lib"
   end
 end
 

data/test/test_mailer_base.rb

@@ -53,7 +53,7 @@ class TestMailerBase < Test::Unit::TestCase
 
    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', 
+      Delivery.expects(:mail).with(:from => 'test@default.com', :to => 'test@test.com',
                                :body => "SMTP Hello world!", :via => :smtp, :smtp => { :host => 'smtp.arcadic.com' })
       DemoMailer.deliver(:sample_mail_smtp)
     end

data/test/test_padrino_mailer.rb

@@ -7,14 +7,14 @@ class TestPadrinoMailer < Test::Unit::TestCase
   end
 
   context 'for mail delivery in sample application' do
-    setup { 
-      Padrino::Mailer::Base::views_path = MailerDemo.views
-      MailerDemo::SampleMailer.smtp_settings = MailerDemo.smtp_settings 
+    setup {
+      Padrino::Mailer::Base::views_path << MailerDemo.views
+      MailerDemo::SampleMailer.smtp_settings = MailerDemo.smtp_settings
     }
 
     should 'be able to deliver plain text emails' do
       assert_email_sent(:to => 'john@fake.com', :from => 'noreply@birthday.com', :via => :smtp,
-                        :subject => "Happy Birthday!", :body => "Happy Birthday Joey! \nYou are turning 21")
+                        :subject => "Happy Birthday!", :body => "Happy Birthday Joey!\nYou are turning 21")
       visit '/deliver/plain', :post
       assert_equal 'mail delivered', last_response.body
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 6
-  version: 0.9.6
+  - 7
+  version: 0.9.7
 platform: ruby
 authors: 
 - Padrino Team
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-15 00:00:00 -07:00
+date: 2010-03-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,8 +30,8 @@ dependencies:
         segments: 
         - 0
         - 9
-        - 6
-        version: 0.9.6
+        - 7
+        version: 0.9.7
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency