merb-mailer 0.9.4 → 0.9.5

data/Rakefile

@@ -17,7 +17,7 @@ GEM_EMAIL  = "ykatz@engineyard.com"
 
 GEM_NAME    = "merb-mailer"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.4") + PKG_BUILD
+GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.5") + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 
@@ -35,7 +35,7 @@ spec = Gem::Specification.new do |s|
   s.author = GEM_AUTHOR
   s.email = GEM_EMAIL
   s.homepage = PROJECT_URL
-  s.add_dependency('merb-core', '>= 0.9.4')
+  s.add_dependency('merb-core', '>= 0.9.5')
   s.add_dependency('mailfactory', '>= 1.2.3')
   s.require_path = 'lib'
   s.files = %w(LICENSE README.textile Rakefile TODO) + Dir.glob("{lib,spec}/**/*")

data/lib/generators/mailer_generator.rb

@@ -9,7 +9,7 @@ module Merb::Generators
       Generates a mailer
     DESC
     
-    option :testing_framework, :desc => 'Testing framework to use (one of: spec, test_unit)'
+    option :testing_framework, :desc => 'Testing framework to use (one of: rspec, test_unit)'
     
     first_argument :name, :required => true, :desc => "mailer name"
     

data/lib/merb-mailer/mail_controller.rb

@@ -231,7 +231,8 @@ module Merb
         begin
           local_opts = opts.merge(:format => fmt)
           local_opts.merge!(:layout => false) if opts_hash[fmt].is_a?(String)
-      
+
+          clear_content
           value = render opts_hash[fmt], local_opts
           @mail.send(meth,value) unless value.nil? || value.empty?
         rescue Merb::ControllerExceptions::TemplateNotFound => e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-mailer
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-13 00:00:00 +03:00
+date: 2008-08-21 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
+        version: 0.9.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: mailfactory