incoming 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1342785e330570e8dead5676e9f6bfbbfc5e7c71
-  data.tar.gz: 131181e9b82a02b6fa5532cd57d1a00c1e77382a
+  metadata.gz: 669e826d514d7f60c2f0b573d05e06b5c787bd58
+  data.tar.gz: 69297a42708e49dcc34dfbb8c9e7564c98fca255
 SHA512:
-  metadata.gz: bedd0840a7fd2cb6ac7fa8e8f8737b041f4e8ee2cd320fa84225ce7a16c08b1ce2f614a2a18e1429785c97a121f263ad75dd54da7738b3c3fa24c01fe5220122
-  data.tar.gz: cab1511a00c240863aabef46d66d721393b168d4b4316350f481c02eeb803bcb172072f5f45f12033f694ca9116c21e47ef45d7e2baf12009991135b9e6c1003
+  metadata.gz: fffdd521a873011ce3a2c63086b9a90428a366b6eb0e902692d1c58c10d15a200f6b1329bcb5c270dc0d7ad8fb93f30e2fa30c4298c2faf218a892b16ed12b56
+  data.tar.gz: b74dd6dd56b1a0dacc49807b38da6fbe5747045d7ea28703574eee4ea0f827e8275154141ff724520501a06aa6eb94a781c9968ec69de29543b4202d930ca18c

data/README.md

@@ -7,11 +7,12 @@ Incoming! receives a `Rack::Request` and hands you a [`Mail::Message`](https://g
 like `ActionMailer::Base.receive` does with a raw email. We currently
 support the following services:
 
-1. SendGrid
-2. Mailgun
-3. Postmark
-4. CloudMailin
-5. Any mail server capable of routing messages to a system command
+* SendGrid
+* Mailgun
+* Postmark
+* CloudMailin
+* Mandrill
+* Any mail server capable of routing messages to a system command
 
 Brought to you by :zap: **Honeybadger.io**, painless [Rails exception tracking](https://www.honeybadger.io/).
 
@@ -31,12 +32,12 @@ Brought to you by :zap: **Honeybadger.io**, painless [Rails exception tracking](
 3. Implement an HTTP endpoint to receive HTTP post hooks, and pass the
    request to your receiver. (see examples below)
 
-## SendGrid example:
+## SendGrid example
 
 ```ruby
 class EmailReceiver < Incoming::Strategies::SendGrid
   def receive(mail)
-    puts %(Got message from #{mail.to.first} with subject "#{mail.subject}")
+    %(Got message from #{mail.to.first} with subject "#{mail.subject}")
   end
 end
 
@@ -46,14 +47,14 @@ result = EmailReceiver.receive(req) # => Got message from whoever@wherever.com w
 
 [Sendgrid API reference](http://sendgrid.com/docs/API_Reference/Webhooks/parse.html)
 
-## Mailgun example:
+## Mailgun example
 
 ```ruby
 class EmailReceiver < Incoming::Strategies::Mailgun
   setup :api_key => 'asdf'
 
   def receive(mail)
-    puts %(Got message from #{mail.to.first} with subject "#{mail.subject}")
+    %(Got message from #{mail.to.first} with subject "#{mail.subject}")
   end
 end
 
@@ -63,12 +64,12 @@ result = EmailReceiver.receive(req) # => Got message from whoever@wherever.com w
 
 [Mailgun API reference](http://documentation.mailgun.net/user_manual.html#receiving-messages)
 
-## Postmark example:
+## Postmark example
 
 ```ruby
 class EmailReceiver < Incoming::Strategies::Postmark
   def receive(mail)
-    puts %(Got message from #{mail.to.first} with subject "#{mail.subject}")
+    %(Got message from #{mail.to.first} with subject "#{mail.subject}")
   end
 end
 
@@ -78,14 +79,14 @@ result = EmailReceiver.receive(req) # => Got message from whoever@wherever.com w
 
 [Postmark API reference](http://developer.postmarkapp.com/developer-inbound.html)
 
-## CloudMailin example:
+## CloudMailin example
 
 Use the Raw Format when setting up your address target.
 
 ```ruby
 class EmailReceiver < Incoming::Strategies::CloudMailin
   def receive(mail)
-    puts %(Got message from #{mail.to.first} with subject "#{mail.subject}")
+    %(Got message from #{mail.to.first} with subject "#{mail.subject}")
   end
 end
 
@@ -95,14 +96,35 @@ result = EmailReceiver.receive(req) # => Got message from whoever@wherever.com w
 
 [CloudMailin API reference](http://docs.cloudmailin.com/http_post_formats/)
 
-## Postfix example:
+## Mandrill example
+
+Mandrill is capable of sending multiple events in a single webhook, so
+the Mandrill strategy works a bit differently than the others. Namely,
+the `.receive` method returns an Array of return values from your
+`#receive` method for each inbound event in the payload. Otherwise, the
+implementation is the same:
+
+```ruby
+class EmailReceiver < Incoming::Strategies::Mandrill
+  def receive(mail)
+    %(Got message from #{mail.to.first} with subject "#{mail.subject}")
+  end
+end
+
+req = Rack::Request.new(env)
+result = EmailReceiver.receive(req) # => ['Got message from whoever@wherever.com with subject "hello world"', '...']
+```
+
+[Mandrill API reference](http://help.mandrill.com/entries/22092308-What-is-the-format-of-inbound-email-webhooks-)
+
+## Postfix example
 
 ```ruby
 class EmailReceiver < Incoming::Strategies::HTTPPost
   setup :secret => '6d7e5337a0cd69f52c3fcf9f5af438b1'
 
   def receive(mail)
-    puts %(Got message from #{mail.to.first} with subject "#{mail.subject}")
+    %(Got message from #{mail.to.first} with subject "#{mail.subject}")
   end
 end
 
@@ -124,7 +146,7 @@ class EmailReceiver < Incoming::Strategies::HTTPPost
   setup :secret => '6d7e5337a0cd69f52c3fcf9f5af438b1'
 
   def receive(mail)
-    puts %(Got message from #{mail.to.first} with subject "#{mail.subject}")
+    %(Got message from #{mail.to.first} with subject "#{mail.subject}")
   end
 end
 

data/lib/incoming.rb

@@ -2,9 +2,10 @@ require 'mail'
 require 'incoming/strategy'
 
 module Incoming
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 
   module Strategies
+    autoload :Mandrill, 'incoming/strategies/mandrill'
     autoload :SendGrid, 'incoming/strategies/sendgrid'
     autoload :Mailgun, 'incoming/strategies/mailgun'
     autoload :Postmark, 'incoming/strategies/postmark'

data/lib/incoming/strategies/mandrill.rb

@@ -0,0 +1,22 @@
+require 'json'
+
+module Incoming
+  module Strategies
+    class Mandrill
+      include Incoming::Strategy
+
+      def self.receive(request)
+        JSON.parse(request.params['mandrill_events']).map do |event|
+          next unless event['event'] == 'inbound'
+          result = super(event['msg'])
+          yield(result) if block_given?
+          result
+        end.compact
+      end
+
+      def initialize(msg)
+        @message = Mail.new(msg['raw_msg'])
+      end
+    end
+  end
+end

data/lib/incoming/strategies/sendgrid.rb

@@ -9,7 +9,7 @@ module Incoming
         params = request.params.dup
 
         # TODO: Properly handle encodings
-        # encodings = JSON.parse(params['charsets'])
+        encodings = JSON.parse(params['charsets'])
 
         attachments = 1.upto(params['attachments'].to_i).map do |num|
           attachment_from_params(params["attachment#{num}"])
@@ -17,12 +17,19 @@ module Incoming
 
         @message = Mail.new do
           header params['headers']
-
-          body params['text']
+          if encodings['text'].blank?
+            body params['text']
+          else
+            body params['text'].force_encoding(encodings['text']).encode('UTF-8')
+          end
 
           html_part do
             content_type 'text/html; charset=UTF-8'
-            body params['html']
+            if encodings['html'].blank?
+              body params['html']
+            else
+              body params['html'].force_encoding(encodings['html']).encode('UTF-8')
+            end
           end if params['html']
 
           attachments.each do |attachment|

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: incoming
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Joshua Wood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-27 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   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: Incoming! standardizes various mail parse apis, making it a snap to receive
@@ -75,17 +75,18 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.md
+- Rakefile
+- bin/http_post
+- lib/incoming.rb
 - lib/incoming/strategies/cloudmailin.rb
 - lib/incoming/strategies/http_post.rb
 - lib/incoming/strategies/mailgun.rb
+- lib/incoming/strategies/mandrill.rb
 - lib/incoming/strategies/postmark.rb
 - lib/incoming/strategies/sendgrid.rb
 - lib/incoming/strategy.rb
-- lib/incoming.rb
-- MIT-LICENSE
-- Rakefile
-- README.md
-- bin/http_post
 homepage: https://github.com/honeybadger-io/incoming
 licenses: []
 metadata: {}
@@ -95,17 +96,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Incoming! helps you receive email in your Rack apps.