pony 1.0.1 → 1.1

data/README.rdoc

@@ -87,6 +87,14 @@ Other options
  via # :smtp or :sendmail, see Transport section above
  via_options # specify transport options, see Transport section above
 
+== Set default options 
+
+Default options can be set so that they don't have to be repeated. The default options you set will be overriden by any options you pass in to Pony.mail()
+
+  Pony.options = { :from => 'noreply@example.com', :via => :smtp, :via_options => { :host => 'smtp.yourserver.com' } }
+  Pony.mail(:to => 'foo@bar') # Sends mail to foo@bar from noreply@example.com using smtp 
+  Pony.mail(:from => 'pony@example.com', :to => 'foo@bar') # Sends mail to foo@bar from pony@example.com using smtp
+
 == Help
 
 If you need help using Pony, or it looks like you've found a bug, we have a google group setup at: ponyrb@googlegroups.com.
@@ -124,6 +132,9 @@ mailing list: ponyrb@googlegroups.com
 
 == Releases
 
+1.1
+* Add default options
+
 1.0
 * Convert to using Mail as the mail-generation backend, instead of TMail
 

data/Rakefile

@@ -1,22 +1,8 @@
 require 'rake'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
 desc "Run all specs"
-Spec::Rake::SpecTask.new('spec') do |t|
-	t.spec_files = FileList['spec/*_spec.rb']
-end
-
-desc "Print specdocs"
-Spec::Rake::SpecTask.new(:doc) do |t|
-	t.spec_opts = ["--format", "specdoc", "--dry-run"]
-	t.spec_files = FileList['spec/*_spec.rb']
-end
-
-desc "Run all examples with RCov"
-Spec::Rake::SpecTask.new('rcov') do |t|
-	t.spec_files = FileList['spec/*_spec.rb']
-	t.rcov = true
-	t.rcov_opts = ['--exclude', 'examples']
+RSpec::Core::RakeTask.new() do |t|
 end
 
 task :default => :spec

data/lib/pony.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'mail'
 require 'base64'
 
-# = Pony, the express way to send email in Ruby
+# = The express way to send email in Ruby
 # 
 # == Overview
 # 
@@ -90,16 +90,39 @@ require 'base64'
 # Other options
 #  via # :smtp or :sendmail, see Transport section above
 #  via_options # specify transport options, see Transport section above
-
+#
+# == Set default options 
+# 
+# Default options can be set so that they don't have to be repeated. The default options you set will be overriden by any options you pass in to Pony.mail()
+# 
+#   Pony.options = { :from => 'noreply@example.com', :via => :smtp, :via_options => { :host => 'smtp.yourserver.com' } }
+#   Pony.mail(:to => 'foo@bar') # Sends mail to foo@bar from noreply@example.com using smtp 
+#   Pony.mail(:from => 'pony@example.com', :to => 'foo@bar') # Sends mail to foo@bar from pony@example.com using smtp
 
 
 module Pony
 
+	@@options = {}
+
+# Default options can be set so that they don't have to be repeated.
+# 
+#   Pony.options = { :from => 'noreply@example.com', :via => :smtp, :via_options => { :host => 'smtp.yourserver.com' } }
+#   Pony.mail(:to => 'foo@bar') # Sends mail to foo@bar from noreply@example.com using smtp 
+#   Pony.mail(:from => 'pony@example.com', :to => 'foo@bar') # Sends mail to foo@bar from pony@example.com using smtp
+	def self.options=(value)
+		@@options = value 
+	end
+
+	def self.options()
+		@@options
+	end
+
 # Send an email
 #   Pony.mail(:to => 'you@example.com', :from => 'me@example.com', :subject => 'hi', :body => 'Hello there.')
 #   Pony.mail(:to => 'you@example.com', :html_body => '<h1>Hello there!</h1>', :body => "In case you can't read html, Hello there.")
 #   Pony.mail(:to => 'you@example.com', :cc => 'him@example.com', :from => 'me@example.com', :subject => 'hi', :body => 'Howsit!')
 	def self.mail(options)
+		options = @@options.merge options
 		raise(ArgumentError, ":to is required") unless options[:to]
 
 		options[:via] = default_delivery_method unless options.has_key?(:via)

data/pony.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = %q{pony}
-	s.version = "1.0.1"
+	s.version = "1.1"
 
 	s.description = "Send email in one command: Pony.mail(:to => 'someone@example.com', :body => 'hello')"
 	s.summary = s.description

data/spec/base.rb

@@ -1,4 +1,4 @@
 require 'rubygems'
-require 'spec'
+require 'rspec'
 
 require File.dirname(__FILE__) + '/../lib/pony'

data/spec/pony_spec.rb

@@ -27,7 +27,7 @@ describe Pony do
 
 	it "should handle depricated options gracefully" do
 		Pony.should_receive(:build_mail).with(hash_including(:via_options => {:address => 'test'}))
-		Pony.mail(:to => 'foo@bar', :smtp => { :host => 'test' })
+		Pony.mail(:to => 'foo@bar', :smtp => { :host => 'test' }, :via => :smtp)
 	end
 
 	it "should handle depricated content-type gracefully" do
@@ -212,4 +212,25 @@ describe Pony do
 		end
 	end
 
+	describe "default options" do
+		it "should use default options" do
+			Pony.should_receive(:build_mail).with(hash_including(:from => 'noreply@pony'))
+			Pony.options = { :from => 'noreply@pony' }
+			Pony.mail(:to => 'foo@bar')
+		end
+
+		it "should merge default options with options" do
+			Pony.should_receive(:build_mail).with(hash_including(:from => 'override@pony'))
+			Pony.options = { :from => 'noreply@pony' }
+			Pony.mail(:from => 'override@pony', :to => "foo@bar")
+		end
+
+		it "should return the default options" do
+			input = { :from => 'noreply@pony' }
+			Pony.options = input
+			output = Pony.options
+			output.should == input
+		end
+	end
+
 end

metadata

@@ -4,9 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  version: "1.1"
 platform: ruby
 authors: 
 - Adam Wiggins
@@ -15,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 -07:00
+date: 2010-11-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mail
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
@@ -45,8 +45,8 @@ files:
 - pony.gemspec
 - lib/pony.rb~
 - lib/pony.rb
-- spec/base.rb
 - spec/pony_spec.rb~
+- spec/base.rb
 - spec/pony_spec.rb
 has_rdoc: true
 homepage: http://github.com/benprew/pony
@@ -59,6 +59,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -66,6 +67,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -75,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: pony
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: "Send email in one command: Pony.mail(:to => 'someone@example.com', :body => 'hello')"