pony 1.5.1 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98a39271d987be0cc8e7e5b6b8b2009a83e89a7f
-  data.tar.gz: 5f1f182c96248255f4e012fe7a1cf1361ec63e5d
+  metadata.gz: b989ba61f81f34d5bbdc1f6053c3094b923b161b
+  data.tar.gz: 1e22e925f9798fd041a30788e58a86918a19b1b9
 SHA512:
-  metadata.gz: b51ce4f8dadeabbbae7587f7d5d22f9885559cfbcaf6f984125e1d90bff9cc57d43bb2a5da4a91502ba1fd7c43e46bcfbd56c97cc2a086a7a17dd48dc08783f8
-  data.tar.gz: e0e45fd94fcdcc495fe9b32ad0da341cc1cc290519c5667964a64188d094775910207814d9406fb787a226521564858987189920e0b96d6b7e910d29f88de8cf
+  metadata.gz: 8b6f8cb9c850970c1307a965b706673e12e5317614e097b8590406d2806cb0bebd32d44b57e538e4b30e4ac3f33b12c008fe5987fb3aec330ded706a44c0f7fa
+  data.tar.gz: 3efca87c016ffcccc4b77ea3f66da7b0ce5620fdb403ed8ed69bbe79f22b012d4a858caeedeb34394a47fb74c90e5190b9486566a6ba19b65f11949d187218c3

data/README.rdoc

@@ -91,6 +91,7 @@ Options passed pretty much directly to Mail
  body # the plain text body
  html_body # for sending html-formatted email
  subject
+ content_type
  charset # In case you need to send in utf-8 or similar
  text_part_charset # for multipart messages, set the charset of the text part
  attachments # see Attachments section above
@@ -98,6 +99,7 @@ Options passed pretty much directly to Mail
  message_id
  sender  # Sets "envelope from" (and the Sender header)
  reply_to
+ smtp_envelope_to
 
 Other options
  via # :smtp or :sendmail, see Transport section above
@@ -113,7 +115,9 @@ Default options can be set so that they don't have to be repeated. The default o
 
 == 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.
+If you need help using Pony, or it looks like you've found a bug,
+email ponyrb@googlegroups.com.  The full forum is
+https://groups.google.com/forum/#!forum/ponyrb
 
 == External Dependencies
 
@@ -148,6 +152,9 @@ mailing list: ponyrb@googlegroups.com
 
 
 == Releases
+1.6
+* Unknown options are passed directly to mail to handle.  Remove deprecated syntax
+
 1.5.1
 * Loosen mail dependency to >= 2.0 instead of > 2.0
 

data/lib/pony.rb

@@ -125,13 +125,11 @@ module Pony
 #   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]
+    fail ArgumentError, ':to is required' unless options[:to]
 
-    options[:via] = default_delivery_method unless options.has_key?(:via)
+    options[:via] = default_delivery_method unless options.key?(:via)
 
-    options = cross_reference_depricated_fields(options)
-
-    if options.has_key?(:via) && options[:via] == :sendmail
+    if options.key?(:via) && options[:via] == :sendmail
       options[:via_options] ||= {}
       options[:via_options][:location] ||= sendmail_binary
     end
@@ -141,28 +139,6 @@ module Pony
 
   private
 
-  def self.cross_reference_depricated_fields(options)
-    if options.has_key?(:smtp)
-      warn depricated_message(:smtp, :via_options)
-      options[:via_options] = options.delete(:smtp)
-    end
-
-    # cross-reference pony options to be compatible with keys mail expects
-    { :host => :address, :user => :user_name, :auth => :authentication, :tls => :enable_starttls_auto }.each do |key, val|
-      if options[:via_options] && options[:via_options].has_key?(key)
-        warn depricated_message(key, val)
-        options[:via_options][val] = options[:via_options].delete(key)
-      end
-    end
-
-    if options[:content_type] && options[:content_type] =~ /html/ && !options[:html_body]
-      warn depricated_message(:content_type, :html_body)
-      options[:html_body] = options[:body]
-    end
-
-    return options
-  end
-
   def self.deliver(mail)
     mail.deliver!
   end
@@ -172,16 +148,27 @@ module Pony
   end
 
   def self.build_mail(options)
-    mail = Mail.new do
-      to options[:to]
-      from options[:from] || 'pony@unknown'
-      cc options[:cc]
-      reply_to options[:reply_to]
-      bcc options[:bcc]
-      subject options[:subject]
-      date options[:date] || Time.now
-      message_id options[:message_id]
-      sender options[:sender] if options[:sender]
+    mail = Mail.new do |m|
+      options[:date] ||= Time.now
+      options[:from] ||= 'pony@unknown'
+      options[:via_options] ||= {}
+
+      non_standard_options = [
+        :attachments,
+        :body,
+        :charset,
+        :enable_starttls_auto,
+        :headers,
+        :html_body,
+        :text_part_charset,
+        :via,
+        :via_options,
+      ]
+
+      options.each do |k, v|
+        next if non_standard_options.include?(k)
+        m.send(k, v)
+      end
 
       if options[:html_body]
         html_part do
@@ -190,8 +177,8 @@ module Pony
         end
       end
 
-      # If we're using attachments, the body needs to be a separate part. If not,
-                        # we can just set the body directly.
+      # If we're using attachments, the body needs to be a separate
+      # part. If not, we can just set the body directly.
       if options[:body] && (options[:html_body] || options[:attachments])
         text_part do
           body options[:body]
@@ -200,26 +187,15 @@ module Pony
         body options[:body]
       end
 
-      delivery_method options[:via], (options.has_key?(:via_options) ? options[:via_options] : {})
-                end
-
-    (options[:attachments] || []).each do |name, body|
-      # mime-types wants to send these as "quoted-printable"
-      if name =~ /\.xlsx$/
-        mail.attachments[name] = {
-          :content => Base64.encode64(body),
-          :transfer_encoding => :base64
-        }
-      else
-        mail.attachments[name] = body
-      end
-      mail.attachments[name].add_content_id("<#{name}@#{Socket.gethostname}>")
+      delivery_method options[:via], options[:via_options]
     end
 
     (options[:headers] ||= {}).each do |key, value|
       mail[key] = value
     end
 
+    add_attachments(mail, options[:attachments]) if options[:attachments]
+
     mail.charset = options[:charset] if options[:charset] # charset must be set after setting content_type
 
     if mail.multipart? && options[:text_part_charset]
@@ -229,14 +205,23 @@ module Pony
     mail
   end
 
+  def self.add_attachments(mail, attachments)
+    attachments.each do |name, body|
+      # mime-types wants to send these as "quoted-printable"
+      if name =~ /\.xlsx$/
+        mail.attachments[name] = {
+          content: Base64.encode64(body),
+          transfer_encoding: :base64
+        }
+      else
+        mail.attachments[name] = body
+      end
+      mail.attachments[name].add_content_id("<#{name}@#{Socket.gethostname}>")
+    end
+  end
+
   def self.sendmail_binary
     sendmail = `which sendmail`.chomp
     sendmail.empty? ? '/usr/sbin/sendmail' : sendmail
   end
-
-  def self.depricated_message(method, alternative)
-    warning_message = "warning: '#{method}' is deprecated"
-    warning_message += "; use '#{alternative}' instead." if alternative
-    return warning_message
-  end
 end

data/pony.gemspec

@@ -1,23 +1,19 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{pony}
-  s.version = "1.5.1"
+  s.name = 'pony'
+  s.version = "1.6.1"
 
-  s.description = "Send email in one command: Pony.mail(:to => 'someone@example.com', :body => 'hello')"
-  s.summary = s.description
-  s.authors = ["Adam Wiggins", "maint: Ben Prew"]
-  s.email = %q{ben.prew@gmail.com}
-  s.homepage = %q{http://github.com/benprew/pony}
-  s.rubyforge_project = "pony"
+  s.summary = "Send email in one command: Pony.mail(:to => 'someone@example.com', :body => 'hello')Pony, the express way to send email in Ruby"
+  s.description = s.summary
+  s.authors = ["Adam Wiggins", "Ben Prew"]
+  s.email = 'ben@throwingbones.com'
+  s.homepage = 'http://github.com/benprew/pony'
+  s.license = 'MIT'
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.files = ["README.rdoc", "Rakefile", "pony.gemspec" ] + Dir.glob("{lib,spec}/**/*")
-  s.has_rdoc = false
   s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
-  s.add_dependency 'mail', '>= 2.0'
-  s.add_development_dependency "rspec", ">= 2.0.0"  
-  s.platform = Gem::Platform::RUBY
+  s.add_runtime_dependency 'mail', '>= 2.0'
+  s.add_development_dependency "rspec", ">= 2.0.0"
 end

data/spec/pony_spec.rb

@@ -25,30 +25,19 @@ describe Pony do
     lambda { Pony.mail(:to => 'joe@example.com') }.should_not raise_error
   end
 
-  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' }, :via => :smtp)
-  end
-
-  it "should handle depricated content-type gracefully" do
-    Pony.should_receive(:build_mail).with(hash_including(:html_body => "this is <h1>HTML</h1>"))
-    Pony.mail(:to => 'foo@bar', :content_type => 'text/html', :body => 'this is <h1>HTML</h1>')
-  end
-  ####################
-
   describe "builds a Mail object with field:" do
     it "to" do
       Pony.build_mail(:to => 'joe@example.com').to.should == [ 'joe@example.com' ]
     end
-    
+
     it "to with multiple recipients" do
       Pony.build_mail(:to => 'joe@example.com, friedrich@example.com').to.should == [ 'joe@example.com', 'friedrich@example.com' ]
     end
-    
+
     it "to with multiple recipients and names" do
       Pony.build_mail(:to => 'joe@example.com, "Friedrich Hayek" <friedrich@example.com>').to.should == [ 'joe@example.com', 'friedrich@example.com' ]
     end
-    
+
     it "to with multiple recipients and names in an array" do
       Pony.build_mail(:to => ['joe@example.com', '"Friedrich Hayek" <friedrich@example.com>']).to.should == [ 'joe@example.com', 'friedrich@example.com' ]
     end
@@ -56,11 +45,11 @@ describe Pony do
     it "cc" do
       Pony.build_mail(:cc => 'joe@example.com').cc.should == [ 'joe@example.com' ]
     end
-    
+
     it "reply_to" do
       Pony.build_mail(:reply_to => 'joe@example.com').reply_to.should == [ 'joe@example.com' ]
-    end    
-    
+    end
+
     it "cc with multiple recipients" do
       Pony.build_mail(:cc => 'joe@example.com, friedrich@example.com').cc.should == [ 'joe@example.com', 'friedrich@example.com' ]
     end
@@ -88,8 +77,8 @@ describe Pony do
     end
 
     it "default charset" do
-      Pony.build_mail(:body => 'body').charset.should == 'UTF-8'
-      Pony.build_mail(:body => 'body', :content_type => 'text/html').charset.should == 'UTF-8'
+      Pony.build_mail(body: 'body').charset.should eq 'UTF-8'
+      Pony.build_mail(html_body: 'body').charset.should eq 'UTF-8'
     end
 
     it "from (default)" do
@@ -101,12 +90,20 @@ describe Pony do
     end
 
     it "body" do
-      Pony.build_mail(:body => 'What do you know, Joe?').body.should == 'What do you know, Joe?'
+      Pony.build_mail(body: 'What do you know, Joe?').body.should
+        eq 'What do you know, Joe?'
     end
 
     it "html_body" do
-      Pony.build_mail(:html_body => 'What do you know, Joe?').parts.first.body.should == 'What do you know, Joe?'
-      Pony.build_mail(:html_body => 'What do you know, Joe?').parts.first.content_type.should == 'text/html; charset=UTF-8'
+      Pony.build_mail(html_body: 'What do you know, Joe?').parts.first.body.should
+        eq 'What do you know, Joe?'
+      Pony.build_mail(html_body: 'What do you know, Joe?').parts.first.content_type.should
+        eq 'text/html; charset=UTF-8'
+    end
+
+    it 'content_type' do
+      Pony.build_mail(content_type: 'multipart/related').content_type.should
+        eq 'multipart/related'
     end
 
     it "date" do
@@ -114,11 +111,6 @@ describe Pony do
       Pony.build_mail(:date => now).date.should == DateTime.parse(now.to_s)
     end
 
-    it "content_type of html should set html_body" do
-      Pony.should_receive(:build_mail).with(hash_including(:html_body => '<h1>test</h1>'))
-      Pony.mail(:to => 'foo@bar', :content_type => 'text/html', :body => '<h1>test</h1>')
-    end
-
     it "message_id" do
       Pony.build_mail(:message_id => '<abc@def.com>').message_id.should == 'abc@def.com'
     end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pony
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.1
 platform: ruby
 authors:
 - Adam Wiggins
-- 'maint: Ben Prew'
+- Ben Prew
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-11 00:00:00.000000000 Z
+date: 2013-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -40,8 +40,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0
 description: 'Send email in one command: Pony.mail(:to => ''someone@example.com'',
-  :body => ''hello'')'
-email: ben.prew@gmail.com
+  :body => ''hello'')Pony, the express way to send email in Ruby'
+email: ben@throwingbones.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -53,7 +53,8 @@ files:
 - spec/base.rb
 - spec/pony_spec.rb
 homepage: http://github.com/benprew/pony
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -72,10 +73,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: pony
-rubygems_version: 2.0.0
+rubyforge_project: 
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: 'Send email in one command: Pony.mail(:to => ''someone@example.com'', :body
-  => ''hello'')'
+  => ''hello'')Pony, the express way to send email in Ruby'
 test_files: []