postmark 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73d01dca4a5c8f9829f1ca039ae3f21c6f8f4e9e
-  data.tar.gz: cdfd6f7286b9a054183fe60701b70cc9e8f1ad9e
+  metadata.gz: fc241632a8664fa4d6da4f478cb3b06d16dcad9e
+  data.tar.gz: 05270b025e77c916322187db871b53aa9d2f90dd
 SHA512:
-  metadata.gz: a464977cf081ee97a239ff633d40d95f7685536a6b224adc3e1f55023d709a562da06009a91f4206d7e4cdb672903df74af1b4c86f95992e6dca63b7395c3973
-  data.tar.gz: 544a52694c765a7e2f91456864b26307c2ed968d775e96f5e211fa7b6fc653cf6ad62302b114cde057004ce9931dee9484f2a4f83bdfa14e893ea82a9d669243
+  metadata.gz: de873b858f3b93c0e4bbbbec6b6092d579799da2e7d393909d163c2522a3a336d03846faffcaf8b618791d59d7dde5d8376ae808ee4f21d4112bb7ffb4f181f4
+  data.tar.gz: bfc1403186f4522b58174842bd104848a52f5b6aa405f3b61dc8e1db252785160b76f1b6b5a8046b079eb95975bf0a6a1717855787ded20fd93069e8590b9f02

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = Changelog
 
+== 1.4.2
+
+* Fix a regression when using the gem with older mail gem versions introduced in 1.4.1. Affected mail gem versions are 2.5.3 and below.
+
 == 1.4.1
 
 * Fix an exception when sending a Mail::Message containing quoted-printable parts with unicode characters.

data/Gemfile

@@ -8,4 +8,7 @@ group :test do
   gem 'fakeweb'
   gem 'fakeweb-matcher'
   gem 'mime-types', '~> 1.25.1'
+  gem 'activesupport', '~> 3.2.0'
+  gem 'i18n', '~> 0.6.0'
+  gem 'yajl-ruby', '~> 1.0', :platforms => [:mingw, :mswin, :ruby]
 end

data/VERSION

@@ -1 +1 @@
-1.4.1
+1.4.2

data/lib/postmark/message_extensions/mail.rb

@@ -44,18 +44,20 @@ module Mail
     end
 
     def body_html
-      if html_part.nil?
-        decoded if html?
-      else
+      if multipart? && html_part
         html_part.decoded
+      elsif text? && html?
+        decoded
       end
     end
 
     def body_text
-      if text_part.nil?
-        decoded unless html?
-      else
+      if multipart? && text_part
         text_part.decoded
+      elsif text? && !html?
+        decoded
+      elsif !html?
+        body.decoded
       end
     end
 
@@ -76,6 +78,7 @@ module Mail
     end
 
     def to_postmark_hash
+      ready_to_send!
       ::Postmark::MailMessageConverter.new(self).run
     end
 

data/lib/postmark/version.rb

@@ -1,3 +1,3 @@
 module Postmark
-  VERSION = '1.4.1'
+  VERSION = '1.4.2'
 end

data/postmark.gemspec

@@ -37,6 +37,4 @@ Gem::Specification.new do |s|
   s.add_dependency "json"
 
   s.add_development_dependency "mail"
-  s.add_development_dependency "activesupport", "~> 3.0"
-  s.add_development_dependency "yajl-ruby" unless RUBY_PLATFORM == "java"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postmark
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Petyo Ivanov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2014-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -54,34 +54,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Use this gem to send emails through Postmark HTTP API and retrieve info
   about bounces.
 email: ilya@wildbit.com
@@ -169,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.7
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Official Postmark API wrapper.