pony 1.9 → 1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e71b53cc0803fe9e1f8648ae097a633aeb0b371
-  data.tar.gz: 43f71c33f354a576a53c420fe857084c5aeea1ee
+  metadata.gz: 21b0731fb0237480bcebbaabdb5a16f2cd912ac8
+  data.tar.gz: 51429c927817896031f8505403189ed34bf272bb
 SHA512:
-  metadata.gz: 289cc47015308df12027fe7df67297002a2e888a0dbfc00b9b6300e6dfb9ac25094f96184bec2f411233061f8ec327a1074f8eb21796dcacf7b9ef757a6dce50
-  data.tar.gz: df00f49c87634ed310c1a5d36e36d3c537c2030d5258c8b54c1e31c04f359effa663fbd9fe9f888a120a6af3cbe1f0e86cb600d2ca82a81f9ea104c6c465e214
+  metadata.gz: 4e080bca7fc9a958ca2bcb9fa19c24b67832c9e13c42c7cb42edd3c884735a4801495e79693fed386672aa1e96624cb238146cdce7bf67cd8dd3cb62a0501109
+  data.tar.gz: d74c23bf55d5b4429de41a321b2d6ca99378d711f64cb9b5108d0536eb700ec2ba426e5cd13102fcdfbc43612b301669c82a599f2b750076c8d50a15220e874b

data/README.rdoc

@@ -134,6 +134,26 @@ Default options can be set so that they don't have to be repeated. The default o
   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
 
+
+== Set override options
+
+Override options can be set so that the override value is always be used, even if a different value is passed in to Pony.options() or Pony.mail(). This can be used to configure a development or staging environment.
+
+  Pony.override_options = { :to => 'test@example.com' }
+  Pony.mail(:to => 'foo@bar') # Sends mail to test@example.com instead of foo@bar
+
+== Set subject prefix
+
+Prepends a string to the subject line.  This is used to identify email sent from a specific environment.
+
+  Pony.subject_prefix('Prefix:')
+
+== Append options to body
+
+Append the options passd into Pony.mail to the body of the email.  Useful for debugging.
+
+  Pony.append_inputs
+
 == Help
 
 If you need help using Pony, or it looks like you've found a bug,
@@ -153,18 +173,28 @@ Maintained by Ben Prew
 Written by Adam Wiggins
 
 Patches contributed by:
-Arun Thampi,
-Hiroshi Saito,
-Jesse Cooke,
-Mathieu Martin,
-Neil Mock,
-Nickolas Means,
-Othmane Benkirane,
-Rick Olson
-Stephen Celis,
-Thomas Hurst,
-Kalin Harvey
-Carl Hörberg
+* Adam Wiggins
+* Ben Prew
+* Cameron Matheson
+* Carl Hörberg
+* Daniel Lopes
+* Hiroshi Saito
+* Kalin Harvey
+* MIKAMI Yoshiyuki
+* Mathieu Martin
+* Michael Durrant
+* Neil Middleton
+* Neil Mock
+* Nickolas Means
+* Othmane Benkirane
+* Rich Meyers
+* Roman Franko
+* Ryan Malecky
+* Seamus Abshere
+* Stephen Celis
+* arunthampi
+* rick
+* rohit
 
 Released under the MIT License: http://www.opensource.org/licenses/mit-license.php
 
@@ -173,6 +203,9 @@ mailing list: ponyrb@googlegroups.com
 
 
 == Releases
+1.10
+* Add subject_prefix, append_options and override_options
+
 1.9
 * Allow options to be queried from the gem
 

data/Rakefile

@@ -26,4 +26,8 @@ task :uninstall => [ :clean ] do
 	sh %{sudo gem uninstall #{name}}
 end
 
+task :authors do
+  sh %{git log |grep Author |cut -f 1 -d'<' |cut -f2 -d':' |sort -u}
+end
+
 CLEAN.include [ 'pkg', '*.gem', '.config' ]

data/lib/pony.rb

@@ -105,8 +105,9 @@ require 'socket'
 module Pony
 
   @@options = {}
-
-
+  @@override_options = {}
+  @@subject_prefix = false
+  @@append_inputs = false
 
 # Default options can be set so that they don't have to be repeated.
 #
@@ -121,12 +122,38 @@ module Pony
     @@options
   end
 
+  def self.override_options=(value)
+    @@override_options = value
+  end
+
+  def self.override_options
+    @@override_options
+  end
+
+  def self.subject_prefix(value)
+    @@subject_prefix = value
+  end
+
+  def self.append_inputs
+    @@append_inputs = true
+  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)
+    if @@append_inputs
+      options[:body] = "#{options[:body]}/n #{options.to_s}"
+    end
+    
     options = @@options.merge options
+    options = options.merge @@override_options
+
+    if @@subject_prefix
+      options[:subject] = "#{@@subject_prefix}#{options[:subject]}"
+    end
+
     fail ArgumentError, ':to is required' unless options[:to]
 
     options[:via] = default_delivery_method unless options.key?(:via)

data/pony.gemspec

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

data/spec/pony_spec.rb

@@ -229,6 +229,77 @@ describe Pony do
     end
   end
 
+  describe "override options" do
+    it "should use the overide options" do
+      expect(Pony).to receive(:build_mail).with(hash_including(:from => 'reply@pony'))
+
+      Pony.override_options = { :from => 'reply@pony' }
+      Pony.mail(:to => 'foo@bar')
+    end
+
+    it "should use an override option instead of a default options" do
+      expect(Pony).to receive(:build_mail).with(hash_including(:from => 'reply@pony.com'))
+
+      Pony.options = { :from => 'other_address@pony.com' }
+      Pony.override_options = { :from => 'reply@pony.com' }
+      Pony.mail(:to => 'foo@bar')
+    end
+
+    it "should use an override instead of a passed in value" do
+      expect(Pony).to receive(:build_mail).with(hash_including(:from => 'reply@pony.com'))
+
+      Pony.override_options = { :from => 'reply@pony.com' }
+      Pony.mail(:to => 'foo@bar', :from => 'other_address@pony.com')
+    end
+
+    it "should return the override options" do
+      input = { :from => 'reply@pony' }
+      Pony.override_options = input
+      output = Pony.override_options
+
+      expect(output).to eq input
+    end
+  end
+
+  describe "subject prefix" do
+    after(:all) do
+      Pony.subject_prefix(false)
+    end
+
+    it "should prefix email subject line with the given text" do
+      expect(Pony).to receive(:build_mail).with(hash_including(:subject => 'First: Second'))
+
+      Pony.subject_prefix('First: ')
+      Pony.mail(:to => 'foo@bar', :subject => 'Second')
+    end
+
+    it "should set the prefix as the subject if no subject is given" do
+      expect(Pony).to receive(:build_mail).with(hash_including(:subject => 'First: '))
+
+      Pony.subject_prefix('First: ')
+      Pony.mail(:to => 'foo@bar')
+    end
+  end
+
+  describe "append_inputs" do
+    it "appends the options passed into Pany.mail to the body" do
+      expect(Pony).to receive(:build_mail).with(hash_including(:body => "body/n {:to=>\"foo@bar\", :body=>\"body\"}"))
+
+      Pony.append_inputs
+
+      Pony.mail(:to => 'foo@bar', :body => 'body')
+    end
+
+    it "sets the options passed into Pany.mail as the body if one is not present" do
+      expect(Pony).to receive(:build_mail).with(hash_including(:body => "/n {:to=>\"foo@bar\"}"))
+
+      Pony.append_inputs
+
+      Pony.mail(:to => 'foo@bar')
+    end
+
+  end
+
   describe "content type" do
     context "mail with attachments, html_body and body " do
       subject(:mail) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pony
 version: !ruby/object:Gem::Version
-  version: '1.9'
+  version: '1.10'
 platform: ruby
 authors:
 - Adam Wiggins
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail