incoming 0.1.5 → 0.1.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1342785e330570e8dead5676e9f6bfbbfc5e7c71
+  data.tar.gz: 131181e9b82a02b6fa5532cd57d1a00c1e77382a
+SHA512:
+  metadata.gz: bedd0840a7fd2cb6ac7fa8e8f8737b041f4e8ee2cd320fa84225ce7a16c08b1ce2f614a2a18e1429785c97a121f263ad75dd54da7738b3c3fa24c01fe5220122
+  data.tar.gz: cab1511a00c240863aabef46d66d721393b168d4b4316350f481c02eeb803bcb172072f5f45f12033f694ca9116c21e47ef45d7e2baf12009991135b9e6c1003

data/lib/incoming.rb

@@ -2,7 +2,7 @@ require 'mail'
 require 'incoming/strategy'
 
 module Incoming
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 
   module Strategies
     autoload :SendGrid, 'incoming/strategies/sendgrid'

data/lib/incoming/strategies/postmark.rb

@@ -1,4 +1,4 @@
-require 'postmark_mitt'
+require 'json'
 require 'base64'
 
 module Incoming
@@ -7,25 +7,52 @@ module Incoming
       include Incoming::Strategy
 
       def initialize(request)
-        email = ::Postmark::Mitt.new(request.body.read)
+        source = JSON.parse(request.body.read)
 
-        @attachments = email.attachments
+        headers = parse_headers(source['Headers'])
+        from    = parse_address(source['FromFull'])
+        to      = source['ToFull'].map{|h| parse_address(h)}
+        cc      = source['CcFull'].map{|h| parse_address(h)}
 
         @message = Mail.new do
-          headers email.headers
+          headers   headers
+          from      from
+          to        to
+          cc        cc
+          reply_to  source['ReplyTo']
+          subject   source['Subject']
+          date      source['Date']
 
-          body email.text_body
+          body source['TextBody']
 
           html_part do
             content_type 'text/html; charset=UTF-8'
-            body email.html_body
-          end if email.html_body
+            body CGI.unescapeHTML(source['HtmlBody'])
+          end if source['HtmlBody']
 
-          email.attachments.each do |a|
-            add_file :filename => a.file_name, :content => Base64.decode64(a.source['Content'])
+          source['Attachments'].each do |a|
+            add_file :filename => a['Name'], :content => Base64.decode64(a['Content'])
+          end
+
+          %w(MailboxHash MessageID Tag).each do |key|
+            if source[key] =~ /\S/
+              header[key] = source[key]
+            end
           end
         end
       end
+
+      private
+
+        def parse_headers(source)
+          source.inject({}){|hash,obj| hash[obj['Name']] = obj['Value']; hash}
+        end
+
+        def parse_address(hash)
+          Mail::Address.new(hash['Email']).tap do |address|
+            address.display_name = hash['Name']
+          end.to_s
+        end
     end
   end
 end

data/lib/incoming/strategy.rb

@@ -111,7 +111,7 @@ module Incoming
       # Returns Hash for Mail::Message#add_file
       def attachment_from_params(uploaded_file_or_hash)
         filename, content = if Hash === uploaded_file_or_hash
-                              [uploaded_file_or_hash['filename'], uploaded_file_or_hash['tempfile'].read]
+                              [uploaded_file_or_hash[:filename], uploaded_file_or_hash[:tempfile].read]
                             else
                               [uploaded_file_or_hash.original_filename, uploaded_file_or_hash.read]
                             end

metadata

@@ -1,78 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: incoming
 version: !ruby/object:Gem::Version
-  version: 0.1.5
-  prerelease: 
+  version: 0.1.6
 platform: ruby
 authors:
 - Joshua Wood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-23 00:00:00.000000000 Z
+date: 2013-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mail
+  name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: postmark-mitt
+  name: mail
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.11
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.11
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Incoming! standardizes various mail parse apis, making it a snap to receive
@@ -97,32 +88,25 @@ files:
 - bin/http_post
 homepage: https://github.com/honeybadger-io/incoming
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1004414202407084554
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1004414202407084554
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Incoming! helps you receive email in your Rack apps.
 test_files: []