griddler-ses 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e8a8dc6b0a47c33b42449f0d33681023887dee6
-  data.tar.gz: 9e4c2cdafbf1bfcb04e8847ea5b62e00b6427f34
+  metadata.gz: a254412f4d73e3ca99782daa1c8f067cbf916f99
+  data.tar.gz: cf45a3a5826cf3954b21dfe3adf6ca31eba93517
 SHA512:
-  metadata.gz: 760e0626163545aca32eefbe2634ef9f98b7de781a830667e23590321add74bfb0b2b1331ff733a30e5008941f2cb97a76fd1c65d5daf3e83d2fe1a25fb9f056
-  data.tar.gz: 626135972c580d7c952460cd45d56d170aa1b134026841333e8b2692c8156217aaf7324f660786b24ed60aad0ce5f9869a2b5b2785d57e9c8026e2a763b01987
+  metadata.gz: b78e58bd0a0541c9fb4111a53beaed53747281a9cb0de2cab6f4e2241cc95f3196f9ff2b1e2871202391addd6441b4c542f1c417756774e1fd7e8da4badf19b8
+  data.tar.gz: 3945b1b7c8f13796a06fd15d3b27963379b781bd57e4ae357f9d2a49e86fc76e4ce7eea31c26b273f02c01d5468de8c07a5b42864b894af6c375d9f08918e889

data/lib/griddler/ses/adapter.rb

@@ -5,15 +5,14 @@ require 'net/http'
 module Griddler
   module Ses
     class Adapter
-      attr_reader :params, :raw_request
+      attr_reader :sns_json
 
-      def initialize(params, raw_request)
-        @params = params
-        @raw_request = raw_request
+      def initialize(params)
+        @sns_json = params
       end
 
       def self.normalize_params(params)
-        adapter = new(params, self.raw_request)
+        adapter = new(params)
         adapter.normalize_params
       end
 
@@ -29,7 +28,7 @@ module Griddler
           {}
         when :Notification
           ensure_valid_notification_type!
-          params.merge(
+          sns_json.merge(
             to: recipients,
             from: sender,
             cc: cc,
@@ -46,10 +45,6 @@ module Griddler
       end
 
       private
-      def sns_json
-        @sns_json ||= JSON.parse(raw_request.raw_post)
-      end
-
       def email_json
         @email_json ||= JSON.parse(sns_json['Message'])
       end
@@ -135,12 +130,6 @@ module Griddler
         confirmation_endpoint = URI.parse(sns_json['SubscribeURL'])
         Net::HTTP.get confirmation_endpoint
       end
-
-      def self.raw_request
-        # TODO: this is an ugly hack using introspection to get the request from the calling controller; should update Griddler
-        # to provide the full request context
-        raw_request = binding.of_caller(2).eval('request')
-      end
     end
   end
 end

data/lib/griddler/ses/middleware.rb

@@ -0,0 +1,25 @@
+module Griddler
+  module Ses
+    class Middleware
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        # a bug on the AWS side doesn't set the content type to application/json type properly,
+        # so we have to intercept and do this in order for Griddler's controller to correctly
+        # parse the parameters (see https://forums.aws.amazon.com/thread.jspa?messageID=418160)
+        if env['REQUEST_PATH'] == griddler_path
+          env['CONTENT_TYPE'] = 'application/json; charset=UTF-8'
+        end
+
+        @app.call(env)
+      end
+
+      private
+      def griddler_path
+        @griddler_path ||= Rails.application.routes.url_helpers.url_for(controller: 'griddler/emails', action: 'create', only_path: true)
+      end
+    end
+  end
+end

data/lib/griddler/ses/railtie.rb

@@ -0,0 +1,9 @@
+module Griddler
+  module Ses
+    class Railtie < Rails::Railtie
+      initializer "griddler_ses.configure_rails_initialization" do |app|
+        Rails.application.middleware.insert_before ActionDispatch::ParamsParser, Griddler::Ses::Middleware
+      end
+    end
+  end
+end

data/lib/griddler/ses/version.rb

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

data/lib/griddler/ses.rb

@@ -1,6 +1,8 @@
 require 'griddler'
 require 'griddler/ses/version'
 require 'griddler/ses/adapter'
+require 'griddler/ses/middleware'
+require 'griddler/ses/railtie'
 
 module Griddler
   module Ses

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: griddler-ses
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Kent Mewhort @ Coupa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: griddler
@@ -111,6 +111,8 @@ files:
 - griddler-ses.gemspec
 - lib/griddler/ses.rb
 - lib/griddler/ses/adapter.rb
+- lib/griddler/ses/middleware.rb
+- lib/griddler/ses/railtie.rb
 - lib/griddler/ses/version.rb
 homepage: https://github.com/85x14/griddler-ses
 licenses: