incoming 0.1.4 → 0.1.5

data/README.md

@@ -117,6 +117,38 @@ result = EmailReceiver.receive(req) # => Got message from whoever@wherever.com w
 # /etc/mail/aliases
 http_post: "|http_post -s 6d7e5337a0cd69f52c3fcf9f5af438b1 http://www.example.com/emails"
 ```
+## Qmail example:
+
+```ruby
+class EmailReceiver < Incoming::Strategies::HTTPPost
+  setup :secret => '6d7e5337a0cd69f52c3fcf9f5af438b1'
+
+  def receive(mail)
+    puts %(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"
+```
+
+To setup a *global* incoming email alias:
+
+```
+# /var/qmail/alias/.qmail-whoever - mails to whoever@ will be delivered to this alias.
+|http_post -s 6d7e5337a0cd69f52c3fcf9f5af438b1 http://www.example.com/emails
+```
+
+Domain-specific incoming aliases can be set as follows:
+
+```
+#/var/qmail/control/virtualdomains
+example.com:example
+
+#~example/.qmail-whoever
+|http_post -s 6d7e5337a0cd69f52c3fcf9f5af438b1 http://www.example.com/emails
+```
+Now mails to `whoever@example.com` will be posted to the corresponding URL above. To post all mails for `example.com`, just add the above line to `~example/.qmail-default`.
 
 ## Example Rails controller
 

data/lib/incoming.rb

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

data/lib/incoming/strategies/mailgun.rb

@@ -41,11 +41,17 @@ module Incoming
         html_content = params[ self.class.default_options[:stripped] ? 'stripped-html' : 'body-html' ]
         text_content = params[ self.class.default_options[:stripped] ? 'stripped-text' : 'body-plain' ]
 
+        if self.class.default_options[:stripped] && text_content.to_s == ''
+          html_content = params['body-html']
+          text_content = params['body-plain']
+        end
+
+        attachments = 1.upto(params['attachment-count'].to_i).map do |num|
+          attachment_from_params(params["attachment-#{num}"])
+        end
+
         @message = Mail.new do
           headers Hash[JSON.parse(params['message-headers'])]
-          from params['from']
-          to params['recipient']
-          subject params['subject']
 
           body text_content
 
@@ -54,9 +60,8 @@ module Incoming
             body html_content
           end if html_content
 
-          1.upto(params['attachment-count'].to_i).each do |num|
-            attachment = params["attachment-#{num}"]
-            add_file(:filename => attachment.original_filename, :content => attachment.read)
+          attachments.each do |attachment|
+            add_file(attachment)
           end
         end
       end

data/lib/incoming/strategies/postmark.rb

@@ -13,10 +13,6 @@ module Incoming
 
         @message = Mail.new do
           headers email.headers
-          from email.from
-          to email.to
-          reply_to email.reply_to
-          subject email.subject
 
           body email.text_body
 

data/lib/incoming/strategies/sendgrid.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module Incoming
   module Strategies
     class SendGrid
@@ -5,16 +7,16 @@ module Incoming
 
       def initialize(request)
         params = request.params.dup
-        envelope = JSON.parse(params['envelope'])
 
         # TODO: Properly handle encodings
         # encodings = JSON.parse(params['charsets'])
 
+        attachments = 1.upto(params['attachments'].to_i).map do |num|
+          attachment_from_params(params["attachment#{num}"])
+        end
+
         @message = Mail.new do
           header params['headers']
-          from params['from']
-          to envelope['to'].first
-          subject params['subject']
 
           body params['text']
 
@@ -23,9 +25,8 @@ module Incoming
             body params['html']
           end if params['html']
 
-          1.upto(params['attachments'].to_i).each do |num|
-            attachment = params["attachment#{num}"]
-            add_file(:filename => attachment.original_filename, :content => attachment.read)
+          attachments.each do |attachment|
+            add_file(attachment)
           end
         end
       end

data/lib/incoming/strategy.rb

@@ -72,9 +72,7 @@ module Incoming
     # Public: Translates arguments into a Mail::Message object
     def initialize(*args) ; end
 
-    protected
-
-    # Protected: Evaluates message and performs appropriate action.
+    # Public: Evaluates message and performs appropriate action.
     # Override in subclass
     #
     # mail - A Mail::Message object
@@ -84,7 +82,7 @@ module Incoming
       raise NotImplementedError.new('You must implement #receive')
     end
 
-    # Protected: Authenticates request before performing #receive
+    # Public: Authenticates request before performing #receive
     #
     # Examples:
     #
@@ -102,5 +100,27 @@ module Incoming
     def authenticate
       true
     end
+
+    protected
+
+      # Protected: Normalize file from params
+      #
+      # uploaded_file_or_hash - ActionController::UploadedFile,
+      #                         ActionDispatch::Http::UploadedFile, or Hash
+      #
+      # 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]
+                            else
+                              [uploaded_file_or_hash.original_filename, uploaded_file_or_hash.read]
+                            end
+
+        {
+          :filename => filename,
+          :content => content
+        }
+      end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: incoming
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -75,38 +75,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  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: guard-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
   emails through HTTP post hooks.
 email:
@@ -141,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2096037568336777979
+      hash: 1004414202407084554
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -150,10 +118,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2096037568336777979
+      hash: 1004414202407084554
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Incoming! helps you receive email in your Rack apps.