merb-mailer 1.0.15 → 1.1.0.pre

data/Rakefile

@@ -1,74 +1,65 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "rake_helpers"))
-
-##############################################################################
-# Package && release
-##############################################################################
-RUBY_FORGE_PROJECT  = "merb"
-PROJECT_URL         = "http://merbivore.com"
-PROJECT_SUMMARY     = "Merb plugin that provides mailer functionality to Merb"
-PROJECT_DESCRIPTION = PROJECT_SUMMARY
-
-GEM_AUTHOR = "Yehuda Katz"
-GEM_EMAIL  = "ykatz@engineyard.com"
-
-GEM_NAME    = "merb-mailer"
-PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = Merb::VERSION + PKG_BUILD
-
-RELEASE_NAME    = "REL #{GEM_VERSION}"
-
-require "extlib/tasks/release"
-
-spec = Gem::Specification.new do |s|
-  s.rubyforge_project = RUBY_FORGE_PROJECT
-  s.name = GEM_NAME
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README.textile", "LICENSE", 'TODO']
-  s.summary = PROJECT_SUMMARY
-  s.description = PROJECT_DESCRIPTION
-  s.author = GEM_AUTHOR
-  s.email = GEM_EMAIL
-  s.homepage = PROJECT_URL
-  s.add_dependency('merb-core', "~> #{Merb::VERSION}")
-  s.add_dependency('mailfactory', '>= 1.2.3')
-  s.require_path = 'lib'
-  s.files = %w(LICENSE README.textile Rakefile TODO Generators) + Dir.glob("{lib,spec}/**/*")
-end
+require 'rubygems'
+require 'rake'
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
+# Assume a typical dev checkout to fetch the current merb-core version
+require File.expand_path('../../merb-core/lib/merb-core/version', __FILE__)
 
-desc "Install the gem"
-task :install do
-  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
-end
+# Load this library's version information
+require File.expand_path('../lib/merb-mailer/version', __FILE__)
 
-desc "Uninstall the gem"
-task :uninstall do
-  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
-end
+begin
+
+  gem 'jeweler', '~> 1.4'
+  require 'jeweler'
+
+  Jeweler::Tasks.new do |gemspec|
+
+    gemspec.version     = Merb::Mailer::VERSION
+
+    gemspec.name        = "merb-mailer"
+    gemspec.description = "Merb plugin for mailer support"
+    gemspec.summary     = "Merb plugin that provides mailer functionality to Merb"
+
+    gemspec.authors     = [ "Yehuda Katz" ]
+    gemspec.email       = "ykatz@engineyard.com"
+    gemspec.homepage    = "http://merbivore.com/"
+
+    gemspec.files       = %w(Generators LICENSE Rakefile README.textile TODO) + Dir['{lib,spec}/**/*']
+
+    # Runtime dependencies
+    gemspec.add_dependency 'merb-core',   "~> #{Merb::VERSION}"
+    gemspec.add_dependency('mailfactory', '>= 1.2.3')
+
+    # Development dependencies
+    gemspec.add_development_dependency 'rspec', '>= 1.2.9'
 
-desc "Create a gemspec file"
-task :gemspec do
-  File.open("#{GEM_NAME}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
   end
+
+  Jeweler::GemcutterTasks.new
+
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-desc "Run all examples (or a specific spec with TASK=xxxx)"
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_opts  = ["-cfs"]
-  t.spec_files = begin
-    if ENV["TASK"] 
-      ENV["TASK"].split(',').map { |task| "spec/**/#{task}_spec.rb" }
-    else
-      FileList['spec/**/*_spec.rb']
-    end
-  end
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-desc 'Default: run spec examples'
-task :default => 'spec'
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "test_gem #{Merb::Mailer::VERSION}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/lib/merb-mailer/mail_controller.rb

@@ -241,7 +241,7 @@ module Merb
         rescue Merb::ControllerExceptions::TemplateNotFound => e
           # An error should be logged if no template is found instead of an error raised
           if @_missing_templates
-            Merb.logger.error(e)
+            Merb.logger.error(e.message)
           else
             @_missing_templates = true
           end

data/lib/merb-mailer/mailer.rb

@@ -21,6 +21,7 @@ module Merb
   #     :pass   => 'pass',
   #     :auth   => :plain # :plain, :login, :cram_md5, the default is no auth
   #     :domain => "localhost.localdomain" # the HELO domain provided by the client to the server
+  #     :tls    => true/false/nil, true enables tls, default nil 
   #   }
   #
   #   or
@@ -54,9 +55,19 @@ module Merb
 
     # Sends the mail using SMTP.
     def net_smtp
-      Net::SMTP.start(config[:host], config[:port].to_i, config[:domain],
-                      config[:user], config[:pass], config[:auth]) { |smtp|
-        smtp.send_message(@mail.to_s, @mail.from.first, @mail.to.to_s.split(/[,;]/))
+      smtp = Net::SMTP.new(config[:host], config[:port].to_i)
+      if config[:tls]
+        if smtp.respond_to?(:enable_starttls) # 1.9.x
+          smtp.enable_starttls
+        elsif smtp.respond_to?(:enable_tls) && smtp.respond_to?(:use_tls?)
+          smtp.enable_tls(OpenSSL::SSL::VERIFY_NONE) # 1.8.x with tlsmail
+        else
+          raise 'Unable to enable TLS, for Ruby 1.8.x install tlsmail'
+        end
+      end
+      smtp.start(config[:domain], config[:user], config[:pass], config[:auth]) { |smtp|
+        to = @mail.to.is_a?(String) ? @mail.to.split(/[,;]/) : @mail.to
+        smtp.send_message(@mail.to_s, @mail.from.first, to)
       }
     end
 
@@ -92,7 +103,9 @@ module Merb
       	  @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)
+        if !file_or_files.is_a?(File) && !file_or_files.is_a?(StringIO)
+          raise ArgumentError, "You did not pass in a file. Instead, you sent a #{file_or_files.class}" 
+        end
         @mail.add_attachment_as(file_or_files, filename, type, headers)
       end
     end

data/lib/merb-mailer/version.rb

@@ -0,0 +1,5 @@
+module Merb
+  module Mailer
+    VERSION = '1.1.0.pre'.freeze
+  end
+end

data/spec/mail_controller_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 Spec::Runner.configure do |config|
   config.include Merb::Test::RequestHelper

data/spec/mailer_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 class TestMailer < Merb::Mailer
   self.delivery_method = :test_send
@@ -6,12 +6,12 @@ end
 
 class TestSMTPMailer < Merb::Mailer
   self.delivery_method = :net_smtp
-  self.config = { :host     => 'smtp.yourserver.com',
+  self.config = { :domain   => 'localhost.localdomain', 
+                  :host     => 'smtp.yourserver.com',
                   :port     => '25',              
                   :user     => 'user',
                   :pass     => 'pass',
                   :auth     => :plain }
-                  
 end
 
 class TestSendmailMailer < Merb::Mailer
@@ -89,18 +89,32 @@ describe "a merb mailer" do
     attachments.last["headers"].should include("Content-ID: <license.txt>")
   end
 
+  it "should be able to accept objects that respond to :read as attachments" do
+    setup_test_mailer
+    @m.attach StringIO.new('This is some dummy text'), '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 send mails via SMTP" do
     setup_test_mailer TestSMTPMailer
-    Net::SMTP.stub!(:start).and_return(true)
-    Net::SMTP.should_receive(:start).with("smtp.yourserver.com", 25, nil, "user", "pass", :plain)
+    smtp = Net::SMTP.new(@m.config[:host], @m.config[:port])
+    Net::SMTP.stub!(:new).and_return(smtp)
+    smtp.should_receive(:start).with("localhost.localdomain", "user", "pass", :plain)
     @m.deliver!
   end
   
   it "should send mails via SMTP with no auth" do
     setup_test_mailer TestSMTPMailer
     @m.config[:auth] = nil
-    Net::SMTP.stub!(:start).and_return(true)
-    Net::SMTP.should_receive(:start).with("smtp.yourserver.com", 25, nil, "user", "pass", nil)
+    smtp = Net::SMTP.new(@m.config[:host], @m.config[:port])
+    Net::SMTP.stub!(:new).and_return(smtp)
+    smtp.should_receive(:start).with("localhost.localdomain", "user", "pass", nil)
     @m.deliver!
   end
   

data/spec/spec.opts

@@ -0,0 +1,2 @@
+--format specdoc
+--colour

data/spec/spec_helper.rb

@@ -1,8 +1,21 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require "rubygems"
-require "merb-core"
+
+# Use current merb-core sources if running from a typical dev checkout.
+lib = File.expand_path('../../../merb-core/lib', __FILE__)
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
+require 'merb-core'
+
+# Use current merb-gen sources if running from a typical dev checkout.
+lib = File.expand_path('../../../merb-gen/lib', __FILE__)
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
+require 'merb-gen'
+
+# The lib under test
 require "merb-mailer"
 
+# Satisfies Autotest and anyone else not using the Rake tasks
+require 'spec'
+
 Merb::Config.use do |c|
   c[:session_store] = :memory
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-mailer
 version: !ruby/object:Gem::Version 
-  version: 1.0.15
+  version: 1.1.0.pre
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 +00:00
+date: 2010-02-20 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.15
+        version: 1.1.0.pre
     version: 
 - !ruby/object:Gem::Dependency 
   name: mailfactory
@@ -32,30 +32,40 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.3
     version: 
-description: Merb plugin that provides mailer functionality to Merb
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
+description: Merb plugin for mailer support
 email: ykatz@engineyard.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README.textile
 - LICENSE
 - TODO
 files: 
+- Generators
 - LICENSE
 - README.textile
 - Rakefile
 - TODO
-- Generators
 - lib/generators/mailer_generator.rb
 - lib/generators/templates/mailer/app/mailers/%file_name%_mailer.rb
 - lib/generators/templates/mailer/app/mailers/views/%file_name%_mailer/notify_on_event.text.erb
 - lib/generators/templates/mailer/spec/mailers/%file_name%_mailer_spec.rb
+- lib/merb-mailer.rb
 - lib/merb-mailer/mail_controller.rb
 - lib/merb-mailer/mailer.rb
 - lib/merb-mailer/mailer_mixin.rb
-- lib/merb-mailer.rb
+- lib/merb-mailer/version.rb
 - spec/mail_controller_spec.rb
 - spec/mailer_generator_spec.rb
 - spec/mailer_spec.rb
@@ -71,14 +81,15 @@ files:
 - spec/mailers/views/test_mail_controller/ninth.text.erb
 - spec/mailers/views/test_mail_controller/second.text.erb
 - spec/mailers/views/test_mail_controller/third.html.erb
+- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://merbivore.com
+homepage: http://merbivore.com/
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -89,13 +100,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
   version: 
 requirements: []
 
-rubyforge_project: merb
+rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3