pony 0.3 → 0.4

data/Rakefile

@@ -29,7 +29,7 @@ require 'rake/clean'
 require 'rake/gempackagetask'
 require 'fileutils'
 
-version = "0.3"
+version = "0.4"
 name = "pony"
 
 spec = Gem::Specification.new do |s|
@@ -37,9 +37,9 @@ spec = Gem::Specification.new do |s|
 	s.version = version
 	s.summary = "Send email in one command: Pony.mail(:to => 'someone@example.com', :body => 'hello')"
 	s.description = "Send email in one command: Pony.mail(:to => 'someone@example.com', :body => 'hello')"
-	s.author = "Adam Wiggins"
-	s.email = "adam@heroku.com"
-	s.homepage = "http://github.com/adamwiggins/pony"
+	s.author = "Adam Wiggins, maint: Ben Prew"
+	s.email = "ben.prew@gmail.com"
+	s.homepage = "http://github.com/benprew/pony"
 	s.rubyforge_project = "pony"
 
 	s.platform = Gem::Platform::RUBY

data/lib/pony.rb

@@ -1,5 +1,10 @@
 require 'rubygems'
 require 'net/smtp'
+begin
+	require 'smtp_tls'
+rescue LoadError
+end
+require 'base64'
 begin
 	require 'tmail'
 rescue LoadError
@@ -24,10 +29,19 @@ module Pony
 
 	def self.build_tmail(options)
 		mail = TMail::Mail.new
+		mail.content_type = options[:content_type] if options[:content_type]
 		mail.to = options[:to]
 		mail.from = options[:from] || 'pony@unknown'
 		mail.subject = options[:subject]
 		mail.body = options[:body] || ""
+		(options[:attachments] || []).each do |name, body|
+			attachment = TMail::Mail.new
+			attachment.transfer_encoding = "base64"
+			attachment.body = Base64.encode64(body)
+			# attachment.set_content_type # TODO: if necessary
+			attachment.set_content_disposition "attachment", "filename" => name
+			mail.parts.push attachment
+		end
 		mail
 	end
 
@@ -61,6 +75,10 @@ module Pony
 		default_options = {:smtp => { :host => 'localhost', :port => '25', :domain => 'localhost.localdomain' }}
 		o = default_options[:smtp].merge(options[:smtp])
 		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)
+			smtp.enable_starttls
+		end
 		if o.include?(:auth)
 			smtp.start(o[:domain], o[:user], o[:password], o[:auth])
 		else

data/spec/pony_spec.rb

@@ -43,6 +43,21 @@ describe Pony do
 		it "body" do
 			Pony.build_tmail(:body => 'What do you know, Joe?').body.should == 'What do you know, Joe?'
 		end
+
+		it "content_type" do
+			Pony.build_tmail(:content_type => 'text/html').content_type.should == 'text/html'
+		end
+
+		it "attachments" do
+			tmail = Pony.build_tmail(:attachments => {"foo.txt" => "content of foo.txt"})
+			tmail.should have(1).parts
+			tmail.parts.first.to_s.should == <<-PART
+Content-Transfer-Encoding: Base64
+Content-Disposition: attachment; filename=foo.txt
+
+Y29udGVudCBvZiBmb28udHh0
+			 PART
+		end
 	end
 
 	describe "transport" do
@@ -85,6 +100,12 @@ describe Pony do
 				Pony.transport_via_smtp(mock('tmail', :to => 'to', :from => 'from', :to_s => 'message'), o)
 			end
 
+			it "enable starttls when tls option is true" do
+				o = { :smtp => { :user => 'user', :password => 'password', :auth => 'plain', :tls => true}}
+				@smtp.should_receive(:enable_starttls)
+				Pony.transport_via_smtp(mock('tmail', :to => 'to', :from => 'from', :to_s => 'message'), o)
+			end
+
 			it "starts the job" do
 				@smtp.should_receive(:start)
 				Pony.transport_via_smtp(mock('tmail', :to => 'to', :from => 'from', :to_s => 'message'))

data/spec/pony_spec.rb.orig

@@ -0,0 +1,145 @@
+require File.dirname(__FILE__) + '/base'
+
+describe Pony do
+	it "sends mail" do
+		Pony.should_receive(:transport) do |tmail|
+			tmail.to.should == [ 'joe@example.com' ]
+			tmail.from.should == [ 'sender@example.com' ]
+			tmail.subject.should == 'hi'
+			tmail.body.should == 'Hello, Joe.'
+		end
+		Pony.mail(:to => 'joe@example.com', :from => 'sender@example.com', :subject => 'hi', :body => 'Hello, Joe.')
+	end
+
+	it "requires :to param" do
+		Pony.stub!(:transport)
+		lambda { Pony.mail({}) }.should raise_error(ArgumentError)
+	end
+
+	it "doesn't require any other param" do
+		Pony.stub!(:transport)
+		lambda { Pony.mail(:to => 'joe@example.com') }.should_not raise_error
+	end
+
+	####################
+
+	describe "builds a TMail object with field:" do
+		it "to" do
+			Pony.build_tmail(:to => 'joe@example.com').to.should == [ 'joe@example.com' ]
+		end
+
+		it "from" do
+			Pony.build_tmail(:from => 'joe@example.com').from.should == [ 'joe@example.com' ]
+		end
+
+		it "from (default)" do
+			Pony.build_tmail({}).from.should == [ 'pony@unknown' ]
+		end
+
+		it "subject" do
+			Pony.build_tmail(:subject => 'hello').subject.should == 'hello'
+		end
+
+		it "body" do
+			Pony.build_tmail(:body => 'What do you know, Joe?').body.should == 'What do you know, Joe?'
+		end
+
+<<<<<<< HEAD:spec/pony_spec.rb
+    it "content_type" do
+			Pony.build_tmail(:content_type => 'text/html').content_type.should == 'text/html'
+    end
+=======
+		it "attachments" do
+			tmail = Pony.build_tmail(:attachments => {"foo.txt" => "content of foo.txt"})
+			tmail.should have(1).parts
+			tmail.parts.first.to_s.should == <<-PART
+Content-Transfer-Encoding: Base64
+Content-Disposition: attachment; filename=foo.txt
+
+Y29udGVudCBvZiBmb28udHh0
+			 PART
+		end
+>>>>>>> c01d11243041d1897c67221bb92cdd5ff3fd6c0c:spec/pony_spec.rb
+	end
+
+	describe "transport" do
+		it "transports via the sendmail binary if it exists" do
+			File.stub!(:executable?).and_return(true)
+			Pony.should_receive(:transport_via_sendmail).with(:tmail)
+			Pony.transport(:tmail)
+		end
+
+		it "transports via smtp if no sendmail binary" do
+			Pony.stub!(:sendmail_binary).and_return('/does/not/exist')
+			Pony.should_receive(:transport_via_smtp).with(:tmail)
+			Pony.transport(:tmail)
+		end
+
+		it "transports mail via /usr/sbin/sendmail binary" do
+			pipe = mock('sendmail pipe')
+			IO.should_receive(:popen).with('-',"w+").and_yield(pipe)
+			pipe.should_receive(:write).with('message')
+			Pony.transport_via_sendmail(mock('tmail', :to => 'to', :from => 'from', :to_s => 'message'))
+		end
+
+		describe "SMTP transport" do
+			before do
+				@smtp = mock('net::smtp object')
+				@smtp.stub!(:start)
+				@smtp.stub!(:send_message)
+				@smtp.stub!(:finish)
+				Net::SMTP.stub!(:new).and_return(@smtp)
+			end
+
+			it "defaults to localhost as the SMTP server" do
+				Net::SMTP.should_receive(:new).with('localhost', '25').and_return(@smtp)
+				Pony.transport_via_smtp(mock('tmail', :to => 'to', :from => 'from', :to_s => 'message'))
+			end
+
+			it "uses SMTP authorization when auth key is provided" do
+				o = { :smtp => { :user => 'user', :password => 'password', :auth => 'plain'}}
+				@smtp.should_receive(:start).with('localhost.localdomain', 'user', 'password', 'plain')
+				Pony.transport_via_smtp(mock('tmail', :to => 'to', :from => 'from', :to_s => 'message'), o)
+			end
+
+			it "enable starttls when tls option is true" do
+				o = { :smtp => { :user => 'user', :password => 'password', :auth => 'plain', :tls => true}}
+				@smtp.should_receive(:enable_starttls)
+				Pony.transport_via_smtp(mock('tmail', :to => 'to', :from => 'from', :to_s => 'message'), o)
+			end
+
+			it "starts the job" do
+				@smtp.should_receive(:start)
+				Pony.transport_via_smtp(mock('tmail', :to => 'to', :from => 'from', :to_s => 'message'))
+			end
+
+			it "sends a tmail message" do
+				@smtp.should_receive(:send_message)
+				Pony.transport_via_smtp(mock('tmail', :to => 'to', :from => 'from', :to_s => 'message'))
+			end
+
+			it "finishes the job" do
+				@smtp.should_receive(:finish)
+				Pony.transport_via_smtp(mock('tmail', :to => 'to', :from => 'from', :to_s => 'message'))
+			end
+
+		end
+	end
+
+	describe ":via option should over-ride the default transport mechanism" do
+		it "should send via sendmail if :via => sendmail" do
+			Pony.should_receive(:transport_via_sendmail)
+			Pony.mail(:to => 'joe@example.com', :via => :sendmail)
+		end
+
+		it "should send via smtp if :via => smtp" do
+			Pony.should_receive(:transport_via_smtp)
+			Pony.mail(:to => 'joe@example.com', :via => :smtp)
+		end
+
+		it "should raise an error if via is neither smtp nor sendmail" do
+			lambda { Pony.mail(:to => 'joe@plumber.com', :via => :pigeon) }.should raise_error(ArgumentError)
+		end
+	end
+
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: pony
 version: !ruby/object:Gem::Version 
-  version: "0.3"
+  version: "0.4"
 platform: ruby
 authors: 
-- Adam Wiggins
+- "Adam Wiggins, maint: Ben Prew"
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-02-17 00:00:00 -08:00
+date: 2009-11-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,7 +23,7 @@ dependencies:
         version: "1.0"
     version: 
 description: "Send email in one command: Pony.mail(:to => 'someone@example.com', :body => 'hello')"
-email: adam@heroku.com
+email: ben.prew@gmail.com
 executables: []
 
 extensions: []
@@ -35,8 +35,11 @@ files:
 - lib/pony.rb
 - spec/base.rb
 - spec/pony_spec.rb
-has_rdoc: false
-homepage: http://github.com/adamwiggins/pony
+- spec/pony_spec.rb.orig
+has_rdoc: true
+homepage: http://github.com/benprew/pony
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -57,9 +60,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: pony
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: "Send email in one command: Pony.mail(:to => 'someone@example.com', :body => 'hello')"
 test_files: []