griddler-mailgun 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35285f68548904ddab1f410fce0f047ab4681e5c
-  data.tar.gz: fae1d9a3d9b469dd0b020f098fa97647cd2f8ae3
+  metadata.gz: 2377ee3b434c8ed1763841a6158052ef0d5cdfcd
+  data.tar.gz: 3138c2e3d6962b70aa89c2df0e262ef74eea0bb2
 SHA512:
-  metadata.gz: 61908cb6d794afd73bd556a43bcba8ed64265d1e44f824595d4d9d39097ce6058746c17b6bf2837b460ebed945b1ab3054da3a6967975a1463a92923b2521b25
-  data.tar.gz: 756b89b4186b0b117e8fd41b605ef1d18d47d20f9fb893b8e8eacb9ff0f2a401ce56c443fd0b07217610ad945ace8c088904a06ae9aad8f0ffc4ed2553528989
+  metadata.gz: 082e170f993d4f7751361d33f5bb6ff211612ddb6d957675fdda01f8c922d48b88ff3833fa9517de0ff7d90eede0dc53451e9dbf0371ad81237e845a10122fde
+  data.tar.gz: 0a2a0956210186cb7d228f8b6fec99d2d83f37a0a1439d418a90fca09b639ef3f07a444fe8138c47cb286bfa82ba61276373417a4716a90c1a89baa6276f083d

data/.ruby-version

@@ -1 +1 @@
-2.1.1
+2.1.2

data/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'griddler', '1.0.0'
+gem 'griddler', '1.1.0'
 
 gemspec

data/lib/griddler/mailgun/adapter.rb

@@ -1,6 +1,8 @@
 module Griddler
   module Mailgun
     class Adapter
+      attr_reader :params
+
       def initialize(params)
         @params = params
       end
@@ -14,17 +16,17 @@ module Griddler
         {
           to: to_recipients,
           cc: cc_recipients,
+          bcc: Array.wrap(param_or_header(:Bcc)),
           from: determine_sender,
           subject: params[:subject],
           text: params['body-plain'],
           html: params['body-html'],
-          attachments: attachment_files
+          attachments: attachment_files,
+          headers: serialized_headers
         }
       end
 
-      private
-
-      attr_reader :params
+    private
 
       def determine_sender
         sender = param_or_header(:From)
@@ -55,6 +57,18 @@ module Griddler
         ActiveSupport::HashWithIndifferentAccess.new(extracted_headers)
       end
 
+      def serialized_headers
+
+        # Griddler expects unparsed headers to pass to ActionMailer, which will manually
+        # unfold, split on line-endings, and parse into individual fields.
+        #
+        # Mailgun already provides fully-parsed headers in JSON -- so we're reconstructing
+        # fake headers here for now, until we can find a better way to pass the parsed
+        # headers directly to Griddler
+
+        headers.to_a.collect { |header| "#{header[0]}: #{header[1]}" }.join("\n")
+      end
+
       def param_or_header(key)
         if params[key].present?
           params[key]

data/lib/griddler/mailgun/version.rb

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

data/spec/griddler/mailgun/adapter_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Griddler::Mailgun::Adapter do
   it 'registers itself with griddler' do
-    Griddler.adapter_registry[:mailgun].should eq Griddler::Mailgun::Adapter
+    expect(Griddler.adapter_registry[:mailgun]).to eq Griddler::Mailgun::Adapter
   end
 end
 
@@ -27,12 +27,12 @@ describe Griddler::Mailgun::Adapter, '.normalize_params' do
     )
 
     normalized_params = Griddler::Mailgun::Adapter.normalize_params(params)
-    normalized_params[:attachments].should eq [upload_1, upload_2]
+    expect(normalized_params[:attachments]).to eq [upload_1, upload_2]
   end
 
   it 'has no attachments' do
     normalized_params = Griddler::Mailgun::Adapter.normalize_params(default_params)
-    normalized_params[:attachments].should be_empty
+    expect(normalized_params[:attachments]).to be_empty
   end
 
   it 'gets sender from headers' do
@@ -69,6 +69,26 @@ describe Griddler::Mailgun::Adapter, '.normalize_params' do
     expect(normalized_params[:to]).to eq ['johndoe@example.com']
   end
 
+  it 'handles message-headers' do
+    params = default_params.merge(
+      'message-headers' => '[["NotCc", "emily@example.mailgun.org"], ["Reply-To", "mail2@example.mailgun.org"]]'
+    )
+    normalized_params = Griddler::Mailgun::Adapter.normalize_params(params)
+    email = Griddler::Email.new(normalized_params)
+    expect(email.headers["Reply-To"]).to eq "mail2@example.mailgun.org"
+  end
+
+  it 'adds Bcc when it exists' do
+    params = default_params.merge('Bcc' => 'bcc@example.com')
+    normalized_params = Griddler::Mailgun::Adapter.normalize_params(params)
+    expect(normalized_params[:bcc]).to eq ['bcc@example.com']
+  end
+
+  it 'bcc is empty array when it missing' do
+    normalized_params = Griddler::Mailgun::Adapter.normalize_params(default_params)
+    expect(normalized_params[:bcc]).to eq []
+  end
+
   def upload_1
     @upload_1 ||= ActionDispatch::Http::UploadedFile.new(
       filename: 'photo1.jpg',
@@ -100,7 +120,7 @@ describe Griddler::Mailgun::Adapter, '.normalize_params' do
   end
 
   def short_params
-    params = ActiveSupport::HashWithIndifferentAccess.new(
+    ActiveSupport::HashWithIndifferentAccess.new(
       {
         "from" => "Jon Snow <jon@example.com>",
         "recipient" => "johndoe@example.com",
@@ -110,7 +130,7 @@ describe Griddler::Mailgun::Adapter, '.normalize_params' do
   end
 
   def default_params
-    params = ActiveSupport::HashWithIndifferentAccess.new(
+    ActiveSupport::HashWithIndifferentAccess.new(
       {
         "Cc"=>"Brandon Stark <brandon@example.com>, Arya Stark <arya@example.com>",
         "From"=>"Jon Snow <jon@example.com>",

data/spec/spec_helper.rb

@@ -5,7 +5,6 @@ require 'active_support/core_ext/string'
 require 'active_support/core_ext/hash'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.order = 'random'
   config.include Griddler::Testing

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: griddler-mailgun
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Brad Pauly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -103,3 +103,4 @@ test_files:
 - spec/fixtures/photo2.jpg
 - spec/griddler/mailgun/adapter_spec.rb
 - spec/spec_helper.rb
+has_rdoc: