pony 1.12 → 1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 756a7871e13ad465c063b18683d18202907948b1
-  data.tar.gz: 38a9f0e41442da28577320ed8c54afe991d77be5
+SHA256:
+  metadata.gz: 3abcec67b278593b90167a520183c1648c3bf01c86275cd3c3ac82bf192b7741
+  data.tar.gz: b7534155840b1bb03bb143222d4288df2acee8b52ecd2382bc61c9e1bae08789
 SHA512:
-  metadata.gz: e913d65e224fcebb25ab8eb5ae82afddd84530a9eafc7e3c11aff3a3f8554e383386e5a1d077fe041c3ebd9fdcb871b5989b385b632e458a4f8defd755c9542b
-  data.tar.gz: d74bf0263e7acfc0f33b1172ecca76a01a23b9149a00245d9682bbc7e89c5f42b6e5c1dd05e11dd5d881d3b32e1c59d89d04c3bf01bc796f6158dd840941b7dd
+  metadata.gz: 153288b21f87facc30475138c3cf184bb49b6984d7812a9e01c337908c7f9dfe8ab5b508a952eced3196ce2b022cba5a0876d0f8590f23f201b66dc276e1772d
+  data.tar.gz: 5de0842ef7999ccc5a30a53c1baca95a689c6bd6433370999e2368ea94be2e40cc31088d81b653f041f8e3366bd39539d5140cf9ec19a968ee94b3dbe065dbf4

data/README.md

@@ -169,7 +169,7 @@ As pony relies on mail to send the mails, you can also use its TestMailer in you
     Pony.mail(:to => 'foo@bar')
     Mail::TestMailer.deliveries.length
     => 1
-    
+
 For further examples see the [corresponding section of mail's readme](https://github.com/mikel/mail#using-mail-with-testing-or-specing-libraries)
 
 ## Help ##
@@ -186,19 +186,20 @@ https://groups.google.com/forum/#!forum/ponyrb
 
 ## Authors ##
 *  Adam Wiggins  [@adamwiggins](https://github.com/adamwiggins)
-*  Andrea Talbot  [@janehax](https://github.com/janehax)
+*  Andrea Talbot
 *  Ben Prew  [@benprew](https://github.com/benprew)
 *  Cameron Matheson  [@cmatheson](https://github.com/cmatheson)
 *  Carl Hörberg  [@carlhoerberg](https://github.com/carlhoerberg)
 *  Christian Haase  [@krissi](https://github.com/krissi)
 *  Daniel Lopes  [@danielvlopes](https://github.com/danielvlopes)
 *  Doug Hammond  [@dslh](https://github.com/dslh)
+*  Fabó Márton
 *  Hiroshi Saito  [@hiroshi](https://github.com/hiroshi)
 *  Kalin Harvey
 *  MIKAMI Yoshiyuki  [@yoshuki](https://github.com/yoshuki)
 *  Mathieu Martin  [@webmat](https://github.com/webmat)
 *  Michael Durrant  [@durrantm](https://github.com/durrantm)
-*  Michał Kwiatkowski  [@mkwiatkowski](https://github.com/mkwiatkowski)
+*  Michal Kwiatkowski  [@mkwiatkowski](https://github.com/mkwiatkowski)
 *  Nami-Doc
 *  Neil Middleton  [@neilmiddleton](https://github.com/neilmiddleton)
 *  Neil Mock  [@neilmock](https://github.com/neilmock)
@@ -216,6 +217,10 @@ https://groups.google.com/forum/#!forum/ponyrb
 
 ## Changelog ##
 
+#### 1.13 ####
+* fix bug: suppress potential error message from "which"
+* fix bug: Add support for passing empty hashes as attachment
+
 #### 1.12 ####
 * fix bug: NoMethodError when using mail 2.7.0
 

data/lib/pony.rb

@@ -233,7 +233,9 @@ module Pony
       # we need to explicitly define a second multipart/alternative
       # boundary to encapsulate the body-parts within the
       # multipart/mixed boundary that will be created automatically.
-      if options[:attachments] && options[:html_body] && options[:body]
+      options[:attachments] ||= {}
+
+      if options[:attachments].any? && options[:html_body] && options[:body]
         mail.part(:content_type => 'multipart/alternative') do |p|
           p.html_part = build_html_part(options)
           p.text_part = build_text_part(options)
@@ -241,7 +243,7 @@ module Pony
 
       # Otherwise if there is more than one part we still need to
       # ensure that they are all declared to be separate.
-      elsif options[:html_body] || options[:attachments]
+      elsif options[:html_body] || options[:attachments].any?
         mail.html_part = build_html_part(options) if options[:html_body]
         mail.text_part = build_text_part(options) if options[:body]
 
@@ -254,7 +256,7 @@ module Pony
         mail[key] = value
       end
 
-      add_attachments(mail, options[:attachments]) if options[:attachments]
+      add_attachments(mail, options[:attachments]) if options[:attachments].any?
 
       mail.charset = options[:charset] if options[:charset] # charset must be set after setting content_type
 
@@ -327,7 +329,7 @@ module Pony
     end
 
     def sendmail_binary
-      sendmail = `which sendmail`.chomp
+      sendmail = `which sendmail 2>#{Gem.win_platform? ? 'nul' : '/dev/null'}`.chomp
       sendmail.empty? ? '/usr/sbin/sendmail' : sendmail
     end
   end

data/pony.gemspec

@@ -1,8 +1,6 @@
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
   s.name = 'pony'
-  s.version = "1.12"
+  s.version = "1.13"
 
   s.summary = "Send email in one command: Pony.mail(:to => 'someone@example.com', :body => 'hello')"
   s.description = s.summary

data/spec/pony_spec.rb

@@ -301,6 +301,24 @@ describe Pony do
   end
 
   describe "content type" do
+    shared_examples 'a mail with only html_body and body set' do
+      it { expect(mail.parts.length).to eq 2 }
+      it { expect(mail.content_type.to_s).to include( 'multipart/alternative' ) }
+      it { expect(mail.parts[0].to_s).to include( 'Content-Type: text/html' ) }
+      it { expect(mail.parts[1].to_s).to include( 'Content-Type: text/plain' ) }
+    end
+
+    context "mail html_body and body" do
+      subject(:mail) do
+        Pony.send(:build_mail,
+                  :body => 'test',
+                  :html_body => 'What do you know, Joe?',
+                  )
+      end
+
+      it_behaves_like 'a mail with only html_body and body set'
+    end
+
     context "mail with attachments, html_body and body " do
       subject(:mail) do
         Pony.send(:build_mail,
@@ -318,6 +336,18 @@ describe Pony do
       it { expect(mail.parts[0].parts[1].to_s).to include( 'Content-Type: text/plain' ) }
       it { expect(mail.parts[1].to_s).to include( 'Content-Type: text/plain' ) }
     end
+
+    context "mail html_body and body and empty attachment list" do
+      subject(:mail) do
+        Pony.send(:build_mail,
+                  :body => 'test',
+                  :html_body => 'What do you know, Joe?',
+                  :attachments => {},
+                  )
+      end
+
+      it_behaves_like 'a mail with only html_body and body set'
+    end
   end
 
   describe "additional headers" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pony
 version: !ruby/object:Gem::Version
-  version: '1.12'
+  version: '1.13'
 platform: ruby
 authors:
 - Adam Wiggins
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2019-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -87,8 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: 'Send email in one command: Pony.mail(:to => ''someone@example.com'', :body