mandrill-api 1.0.4 → 1.0.6

data/lib/mandrill/api.rb

@@ -259,8 +259,9 @@ module Mandrill
             @master = master
         end
 
-        # Retrieves your email rejection blacklist. You can provide an email address to limit the results. Returns up to 1000 results.
+        # Retrieves your email rejection blacklist. You can provide an email address to limit the results. Returns up to 1000 results. By default, entries that have expired are excluded from the results; set include_expired to true to include them.
         # @param [String] email an optional email address to search by
+        # @param [Boolean] include_expired whether to include rejections that have already expired.
         # @return [Array] Up to 1000 rejection entries
         #     - [Hash] return[] the information for each rejection blacklist entry
         #         - [String] email the email that is blocked
@@ -269,8 +270,8 @@ module Mandrill
         #         - [String] expires_at when the blacklist entry will expire (this may be in the past)
         #         - [Boolean] expired whether the blacklist entry has expired
         #         - [Hash] Sender sender the sender that this blacklist entry applies to, or null if none.
-        def list(email=nil)
-            _params = {:email => email}
+        def list(email=nil, include_expired=false)
+            _params = {:email => email, :include_expired => include_expired}
             return @master.call 'rejects/list', _params
         end
 
@@ -462,6 +463,10 @@ module Mandrill
         #     - [Array] google_analytics_domains an array of strings indicating for which any matching URLs will automatically have Google Analytics parameters appended to their query string automatically.
         #     - [Array, String] google_analytics_campaign optional string indicating the value to set for the utm_campaign tracking parameter. If this isn't provided the email's from address will be used instead.
         #     - [Array] metadata metadata an associative array of user metadata. Mandrill will store this metadata and make it available for retrieval. In addition, you can select up to 10 metadata fields to index and make searchable using the Mandrill search api.
+        #     - [Array] recipient_metadata Per-recipient metadata that will override the global values specified in the metadata parameter.
+        #         - [Hash] recipient_metadata[] metadata for a single recipient
+        #             - [String] rcpt the email address of the recipient that the metadata is associated with
+        #             - [Array] values an associated array containing the recipient's unique metadata. If a key exists in both the per-recipient metadata and the global metadata, the per-recipient metadata will be used.
         #     - [Array] attachments an array of supported attachments to add to the message
         #         - [Hash] attachments[] a single supported attachment
         #             - [String] type the MIME type of the attachment - allowed types are text/*, image/*, and application/pdf
@@ -514,6 +519,10 @@ module Mandrill
         #     - [Array] google_analytics_domains an array of strings indicating for which any matching URLs will automatically have Google Analytics parameters appended to their query string automatically.
         #     - [Array, String] google_analytics_campaign optional string indicating the value to set for the utm_campaign tracking parameter. If this isn't provided the email's from address will be used instead.
         #     - [Array] metadata metadata an associative array of user metadata. Mandrill will store this metadata and make it available for retrieval. In addition, you can select up to 10 metadata fields to index and make searchable using the Mandrill search api.
+        #     - [Array] recipient_metadata Per-recipient metadata that will override the global values specified in the metadata parameter.
+        #         - [Hash] recipient_metadata[] metadata for a single recipient
+        #             - [String] rcpt the email address of the recipient that the metadata is associated with
+        #             - [Array] values an associated array containing the recipient's unique metadata. If a key exists in both the per-recipient metadata and the global metadata, the per-recipient metadata will be used.
         #     - [Array] attachments an array of supported attachments to add to the message
         #         - [Hash] attachments[] a single supported attachment
         #             - [String] type the MIME type of the attachment - allowed types are text/*, image/*, and application/pdf

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: mandrill-api
 version: !ruby/object:Gem::Version 
-  hash: 31
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 4
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors: 
 - Mandrill Devs
@@ -15,7 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-01 00:00:00 Z
+date: 2012-09-11 00:00:00 +00:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -25,11 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 7
-        - 4
         version: 1.7.4
   type: :runtime
   version_requirements: *id001
@@ -41,11 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 15
-        - 4
         version: 0.15.4
   type: :runtime
   version_requirements: *id002
@@ -61,6 +47,7 @@ files:
 - lib/mandrill.rb
 - lib/mandrill/api.rb
 - lib/mandrill/errors.rb
+has_rdoc: true
 homepage: https://bitbucket.org/mailchimp/mandrill-api-ruby/
 licenses: []
 
@@ -74,26 +61,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A Ruby API library for the Mandrill email as a service platform.
 test_files: []
 
-has_rdoc: