padrino-mailer 0.9.14 → 0.9.15

data/LICENSE

@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/padrino-mailer/base.rb

@@ -59,16 +59,16 @@ module Padrino
         }
       end
       alias :message :email
-      
+
       # Defines the default attributes for a message in this mailer (including app-wide defaults)
-      # 
+      #
       # ==== Examples
       #
       #   mailer :alternate do
       #    defaults :from => 'padrino@from.com', :to => 'padrino@to.com'
       #    email(:foo) do ... end
-      #  end
-      # 
+      #   end
+      #
       def defaults(attributes=nil)
         if attributes.nil? # Retrieve the default values
           @app.respond_to?(:mailer_defaults) ? @app.mailer_defaults.merge(@defaults) : @defaults

data/lib/padrino-mailer/ext.rb

@@ -1,5 +1,5 @@
-module Mail
-  class Message
+module Mail #:nodoc:
+  class Message #:nodoc:
     include Sinatra::Templates
     include Padrino::Rendering if defined?(Padrino::Rendering)
 

data/lib/padrino-mailer/helpers.rb

@@ -79,7 +79,9 @@ module Padrino
         #   deliver(:example, :message, "John")
         #
         def deliver(mailer_name, message_name, *attributes)
-          registered_mailers[mailer_name].messages[message_name].call(*attributes).deliver
+          message = registered_mailers[mailer_name].messages[message_name].call(*attributes)
+          message.delivery_method(*delivery_settings)
+          message.deliver
         end
 
         ##

data/padrino-mailer.gemspec

@@ -1,22 +1,21 @@
 require File.expand_path("../../padrino-core/lib/padrino-core/version.rb", __FILE__)
-require 'rubygems'
-require 'bundler'
 
 Gem::Specification.new do |s|
-  s.name = %q{padrino-mailer}
-  s.rubyforge_project = %q{padrino-mailer}
+  s.name = "padrino-mailer"
+  s.rubyforge_project = "padrino-mailer"
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.email = %q{padrinorb@gmail.com}
-  s.summary = %q{Mailer system for padrino}
-  s.homepage = %q{http://github.com/padrino/padrino-framework/tree/master/padrino-mailer}
-  s.description = %q{Mailer system for padrino allowing easy delivery of application emails}
+  s.email = "padrinorb@gmail.com"
+  s.summary = "Mailer system for padrino"
+  s.homepage = "http://www.padrinorb.com"
+  s.description = "Mailer system for padrino allowing easy delivery of application emails"
   s.required_rubygems_version = ">= 1.3.6"
   s.version = Padrino.version
   s.date = Time.now.strftime("%Y-%m-%d")
   s.extra_rdoc_files = Dir["*.rdoc"]
   s.files = %w(.document .gitignore LICENSE README.rdoc Rakefile padrino-mailer.gemspec) + Dir.glob("{bin,lib,test}/**/*")
   s.rdoc_options = ["--charset=UTF-8"]
-  s.require_path = 'lib'
-  s.add_runtime_dependency(%q<padrino-core>, ["= #{Padrino.version}"])
-  s.add_bundler_dependencies :mailer, :development
+  s.require_path = "lib"
+  s.add_dependency("padrino-core", Padrino.version)
+  s.add_dependency("mail", ">= 2.2.0")
+  s.add_dependency("tlsmail") if RUBY_VERSION == "1.8.6"
 end

data/test/fixtures/padrino_app/app.rb

@@ -2,17 +2,10 @@ ENV['PADRINO_ENV'] = 'test'
 PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
 
 class PadrinoApp < Padrino::Application
+  register Padrino::Helpers
   register Padrino::Mailer
 
-  set :delivery_method, :smtp => {
-    :address              => "smtp.gmail.com",
-    :port                 => 587,
-    :domain               => 'your.host.name',
-    :user_name            => '<username>',
-    :password             => '<password>',
-    :authentication       => 'plain',
-    :enable_starttls_auto => true
-  }
+  set :delivery_method, :test
 
   mailer :sample do
     email :birthday do |name, age|
@@ -42,6 +35,16 @@ class PadrinoApp < Padrino::Application
       via     :test
       render  'sample/foo_message'
     end
+    
+    message :helper do |name|
+      subject "Welcome Helper!"
+      to      'jim@fake.com'
+      from    'noreply@custom.com'
+      locals  :name => name
+      via     :test
+      render  'sample/helper_message'
+    end
+    
   end
 
   post "/deliver/inline" do
@@ -63,6 +66,12 @@ class PadrinoApp < Padrino::Application
     result = deliver(:sample, :welcome, "Bobby")
     result ? "mail delivered" : 'mail not delivered'
   end
+  
+  post "/deliver/helper" do
+    result = deliver(:sample, :helper, "Jim")
+    result ? "mail delivered" : 'mail not delivered'
+  end
+  
 end
 
 Padrino.mount("PadrinoApp").to("/")

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

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

data/test/fixtures/sinatra_app/app.rb

@@ -5,15 +5,7 @@ class SinatraApp < Sinatra::Base
   register Padrino::Mailer
 
   set :root, File.dirname(__FILE__)
-  set :delivery_method, :smtp => {
-    :address              => "smtp.gmail.com",
-    :port                 => 587,
-    :domain               => 'your.host.name',
-    :user_name            => '<username>',
-    :password             => '<password>',
-    :authentication       => 'plain',
-    :enable_starttls_auto => true
-  }
+  set :delivery_method, :test
 
   mailer :sample do
     email :birthday do |name, age|

data/test/helper.rb

@@ -7,6 +7,7 @@ require 'shoulda'
 require 'mocha'
 require 'rack/test'
 require 'padrino-core'
+require 'padrino-helpers'
 require 'padrino-mailer'
 
 class Test::Unit::TestCase

data/test/test_email.rb

@@ -75,6 +75,7 @@ class TestEmail < Test::Unit::TestCase
       mock_app do
         register Padrino::Mailer
         set :views, File.dirname(__FILE__) + '/fixtures/views'
+        set :delivery_method, :test
         mailer :alternate do
           defaults :from => 'padrino@from.com', :to => 'padrino@to.com'
           email :foo do
@@ -98,6 +99,7 @@ class TestEmail < Test::Unit::TestCase
     should 'send emails with app mailer defaults' do
       mock_app do
         register Padrino::Mailer
+        set :delivery_method, :test
         set :views, File.dirname(__FILE__) + '/fixtures/views'
         set :mailer_defaults, :from => 'padrino@from.com', :to => 'padrino@to.com', :subject => "This is a test"
         mailer :alternate do
@@ -122,6 +124,7 @@ class TestEmail < Test::Unit::TestCase
       mock_app do
         register Padrino::Mailer
         set :views, File.dirname(__FILE__) + '/fixtures/views'
+        set :delivery_method, :test
         mailer :alternate do
           email :foo do
             from    'padrino@me.com'
@@ -155,4 +158,4 @@ class TestEmail < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/test_padrino_mailer.rb

@@ -82,5 +82,14 @@ class TestPadrinoMailer < Test::Unit::TestCase
       assert_email_sent(:to => 'john@apple.com', :from => 'joe@smith.com',
                         :subject => 'Test Email', :body => 'Test Body', :delivery_method => @app.delivery_method)
     end
+    
+    should_eventually 'be able to deliver a basic email using Padrino::Helpers' do
+      post '/deliver/helper'
+      assert_equal 'mail delivered', body
+      assert_email_sent(:to => 'jim@fake.com', :from => 'noreply@custom.com',
+                        :content_type => 'text/html', :delivery_method => @app.delivery_method,
+                        :subject => "Welcome Helper!", :body => "<a href=\"#\">jim</a>")
+    end
+    
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-mailer
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: false
   segments: 
   - 0
   - 9
-  - 14
-  version: 0.9.14
+  - 15
+  version: 0.9.15
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,26 +18,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-30 00:00:00 -07:00
+date: 2010-08-28 00:00:00 +02: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 
-        hash: 39
+        hash: 37
         segments: 
         - 0
         - 9
-        - 14
-        version: 0.9.14
+        - 15
+        version: 0.9.15
   type: :runtime
-  name: padrino-core
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: mail
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -50,105 +52,7 @@ dependencies:
         - 0
         version: 2.2.0
   type: :runtime
-  name: mail
-  prerelease: false
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
-  type: :development
-  name: rake
-  prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
-        version: 0.9.8
-  type: :development
-  name: mocha
-  prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
-        version: 0.5.0
-  type: :development
-  name: rack-test
-  prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 5
-        - 1
-        version: 0.5.1
-  type: :development
-  name: webrat
-  prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 2
-        - 2
-        - 22
-        version: 2.2.22
-  type: :development
-  name: haml
-  prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 33
-        segments: 
-        - 2
-        - 10
-        - 3
-        version: 2.10.3
-  type: :development
-  name: shoulda
-  prerelease: false
-  version_requirements: *id008
 description: Mailer system for padrino allowing easy delivery of application emails
 email: padrinorb@gmail.com
 executables: []
@@ -176,6 +80,7 @@ files:
 - 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/padrino_app/views/mailers/sample/helper_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
@@ -195,7 +100,7 @@ files:
 - test/test_padrino_mailer.rb
 - test/test_part.rb
 has_rdoc: true
-homepage: http://github.com/padrino/padrino-framework/tree/master/padrino-mailer
+homepage: http://www.padrinorb.com
 licenses: []
 
 post_install_message: