padrino-mailer 0.9.5 → 0.9.6

data/VERSION

@@ -1 +1 @@
-0.9.5
+0.9.6

data/lib/padrino-mailer/delivery.rb

@@ -89,8 +89,8 @@ module Padrino
 
         def transport_via_smtp(tmail, options={:smtp => {}})
           logger.debug "Sending email via smtp:\n#{tmail}" if Kernel.respond_to?(:logger)
-          default_options = {:smtp => { :host => 'localhost', :port => '25', :domain => 'localhost.localdomain' }}
-          o = default_options[:smtp].merge(options[:smtp])
+          o = { :host => 'localhost', :port => '25', :domain => 'localhost.localdomain' }
+          o.merge!(options[:smtp]) if options[:smtp].is_a?(Hash)
           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)

data/padrino-mailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-mailer}
-  s.version = "0.9.5"
+  s.version = "0.9.6"
 
   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-11}
+  s.date = %q{2010-03-15}
   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.5"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.9.6"])
       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.5"])
+      s.add_dependency(%q<padrino-core>, ["= 0.9.6"])
       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.5"])
+    s.add_dependency(%q<padrino-core>, ["= 0.9.6"])
     s.add_dependency(%q<tilt>, [">= 0.6"])
     s.add_dependency(%q<tmail>, [">= 1.2"])
     s.add_dependency(%q<shoulda>, [">= 2.10.3"])

metadata

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