merb-mailer 0.9.5 → 0.9.6

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.5") + PKG_BUILD
+GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.6") + 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.5')
+  s.add_dependency('merb-core', '>= 0.9.6')
   s.add_dependency('mailfactory', '>= 1.2.3')
   s.require_path = 'lib'
   s.files = %w(LICENSE README.textile Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
@@ -47,14 +47,14 @@ end
 
 desc "Install the gem"
 task :install => [:package] do
-  sh %{#{sudo} gem install #{install_home} pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources}
+  sh install_command(GEM_NAME, GEM_VERSION)
 end
 
 namespace :jruby do
 
   desc "Run :package and install the resulting .gem with jruby"
   task :install => :package do
-    sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{GEM_NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
+    sh jinstall_command(GEM_NAME, GEM_VERSION)
   end
 
 end

data/lib/generators/mailer_generator.rb

@@ -13,22 +13,22 @@ module Merb::Generators
     
     first_argument :name, :required => true, :desc => "mailer name"
     
-    template :mailer do
-      source('app/mailers/%file_name%_mailer.rb')
-      destination("app/mailers", base_path, "#{file_name}_mailer.rb")
+    template :mailer do |t|
+      t.source = 'app/mailers/%file_name%_mailer.rb'
+      t.destination = File.join("app/mailers", base_path, "#{file_name}_mailer.rb")
     end
     
-    template :notify_on_event do
-      source('app/mailers/views/%file_name%_mailer/notify_on_event.text.erb')
-      destination("app/mailers/views", base_path, "#{file_name}_mailer/notify_on_event.text.erb")
+    template :notify_on_event do |t|
+      t.source = 'app/mailers/views/%file_name%_mailer/notify_on_event.text.erb'
+      t.destination = File.join("app/mailers/views", base_path, "#{file_name}_mailer/notify_on_event.text.erb")
     end
     
-    template :controller_spec, :testing_framework => :rspec do
-      source('spec/mailers/%file_name%_mailer_spec.rb')
-      destination("spec/mailers", base_path, "#{file_name}_mailer_spec.rb")
+    template :controller_spec, :testing_framework => :rspec do |t|
+      t.source = 'spec/mailers/%file_name%_mailer_spec.rb'
+      t.destination = File.join("spec/mailers", base_path, "#{file_name}_mailer_spec.rb")
     end
  
   end
  
   add :mailer, MailerGenerator
-end
+end

data/lib/merb-mailer/mailer.rb

@@ -85,7 +85,12 @@ module Merb
     def attach(file_or_files, filename = file_or_files.is_a?(File) ? File.basename(file_or_files.path) : nil,
       type = nil, headers = nil)
       if file_or_files.is_a?(Array)
-        file_or_files.each {|k,v| @mail.add_attachment_as k, *v}
+        file_or_files.each do |v|
+	  if v.length < 2
+	    v << v.first.is_a?(File) ? File.basename(v.first.path) : nil
+	  end
+	  @mail.add_attachment_as *v
+	end
       else
         raise ArgumentError, "You did not pass in a file. Instead, you sent a #{file_or_files.class}" if !file_or_files.is_a?(File)
         @mail.add_attachment_as(file_or_files, filename, type, headers)

data/spec/mailer_spec.rb

@@ -40,7 +40,7 @@ describe "a merb mailer" do
   
   it "should be able to accept attachments" do
     setup_test_mailer
-    @m.attach File.open("README")
+    @m.attach File.open("README.textile")
     @m.deliver!
     delivery = TestMailer.deliveries.last
     delivery.instance_variable_get("@attachments").size.should == 1
@@ -48,12 +48,40 @@ describe "a merb mailer" do
   
   it "should be able to accept multiple attachments" do
     setup_test_mailer
-    @m.attach [[File.open("README")], [File.open("LICENSE")]]
+    @m.attach [[File.open("README.textile")], [File.open("LICENSE")]]
     @m.deliver!
     delivery = TestMailer.deliveries.last
     delivery.instance_variable_get("@attachments").size.should == 2    
   end
-  
+
+  it "should be able to accept custom options for attachments" do
+    setup_test_mailer
+    @m.attach File.open("README.textile"), 'readme', 'text/plain', 'Content-ID: <readme.txt>'
+    @m.deliver!
+    delivery = TestMailer.deliveries.last
+    attachments = delivery.instance_variable_get("@attachments")
+    attachments.size.should == 1
+    attachments.first["mimetype"].should eql("text/plain")
+    attachments.first["filename"].should eql("readme")
+    attachments.first["headers"].should include("Content-ID: <readme.txt>")
+  end
+
+  it "should be able to accept custom options for multiple attachments" do
+    setup_test_mailer
+    @m.attach [[File.open("README.textile"), 'readme', 'text/plain', 'Content-ID: <readme.txt>'],
+               [File.open("LICENSE"), 'license', 'text/plain', 'Content-ID: <license.txt>']]
+    @m.deliver!
+    delivery = TestMailer.deliveries.last
+    attachments = delivery.instance_variable_get("@attachments")
+    attachments.size.should == 2
+    attachments.first["mimetype"].should eql("text/plain")
+    attachments.first["filename"].should eql("readme")
+    attachments.first["headers"].should include("Content-ID: <readme.txt>")
+    attachments.last["mimetype"].should eql("text/plain")
+    attachments.last["filename"].should eql("license")
+    attachments.last["headers"].should include("Content-ID: <license.txt>")
+  end
+
   it "should be able to send mails via SMTP" do
     setup_test_mailer TestSMTPMailer
     Net::SMTP.stub!(:start).and_return(true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-mailer
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-21 00:00:00 +03:00
+date: 2008-09-09 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.5
+        version: 0.9.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: mailfactory