padrino-mailer 0.9.3 → 0.9.4

data/Rakefile

@@ -15,6 +15,7 @@ begin
     gem.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
     gem.rubyforge_project = 'padrino-mailer'
     gem.add_runtime_dependency     "padrino-core",  "= #{GEM_VERSION}"
+    gem.add_runtime_dependency     "tilt",          ">= 0.6"
     gem.add_runtime_dependency     "tmail",         ">= 1.2"
     gem.add_development_dependency "shoulda",       ">= 2.10.3"
     gem.add_development_dependency "haml",          ">= 2.2.1"

data/VERSION

@@ -1 +1 @@
-0.9.3
+0.9.4

data/lib/padrino-mailer.rb

@@ -20,7 +20,7 @@ module Padrino
     # Used Padrino::Application for register Padrino::Mailer::Base::views_path
     # 
     def self.registered(app)
-      Padrino::Mailer::Base::views_path = app.views
+      Padrino::Mailer::Base::views_path << app.views
     end
   end # Mailer
 end # Padrino

data/lib/padrino-mailer/base.rb

@@ -21,7 +21,7 @@ module Padrino
       # Returns the available mail fields when composing a message
       # 
       def self.mail_fields
-        [:to, :cc, :bcc, :reply_to, :from, :subject, :type, :charset, :via, :attachments]
+        [:to, :cc, :bcc, :reply_to, :from, :subject, :content_type, :charset, :via, :attachments]
       end
 
       attr_accessor :mail_attributes
@@ -42,7 +42,9 @@ module Padrino
       # 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)
+        template = template_path
+        raise "Template for '#{@mail_name}' could not be located in views path!" unless template
+        @mail_attributes[:body] = Tilt.new(template).render(self, body_value.symbolize_keys) if body_value.is_a?(Hash)
         @mail_attributes[:body] = body_value if body_value.is_a?(String)
       end
 
@@ -50,9 +52,13 @@ module Padrino
       # 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
+        self.views_path.each do |path|
+          template = Dir[File.join(path, self.class.name.underscore.split("/").last, "#{@mail_name}.*")].first
+          return template if template
+        end
       end
 
+      @@views_path = []
       cattr_accessor :smtp_settings
       cattr_accessor :views_path
 

data/lib/padrino-mailer/delivery.rb

@@ -28,7 +28,6 @@ module Padrino
         end
 
         def build_tmail(options)
-          logger.error options.inspect
           mail          = TMail::Mail.new
           mail.to       = options[:to]
           mail.cc       = options[:cc]   || ''

data/padrino-mailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-mailer}
-  s.version = "0.9.3"
+  s.version = "0.9.4"
 
   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-01}
+  s.date = %q{2010-03-03}
   s.description = %q{Mailer system for padrino allowing easy delivery of application emails}
   s.email = %q{padrinorb@gmail.com}
   s.extra_rdoc_files = [
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{padrino-mailer}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Mailer system for padrino}
 
   if s.respond_to? :specification_version then
@@ -48,7 +48,8 @@ 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.3"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.9.4"])
+      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"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
@@ -56,7 +57,8 @@ 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.3"])
+      s.add_dependency(%q<padrino-core>, ["= 0.9.4"])
+      s.add_dependency(%q<tilt>, [">= 0.6"])
       s.add_dependency(%q<tmail>, [">= 1.2"])
       s.add_dependency(%q<shoulda>, [">= 2.10.3"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
@@ -65,7 +67,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<webrat>, [">= 0.5.1"])
     end
   else
-    s.add_dependency(%q<padrino-core>, ["= 0.9.3"])
+    s.add_dependency(%q<padrino-core>, ["= 0.9.4"])
+    s.add_dependency(%q<tilt>, [">= 0.6"])
     s.add_dependency(%q<tmail>, [">= 1.2"])
     s.add_dependency(%q<shoulda>, [">= 2.10.3"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])

data/test/fixtures/mailer_app/app.rb

@@ -31,7 +31,7 @@ class MailerDemo < Sinatra::Base
       to   'julie@fake.com'
       from 'noreply@anniversary.com'
       body 'names' => names, 'years_married' => years_married
-      type 'html'
+      content_type 'text/html'
     end
   end
 

data/test/test_mailer_base.rb

@@ -10,9 +10,9 @@ class DemoMailer < Padrino::Mailer::Base
     body "Hello world!"
     via :sendmail
   end
-  
+
   def sample_mail_smtp
-   from 'test@default.com'
+    from 'test@default.com'
     to 'test@test.com'
     body "SMTP Hello world!"
   end

data/test/test_padrino_mailer.rb

@@ -20,7 +20,7 @@ class TestPadrinoMailer < Test::Unit::TestCase
     end
 
     should 'be able to deliver html emails' do
-      assert_email_sent(:to => 'julie@fake.com', :from => 'noreply@anniversary.com', :type => 'html', :via => :smtp,
+      assert_email_sent(:to => 'julie@fake.com', :from => 'noreply@anniversary.com', :content_type => 'text/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

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-mailer
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,79 +17,119 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-01 00:00:00 +01:00
+date: 2010-03-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: padrino-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
-    version: 
+        segments: 
+        - 0
+        - 9
+        - 4
+        version: 0.9.4
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: tmail
+  name: tilt
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        version: "0.6"
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: tmail
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
         version: "1.2"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 10
+        - 3
         version: 2.10.3
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: haml
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 2
+        - 1
         version: 2.2.1
-    version: 
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 7
         version: 0.9.7
-    version: 
+  type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 0
         version: 0.5.0
-    version: 
+  type: :development
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: webrat
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 1
         version: 0.5.1
-    version: 
+  type: :development
+  version_requirements: *id008
 description: Mailer system for padrino allowing easy delivery of application emails
 email: padrinorb@gmail.com
 executables: []
@@ -126,18 +171,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: padrino-mailer
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Mailer system for padrino