sinatra_more 0.2.7 → 0.2.8

data/README.rdoc

@@ -49,8 +49,8 @@ Here is a small list of what sinatra_more contains:
 * Asset tag helpers (<tt>link_to</tt>, <tt>image_tag</tt>, <tt>javascript_include_tag</tt>, ...)
 * Full form helpers and builders support (<tt>form_tag</tt>, <tt>form_for</tt>, <tt>field_set_tag</tt>, <tt>text_field</tt>, ...)
 * Generally useful formatting extensions (<tt>relative_time_ago</tt>, <tt>js_escape_html</tt>, <tt>sanitize_html</tt>)
+* Simple 'mailer' support for sinatra (akin to <tt>ActionMailer</tt> but simpler and powered by <tt>pony</tt>)
 * Plug and play setup for the excellent Warden authentication system
-* Robust 'mailer' support for sinatra (akin to <tt>ActionMailer</tt> but simpler and powered by <tt>pony</tt>) (COMING SOON)
 * Code generators for creating a new sinatra application (COMING SOON)
 
 Keep in mind, the user will be able to pull in these components seperately and leave out those that are not required.
@@ -75,12 +75,13 @@ different components based on which pieces are useful for your particular applic
 
   # app.rb 
   require 'sinatra/base'
-  require 'sinatra_more'
+  require 'sinatra_more' # or require 'sinatra_more/markup_plugin' for precise inclusion
 
   class Application < Sinatra::Base
     register SinatraMore::MarkupPlugin
     register SinatraMore::RenderPlugin
     register SinatraMore::WardenPlugin
+    register SinatraMore::MailerPlugin
   end
 
 This will then allow you to use the components that have been registered. A breakdown of components is below:
@@ -467,10 +468,85 @@ Eventually I plan to vendor that gem or just remove support for this piece of my
 If anybody has any thoughts on this or the warden integration in general, please let me know. 
 Nonetheless, there is a certain convenience for me having access to a plug-and-play warden solution directly from this gem.
 
+=== MailerPlugin
+
+This component uses an enhanced version of the excellent <tt>pony</tt> library (vendored) for a powerful but simple
+mailer system within Sinatra. 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.
+
+Let's take a look at using the MailerPlugin in an application. By default, MailerPlugin uses the built-in sendmail
+functionality on the server. However, smtp is also supported using the following configuration:
+
+    SinatraMore::MailerBase.smtp_settings = {
+      :host   => 'smtp.gmail.com',
+      :port   => '587',
+      :tls    => true,
+      :user   => 'user',
+      :pass   => 'pass',
+      :auth   => :plain
+   }
+
+Once those have been defined, the default will become smtp delivery unless overwritten in an individual mail definition.
+Next, we should define a custom mailer extended from <tt>SinatraMore::MailerBase</tt>.
+
+  class SampleMailer < SinatraMore::MailerBase
+    def registration_email(name, user_email_address)
+      from 'admin@site.com'
+      to user_email_address
+      subject 'Welcome to the site!'
+      body    :name => name
+      type    'html'                # optional, defaults to plain/text
+      charset 'windows-1252'        # optional, defaults to utf-8
+      via     :sendmail             # optional, to smtp if defined otherwise sendmail
+    end
+  end
+
+This defines a mail called '<tt>registration_mail</tt>' with the specified attributes for delivery. The <tt>body</tt> method
+is passing the <tt>name</tt> attribute to the body message template which should be defined in
+<tt>[views_path]/sample_mailer/registration_email.erb</tt> as shown below:
+
+  # ./views/sample_mailer/registration_email.erb
+  This is the body of the email and can access the <%= name %> that was passed in from the mailer definition
+  That's all there is to defining the body of the email which can be plain text or email
+
+Once the mailer definition has been completed and the template has been defined, the email can be sent using:
+
+  SampleMailer.deliver(:registration_email, "Bob", "bob@bobby.com")
+
+or if you like the method_missing approach:
+
+  SampleMailer.deliver_registration_email "Bob", 'bob@bobby.com'
+
+And that will then deliver the email according the the configured options. This is really all you need to send emails.
+A few variations are shown below for completeness.
+
+If we want to attach files to our email:
+
+  class SampleMailer < SinatraMore::MailerBase
+    def attachment_email(name, user_email_address)
+      from 'admin@site.com'
+      to user_email_address
+      # ...
+      attachments { "foo.zip" => File.read("path/to/foo.zip"), "file.txt" => "this is a text file!" }
+    end
+  end
+
+or perhaps we want to have a short body without the need for a template file:
+
+  class SampleMailer < SinatraMore::MailerBase
+    def short_email(name, user_email_address)
+      from 'admin@site.com'
+      to user_email_address
+      subject 'Welcome to the site!'
+      body    "This is a short body defined right in the mailer itself"
+    end
+  end
+
 == Acknowledgements
 
-* Thanks to keldredd for the sinatra_helpers code that helped me to create erb capture and concat methods.
-* Thanks to sbfaulkner for the sinatra-helpers code that I browsed through many times while starting this library.
+* Thanks to keldredd for the <tt>sinatra_helpers</tt> code that helped me to create erb capture and concat methods.
+* Thanks to sbfaulkner for the <tt>sinatra-helpers</tt> code that I browsed through many times while starting this library.
+* Thanks to vestel for the excellent modified <tt>pony</tt> fork which in part powers the mailer_plugin (http://github.com/vestel/pony)
 
 == Contributors
 

data/Rakefile

@@ -12,6 +12,7 @@ begin
     gem.email = "nesquena@gmail.com"
     gem.homepage = "http://github.com/nesquena/sinatra_more"
     gem.authors = ["Nathan Esquenazi"]
+    gem.add_runtime_dependency     "tilt",          ">= 0.2"
     gem.add_runtime_dependency     "sinatra",       ">= 0.9.2"
     gem.add_runtime_dependency     "activesupport", ">= 2.2.2"
     gem.add_development_dependency "haml",          ">= 2.2.1"

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.8

data/lib/sinatra_more/mailer_plugin/mail_object.rb

@@ -0,0 +1,37 @@
+# This represents a particular mail object which will need to be sent
+# A mail_object requires the mail attributes and the delivery_settings
+
+module SinatraMore
+  class MailObject
+    def initialize(mail_attributes={}, smtp_settings={})
+      @mail_attributes = mail_attributes.dup
+      @smtp_settings = smtp_settings.dup if smtp_settings.present?
+    end
+
+    # Constructs the delivery attributes for the message and then sends the mail
+    # @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?
+      self.send_mail(@mail_attributes)
+    end
+
+    protected
+
+    # Returns the delivery method to use for this mail object
+    # @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 using a third-party library
+    def send_mail(delivery_attributes)
+      Pony.mail(delivery_attributes) && true
+    end
+  end
+end

data/lib/sinatra_more/mailer_plugin/mailer_base.rb

@@ -0,0 +1,73 @@
+=begin
+
+This is the abstract class that other mailers will inherit from in order to send mail
+
+You can set the default delivery settings through:
+
+  SinatraMore::MailerBase.smtp_settings = {
+    :host   => 'smtp.yourserver.com',
+    :port   => '25',
+    :user   => 'user',
+    :pass   => 'pass',
+    :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.
+
+=end
+
+module SinatraMore
+  class MailerBase
+    # Returns the available mail fields when composing a message
+    def self.mail_fields
+      [:to, :from, :subject, :type, :charset, :via, :attachments]
+    end
+
+    attr_accessor :mail_attributes
+
+    def initialize(mail_name=nil)
+      @mail_name = mail_name
+      @mail_attributes = {}
+    end
+
+    # 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)
+      @mail_attributes[:body] = Tilt.new(template_path).render(self, body_value.symbolize_keys) if body_value.is_a?(Hash)
+      @mail_attributes[:body] = body_value if body_value.is_a?(String)
+    end
+
+    # Returns the path to the email template searched for using glob pattern
+    def template_path
+      Dir[File.join(self.views_path, self.class.name.underscore.split("/").last, "#{@mail_name}.*")].first
+    end
+
+    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
+    # SampleMailer.deliver(:birthday_message)
+    def self.deliver(mail_name, *args)
+      mail_object = self.new(mail_name)
+      mail_object.method(mail_name).call(*args)
+      MailObject.new(mail_object.mail_attributes, self.smtp_settings).deliver
+    end
+
+    # 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
+    end
+
+    # 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
+    end
+  end
+end

data/lib/sinatra_more/mailer_plugin.rb

@@ -0,0 +1,12 @@
+require 'tilt'
+require File.dirname(__FILE__) + '/support_lite'
+require File.dirname(__FILE__) + '/../../vendor/pony/lib/pony'
+Dir[File.dirname(__FILE__) + '/mailer_plugin/**/*.rb'].each { |file| load file }
+
+module SinatraMore
+  module MailerPlugin
+    def self.registered(app)
+      MailerBase::views_path = app.views
+    end
+  end  
+end

data/lib/sinatra_more.rb

@@ -3,3 +3,4 @@ require 'sinatra/base'
 require File.join(File.dirname(__FILE__) + '/sinatra_more/markup_plugin')
 require File.join(File.dirname(__FILE__) + '/sinatra_more/render_plugin')
 require File.join(File.dirname(__FILE__) + '/sinatra_more/warden_plugin')
+require File.join(File.dirname(__FILE__) + '/sinatra_more/mailer_plugin')

data/sinatra_more.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.2.7"
+  s.version = "0.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]
-  s.date = %q{2009-10-29}
+  s.date = %q{2009-11-03}
   s.description = %q{Expands sinatra with standard helpers and tools to allow for complex applications}
   s.email = %q{nesquena@gmail.com}
   s.extra_rdoc_files = [
@@ -25,6 +25,9 @@ Gem::Specification.new do |s|
      "TODO",
      "VERSION",
      "lib/sinatra_more.rb",
+     "lib/sinatra_more/mailer_plugin.rb",
+     "lib/sinatra_more/mailer_plugin/mail_object.rb",
+     "lib/sinatra_more/mailer_plugin/mailer_base.rb",
      "lib/sinatra_more/markup_plugin.rb",
      "lib/sinatra_more/markup_plugin/asset_tag_helpers.rb",
      "lib/sinatra_more/markup_plugin/form_builder/abstract_form_builder.rb",
@@ -40,6 +43,10 @@ Gem::Specification.new do |s|
      "lib/sinatra_more/warden_plugin/warden_helpers.rb",
      "sinatra_more.gemspec",
      "test/active_support_helpers.rb",
+     "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/markup_app/app.rb",
      "test/fixtures/markup_app/views/capture_concat.erb",
      "test/fixtures/markup_app/views/capture_concat.haml",
@@ -60,14 +67,20 @@ Gem::Specification.new do |s|
      "test/fixtures/warden_app/app.rb",
      "test/fixtures/warden_app/views/dashboard.haml",
      "test/helper.rb",
+     "test/mailer_plugin/test_mail_object.rb",
+     "test/mailer_plugin/test_mailer_base.rb",
      "test/markup_plugin/test_asset_tag_helpers.rb",
      "test/markup_plugin/test_form_builder.rb",
      "test/markup_plugin/test_form_helpers.rb",
      "test/markup_plugin/test_format_helpers.rb",
      "test/markup_plugin/test_output_helpers.rb",
      "test/markup_plugin/test_tag_helpers.rb",
+     "test/test_mailer_plugin.rb",
      "test/test_render_plugin.rb",
-     "test/test_warden_plugin.rb"
+     "test/test_warden_plugin.rb",
+     "vendor/pony/lib/pony.rb",
+     "vendor/pony/spec/base.rb",
+     "vendor/pony/spec/pony_spec.rb"
   ]
   s.homepage = %q{http://github.com/nesquena/sinatra_more}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -76,16 +89,20 @@ Gem::Specification.new do |s|
   s.summary = %q{Expands sinatra to allow for complex applications}
   s.test_files = [
     "test/active_support_helpers.rb",
+     "test/fixtures/mailer_app/app.rb",
      "test/fixtures/markup_app/app.rb",
      "test/fixtures/render_app/app.rb",
      "test/fixtures/warden_app/app.rb",
      "test/helper.rb",
+     "test/mailer_plugin/test_mail_object.rb",
+     "test/mailer_plugin/test_mailer_base.rb",
      "test/markup_plugin/test_asset_tag_helpers.rb",
      "test/markup_plugin/test_form_builder.rb",
      "test/markup_plugin/test_form_helpers.rb",
      "test/markup_plugin/test_format_helpers.rb",
      "test/markup_plugin/test_output_helpers.rb",
      "test/markup_plugin/test_tag_helpers.rb",
+     "test/test_mailer_plugin.rb",
      "test/test_render_plugin.rb",
      "test/test_warden_plugin.rb"
   ]
@@ -95,6 +112,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<tilt>, [">= 0.2"])
       s.add_runtime_dependency(%q<sinatra>, [">= 0.9.2"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.2.2"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
@@ -103,6 +121,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<tilt>, [">= 0.2"])
       s.add_dependency(%q<sinatra>, [">= 0.9.2"])
       s.add_dependency(%q<activesupport>, [">= 2.2.2"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
@@ -112,6 +131,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<webrat>, [">= 0.5.1"])
     end
   else
+    s.add_dependency(%q<tilt>, [">= 0.2"])
     s.add_dependency(%q<sinatra>, [">= 0.9.2"])
     s.add_dependency(%q<activesupport>, [">= 2.2.2"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])

data/test/fixtures/mailer_app/app.rb

@@ -0,0 +1,51 @@
+require 'sinatra/base'
+require 'sinatra_more'
+require 'haml'
+
+class MailerDemo < Sinatra::Base
+  configure do
+    set :root, File.dirname(__FILE__)
+    set :smtp_settings, {
+      :host   => 'smtp.gmail.com',
+      :port   => '587',
+      :tls    => true,
+      :user   => 'user',
+      :pass   => 'pass',
+      :auth   => :plain
+   }
+  end
+  
+  register SinatraMore::MailerPlugin
+  
+  class SampleMailer < SinatraMore::MailerBase    
+    def birthday_message(name, age)
+      subject "Happy Birthday!"
+      to   'john@fake.com'
+      from 'noreply@birthday.com'
+      body 'name' => name, 'age' => age
+      via  :smtp
+    end
+    
+    def anniversary_message(names, years_married)
+      subject "Happy anniversary!"
+      to   'julie@fake.com'
+      from 'noreply@anniversary.com'
+      body 'names' => names, 'years_married' => years_married
+      type 'html'
+    end
+  end
+  
+  post "/deliver/plain" do
+    result = SampleMailer.deliver_birthday_message("Joey", 21)
+    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'
+  end
+end
+
+class MailerUser
+  
+end

data/test/fixtures/mailer_app/views/demo_mailer/sample_mail.erb

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

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

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

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

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

data/test/mailer_plugin/test_mail_object.rb

@@ -0,0 +1,24 @@
+require 'helper'
+require 'sinatra_more'
+
+class TestMailObject < Test::Unit::TestCase
+  context 'for #deliver method' do
+    should "send mail with attributes default to sendmail no smtp" do
+      mail_object = SinatraMore::MailObject.new({:to => "test@john.com", :from => "sender@sent.com", :body => "Hello"}, {})
+      Pony.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 = SinatraMore::MailObject.new({:to => "test@john.com", :body => "Hello"}, { :host => 'smtp.gmail.com' })
+      Pony.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 = SinatraMore::MailObject.new({:to => "test@john.com", :via => :sendmail }, { :host => 'smtp.gmail.com' })
+      Pony.expects(:mail).with(:to => "test@john.com", :via => :sendmail)
+      mail_object.deliver
+    end
+  end
+end

data/test/mailer_plugin/test_mailer_base.rb

@@ -0,0 +1,81 @@
+require 'helper'
+require 'sinatra_more'
+
+class DemoMailer < SinatraMore::MailerBase
+  def sample_mail
+    from 'test@default.com'
+    to 'test@test.com'
+    body "Hello world!"
+    via :sendmail
+  end
+  
+  def sample_mail_smtp
+   from 'test@default.com'
+    to 'test@test.com'
+    body "SMTP Hello world!"
+  end
+end
+
+class TestMailerBase < Test::Unit::TestCase
+  context 'for defining email attributes' do
+    DemoMailer.mail_fields.each do |field|
+      should "support setting '#{field}' attribute" do
+        demo_mailer = DemoMailer.new(:sample_mail)
+        demo_mailer.send(field, "some_value")
+        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
+      Pony.expects(:mail).with(:from => 'test@default.com', :to => 'test@test.com', :body => "Hello world!", :via => :sendmail)
+      DemoMailer.deliver(:sample_mail)
+    end
+    
+   should "perform the email delivery for smtp" do
+      DemoMailer.smtp_settings = { :host => 'smtp.arcadic.com' }
+      Pony.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
+  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)
+      DemoMailer.deliver_example_name("test", 5)
+    end
+  end
+end

data/test/test_mailer_plugin.rb

@@ -0,0 +1,33 @@
+require 'helper'
+require 'fixtures/mailer_app/app'
+
+class TestMailerPlugin < Test::Unit::TestCase
+  def app
+    MailerDemo.tap { |app| app.set :environment, :test }
+  end
+
+  context 'for mail delivery in sample application' do
+    setup { 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")
+      visit '/deliver/plain', :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', :type => '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
+    end
+  end
+
+  protected
+
+  def assert_email_sent(mail_attributes)
+    delivery_attributes = mail_attributes.merge(:smtp => MailerDemo.smtp_settings)
+    SinatraMore::MailObject.any_instance.expects(:send_mail).with(delivery_attributes).once.returns(true)
+  end
+end

data/vendor/pony/lib/pony.rb

@@ -0,0 +1,90 @@
+require 'rubygems'
+require 'net/smtp'
+begin
+	require 'smtp_tls'
+rescue LoadError
+end
+require 'base64'
+begin
+	require 'tmail'
+rescue LoadError
+	require 'actionmailer'
+end
+
+module Pony
+	def self.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 self.build_tmail(options)
+		mail = TMail::Mail.new
+		mail.to = options[:to]
+		mail.from = options[:from] || 'pony@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
+		end
+		mail
+	end
+
+	def self.sendmail_binary
+		@sendmail_binary ||= `which sendmail`.chomp
+	end
+
+	def self.transport(tmail)
+		if File.executable? sendmail_binary
+			transport_via_sendmail(tmail)
+		else
+			transport_via_smtp(tmail)
+		end
+	end
+
+	def self.via_options
+		%w(sendmail smtp)
+	end
+
+	def self.transport_via_sendmail(tmail, options={})
+		IO.popen('-', 'w+') do |pipe|
+			if pipe
+				pipe.write(tmail.to_s)
+			else
+				exec(sendmail_binary, *tmail.to)
+			end
+		end
+	end
+
+	def self.transport_via_smtp(tmail, options={:smtp => {}})
+		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])
+		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[:password], o[:auth])
+		else
+			smtp.start(o[:domain])
+		end
+		smtp.send_message tmail.to_s, tmail.from, tmail.to
+		smtp.finish
+	end
+end

data/vendor/pony/spec/base.rb

@@ -0,0 +1,4 @@
+require 'rubygems'
+require 'spec'
+
+require File.dirname(__FILE__) + '/../lib/pony'

data/vendor/pony/spec/pony_spec.rb

@@ -0,0 +1,147 @@
+require File.dirname(__FILE__) + '/base'
+
+describe Pony do
+	it "sends mail" do
+		Pony.should_receive(:transport) do |tmail|
+			tmail.to.should == [ 'joe@example.com' ]
+			tmail.from.should == [ 'sender@example.com' ]
+			tmail.subject.should == 'hi'
+			tmail.body.should == 'Hello, Joe.'
+		end
+		Pony.mail(:to => 'joe@example.com', :from => 'sender@example.com', :subject => 'hi', :body => 'Hello, Joe.')
+	end
+
+	it "requires :to param" do
+		Pony.stub!(:transport)
+		lambda { Pony.mail({}) }.should raise_error(ArgumentError)
+	end
+
+	it "doesn't require any other param" do
+		Pony.stub!(:transport)
+		lambda { Pony.mail(:to => 'joe@example.com') }.should_not raise_error
+	end
+
+	####################
+
+	describe "builds a TMail object with field:" do
+		it "to" do
+			Pony.build_tmail(:to => 'joe@example.com').to.should == [ 'joe@example.com' ]
+		end
+
+		it "from" do
+			Pony.build_tmail(:from => 'joe@example.com').from.should == [ 'joe@example.com' ]
+		end
+
+		it "from (default)" do
+			Pony.build_tmail({}).from.should == [ 'pony@unknown' ]
+		end
+
+		it "subject" do
+			Pony.build_tmail(:subject => 'hello').subject.should == 'hello'
+		end
+
+		it "body" do
+			Pony.build_tmail(:body => 'What do you know, Joe?').body.should == 'What do you know, Joe?'
+		end
+		
+		it "type" do
+		  Pony.build_tmail(:type => 'html').content_type.should == 'text/html'
+		end
+		
+		it "charset" do
+		  Pony.build_tmail(:charset => 'windows-1252').charset.should == 'windows-1252'
+		end
+		
+		it "attachments" do
+			tmail = Pony.build_tmail(:attachments => {"foo.txt" => "content of foo.txt"})
+			tmail.should have(1).parts
+			tmail.parts.first.to_s.should == <<-PART
+Content-Transfer-Encoding: Base64
+Content-Disposition: attachment; filename=foo.txt
+
+Y29udGVudCBvZiBmb28udHh0
+			 PART
+		end
+	end
+
+	describe "transport" do
+		it "transports via the sendmail binary if it exists" do
+			File.stub!(:executable?).and_return(true)
+			Pony.should_receive(:transport_via_sendmail).with(:tmail)
+			Pony.transport(:tmail)
+		end
+
+		it "transports via smtp if no sendmail binary" do
+			Pony.stub!(:sendmail_binary).and_return('/does/not/exist')
+			Pony.should_receive(:transport_via_smtp).with(:tmail)
+			Pony.transport(:tmail)
+		end
+
+		it "transports mail via /usr/sbin/sendmail binary" do
+			pipe = mock('sendmail pipe')
+			IO.should_receive(:popen).with('-',"w+").and_yield(pipe)
+			pipe.should_receive(:write).with('message')
+			Pony.transport_via_sendmail(mock('tmail', :to => 'to', :from => 'from', :to_s => 'message'))
+		end
+
+		describe "SMTP transport" do
+			before do
+				@smtp = mock('net::smtp object')
+				@smtp.stub!(:start)
+				@smtp.stub!(:send_message)
+				@smtp.stub!(:finish)
+				Net::SMTP.stub!(:new).and_return(@smtp)
+			end
+
+			it "defaults to localhost as the SMTP server" do
+				Net::SMTP.should_receive(:new).with('localhost', '25').and_return(@smtp)
+				Pony.transport_via_smtp(mock('tmail', :to => 'to', :from => 'from', :to_s => 'message'))
+			end
+
+			it "uses SMTP authorization when auth key is provided" do
+				o = { :smtp => { :user => 'user', :password => 'password', :auth => 'plain'}}
+				@smtp.should_receive(:start).with('localhost.localdomain', 'user', 'password', 'plain')
+				Pony.transport_via_smtp(mock('tmail', :to => 'to', :from => 'from', :to_s => 'message'), o)
+			end
+
+			it "enable starttls when tls option is true" do
+				o = { :smtp => { :user => 'user', :password => 'password', :auth => 'plain', :tls => true}}
+				@smtp.should_receive(:enable_starttls)
+				Pony.transport_via_smtp(mock('tmail', :to => 'to', :from => 'from', :to_s => 'message'), o)
+			end
+
+			it "starts the job" do
+				@smtp.should_receive(:start)
+				Pony.transport_via_smtp(mock('tmail', :to => 'to', :from => 'from', :to_s => 'message'))
+			end
+
+			it "sends a tmail message" do
+				@smtp.should_receive(:send_message)
+				Pony.transport_via_smtp(mock('tmail', :to => 'to', :from => 'from', :to_s => 'message'))
+			end
+
+			it "finishes the job" do
+				@smtp.should_receive(:finish)
+				Pony.transport_via_smtp(mock('tmail', :to => 'to', :from => 'from', :to_s => 'message'))
+			end
+
+		end
+	end
+
+	describe ":via option should over-ride the default transport mechanism" do
+		it "should send via sendmail if :via => sendmail" do
+			Pony.should_receive(:transport_via_sendmail)
+			Pony.mail(:to => 'joe@example.com', :via => :sendmail)
+		end
+
+		it "should send via smtp if :via => smtp" do
+			Pony.should_receive(:transport_via_smtp)
+			Pony.mail(:to => 'joe@example.com', :via => :smtp)
+		end
+
+		it "should raise an error if via is neither smtp nor sendmail" do
+			lambda { Pony.mail(:to => 'joe@plumber.com', :via => :pigeon) }.should raise_error(ArgumentError)
+		end
+	end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -9,9 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-29 00:00:00 -07:00
+date: 2009-11-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: tilt
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0.2"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
   type: :runtime
@@ -100,6 +110,9 @@ files:
 - TODO
 - VERSION
 - lib/sinatra_more.rb
+- lib/sinatra_more/mailer_plugin.rb
+- lib/sinatra_more/mailer_plugin/mail_object.rb
+- lib/sinatra_more/mailer_plugin/mailer_base.rb
 - lib/sinatra_more/markup_plugin.rb
 - lib/sinatra_more/markup_plugin/asset_tag_helpers.rb
 - lib/sinatra_more/markup_plugin/form_builder/abstract_form_builder.rb
@@ -115,6 +128,10 @@ files:
 - lib/sinatra_more/warden_plugin/warden_helpers.rb
 - sinatra_more.gemspec
 - test/active_support_helpers.rb
+- 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/markup_app/app.rb
 - test/fixtures/markup_app/views/capture_concat.erb
 - test/fixtures/markup_app/views/capture_concat.haml
@@ -135,14 +152,20 @@ files:
 - test/fixtures/warden_app/app.rb
 - test/fixtures/warden_app/views/dashboard.haml
 - test/helper.rb
+- test/mailer_plugin/test_mail_object.rb
+- test/mailer_plugin/test_mailer_base.rb
 - test/markup_plugin/test_asset_tag_helpers.rb
 - test/markup_plugin/test_form_builder.rb
 - test/markup_plugin/test_form_helpers.rb
 - test/markup_plugin/test_format_helpers.rb
 - test/markup_plugin/test_output_helpers.rb
 - test/markup_plugin/test_tag_helpers.rb
+- test/test_mailer_plugin.rb
 - test/test_render_plugin.rb
 - test/test_warden_plugin.rb
+- vendor/pony/lib/pony.rb
+- vendor/pony/spec/base.rb
+- vendor/pony/spec/pony_spec.rb
 has_rdoc: true
 homepage: http://github.com/nesquena/sinatra_more
 licenses: []
@@ -173,15 +196,19 @@ specification_version: 3
 summary: Expands sinatra to allow for complex applications
 test_files: 
 - test/active_support_helpers.rb
+- test/fixtures/mailer_app/app.rb
 - test/fixtures/markup_app/app.rb
 - test/fixtures/render_app/app.rb
 - test/fixtures/warden_app/app.rb
 - test/helper.rb
+- test/mailer_plugin/test_mail_object.rb
+- test/mailer_plugin/test_mailer_base.rb
 - test/markup_plugin/test_asset_tag_helpers.rb
 - test/markup_plugin/test_form_builder.rb
 - test/markup_plugin/test_form_helpers.rb
 - test/markup_plugin/test_format_helpers.rb
 - test/markup_plugin/test_output_helpers.rb
 - test/markup_plugin/test_tag_helpers.rb
+- test/test_mailer_plugin.rb
 - test/test_render_plugin.rb
 - test/test_warden_plugin.rb