mandrill-rails 1.3.0 → 1.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTYyZjcwNGMzNTlkMmQ1ODZlZTRkMzI5OWNmZDQwNmVmMWIzYjFmYw==
+    ODA5YzY1YTI5ODBjOTg0M2Y4NDdhNzc0ZTg5MGFhNTk0MDgwMmNhMg==
   data.tar.gz: !binary |-
-    YWQ4MDI4OGU0MTYzNDM0OTMyNzcwNDkyZjNiN2ZlNTY5MGU2YTk4YQ==
+    N2UyZTI0NWU3OTkxNjM2MmUyM2EzODIxNDcxMGMxMGVjZDAxYzU0YQ==
 SHA512:
   metadata.gz: !binary |-
-    MjA5ZDRkMGNlYzA0MTQ4MWYxNDdiODZkNTU4Nzc3OTUwNzMwMTQ4ODllYzJi
-    ZmMyNWFhN2E1ZDJmYjZiOTQxMTcyYmVhNjEzMmI2NWExYjg2ZWFmMzM5ZTk5
-    MGQxOGFiM2VmZTcyODhlZDg0ZmQwNjJkNmM2ODY3NzdiYTA2ZDU=
+    YjcyY2E1MTI1NzNiYWFjMjIyN2I5NTVmYmM0M2E1NzllZDM0MzhiZGIyZTc2
+    Nzk5Zjg3NDUwMDdlYWRlMmNhNWQxNjIyYWRjNDAyZGQ4OTdkYjNmNzEzZjA2
+    YWU0MzYzYjFjZGVkZjYwZDQ4OTA2ZmZjZDc4N2RkYzJjN2RjYTk=
   data.tar.gz: !binary |-
-    NzRhZmI4YTM2ZDA1YTlkYzU3ZTkwMjVlZGVkNTA3NjgwMGM2NjNjYTRkOTUy
-    YTljZmJkNGUwNDRmOWVlMDM1NzI3YTAyNTU0OGQ4ZDIzZGM3ZTU2NTBjYTdl
-    YjQ4MDk2MGNlMGExN2VhYzY2ZTYzMGI4YTE0YWZiODEwMjI2ZjU=
+    N2MwNGFkNTIyYTc2NGZiMDgwNDdhYzIzNWZjYmM2NjhjNGRlNzc0NzdkYmNi
+    MDc5MTViMjg0OTdkY2NkMzY5MDA3ZGJkZTlkNTAyZGZjZDE5NmU1MzA2ZTRl
+    ZTY2NTcwMjA0OWY0Y2VmZGFkMzdlY2JmNTA5YjIyOTFmYzYxZjQ=

data/.rspec

@@ -1,2 +1,2 @@
 --format documentation
---colour
+--colour

data/lib/mandrill-rails/version.rb

@@ -3,5 +3,5 @@ module Mandrill
   end
 end
 unless defined?(Mandrill::Rails::VERSION)
-  Mandrill::Rails::VERSION = "1.3.0"
+  Mandrill::Rails::VERSION = "1.3.1"
 end

data/lib/mandrill/web_hook/event_decorator.rb

@@ -26,6 +26,12 @@ class Mandrill::WebHook::EventDecorator < Hash
     end
   end
 
+  # Returns the entry Hash.
+  # Applicable events: sync
+  def entry
+    self['entry']||{}
+  end
+
   # Returns the reject Hash.
   # Applicable events: sync
   def reject
@@ -48,7 +54,7 @@ class Mandrill::WebHook::EventDecorator < Hash
   # Inbound events: references 'Message-Id' header.
   # Send/Open/Click events: references '_id' message attribute.
   def message_id
-    headers['Message-Id'] || msg['_id']
+    headers['Message-Id'] || msg['_id'] || self['_id']
   end
 
   # Returns the Mandrill message version.
@@ -85,14 +91,14 @@ class Mandrill::WebHook::EventDecorator < Hash
   # Inbound messages: references 'from_email' message attribute.
   # Send/Open/Click messages: references 'sender' message attribute.
   def sender_email
-    msg['from_email'] || msg['sender'] || reject['sender']
+    msg['from_email'] || msg['sender'] || entry['sender'] || reject['sender']
   end
 
   # Returns the subject user email address.
   # Inbound messages: references 'email' message attribute (represents the sender).
   # Send/Open/Click messages: references 'email' message attribute (represents the recipient).
   def user_email
-    msg['email'] || reject['email']
+    msg['email'] || entry['email'] || reject['email']
   end
 
   # Returns an array of all unique recipients (to/cc)

data/spec/fixtures/webhook_examples/sync_blacklist.json

@@ -1,18 +1,53 @@
 [
   {
-    "type": "blacklist",
-    "action": "add",
-    "reject": {
-      "reason": "test",
-      "detail": "this is a mock event, replace with a real example when available",
-      "last_event_at": "2015-01-01 01:02:03",
-      "email": "test@example.net",
-      "created_at": "2015-02-01 01:02:03",
-      "expires_at": "2016-01-01 01:02:03",
-      "expired": "false",
-      "subaccount": "",
-      "sender": "sender@example.net"
-    },
-    "ts": 1350377135
+    "type":"blacklist",
+    "action":"add",
+    "reject":
+      { 
+        "reason":"hard-bounce",
+        "detail":"Example detail",
+        "last_event_at":"2014-02-01 12:43:56",
+        "email":"example.webhook@mandrillapp.com",
+        "created_at":"2014-01-15 11:32:19",
+        "expires_at":"2020-04-02 12:09:18",
+        "expired":false,
+        "subaccount":"example_subaccount",
+        "sender":"example.sender@mandrillapp.com"
+      },
+    "ts":1438785792
+  },
+  {
+    "type":"blacklist",
+    "action":"change",
+    "reject":
+      {
+        "reason":"hard-bounce",
+        "detail":"Example detail",
+        "last_event_at":"2014-02-01 12:43:56",
+        "email":"example.webhook@mandrillapp.com",
+        "created_at":"2014-01-15 11:32:19",
+        "expires_at":"2020-04-02 12:09:18",
+        "expired":false,
+        "subaccount":"example_subaccount",
+        "sender":"example.sender@mandrillapp.com"
+      },
+    "ts":1438785792
+  },
+  {
+    "type":"blacklist",
+    "action":"remove",
+    "reject":
+      {
+        "reason":"hard-bounce",
+        "detail":"Example detail",
+        "last_event_at":"2014-02-01 12:43:56",
+        "email":"example.webhook@mandrillapp.com",
+        "created_at":"2014-01-15 11:32:19",
+        "expires_at":"2020-04-02 12:09:18",
+        "expired":false,
+        "subaccount":"example_subaccount",
+        "sender":"example.sender@mandrillapp.com"
+      },
+    "ts":1438785792
   }
 ]

data/spec/fixtures/webhook_examples/sync_whitelist.json

@@ -1,12 +1,24 @@
 [
   {
-    "type": "whitelist",
-    "action": "add",
-    "reject": {
-      "detail": "this is a mock event, replace with a real example when available",
-      "email": "test@example.net",
-      "created_at": "2015-02-01 01:02:03"
-    },
-    "ts": 1350377135
+    "type":"whitelist",
+    "action":"add",
+    "entry":
+      {
+        "email":"example.webhook@mandrillapp.com",
+        "detail":"example details",
+        "created_at":"2014-01-15 12:03:19"
+      },
+    "ts":1438786546
+  },
+  {
+    "type":"whitelist",
+    "action":"remove",
+    "entry":
+      {
+        "email":"example.webhook@mandrillapp.com",
+        "detail":"example details",
+        "created_at":"2014-01-15 12:03:19"
+      },
+    "ts":1438786546
   }
 ]

data/spec/mandrill/web_hook/event_decorator_spec.rb

@@ -153,15 +153,15 @@ describe Mandrill::WebHook::EventDecorator do
       :event_type => 'sync',
       :sync_type => 'blacklist',
       :reject => {
-        "reason"=>"test",
-        "detail"=>"this is a mock event, replace with a real example when available",
-        "last_event_at"=>"2015-01-01 01:02:03",
-        "email"=>"test@example.net",
-        "created_at"=>"2015-02-01 01:02:03",
-        "expires_at"=>"2016-01-01 01:02:03",
-        "expired"=>"false",
-        "subaccount"=>"",
-        "sender"=>"sender@example.net"
+        "reason"=>"hard-bounce",
+        "detail"=>"Example detail",
+        "last_event_at"=>"2014-02-01 12:43:56",
+        "email"=>"example.webhook@mandrillapp.com",
+        "created_at"=>"2014-01-15 11:32:19",
+        "expires_at"=>"2020-04-02 12:09:18",
+        "expired"=>false,
+        "subaccount"=>"example_subaccount",
+        "sender"=>"example.sender@mandrillapp.com"
       },
       :subject => nil,
       :message_id => nil,
@@ -169,8 +169,8 @@ describe Mandrill::WebHook::EventDecorator do
       :in_reply_to => nil,
       :references => [],
       :headers => {},
-      :sender_email => "sender@example.net",
-      :user_email => "test@example.net",
+      :sender_email => "example.sender@mandrillapp.com",
+      :user_email => "example.webhook@mandrillapp.com",
       :recipients => [],
       :recipient_emails => [],
       :message_body => nil,
@@ -181,10 +181,10 @@ describe Mandrill::WebHook::EventDecorator do
     'sync_whitelist' => {
       :event_type => 'sync',
       :sync_type => 'whitelist',
-      :reject => {
-        "detail"=>"this is a mock event, replace with a real example when available",
-        "email"=>"test@example.net",
-        "created_at"=>"2015-02-01 01:02:03"
+      :entry => {
+        "detail"=>"example details",
+        "email"=>"example.webhook@mandrillapp.com",
+        "created_at"=>"2014-01-15 12:03:19"
       },
       :subject => nil,
       :message_id => nil,
@@ -193,7 +193,7 @@ describe Mandrill::WebHook::EventDecorator do
       :references => [],
       :headers => {},
       :sender_email => nil,
-      :user_email => "test@example.net",
+      :user_email => "example.webhook@mandrillapp.com",
       :recipients => [],
       :recipient_emails => [],
       :message_body => nil,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mandrill-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Paul Gallagher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport