griddler-mailgun 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b056d51cbc72ddb86286d5bc79ef3173ac5d266
-  data.tar.gz: 7d9753839331a38a462d32a19aff575853aea364
+  metadata.gz: 35285f68548904ddab1f410fce0f047ab4681e5c
+  data.tar.gz: fae1d9a3d9b469dd0b020f098fa97647cd2f8ae3
 SHA512:
-  metadata.gz: 30e9313154d7578aa97d99db8c24e34e88dffa7284b5da31901b9197da5a126c95ae1cd294d8a9be758fe8b253bd12217203dd9a51672cf382b9d9778d96a8ed
-  data.tar.gz: 2ea37a65cacdea9c34d47e2589e2580ef1992305e49874f0acc476bb158e1e2d55f620f5b1a5d8263114208c7975aa0c406bdabe33fdb38ed68302e33f26d785
+  metadata.gz: 61908cb6d794afd73bd556a43bcba8ed64265d1e44f824595d4d9d39097ce6058746c17b6bf2837b460ebed945b1ab3054da3a6967975a1463a92923b2521b25
+  data.tar.gz: 756b89b4186b0b117e8fd41b605ef1d18d47d20f9fb893b8e8eacb9ff0f2a401ce56c443fd0b07217610ad945ace8c088904a06ae9aad8f0ffc4ed2553528989

data/README.md

@@ -5,13 +5,15 @@
 This was extracted from the [griddler gem](https://github.com/thoughtbot/griddler) and is used to
 parse emails forwarded to your application from [mailgun](http://mailgun.com/).
 
+**IMPORTANT:** Please use version 1.0.1 or higher. There was a bug in version 1.0.0.
+
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'griddler'
-gem 'griddler-mailgun'
+gem 'griddler', '~> 1.0.0'
+gem 'griddler-mailgun', '~> 1.0.1'
 ```
 
 Then execute:

data/lib/griddler/mailgun/adapter.rb

@@ -18,8 +18,7 @@ module Griddler
           subject: params[:subject],
           text: params['body-plain'],
           html: params['body-html'],
-          attachments: attachment_files,
-          headers: headers
+          attachments: attachment_files
         }
       end
 
@@ -39,7 +38,7 @@ module Griddler
       end
 
       def cc_recipients
-        cc = param_or_header(:Cc)
+        cc = param_or_header(:Cc) || ''
         cc.split(',').map(&:strip)
       end
 
@@ -48,19 +47,21 @@ module Griddler
       end
 
       def extract_headers
-        return nil unless params['message-headers']
-
         extracted_headers = {}
-        parsed_headers = JSON.parse(params['message-headers'])
-        parsed_headers.each{ |h| extracted_headers[h[0]] = h[1] }
+        if params['message-headers']
+          parsed_headers = JSON.parse(params['message-headers'])
+          parsed_headers.each{ |h| extracted_headers[h[0]] = h[1] }
+        end
         ActiveSupport::HashWithIndifferentAccess.new(extracted_headers)
       end
 
       def param_or_header(key)
         if params[key].present?
           params[key]
-        else
+        elsif headers[key].present?
           headers[key]
+        else
+          nil
         end
       end
 

data/lib/griddler/mailgun/version.rb

@@ -1,5 +1,5 @@
 module Griddler
   module Mailgun
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/spec/griddler/mailgun/adapter_spec.rb

@@ -7,6 +7,12 @@ describe Griddler::Mailgun::Adapter do
 end
 
 describe Griddler::Mailgun::Adapter, '.normalize_params' do
+  it 'works with Griddler::Email' do
+    normalized_params = Griddler::Mailgun::Adapter.normalize_params(default_params)
+    griddler_email = Griddler::Email.new(normalized_params)
+    expect(griddler_email.class).to eq Griddler::Email
+  end
+
   it 'falls back to headers for cc' do
     params = default_params.merge(Cc: '')
     normalized_params = Griddler::Mailgun::Adapter.normalize_params(params)
@@ -60,6 +66,7 @@ describe Griddler::Mailgun::Adapter, '.normalize_params' do
 
   it 'handles missing params' do
     normalized_params = Griddler::Mailgun::Adapter.normalize_params(short_params)
+    expect(normalized_params[:to]).to eq ['johndoe@example.com']
   end
 
   def upload_1
@@ -93,12 +100,13 @@ describe Griddler::Mailgun::Adapter, '.normalize_params' do
   end
 
   def short_params
-    params = {
-      To: 'Hello World <hi@example.com>',
-      From: 'There <there@example.com>',
-      Cc: 'emily@example.com',
-      'body-plain' => 'hi',
-    }
+    params = ActiveSupport::HashWithIndifferentAccess.new(
+      {
+        "from" => "Jon Snow <jon@example.com>",
+        "recipient" => "johndoe@example.com",
+        "body-plain" => "hi"
+      }
+    )
   end
 
   def default_params

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: griddler-mailgun
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Brad Pauly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake