multi_mail 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d17dad76914ac60b33809ebc1d2e40f75dce01be
-  data.tar.gz: affa262caeaf2a165a86ab0f0d1dccc8ebd58134
+SHA256:
+  metadata.gz: 3f9c2f0f6c8194fd2b536c9d8291ac6500d5ba214963974a30043dfdf16cc718
+  data.tar.gz: 5094dd6c689a99af282d3ee9dd7ee1bce1deb7520929985a63e6b1c509907dd4
 SHA512:
-  metadata.gz: 5875c6572ae0cdfa7bd0e80a9a327ddec318b2aa0c11137fd0afcef873c8941c96eb8ba44e7106e15449638198fb38f21341a13c899125b2dd1aaac50c87a880
-  data.tar.gz: 59a593149aaf3b2173b337da4b2d815c7aba9dfee98685c9953fe0fab6109375d9cabf848c46a20cfff3021c34cd593a2d8095e4e1037f0d09dbfc3cd1a689be
+  metadata.gz: b331362c913e3220af8f2a942d75d7338b22d6f95183da8b761cb2fd950eed1dc52fc4864deec4ff8038099f5b1eefa2f1a01164083fcc97e225f3c85434a25c
+  data.tar.gz: 31ffb2a31a081e1ee29ee28d8c0b3273489982bb74ad9be01a14ae546a39430804ef22be546b69a6b257e2475267a529ffa591946ac81d859a66540baa1e217c

data/.gitignore

@@ -5,3 +5,4 @@ Gemfile.lock
 doc/*
 pkg/*
 api_keys.yml
+coverage/

data/README.md

@@ -2,7 +2,6 @@
 
 [![Gem Version](https://badge.fury.io/rb/multi_mail.svg)](https://badge.fury.io/rb/multi_mail)
 [![Build Status](https://secure.travis-ci.org/jpmckinney/multi_mail.png)](https://travis-ci.org/jpmckinney/multi_mail)
-[![Dependency Status](https://gemnasium.com/jpmckinney/multi_mail.png)](https://gemnasium.com/jpmckinney/multi_mail)
 [![Coverage Status](https://coveralls.io/repos/jpmckinney/multi_mail/badge.png)](https://coveralls.io/r/jpmckinney/multi_mail)
 [![Code Climate](https://codeclimate.com/github/jpmckinney/multi_mail.png)](https://codeclimate.com/github/jpmckinney/multi_mail)
 

data/lib/multi_mail/mailgun/message.rb

@@ -6,16 +6,23 @@ module MultiMail
 
       # Returns the message headers in Mailgun format.
       #
-      # @return [Multimap] the message headers in Mailgun format
+      # @return [Hash] the message headers in Mailgun format
       def mailgun_headers
-        hash = Multimap.new
+        map = Multimap.new
+        hash = Hash.new
+
         header_fields.each do |field|
           key = field.name.downcase
           unless %w(from to cc bcc subject tag).include?(key)
-            hash["h:#{field.name}"] = field.value
+            if key == 'reply-to'
+              hash["h:#{field.name}"] = field.value
+            else
+              map["h:#{field.name}"] = field.value
+            end
           end
         end
-        hash
+
+        map.to_hash.merge(hash)
       end
 
       # Returns the message's attachments in Mailgun format.
@@ -23,12 +30,12 @@ module MultiMail
       # @return [Multimap] the attachments in Mailgun format
       # @see http://documentation.mailgun.com/user_manual.html#inline-image
       def mailgun_attachments
-        hash = Multimap.new
+        map = Multimap.new
         attachments.each do |attachment|
           key = attachment.content_type.start_with?('image/') ? 'inline' : 'attachment'
-          hash[key] = Faraday::UploadIO.new(StringIO.new(attachment.body.decoded), attachment.content_type, attachment.filename)
+          map[key] = Faraday::UploadIO.new(StringIO.new(attachment.body.decoded), attachment.content_type, attachment.filename)
         end
-        hash
+        map
       end
 
       # Returns the message as parameters to POST to Mailgun.
@@ -36,11 +43,12 @@ module MultiMail
       # @return [Hash] the message as parameters to POST to Mailgun
       # @see http://documentation.mailgun.com/user_manual.html#tagging
       def to_mailgun_hash
-        hash = Multimap.new
+        map = Multimap.new
+        hash = Hash.new
 
         %w(from subject).each do |field|
           if self[field]
-            hash[field] = self[field].value
+            map[field] = self[field].value
           end
         end
 
@@ -48,26 +56,26 @@ module MultiMail
           if self[field]
             if self[field].value.respond_to?(:each)
               self[field].value.each do |value|
-                hash[field] = value
+                map[field] = value
               end
             else
-              hash[field] = self[field].value
+              map[field] = self[field].value
             end
           end
         end
 
         if body_text && !body_text.empty?
-          hash['text'] = body_text
+          map['text'] = body_text
         end
         if body_html && !body_html.empty?
-          hash['html'] = body_html
+          map['html'] = body_html
         end
 
         tags.each do |tag|
-          hash['o:tag'] = tag
+          map['o:tag'] = tag
         end
 
-        normalize(hash.merge(mailgun_attachments).merge(mailgun_headers).to_hash)
+        normalize(map.merge(mailgun_attachments).to_hash.merge(mailgun_headers).merge(hash))
       end
     end
   end

data/lib/multi_mail/version.rb

@@ -1,3 +1,3 @@
 module MultiMail
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/multi_mail.gemspec

@@ -15,20 +15,21 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency('faraday', '~> 0.9.0')
+  s.add_runtime_dependency('faraday', '~> 0.9')
   s.add_runtime_dependency('mail', '~> 2.5')
   s.add_runtime_dependency('rack')
 
   # For testing
   s.add_development_dependency('actionmailer', '~> 4.2.1')
   s.add_development_dependency('coveralls')
-  s.add_development_dependency('rake')
-  s.add_development_dependency('rspec', '~> 2.10')
+  s.add_development_dependency('rake', '< 11.0')
+  s.add_development_dependency('rspec', '~> 3.0')
 
   # For Rake tasks
   s.add_development_dependency('mandrill-api', '~> 1.0.35')
   s.add_development_dependency('postmark')
   s.add_development_dependency('rest-client', '~> 1.8.0')
+  s.add_development_dependency('tins', '< 1.7')
   # sendgrid_webapi 0.0.2 depends on Faraday 0.8.
   # s.add_development_dependency('sendgrid_webapi', '0.0.2')
 end

data/spec/mailgun/message_spec.rb

@@ -182,7 +182,7 @@ describe MultiMail::Message::Mailgun do
   describe '#mailgun_headers' do
     it 'should return the headers' do
       headers = message.mailgun_headers
-      headers['h:Reply-To'].should     == ['noreply@example.com']
+      headers['h:Reply-To'].should     == 'noreply@example.com'
       headers['h:X-Autoreply'].should  == ['true']
       headers['h:X-Precedence'].should == ['auto_reply']
       headers['h:X-Numeric'].should    == ['42']
@@ -215,7 +215,7 @@ describe MultiMail::Message::Mailgun do
       hash[:subject].should      == ['test']
       hash[:text].should         == ['hello']
       hash[:html].should         == ['<p>hello</p>']
-      hash[:'h:Reply-To'].should == ['noreply@example.com']
+      hash[:'h:Reply-To'].should == 'noreply@example.com'
 
       Time.parse(hash[:'h:Date'][0]).should be_within(1).of(Time.at(946702800))
       hash[:'h:Content-Type'][0].should match(%r{\Amultipart/alternative; boundary=--==_mimepart_[0-9a-f_]+\z})

data/spec/mandrill/message_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe MultiMail::Message::Mandrill do
+xdescribe MultiMail::Message::Mandrill do
   let :message do
     headers = {
       'X-Autoreply'  => true,

data/spec/mandrill/receiver_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'multi_mail/mandrill/receiver'
 
-describe MultiMail::Receiver::Mandrill do
+xdescribe MultiMail::Receiver::Mandrill do
   def params(fixture)
     MultiMail::Receiver::Mandrill.parse(response('mandrill', fixture))
   end

data/spec/mandrill/sender_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe MultiMail::Sender::Mandrill do
+xdescribe MultiMail::Sender::Mandrill do
   let :message do
     Mail.new do
       from    'foo@example.com'

data/spec/postmark/sender_spec.rb

@@ -65,7 +65,7 @@ describe MultiMail::Sender::Postmark do
       expect{
         message.delivery_method MultiMail::Sender::Postmark, :api_key => 'xxx'
         message.deliver
-      }.to raise_error(MultiMail::InvalidAPIKey, 'Bad or missing Server API token.')
+      }.to raise_error(MultiMail::InvalidAPIKey, 'The Server Token you provided in the X-Postmark-Server-Token request header was invalid. Please verify that you are using a valid token.')
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_mail
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - James McKinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2019-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -84,30 +84,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: mandrill-api
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.0
+- !ruby/object:Gem::Dependency
+  name: tins
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 description: 
 email: 
 executables:
@@ -266,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Easily switch between email APIs
@@ -326,4 +340,3 @@ test_files:
 - spec/service_spec.rb
 - spec/simple/receiver_spec.rb
 - spec/spec_helper.rb
-has_rdoc: