simple_postmark 0.2 → 0.3

data/lib/simple_postmark.rb

@@ -1,8 +1,8 @@
 require 'active_support/core_ext/object/blank'
 require 'active_support/inflector/methods'
+require 'httparty'
 require 'json'
 require 'mail'
-require 'typhoeus'
 
 module SimplePostmark  
   require 'simple_postmark/mail_ext/message'

data/lib/simple_postmark/delivery_method.rb

@@ -1,20 +1,17 @@
 module Mail
   class SimplePostmark
+    include HTTParty
+    
     def initialize(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)
-      headers = {
-        'Accept'                  => 'application/json',
-        'ContentType'             => 'application/json',
-        'X-Postmark-Server-Token' => settings[:api_key].to_s
-      }
-      body = mail.to_postmark.to_json
-    
-      Typhoeus::Request.post('http://api.postmarkapp.com/email', headers: headers, body: body)
+      self.class.post('/email', headers: self.class.headers.merge('X-Postmark-Server-Token' => settings[:api_key].to_s), body: mail.to_postmark.to_json)
     end
   end
 end

data/lib/simple_postmark/mail_ext/message.rb

@@ -1,5 +1,9 @@
 module Mail
   class Message
+    def html_body
+      html_part.present? ? html_part.to_postmark['Content'] : content_type && content_type.include?('text/html') ? body : nil
+    end
+    
     def tag(val = nil)
       default(:tag, val)
     end
@@ -7,24 +11,19 @@ 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|        
-        hash[key.camelcase] = case (value = send(key).presence or next)
+        hash[key.camelcase] = case (value = public_send(key).presence or next)
           when AttachmentsList then value.map(&:to_postmark)
           when Array then value.join(', ')
           else value.to_s
         end
       end
     end
-    
-    private
-    def html_body
-      html_part.present? ? html_part.to_postmark['Content'] : content_type && content_type.include?('text/html') ? body : nil
-    end
-
-    def text_body
-      text_part.present? ? text_part.to_postmark['Content'] : body
-    end
   end
 end

data/lib/simple_postmark/version.rb

@@ -1,3 +1,3 @@
 module SimplePostmark
-  VERSION = '0.2'
+  VERSION = '0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_postmark
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-20 00:00:00.000000000Z
+date: 2011-09-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70262074977180 !ruby/object:Gem::Requirement
+  requirement: &70317368438940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70262074977180
+  version_requirements: *70317368438940
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: &70262074976680 !ruby/object:Gem::Requirement
+  name: httparty
+  requirement: &70317368438500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70262074976680
+  version_requirements: *70317368438500
 - !ruby/object:Gem::Dependency
-  name: mail
-  requirement: &70262074976060 !ruby/object:Gem::Requirement
+  name: json
+  requirement: &70317368437880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70262074976060
+  version_requirements: *70317368437880
 - !ruby/object:Gem::Dependency
-  name: typhoeus
-  requirement: &70262074975540 !ruby/object:Gem::Requirement
+  name: mail
+  requirement: &70317368437380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70262074975540
+  version_requirements: *70317368437380
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70262074974980 !ruby/object:Gem::Requirement
+  requirement: &70317368436860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70262074974980
+  version_requirements: *70317368436860
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70262074974380 !ruby/object:Gem::Requirement
+  requirement: &70317368436280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70262074974380
+  version_requirements: *70317368436280
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &70262074973660 !ruby/object:Gem::Requirement
+  requirement: &70317368435740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70262074973660
+  version_requirements: *70317368435740
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &70262074973160 !ruby/object:Gem::Requirement
+  requirement: &70317368435320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70262074973160
+  version_requirements: *70317368435320
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70262074972740 !ruby/object:Gem::Requirement
+  requirement: &70317368434860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70262074972740
+  version_requirements: *70317368434860
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70262074972140 !ruby/object:Gem::Requirement
+  requirement: &70317368434380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70262074972140
+  version_requirements: *70317368434380
 description: SimplePostmark makes it easy to send mails via Postmark™ using Rails
   3's ActionMailer.
 email: uher.mario@gmail.com