mailgun-tracking 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21d2fa7599f08ae635591938264cdfdd0dadf64e2baed939ef236e5dead989a2
-  data.tar.gz: a6d7f4a3f6d1c87c08d14467608a02141dd40906d1b5172049662e8ae3ece203
+  metadata.gz: e61daca288034107cca6ca891a80fa601016a555fb1fb2d07ab9b9755d52a12e
+  data.tar.gz: 6bc9cac63844b3190418dbf6b2fa14964bfbe372bf6eb23ef55ea6d6aaf8b739
 SHA512:
-  metadata.gz: 8238ebe57aabc593f7810d20a44fe2c3b8c3440aefcf07fb5a564d093304d1d37874e04dc22346d2dda996c4a9cac3596d4cf0f71af0aa4fd8f0bf5d256465cb
-  data.tar.gz: b90c4aacd8d8f8cc6ad70482eae5e2e23d2fe288fc77b7d259f30ed279214efd4e7d0c691a85d4de34344cb22812913bd9b3bc51d62897880d520e5252acce08
+  metadata.gz: 6de25bb55ff82c27c8420111acd1c72d4ee390ead819abc2631b1196e6d37ed62637023ed5048287f0ab399b23d1b942b626d8de1c4c9c58e7d3b2cc69b94ad0
+  data.tar.gz: dcd30f8087f1fd233b33a20d843ef1517ce1678d51b79bd8570574dabca01ab8963f944501f3e3e3cff1a6f268b1f37329112e7c3392cef3e516bff2fbc7cd09

data/lib/generators/mailgun/tracking/install_generator.rb

@@ -4,7 +4,7 @@ module Mailgun
   module Tracking
     # Creates the Mailgun Tracking initializer file for Rails apps.
     #
-    # @example Invokation from terminal
+    # @example Invocation from terminal
     #   rails generate mailgun:tracking:install API_KEY ENDPOINT
     class InstallGenerator < Rails::Generators::Base
       source_root File.expand_path('templates', __dir__)

data/lib/mailgun/tracking.rb

@@ -6,6 +6,7 @@ require 'mailgun/tracking/listener'
 require 'mailgun/tracking/middleware'
 require 'mailgun/tracking/notifier'
 require 'mailgun/tracking/payload'
+require 'mailgun/tracking/payload/legacy'
 require 'mailgun/tracking/signature'
 require 'mailgun/tracking/subscriber'
 require 'mailgun/tracking/util'

data/lib/mailgun/tracking/middleware.rb

@@ -27,6 +27,7 @@ module Mailgun
       # @return [Array(Numeric,Hash,Array)] The Rack-style response.
       def call!(env)
         @request = Request.new(env)
+
         return @app.call(env) unless @request.mailgun_tracking?
 
         handle_event
@@ -45,7 +46,7 @@ module Mailgun
       end
 
       def handle_event
-        Mailgun::Tracking.notifier.broadcast(@request.params.fetch('event'), @request.payload)
+        Mailgun::Tracking.notifier.broadcast(@request.payload.event, @request.payload)
         null_response
       rescue InvalidSignature
         bad_request

data/lib/mailgun/tracking/notifier.rb

@@ -49,7 +49,7 @@ module Mailgun
       # @return [NilClass]
       def broadcast(event, payload)
         Signature.verify!(payload)
-        listener.broadcast(event, payload)
+        listener.broadcast(event, payload.body)
       end
 
       private

data/lib/mailgun/tracking/payload.rb

@@ -1,50 +1,43 @@
 # frozen_string_literal: true
 
-require 'set'
+require_relative 'payload/legacy'
 
 module Mailgun
   module Tracking
     # Payload object.
     class Payload
-      # Initializes a new Payload object.
-      #
-      # @param options [Hash]
-      #
-      # @return [Mailgun::Tracking::Payload]
       def initialize(options = {})
-        @options = Util.normalize(options)
-        @original = options
-        define_instance_methods(Set.new(@options.keys), @options)
+        @options = options
       end
 
-      # Returns a value of the original payload with the given key.
-      #
-      # @param key [String]
-      #
-      # @return a value of the original payload.
-      def [](key)
-        @original[key]
+      def body
+        @options
       end
 
-      private
+      def event
+        @event ||= __event_data.fetch('event')
+      end
 
-      # @return [Class]
-      def __metaclass__
-        class << self
-          self
-        end
+      def token
+        @token ||= __signature.fetch('token')
       end
 
-      # @return [void]
-      def define_instance_methods(keys, options)
-        __metaclass__.instance_eval do
-          keys.each do |key|
-            define_method(key) { @options[key] }
-            next unless [FalseClass, TrueClass].include?(options[key].class)
+      def timestamp
+        @timestamp ||= __signature.fetch('timestamp')
+      end
+
+      def signature
+        @signature ||= __signature.fetch('signature')
+      end
+
+      private
+
+      def __signature
+        @__signature ||= @options.fetch('signature')
+      end
 
-            define_method(:"#{key}?") { @options[key] }
-          end
-        end
+      def __event_data
+        @__event_data ||= @options.fetch('event-data')
       end
     end
   end

data/lib/mailgun/tracking/payload/legacy.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Mailgun
+  module Tracking
+    class Payload
+      # Legacy payload object.
+      class Legacy
+        def initialize(options = {})
+          @options = options
+          warn(<<~DEPRECATION)
+            [Mailgun::Tracking] The Legacy class refers to a previous version of the API
+            which is deprecated and it will be removed in the next major version.
+          DEPRECATION
+        end
+
+        def body
+          @options
+        end
+
+        def event
+          @event ||= @options.fetch('event')
+        end
+
+        def token
+          @token ||= @options.fetch('token')
+        end
+
+        def timestamp
+          @timestamp ||= @options.fetch('timestamp')
+        end
+
+        def signature
+          @signature ||= @options.fetch('signature')
+        end
+      end
+    end
+  end
+end

data/lib/mailgun/tracking/request.rb

@@ -15,10 +15,38 @@ module Mailgun
         path == Configuration.instance.endpoint
       end
 
-      # @return [Mailgun::Tracking::Payload]
+      # @return [Mailgun::Tracking::Payload, Mailgun::Tracking::Payload::Legacy]
       def payload
-        @payload ||= Payload.new(params)
+        @payload ||= begin
+          if params.key?('timestamp')
+            ::Mailgun::Tracking::Payload::Legacy.new(params)
+          else
+            ::Mailgun::Tracking::Payload.new(params)
+          end
+        end
       end
+
+      # A Mailgun::Tracking::Request::JSON is used to parsing JSON requests.
+      module JSON
+        APPLICATION_JSON = 'application/json'
+        FORM_HASH = 'rack.request.form_hash'
+        FORM_INPUT = 'rack.request.form_input'
+
+        # Returns the data received in the request body.
+        #
+        # @return [Hash]
+        def POST
+          return super unless media_type == APPLICATION_JSON
+
+          body = self.body.read
+          self.body.rewind
+          env.update(FORM_HASH => ::JSON.parse(body), FORM_INPUT => body)
+
+          get_header(FORM_HASH)
+        end
+      end
+
+      include JSON
     end
   end
 end

data/lib/mailgun/tracking/signature.rb

@@ -26,14 +26,12 @@ module Mailgun
       #
       # @return [Mailgun::Tracking::Signature]
       def initialize(payload)
-        @token = payload['token']
-        @timestamp = payload['timestamp']
-        @signature = payload['signature']
+        @payload = payload
       end
 
       # @return [Boolean]
       def valid?
-        @signature == OpenSSL::HMAC.hexdigest(digest, Configuration.instance.api_key, data)
+        @payload.signature == OpenSSL::HMAC.hexdigest(digest, Configuration.instance.api_key, data)
       end
 
       private
@@ -47,7 +45,7 @@ module Mailgun
       #
       # @return [String]
       def data
-        [@timestamp, @token].join
+        [@payload.timestamp, @payload.token].join
       end
     end
   end

data/lib/mailgun/tracking/version.rb

@@ -19,7 +19,7 @@ module Mailgun
       #
       # @return [Integer]
       def minor
-        0
+        1
       end
 
       # Patch version.

data/spec/dummy/rails/logs/test.log

@@ -36,3 +36,18 @@ SystemExit (exit):
 lib/mailgun/tracking/middleware.rb:29:in `_call'
 lib/mailgun/tracking/middleware.rb:22:in `call'
 I, [2019-10-16T17:18:16.198543 #12320]  INFO -- : Started POST "/mailgun" for 127.0.0.1 at 2019-10-16 17:18:16 +0300
+I, [2019-11-07T18:53:57.134697 #53967]  INFO -- : Started POST "/mailgun" for 127.0.0.1 at 2019-11-07 18:53:57 +0200
+I, [2019-11-07T18:53:57.158453 #53967]  INFO -- : Started POST "/mailgun" for 127.0.0.1 at 2019-11-07 18:53:57 +0200
+F, [2019-11-07T18:53:57.160416 #53967] FATAL -- : 
+KeyError (key not found: "event"):
+  lib/mailgun/tracking/payload/legacy.rb:17:in `fetch'
+  lib/mailgun/tracking/payload/legacy.rb:17:in `event'
+  lib/mailgun/tracking/middleware.rb:60:in `handle_event'
+  lib/mailgun/tracking/middleware.rb:43:in `call!'
+  lib/mailgun/tracking/middleware.rb:20:in `call'
+
+
+I, [2019-11-07T18:55:50.036561 #53989]  INFO -- : Started POST "/mailgun" for 127.0.0.1 at 2019-11-07 18:55:50 +0200
+I, [2019-11-07T18:55:50.076942 #53989]  INFO -- : Started POST "/mailgun" for 127.0.0.1 at 2019-11-07 18:55:50 +0200
+I, [2019-11-07T18:56:17.648709 #53999]  INFO -- : Started POST "/mailgun" for 127.0.0.1 at 2019-11-07 18:56:17 +0200
+I, [2019-11-07T18:56:17.662346 #53999]  INFO -- : Started POST "/mailgun" for 127.0.0.1 at 2019-11-07 18:56:17 +0200

data/spec/fixtures/delivered.json

@@ -1,8 +1,65 @@
 {
-  "domain": "mail.example.com",
-  "Message-Id": "<20160329071939.35138.9413.6915422C@mail.example.com>",
-  "event": "delivered",
-  "timestamp": "1499697910",
-  "token": "b5751a49a024483da8d41c3684f98b8f",
-  "signature": "374e0b1a3deeb57318c783d43ff71093fbf26406a452761dab91bf346a93b49e"
+  "signature": {
+    "timestamp": "1572632560",
+    "token": "e71ad7ff8d6f43b62d31615083bde85fb55e4e2b5121cb1239",
+    "signature": "9d21d1689889ec5f4ffa3c7e5e6598c8450c3eada8f6cc03e47b2342a9c9da61"
+  },
+  "event-data": {
+    "tags": [
+      "my_tag_1",
+      "my_tag_2"
+    ],
+    "timestamp": 1521472262.908181,
+    "storage": {
+      "url": "https://se.api.mailgun.net/v3/domains/sandboxfb0641fa1b904bb28ba00cba62dca7f1.mailgun.org/messages/message_key",
+      "key": "message_key"
+    },
+    "envelope": {
+      "sending-ip": "209.61.154.250",
+      "sender": "bob@sandboxfb0641fa1b904bb28ba00cba62dca7f1.mailgun.org",
+      "transport": "smtp",
+      "targets": "alice@example.com"
+    },
+    "recipient-domain": "example.com",
+    "id": "CPgfbmQMTCKtHW6uIWtuVe",
+    "campaigns": [
+
+    ],
+    "user-variables": {
+      "my_var_1": "Mailgun Variable #1",
+      "my-var-2": "awesome"
+    },
+    "flags": {
+      "is-routed": false,
+      "is-authenticated": true,
+      "is-system-test": false,
+      "is-test-mode": false
+    },
+    "log-level": "info",
+    "message": {
+      "headers": {
+        "to": "Alice <alice@example.com>",
+        "message-id": "20130503182626.18666.16540@sandboxfb0641fa1b904bb28ba00cba62dca7f1.mailgun.org",
+        "from": "Bob <bob@sandboxfb0641fa1b904bb28ba00cba62dca7f1.mailgun.org>",
+        "subject": "Test delivered webhook"
+      },
+      "attachments": [
+
+      ],
+      "size": 111
+    },
+    "recipient": "alice@example.com",
+    "event": "delivered",
+    "delivery-status": {
+      "tls": true,
+      "mx-host": "smtp-in.example.com",
+      "attempt-no": 1,
+      "description": "",
+      "session-seconds": 0.4331989288330078,
+      "utf8": true,
+      "code": 250,
+      "message": "OK",
+      "certificate-verified": true
+    }
+  }
 }

data/spec/fixtures/legacy/delivered.json

@@ -0,0 +1,13 @@
+{
+  "timestamp": "1499697910",
+  "token": "b5751a49a024483da8d41c3684f98b8f",
+  "signature": "374e0b1a3deeb57318c783d43ff71093fbf26406a452761dab91bf346a93b49e",
+  "domain": "mail.example.com",
+  "my_var_1": "Mailgun Variable #1",
+  "my-var-2": "awesome",
+  "message-headers": "[[\"Received\", \"by luna.mailgun.net with SMTP mgrt 8734663311733; Fri, 03 May 2013 18:26:27 +0000\"], [\"Content-Type\", [\"multipart/alternative\", {\"boundary\": \"eb663d73ae0a4d6c9153cc0aec8b7520\"}]], [\"Mime-Version\", \"1.0\"], [\"Subject\", \"Test deliver webhook\"], [\"From\", \"Bob <bob@sandboxfb0641fa1b904bb28ba00cba62dca7f1.mailgun.org>\"], [\"To\", \"Alice <alice@example.com>\"], [\"Message-Id\", \"<20130503182626.18666.16540@sandboxfb0641fa1b904bb28ba00cba62dca7f1.mailgun.org>\"], [\"X-Mailgun-Variables\", \"{\\\"my_var_1\\\": \\\"Mailgun Variable #1\\\", \\\"my-var-2\\\": \\\"awesome\\\"}\"], [\"Date\", \"Fri, 03 May 2013 18:26:27 +0000\"], [\"Sender\", \"bob@sandboxfb0641fa1b904bb28ba00cba62dca7f1.mailgun.org\"]]",
+  "Message-Id": "<20160329071939.35138.9413.6915422C@mail.example.com>",
+  "recipient": "alice@example.com",
+  "event": "delivered",
+  "body-plain": ""
+}

data/spec/mailgun/tracking/listener_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe Mailgun::Tracking::Listener do
   end
 
   describe '#broadcast' do
-    let(:payload) { fixture('delivered.json') }
+    let(:payload) { fixture('legacy/delivered.json') }
 
     before do
       allow(subscriber).to receive(:call)

data/spec/mailgun/tracking/middleware_spec.rb

@@ -5,12 +5,13 @@ RSpec.describe Mailgun::Tracking::Middleware do
 
   let(:app) { proc { [200, {}, []] } }
   let(:notifier) { instance_double(Mailgun::Tracking::Notifier) }
-  let(:request) { instance_double(Mailgun::Tracking::Request) }
+  let(:request) do
+    instance_double(Mailgun::Tracking::Request, payload: payload, media_type: 'application/x-www-form-urlencoded')
+  end
   let(:env) { env_for('http://localhost:3000') }
-  let(:payload) { instance_double(Mailgun::Tracking::Payload) }
+  let(:payload) { instance_double(Mailgun::Tracking::Payload::Legacy, event: 'delivered') }
 
   before do
-    allow(request).to receive(:payload).and_return(payload)
     allow(Mailgun::Tracking).to receive(:notifier).and_return(notifier)
     allow(Mailgun::Tracking::Request).to receive(:new).with(env).and_return(request)
   end
@@ -31,7 +32,7 @@ RSpec.describe Mailgun::Tracking::Middleware do
     end
 
     context 'when request is respond to the specified URL and the signature comparison is unsuccessful' do
-      let(:params) { fixture('delivered.json') }
+      let(:params) { fixture('legacy/delivered.json') }
 
       before do
         allow(notifier).to receive(:broadcast).and_raise(Mailgun::Tracking::InvalidSignature)
@@ -48,7 +49,7 @@ RSpec.describe Mailgun::Tracking::Middleware do
     end
 
     context 'when request is respond to the specified URL and the signature comparison is successful' do
-      let(:params) { fixture('delivered.json') }
+      let(:params) { fixture('legacy/delivered.json') }
 
       before do
         allow(request).to receive(:mailgun_tracking?).and_return(true)

data/spec/mailgun/tracking/notifier_spec.rb

@@ -47,7 +47,7 @@ RSpec.describe Mailgun::Tracking::Notifier do
   end
 
   describe '#broadcast' do
-    let(:payload) { fixture('delivered.json') }
+    let(:payload) { instance_double(Mailgun::Tracking::Payload, body: fixture('legacy/delivered.json')) }
 
     before do
       allow(Mailgun::Tracking::Signature).to receive(:verify!)
@@ -60,7 +60,7 @@ RSpec.describe Mailgun::Tracking::Notifier do
     end
 
     it 'broadcasts an event' do
-      expect(listener).to have_received(:broadcast).with(:delivered, payload)
+      expect(listener).to have_received(:broadcast).with(:delivered, fixture('legacy/delivered.json'))
     end
   end
 end

data/spec/mailgun/tracking/payload/legacy_spec.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+RSpec.describe Mailgun::Tracking::Payload::Legacy do
+  subject(:legacy) { described_class.new(options) }
+
+  let(:options) { fixture('legacy/delivered.json') }
+
+  describe '#body' do
+    it 'returns body' do
+      expect(legacy.body).to eq(options)
+    end
+  end
+
+  describe '#event' do
+    it 'returns event' do
+      expect(legacy.event).to eq(options.fetch('event'))
+    end
+  end
+
+  describe '#token' do
+    it 'returns token' do
+      expect(legacy.token).to eq(options.fetch('token'))
+    end
+  end
+
+  describe '#timestamp' do
+    it 'returns timestamp' do
+      expect(legacy.timestamp).to eq(options.fetch('timestamp'))
+    end
+  end
+
+  describe '#signature' do
+    it 'returns signature' do
+      expect(legacy.signature).to eq(options.fetch('signature'))
+    end
+  end
+end

data/spec/mailgun/tracking/payload_spec.rb

@@ -3,38 +3,35 @@
 RSpec.describe Mailgun::Tracking::Payload do
   subject(:payload) { described_class.new(options) }
 
-  describe '#[]' do
-    let(:options) do
-      {
-        'Message-Id' => '<payload@mailgun-tracking.com>'
-      }
-    end
+  let(:options) { fixture('delivered.json') }
 
-    it 'returns the value object from original payload' do
-      expect(payload['Message-Id']).to eq(options['Message-Id'])
+  describe '#body' do
+    it 'returns body' do
+      expect(payload.body).to eq(options)
     end
   end
 
-  describe '#respond_to?' do
-    let(:options) do
-      {
-        'Message-Id' => '<payload@mailgun-tracking.com>'
-      }
+  describe '#event' do
+    it 'returns event' do
+      expect(payload.event).to eq(options.fetch('event-data').fetch('event'))
     end
+  end
 
-    it { is_expected.to respond_to(:message_id) }
-    it { expect(payload.message_id).to eq(options['Message-Id']) }
+  describe '#token' do
+    it 'returns token' do
+      expect(payload.token).to eq(options.fetch('signature').fetch('token'))
+    end
   end
 
-  context 'when the options include a boolean data type' do
-    let(:options) do
-      {
-        boolean: true,
-        string: 'string'
-      }
+  describe '#timestamp' do
+    it 'returns timestamp' do
+      expect(payload.timestamp).to eq(options.fetch('signature').fetch('timestamp'))
     end
+  end
 
-    it { is_expected.to be_boolean }
-    it { is_expected.to respond_to(:boolean?) }
+  describe '#signature' do
+    it 'returns signature' do
+      expect(payload.signature).to eq(options.fetch('signature').fetch('signature'))
+    end
   end
 end

data/spec/mailgun/tracking/request_spec.rb

@@ -22,4 +22,40 @@ RSpec.describe Mailgun::Tracking::Request do
       it { is_expected.not_to be_mailgun_tracking }
     end
   end
+
+  describe '#payload' do
+    context 'when the parameters contain the timestamp' do
+      let(:env) { env_for('http://localhost:3000/mailgun', method: :post, params: { 'timestamp' => '1572632560' }) }
+
+      it 'returns legacy payload' do
+        expect(request.payload).to be_an_instance_of(Mailgun::Tracking::Payload::Legacy)
+      end
+    end
+
+    context 'when the parameters do not contain the timestamp' do
+      let(:env) { env_for('http://localhost:3000/mailgun', method: :post, params: { 'signature' => {} }) }
+
+      it 'returns payload' do
+        expect(request.payload).to be_an_instance_of(Mailgun::Tracking::Payload)
+      end
+    end
+  end
+
+  context 'when application/json request' do
+    let(:env) { env_for('/', method: :post, input: input, 'CONTENT_TYPE' => content_type) }
+    let(:input) { 'foo=bar' }
+    let(:content_type) { 'application/json; charset=utf-8' }
+
+    it 'rewinds input' do
+      expect(request.body.read).to eq(input)
+    end
+
+    context 'when input is a hash' do
+      let(:input) { '{"qux": "bin"}' }
+
+      it 'adds a parsed hash to POST params' do
+        expect(request.params['qux']).to eq('bin')
+      end
+    end
+  end
 end

data/spec/mailgun/tracking/signature_spec.rb

@@ -3,15 +3,29 @@
 RSpec.describe Mailgun::Tracking::Signature do
   subject(:signature) { described_class.new(payload) }
 
-  let(:payload) { fixture('delivered.json') }
-
   describe '.verify!' do
     context 'when the signature comparison is successful' do
+      let(:payload) do
+        instance_double(
+          Mailgun::Tracking::Payload,
+          timestamp: '1499697910',
+          token: 'b5751a49a024483da8d41c3684f98b8f',
+          signature: '374e0b1a3deeb57318c783d43ff71093fbf26406a452761dab91bf346a93b49e'
+        )
+      end
+
       it { expect(described_class.verify!(payload)).to be true }
     end
 
     context 'when the signature comparison is unsuccessful' do
-      before { payload['timestamp'] = '' }
+      let(:payload) do
+        instance_double(
+          Mailgun::Tracking::Payload,
+          timestamp: '',
+          token: 'b5751a49a024483da8d41c3684f98b8f',
+          signature: '374e0b1a3deeb57318c783d43ff71093fbf26406a452761dab91bf346a93b49e'
+        )
+      end
 
       it { expect { described_class.verify!(payload) }.to raise_error(Mailgun::Tracking::InvalidSignature) }
     end
@@ -19,11 +33,27 @@ RSpec.describe Mailgun::Tracking::Signature do
 
   describe '#valid?' do
     context 'when the signature comparison is successful' do
+      let(:payload) do
+        instance_double(
+          Mailgun::Tracking::Payload,
+          timestamp: '1499697910',
+          token: 'b5751a49a024483da8d41c3684f98b8f',
+          signature: '374e0b1a3deeb57318c783d43ff71093fbf26406a452761dab91bf346a93b49e'
+        )
+      end
+
       it { is_expected.to be_valid }
     end
 
     context 'when the signature comparison is unsuccessful' do
-      before { payload['timestamp'] = '' }
+      let(:payload) do
+        instance_double(
+          Mailgun::Tracking::Payload,
+          timestamp: '',
+          token: 'b5751a49a024483da8d41c3684f98b8f',
+          signature: '374e0b1a3deeb57318c783d43ff71093fbf26406a452761dab91bf346a93b49e'
+        )
+      end
 
       it { is_expected.not_to be_valid }
     end

data/spec/mailgun/tracking_spec.rb

@@ -6,6 +6,12 @@ RSpec.describe Mailgun::Tracking do
   it { is_expected.to respond_to(:api_key=) }
   it { is_expected.to respond_to(:endpoint=) }
 
+  it do
+    expect do
+      described_class.non_existent_method
+    end.to raise_error(NoMethodError)
+  end
+
   describe '.configure' do
     before do
       described_class.configure do |config|

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'simplecov' if ENV['COVERAGE']
+
 require 'rack/test'
 require 'bundler/setup'
 require 'mailgun/tracking'

data/spec/support/shared_examples/integration/acts_as_rack.rb

@@ -6,7 +6,7 @@ end
 
 RSpec.shared_examples 'acts as rack' do
   let(:app) { Dummy::Application }
-  let(:payload) { fixture('delivered.json') }
+  let(:payload) { fixture('legacy/delivered.json') }
   let(:delivered) { instance_double(Delivered) }
 
   before do
@@ -24,7 +24,7 @@ RSpec.shared_examples 'acts as rack' do
 
   it do
     post('/mailgun', payload)
-    expect(delivered).to have_received(:call).with(instance_of(Mailgun::Tracking::Payload)).twice
+    expect(delivered).to have_received(:call).with(payload).twice
   end
 
   context 'when the signature comparison is unsuccessful' do

data/spec/support/shared_examples/subscriber.rb

@@ -3,7 +3,7 @@
 RSpec.shared_examples 'subscriber' do
   describe '#call' do
     let(:callable) { proc {} }
-    let(:payload) { fixture('delivered.json') }
+    let(:payload) { fixture('legacy/delivered.json') }
 
     before { allow(callable).to receive(:call).with(payload) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailgun-tracking
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Artem Chubchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-16 00:00:00.000000000 Z
+date: 2019-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.75.1
+        version: 0.76.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.75.1
+        version: 0.76.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -166,6 +166,7 @@ files:
 - lib/mailgun/tracking/middleware.rb
 - lib/mailgun/tracking/notifier.rb
 - lib/mailgun/tracking/payload.rb
+- lib/mailgun/tracking/payload/legacy.rb
 - lib/mailgun/tracking/railtie.rb
 - lib/mailgun/tracking/request.rb
 - lib/mailgun/tracking/signature.rb
@@ -179,6 +180,7 @@ files:
 - spec/dummy/rails/logs/test.log
 - spec/dummy/sinatra/application.rb
 - spec/fixtures/delivered.json
+- spec/fixtures/legacy/delivered.json
 - spec/integration/rack/rack_spec.rb
 - spec/integration/rails/rails_spec.rb
 - spec/integration/sinatra/sinatra_spec.rb
@@ -186,6 +188,7 @@ files:
 - spec/mailgun/tracking/listener_spec.rb
 - spec/mailgun/tracking/middleware_spec.rb
 - spec/mailgun/tracking/notifier_spec.rb
+- spec/mailgun/tracking/payload/legacy_spec.rb
 - spec/mailgun/tracking/payload_spec.rb
 - spec/mailgun/tracking/request_spec.rb
 - spec/mailgun/tracking/signature_spec.rb
@@ -200,11 +203,13 @@ files:
 - spec/support/rack_helpers.rb
 - spec/support/shared_examples/integration/acts_as_rack.rb
 - spec/support/shared_examples/subscriber.rb
-- spec/support/simplecov.rb
 homepage: https://github.com/chubchenko/mailgun-tracking
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/chubchenko/mailgun-tracking/issues
+  changelog_uri: https://github.com/chubchenko/mailgun-tracking/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/chubchenko/mailgun-tracking
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -220,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Integration with Mailgun Webhooks
@@ -233,16 +238,17 @@ test_files:
 - spec/integration/sinatra/sinatra_spec.rb
 - spec/integration/rack/rack_spec.rb
 - spec/integration/rails/rails_spec.rb
-- spec/support/simplecov.rb
 - spec/support/rack_helpers.rb
 - spec/support/fixture.rb
 - spec/support/shared_examples/integration/acts_as_rack.rb
 - spec/support/shared_examples/subscriber.rb
+- spec/fixtures/legacy/delivered.json
 - spec/fixtures/delivered.json
 - spec/mailgun/tracking_spec.rb
 - spec/mailgun/tracking/configuration_spec.rb
 - spec/mailgun/tracking/version_spec.rb
 - spec/mailgun/tracking/signature_spec.rb
+- spec/mailgun/tracking/payload/legacy_spec.rb
 - spec/mailgun/tracking/notifier_spec.rb
 - spec/mailgun/tracking/subscriber_spec.rb
 - spec/mailgun/tracking/middleware_spec.rb

data/spec/support/simplecov.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-if ENV['COVERAGE'] == 'true'
-  require 'simplecov'
-
-  SimpleCov.start do
-    add_filter('integration')
-  end
-end