pony 0.1 → 0.2

data/Rakefile

@@ -29,7 +29,7 @@ require 'rake/clean'
 require 'rake/gempackagetask'
 require 'fileutils'
 
-version = "0.1"
+version = "0.2"
 name = "pony"
 
 spec = Gem::Specification.new do |s|
@@ -48,6 +48,7 @@ spec = Gem::Specification.new do |s|
 	s.files = %w(Rakefile) + Dir.glob("{lib,spec}/**/*")
 
 	s.require_path = "lib"
+	s.add_dependency( 'tmail', '~> 1.0' )
 end
 
 Rake::GemPackageTask.new(spec) do |p|

data/lib/pony.rb

@@ -1,11 +1,25 @@
 require 'rubygems'
 require 'net/smtp'
-require 'tmail'
+begin
+	require 'tmail'
+rescue LoadError
+	require 'actionmailer'
+end
 
 module Pony
 	def self.mail(options)
 		raise(ArgumentError, ":to is required") unless options[:to]
-		transport build_tmail(options)
+
+		via = options.delete(:via)
+		if via.nil?
+			transport build_tmail(options)
+		else
+			if via_options.include?(via.to_s)
+				send("transport_via_#{via}", build_tmail(options))
+			else
+				raise(ArgumentError, ":via must be either smtp or sendmail")
+			end
+		end
 	end
 
 	def self.build_tmail(options)
@@ -18,20 +32,28 @@ module Pony
 	end
 
 	def self.sendmail_binary
-		"/usr/sbin/sendmail"
+		@sendmail_binary ||= `which sendmail`.chomp
 	end
 
 	def self.transport(tmail)
-		if File.exists? sendmail_binary
+		if File.executable? sendmail_binary
 			transport_via_sendmail(tmail)
 		else
 			transport_via_smtp(tmail)
 		end
 	end
 
+	def self.via_options
+		%w(sendmail smtp)
+	end
+
 	def self.transport_via_sendmail(tmail)
-		IO.popen("#{sendmail_binary} #{tmail.to}", "w") do |pipe|
-			pipe.write tmail.to_s
+		IO.popen('-') do |pipe|
+			if pipe
+				pipe.write(tmail.to_s)
+			else
+				exec(sendmail_binary, tmail.to)
+			end
 		end
 	end
 

data/spec/pony_spec.rb

@@ -47,7 +47,7 @@ describe Pony do
 
 	describe "transport" do
 		it "transports via the sendmail binary if it exists" do
-			Pony.stub!(:sendmail_binary).and_return(__FILE__)
+			File.stub!(:executable?).and_return(true)
 			Pony.should_receive(:transport_via_sendmail).with(:tmail)
 			Pony.transport(:tmail)
 		end
@@ -60,7 +60,7 @@ describe Pony do
 
 		it "transports mail via /usr/sbin/sendmail binary" do
 			pipe = mock('sendmail pipe')
-			IO.should_receive(:popen).with('/usr/sbin/sendmail to', 'w').and_yield(pipe)
+			IO.should_receive(:popen).with('-').and_yield(pipe)
 			pipe.should_receive(:write).with('message')
 			Pony.transport_via_sendmail(mock('tmail', :to => 'to', :from => 'from', :to_s => 'message'))
 		end
@@ -72,4 +72,21 @@ describe Pony do
 			Pony.transport_via_smtp(mock('tmail', :to => 'to', :from => 'from', :to_s => 'message'))
 		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,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pony
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: "0.2"
 platform: ruby
 authors: 
 - Adam Wiggins
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-29 00:00:00 -07:00
+date: 2009-01-13 00:00:00 -08:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: tmail
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+    version: 
 description: "Send email in one command: Pony.mail(:to => 'someone@example.com', :body => 'hello')"
 email: adam@heroku.com
 executables: []
@@ -48,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: pony
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: "Send email in one command: Pony.mail(:to => 'someone@example.com', :body => 'hello')"