simple_postmark 0.3.4 → 0.3.5

data/lib/simple_postmark.rb

@@ -7,8 +7,8 @@ require 'mail'
 module SimplePostmark  
   require 'simple_postmark/mail_ext/message'
   require 'simple_postmark/mail_ext/part'
-  
+
   require 'simple_postmark/delivery_method'
-  
+
   require 'simple_postmark/railtie' if defined?(Rails)
 end

data/lib/simple_postmark/delivery_method.rb

@@ -1,17 +1,19 @@
 module Mail
   class SimplePostmark
     include HTTParty
-    
+
     def initialize(values)
-      self.settings = { api_key: '********-****-****-****-************' }.merge!(values)
+      self.settings = { api_key: '********-****-****-****-************' }.merge(values)
     end
-    
+
     attr_accessor :settings
     base_uri 'http://api.postmarkapp.com'
     headers 'Accept' => 'application/json', 'ContentType' => 'application/json'
-    
+
     def deliver!(mail)
-      self.class.post('/email', headers: self.class.headers.merge('X-Postmark-Server-Token' => settings[:api_key].to_s), body: mail.to_postmark.to_json)
+      api_key = { 'X-Postmark-Server-Token' => settings[:api_key].to_s }
+      
+      self.class.post('/email', headers: self.class.headers.merge(api_key), body: mail.to_postmark.to_json)
     end
   end
 end

data/lib/simple_postmark/mail_ext/message.rb

@@ -1,9 +1,13 @@
 module Mail
   class Message
     def html_body
-      html_part.present? ? html_part.to_postmark['Content'] : content_type && content_type.include?('text/html') ? body : nil
+      if html_part.present?
+        html_part.to_postmark['Content']
+      else
+        body if content_type.to_s.include?('text/html')
+      end
     end
-    
+
     def tag(val = nil)
       default(:tag, val)
     end
@@ -11,13 +15,13 @@ module Mail
     def tag=(val)
       header[:tag] = val
     end
-    
+
     def text_body
       text_part.present? ? text_part.to_postmark['Content'] : body
     end
 
     def to_postmark
-      %w[attachments bcc cc from html_body reply_to subject tag text_body to].each.with_object({}) do |key, hash|        
+      %w[attachments bcc cc from html_body reply_to subject tag text_body to].each.with_object({}) do |key, hash|
         hash[key.camelcase] = case (value = public_send(key).presence or next)
           when AttachmentsList then value.map(&:to_postmark)
           when Array then value.join(', ')

data/lib/simple_postmark/railtie.rb

@@ -1,5 +1,5 @@
 module SimplePostmark
   class Railtie < ::Rails::Railtie
-    ActionMailer::Base.add_delivery_method(:simple_postmark, Mail::SimplePostmark, :api_key => nil)
+    ActionMailer::Base.add_delivery_method(:simple_postmark, Mail::SimplePostmark, api_key: nil)
   end
 end

data/lib/simple_postmark/version.rb

@@ -1,3 +1,3 @@
 module SimplePostmark
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_postmark
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-31 00:00:00.000000000 Z
+date: 2012-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70170524320840 !ruby/object:Gem::Requirement
+  requirement: &70134898780960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70170524320840
+  version_requirements: *70134898780960
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70170524320340 !ruby/object:Gem::Requirement
+  requirement: &70134898780500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70170524320340
+  version_requirements: *70134898780500
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70170524336100 !ruby/object:Gem::Requirement
+  requirement: &70134898779800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70170524336100
+  version_requirements: *70134898779800
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &70170524335280 !ruby/object:Gem::Requirement
+  requirement: &70134898778520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70170524335280
+  version_requirements: *70134898778520
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70170524334700 !ruby/object:Gem::Requirement
+  requirement: &70134898793920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170524334700
+  version_requirements: *70134898793920
 - !ruby/object:Gem::Dependency
   name: purdytest
-  requirement: &70170524334280 !ruby/object:Gem::Requirement
+  requirement: &70134898793460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170524334280
+  version_requirements: *70134898793460
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70170524333740 !ruby/object:Gem::Requirement
+  requirement: &70134898792820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70170524333740
+  version_requirements: *70134898792820
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70170524333060 !ruby/object:Gem::Requirement
+  requirement: &70134898792180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170524333060
+  version_requirements: *70134898792180
 description: SimplePostmark makes it easy to send mails via Postmark™ using Rails
   3's ActionMailer.
 email: uher.mario@gmail.com