emarsys 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ae8a2be8a9eb47480f0dfa43f730039a5fc8129
-  data.tar.gz: 97ac47f4b22dc3eca4146573fb714aa7c7104280
+  metadata.gz: c006c15b3aa1bc20e0660c77d7003d4d03084db4
+  data.tar.gz: a9561b3ba62ecf8f9e4830ef615fe4001d415a84
 SHA512:
-  metadata.gz: deb3b4aa58dad053e9bf7fb61e87146d118a83e9eee652f1d6076195a29935138b147982fb3a128bb65d7f3d03f59efee3acddb981fc337a31005d4a3c4c6545
-  data.tar.gz: 7022cdbe34e40380b0c17ff50860055acdd036a037435debb72d89c95b09eb2542a2ca93e691a7964629cc5d43dd8d75d8020d602739b95af2953d9253e4d866
+  metadata.gz: 291d6f93c68a17a9a67fa805dc3d8b24f28b0871957f0daa2d54f2e5adb48572c3f85451a218e8b803d827aca0df6c2d7eefbeb7681196a7a5404920506b591a
+  data.tar.gz: e93647e7963726a2a97c6b177084a4f3d62b52b0262460e66c79d11d7695bb5ce67d82e11ec0a975f5e2e1cd89d41fae39594808431f0d19b873d566284c6123

data/CHANGELOG.md

@@ -0,0 +1,32 @@
+# Changelog
+
+## HEAD (not yet released)
+
+* Return response, not just (parsed) body of it ([#29](https://github.com/Absolventa/emarsys-rb/pull/29)). To migrate existing code, you need to call `#data` on the
+response object.
+* Allow to configure multiple Emarsys accounts. This is optional, existing configuration continues to work unchanged, however, you will need to add `Emarsys.allow_default_configuration = true` ([#30](https://github.com/Absolventa/emarsys-rb/pull/30))
+* Migrate API calls to keyword arguments (also in [#30](https://github.com/Absolventa/emarsys-rb/pull/30))
+
+## v0.2.3
+
+* Convert params when using the batch APIs ([#25](https://github.com/Absolventa/emarsys-rb/pull/25))
+
+## v0.2.2
+
+* Allow batch updates to create missing contacts ([#22](https://github.com/Absolventa/emarsys-rb/pull/22))
+* Add support for the data export API ([#23]((https://github.com/Absolventa/emarsys-rb/pull/23))
+
+## v0.2.1
+
+* Added basic support for rate-limiting response from Emarsys API ([#21](https://github.com/Absolventa/emarsys-rb/pull/21))
+
+## v0.2.0
+* Added country mapping ([#17](https://github.com/Absolventa/emarsys-rb/pull/17))
+* Proper encoding of GET parameters ([#11](https://github.com/Absolventa/emarsys-rb/pull/11))
+* Update default endpoint fom `suite5.emarsys.net/api/v2` to `api.emarsys.net/api/v2` ([#10](https://github.com/Absolventa/emarsys-rb/pull/10))
+* Bugfixes in nonce header ([#5](https://github.com/Absolventa/emarsys-rb/pull/5) and [#19](https://github.com/Absolventa/emarsys-rb/pull/19))
+* Trigger an external event for multiple contacts ([#3](https://github.com/Absolventa/emarsys-rb/pull/3))
+
+## v0.1.0
+
+Initial version

data/README.md

@@ -40,6 +40,20 @@ Emarsys.configure do |c|
 end
 ```
 
+It is also possible to configure multiple Emarsys accounts like this:
+
+```ruby
+Emarsys.configure(account: :foo) do |c|
+  c.api_username = 'foo_username'
+  c.api_password = 'foo_password'
+end
+
+Emarsys.configure(account: :bar) do |c|
+  c.api_username = 'bar_username'
+  c.api_password = 'bar_password'
+end
+```
+
 ### Field Mapping
 
 As said before, Emarsys loves IDs. For using an API, they are evil. This gem provides
@@ -86,7 +100,24 @@ If you exceed the limit, the Emarsys API returns an HTTP 429 'Too Many Requests'
 
 ## Interacting with the API
 
-You can interact with the API on the provided data objects:
+### Responses
+
+Each API request returns a response object, which exposes the following methods:
+
+* `code`: HTTP status code
+* `text`: 'replyText' from parsed JSON
+* `data`: 'data' from parsed JSON
+* `code`: 'replyCode' from parsed JSON
+
+If the `replyCode` is not `0`, an exception will be raised.
+
+### Multiple accounts
+If you configured multiple Emarsys accounts, you will need to pass the keyword
+argument `account` to every API call, e.g.
+`Emarsys::Condition.collection(account: :foo)`.
+
+
+### Endpoints
 
 #### Condition
 
@@ -99,12 +130,12 @@ Emarsys::Condition.collection
 
 ```ruby
 # Create a contact with custom key_field (one example with mapped identifier, one without)
-Emarsys::Contact.create('user_id', 10, {firstname: "Jane", lastname: "Doe", email: "jane.doe@example.com"})
-Emarsys::Contact.create(4980, 10, {1 => "Jane", 2 => "Doe", 3 => "jane.doe@example.com"})
+Emarsys::Contact.create(key_id: 'user_id', key_value: 10, params: {firstname: "Jane", lastname: "Doe", email: "jane.doe@example.com"})
+Emarsys::Contact.create(key_id: 4980, key_value: 10, params: {1 => "Jane", 2 => "Doe", 3 => "jane.doe@example.com"})
 
 # Update a contact with key_field (one example with mapped identifier, one without)
-Emarsys::Contact.update('email', "jane.doe@example.com", {firstname: "John", lastname: "Doe"})
-Emarsys::Contact.update(3, "jane.doe@example.com", {1 => "John", 2 => "Doe"})
+Emarsys::Contact.update(key_id: 'email', key_value: "jane.doe@example.com", params: {firstname: "John", lastname: "Doe"})
+Emarsys::Contact.update(key_id: 3, key_value: "jane.doe@example.com", params: {1 => "John", 2 => "Doe"})
 ```
 
 #### ContactList
@@ -128,9 +159,9 @@ Emarsys::Email.collection(status: 3)
 Emarsys::Email.resource(1)
 
 # Create a new email campaign
-Emarsys::Email.create({})
+Emarsys::Email.create
 
-Emarsys::Email.launch({})
+Emarsys::Email.launch(1)
 ```
 
 #### Event
@@ -139,11 +170,11 @@ Emarsys::Email.launch({})
 Emarsys::Event.collection
 
 # Trigger a custom event
-Emarsys::Event.trigger(65, 3, ["test@example.com"])
+Emarsys::Event.trigger(65, key_id: 3, external_id: "test@example.com")
 
 # Trigger a custom event which actually sends a mail
 # (Emarsys way to send transactional mails with placeholders)
-Emarsys::Event.trigger(2, 3, 'test@example.com', {:global => {:my_placeholder => "some content"}})
+Emarsys::Event.trigger(2, key_id: 3, external_id: 'test@example.com', data: {:global => {:my_placeholder => "some content"}})
 ```
 
 #### Export
@@ -164,7 +195,7 @@ Emarsys::Field.choice(1)
 ```ruby
 # Get all forms, optional filter parameters
 Emarsys::Folder.collection
-Emarsys::Folder.collection(:folder => 3)
+Emarsys::Folder.collection(folder: 3)
 ```
 
 #### Form
@@ -195,7 +226,7 @@ Emarsys::Segment.collection
 Emarsys::Source.collection
 
 # Create a new source
-Emarsys::Source.create("New Source")
+Emarsys::Source.create(name: "New Source")
 
 # Destroy a source
 Emarsys::Source.destroy(123)
@@ -204,33 +235,6 @@ Emarsys::Source.destroy(123)
 Please refer to the code for detailed instructions of each method.
 
 
-## Changelog
-
-### HEAD (not yet released)
-
-### v0.2.3
-
-* Convert params when using the batch APIs ([#25](https://github.com/Absolventa/emarsys-rb/pull/25))
-
-### v0.2.2
-
-* Allow batch updates to create missing contacts ([#22](https://github.com/Absolventa/emarsys-rb/pull/22))
-* Add support for the data export API ([#23]((https://github.com/Absolventa/emarsys-rb/pull/23))
-
-### v0.2.1
-
-* Added basic support for rate-limiting response from Emarsys API ([#21](https://github.com/Absolventa/emarsys-rb/pull/21))
-
-### v0.2.0
-* Added country mapping ([#17](https://github.com/Absolventa/emarsys-rb/pull/17))
-* Proper encoding of GET parameters ([#11](https://github.com/Absolventa/emarsys-rb/pull/11))
-* Update default endpoint fom `suite5.emarsys.net/api/v2` to `api.emarsys.net/api/v2` ([#10](https://github.com/Absolventa/emarsys-rb/pull/10))
-* Bugfixes in nonce header ([#5](https://github.com/Absolventa/emarsys-rb/pull/5) and [#19](https://github.com/Absolventa/emarsys-rb/pull/19))
-* Trigger an external event for multiple contacts ([#3](https://github.com/Absolventa/emarsys-rb/pull/3))
-
-### v0.1.0
-
-Initial version
 
 ## Contributing
 

data/lib/emarsys/client.rb

@@ -1,15 +1,22 @@
 # frozen_string_literal: true
 module Emarsys
   class Client
+    attr_accessor :account
+
+    def initialize(account = nil)
+      self.account = account
+    end
+
+    def endpoint
+      Emarsys::Configuration.for(account).api_endpoint
+    end
 
     def username
-      raise ArgumentError, "Emarsys.api_username is not set" if Emarsys.api_username.nil?
-      Emarsys.api_username
+      Emarsys::Configuration.for(account).api_username
     end
 
     def password
-      raise ArgumentError, "Emarsys.api_password is not set" if Emarsys.api_password.nil?
-      Emarsys.api_password
+      Emarsys::Configuration.for(account).api_password
     end
 
     def x_wsse_string
@@ -33,6 +40,5 @@ module Emarsys
     def calculated_digest
       Digest::SHA1.hexdigest(header_nonce + header_created + password)
     end
-
   end
 end

data/lib/emarsys/configuration.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+module Emarsys
+  class Configuration
+
+    class << self
+      attr_accessor :config_sets
+
+      def for(account)
+        self.config_sets ||= {}
+        if account.nil?
+          raise Emarsys::AccountRequired unless Emarsys.allow_default_configuration
+          account = :default
+        end
+        account_sym = account.to_sym
+        if self.config_sets[account_sym].nil?
+          raise Emarsys::AccountNotConfigured
+        end
+        self.config_sets[account_sym]
+      end
+
+      def configure(account: :default)
+        self.config_sets ||= {}
+        account_sym = account.to_sym
+        self.config_sets[account_sym] ||= self.new
+        yield self.config_sets[account_sym]
+      end
+    end
+
+    # @!attribute api_endpoint
+    #   @return [String] Base URL for emarsys URLs. default: https://api.emarsys.net/api/v2
+    # @!attribute api_password
+    #   @return [String] API Username given by Emarsys
+    # @!attribute api_username
+    #   @return [String] API Username given by Emarsys
+
+    attr_writer :api_endpoint, :api_username, :api_password
+
+    # Base URL for the Emarsys API
+    #
+    # @return [String] domain which should be used to query the API
+    def api_endpoint
+      @api_endpoint ||= 'https://api.emarsys.net/api/v2'
+    end
+
+    def api_username
+      @api_username or raise ArgumentError.new('api_username is not set')
+    end
+
+    def api_password
+      @api_password or raise ArgumentError.new('api_password is not set')
+    end
+
+  end
+end

data/lib/emarsys/data_object.rb

@@ -7,42 +7,46 @@ module Emarsys
 
       # Make a HTTP GET request
       #
+      # @param account [Symbol] Configuration account to use
       # @param method_name [String] The path, relative to Emarsys.api_endpoint
       # @param params [Hash] custom params hash
       # @return [Hash]
-      def get(method_name, params)
+      def get(account, method_name, params)
         if params.empty?
-          self.new.request 'get', method_name, params
+          self.new.request account, 'get', method_name, params
         else
-          self.new.request 'get', [method_name, parameterize_params(params)].join("/"), {}
+          self.new.request account, 'get', [method_name, parameterize_params(params)].join("/"), {}
         end
       end
 
       # Make a HTTP POST request
       #
+      # @param account [Symbol] Configuration account to use
       # @param method_name [String] The path, relative to Emarsys.api_endpoint
       # @param params [Hash] custom params hash
       # @return [Hash]
-      def post(method_name, params)
-        self.new.request 'post', method_name, params
+      def post(account, method_name, params)
+        self.new.request account, 'post', method_name, params
       end
 
       # Make a HTTP PUT request
       #
+      # @param account [Symbol] Configuration account to use
       # @param method_name [String] The path, relative to Emarsys.api_endpoint
       # @param params [Hash] custom params hash
       # @return [Hash]
-      def put(method_name, params)
-        self.new.request 'put', method_name, params
+      def put(account, method_name, params)
+        self.new.request account, 'put', method_name, params
       end
 
       # Make a HTTP DELETE request
       #
+      # @param account [Symbol] Configuration account to use
       # @param method_name [String] The path, relative to Emarsys.api_endpoint
       # @param params [Hash] custom params hash
       # @return [Hash]
-      def delete(method_name, params)
-        self.new.request 'delete', method_name, params
+      def delete(account, method_name, params)
+        self.new.request account, 'delete', method_name, params
       end
 
       # Custom Parameterizer for Emarsys
@@ -64,24 +68,13 @@ module Emarsys
 
     # Make a HTTP request
     #
+    # @param account [Symbol] Configuration account to use
     # @param http_verb [String] Http method
     # @param method_name [String] The path, relative to Emarsys.api_endpoint
     # @param params [Hash] custom params hash
     # @return [Hash]
-    def request(http_verb, method_name, params)
-      response = Emarsys::Request.new(http_verb, method_name, params).send_request
-      #hashiefy(response)
+    def request(account, http_verb, method_name, params)
+      response = Emarsys::Request.new(account, http_verb, method_name, params).send_request
     end
-
-    # TODO: Not finally evaluated. Is Hashie necessary? Maybe use "real Data Objects instead"?
-    # def hashiefy(response)
-    #   if response.is_a?(Array)
-    #     response.map!{|elem| Hashie::Mash.new(elem) }
-    #   elsif
-    #     Hashie::Mash.new(response)
-    #   else
-    #     response
-    #   end
-    # end
   end
 end

data/lib/emarsys/data_objects/condition.rb

@@ -12,8 +12,8 @@ module Emarsys
       # @return [Hash] List of conditions
       # @example
       #   Emarsys::Condition.collection
-      def collection
-        get 'condition', {}
+      def collection(account: nil)
+        get account, 'condition', {}
       end
     end
 

data/lib/emarsys/data_objects/contact.rb

@@ -16,9 +16,9 @@ module Emarsys
       # @example
       #   Emarsys::Contact.create('app_id', 23, {:firstname => "Jon", :lastname => "Doe"})
       #   Emarsys::Contact.create('3', 'john.doe@example.com', {'1' => "Jon", '2' => "Doe"})
-      def create(key_id, key_value, params = {})
+      def create(key_id:, key_value:, params: {}, account: nil)
         transformed_key_id = transform_key_id(key_id)
-        post "contact", params.merge!({'key_id' => transformed_key_id, transformed_key_id => key_value})
+        post account, "contact", params.merge!({'key_id' => transformed_key_id, transformed_key_id => key_value})
       end
 
       # Get the interal emarsys id of a contact. The given params are transformed to emarsys ids.
@@ -29,8 +29,8 @@ module Emarsys
       # @example
       #   Emarsys::Contact.emarsys_id('email', 'john.dow@example.com')
       #   Emarsys::Contact.emarsys_id(1, 'John')
-      def emarsys_id(key_id, key_value)
-        get "contact", {"#{transform_key_id(key_id).to_s}" => key_value}
+      def emarsys_id(key_id:, key_value:, account: nil)
+        get account, "contact", {"#{transform_key_id(key_id).to_s}" => key_value}
       end
 
       # Update a contact. The given params are transformed to emarsys ids.
@@ -43,10 +43,10 @@ module Emarsys
       # @example
       #   Emarsys::Contact.update('app_id', 23, {:firstname => "Jon", :lastname => "Doe"})
       #   Emarsys::Contact.update('3', 'john.doe@example.com', {'1' => "Jon", '2' => "Doe"}, true)
-      def update(key_id, key_value, params = {}, create_if_not_exists = false)
+      def update(key_id:, key_value:, params: {}, create_if_not_exists: false, account: nil)
         path = "contact#{create_if_not_exists ? '/?create_if_not_exists=1' : ''}"
         transformed_key_id = transform_key_id(key_id)
-        put path, params.merge!({'key_id' => transformed_key_id, transformed_key_id => key_value})
+        put account, path, params.merge!({'key_id' => transformed_key_id, transformed_key_id => key_value})
       end
 
       # Batch creation of contacts.
@@ -59,12 +59,8 @@ module Emarsys
       #              {:app_id => 2, :firstname => "Jane", :lastname => "Doe"}
       #   )
       #
-      # TODO params should be parameterized with field mappings
-      def create_batch(key_id, params = [])
-        converted_params = params.map do |p|
-          Emarsys::ParamsConverter.new(p).convert_to_ids
-        end
-        post "contact", {'key_id' => transform_key_id(key_id), 'contacts' => converted_params}
+      def create_batch(key_id:, params: [], account: nil)
+        post account, "contact", {'key_id' => transform_key_id(key_id), 'contacts' => batch_params(params)}
       end
 
       # Batch update of contacts.
@@ -80,22 +76,19 @@ module Emarsys
       #     true
       #   )
       #
-      def update_batch(key_id, params = [], create_if_not_exists = false)
+      def update_batch(key_id:, params: [], create_if_not_exists: false, account: nil)
         path = "contact#{create_if_not_exists ? '/?create_if_not_exists=1' : ''}"
-        converted_params = params.map do |p|
-          Emarsys::ParamsConverter.new(p).convert_to_ids
-        end
-        put path, {'key_id' => transform_key_id(key_id), 'contacts' => converted_params}
+        put account, path, {'key_id' => transform_key_id(key_id), 'contacts' => batch_params(params)}
       end
 
       # Get list of emails send to a contact
       #
-      # @param contact_ids_array [array] Array of contact ids
+      # @param contacts [array] Array of contact ids
       # @return [Hash] result data
       # @example
       #   Emarsys::Contact.contact_history([1,2,3]
-      def contact_history(contact_ids_array)
-        post "contact/getcontacthistory", {'contacts' => contact_ids_array}
+      def contact_history(contacts:, account: nil)
+        post account, "contact/getcontacthistory", {'contacts' => contacts}
       end
 
       # Get contact data by custom search
@@ -105,11 +98,11 @@ module Emarsys
       # @param fields [array] requested fields. If empty, all are considered
       # @return [Hash] result data
       # @example
-      #   Emarsys::Contact.search('3', ['john.doe@example.com'], [1,2,3]
+      #   Emarsys::Contact.search('3', ['john.doe@example.com'], [1,2,3])
       #
       # TODO transform fields to numeric fields
-      def search(key_id, key_values = [], fields = [])
-        post "contact/getdata", {'keyId' => key_id, 'keyValues' => key_values, 'fields' => fields}
+      def search(key_id:, key_values:, fields: [], account: nil)
+        post account, "contact/getdata", {'keyId' => key_id, 'keyValues' => key_values, 'fields' => fields}
       end
 
       # Exports the selected fields of contacts whoch registered in the specified time range
@@ -118,8 +111,12 @@ module Emarsys
       # @return [Hash] result data
       # @example
       #   Emarsys::Contact.export_registrations(distribution_method: 'local', time_range: ["2013-01-01","2013-12-31"], contact_fields: [1,2,3])
-      def export_registrations(params = {})
-        post "contact/getregistrations", params
+      def export_registrations(distribution_method:, time_range:, contact_fields:, account: nil)
+        post account, "contact/getregistrations", {
+          distribution_method: distribution_method,
+          time_range: time_range,
+          contact_fields: contact_fields
+        }
       end
 
       # @private
@@ -128,6 +125,11 @@ module Emarsys
         matching_attributes.nil? ? key_id : matching_attributes[:id]
       end
 
+      # @private
+      def batch_params(params = [])
+        params.map { |p| Emarsys::ParamsConverter.new(p).convert_to_ids }
+      end
+
     end
   end
 end

data/lib/emarsys/data_objects/contact_list.rb

@@ -12,8 +12,8 @@ module Emarsys
       # @return [Hash] List of contact_lists
       # @example
       #   Emarsys::ContactList.collection
-      def collection
-        get 'contactlist', {}
+      def collection(account: nil)
+        get account, 'contactlist', {}
       end
 
       # Create a new contact list
@@ -25,22 +25,22 @@ module Emarsys
       # @return [Hash] internal id of the contact list
       # @example
       #   Emarsys::ContactList.create(key_id: "3", name: 'Test-Liste', description: 'Something')
-      def create(params = {})
-        post "contactlist", params
+      def create(account: nil, **params)
+        post account, "contactlist", params
       end
 
       # Add a contacts to a specific contact list
       #
       # This cannot be an instance method, because the API does not allow to retrieve a single resource. How crappy is that?
-      def add_contacts(contact_list_id, key_id, external_ids = [])
-        post "contactlist/#{contact_list_id}/add", {'key_id' => key_id, 'external_ids' => external_ids}
+      def add_contacts(id, key_id:, external_ids: [], account: nil)
+        post account, "contactlist/#{id}/add", {'key_id' => key_id, 'external_ids' => external_ids}
       end
 
       # Remove contacts from a specific contact list
       #
       # This cannot be an instance method, because the API does not allow to retrieve a single resource. How crappy is that?
-      def remove_contacts(contact_list_id, key_id, external_ids = [])
-        post "contactlist/#{contact_list_id}/remove", {'key_id' => key_id, 'external_ids' => external_ids}
+      def remove_contacts(id, key_id:, external_ids: [], account: nil)
+        post account, "contactlist/#{id}/remove", {'key_id' => key_id, 'external_ids' => external_ids}
       end
 
     end

data/lib/emarsys/data_objects/email.rb

@@ -17,8 +17,8 @@ module Emarsys
       #   Emarsys::Email.collection
       #   Emarsys::Email.collection(:status => 3)
       #   Emarsys::Email.collection(:contactlist => 5)
-      def collection(params = {})
-        get 'email', params
+      def collection(account: nil, **params)
+        get account, 'email', params
       end
 
       # Get Email attirbutes of a specific email
@@ -27,8 +27,8 @@ module Emarsys
       # @return [Hash] Attributes hash
       # @example
       #   Emarsys::Email.resource(1)
-      def resource(id)
-        get "email/#{id}", {}
+      def resource(id, account: nil)
+        get account, "email/#{id}", {}
       end
 
       # Create a new email campaign
@@ -53,8 +53,8 @@ module Emarsys
       #     subject: 'Test Subject', :email_category: 3, segment: 1121, contactlist: 0,
       #     html_source: '<h1>Test</h1>', text_source: 'Test'
       #   )
-      def create(params = {})
-        post "email", params
+      def create(account: nil, **params)
+        post account, "email", params
       end
 
       # Launches an email
@@ -66,8 +66,8 @@ module Emarsys
       # @return [Hash] Result data
       # @example
       #   Emarsys::Email.launch(1)
-      def launch(id, params = {})
-        post "email/#{id}/launch", params
+      def launch(id, account: nil, **params)
+        post account, "email/#{id}/launch", params
       end
 
       # Preview an email
@@ -77,8 +77,8 @@ module Emarsys
       # @return [Hash] Result data
       # @example
       #   Emarsys::Email.preview(1)
-      def preview(id, version = 'html')
-        post "email/#{id}/preview", {:version => version}
+      def preview(id, version: 'html', account: nil)
+        post account, "email/#{id}/preview", {:version => version}
       end
 
       # View response summary of an email
@@ -87,8 +87,8 @@ module Emarsys
       # @return [Hash] Result data
       # @example
       #   Emarsys::Email.response_summary(1)
-      def response_summary(id)
-        get "email/#{id}/responsesummary", {}
+      def response_summary(id, account: nil)
+        get account, "email/#{id}/responsesummary", {}
       end
 
       # Instruct emarsys to send a test mail
@@ -103,8 +103,8 @@ module Emarsys
       # @return [Hash] Result data
       # @example
       #   Emarsys::Email.send_test_mail(1, {:recipientlist => 'john.doe@example.com;jane.doe@example.com'})
-      def send_test_mail(id, params = {})
-        post "email/#{id}/sendtestmail", params
+      def send_test_mail(id, account: nil, **params)
+        post account, "email/#{id}/sendtestmail", params
       end
 
       # Returns the delivery status of an email
@@ -116,12 +116,12 @@ module Emarsys
       # @return [Hash] Result data
       # @example
       #   Emarsys::Email.delivery_status(1)
-      def delivery_status(id, params = {})
-        post "email/#{id}/getdeliverystatus", params
+      def delivery_status(id, account: nil, **params)
+        post account, "email/#{id}/getdeliverystatus", params
       end
 
       # TODO POST /getlaunchesofemail
-      def email_launches(id)
+      def email_launches(id, account: nil)
         raise "Not implemented yet"
       end
 
@@ -143,7 +143,7 @@ module Emarsys
       #     ['trackable_links'],
       #     [5, 8, 13]
       #   )
-      def export_responses(distribution_method, time_range, contact_fields, sources, analysis_fields, params = {})
+      def export_responses(distribution_method:, time_range:, contact_fields:, sources:, analysis_fields:, account: nil, **params)
         params.merge!(
           :distribution_method => distribution_method,
           :time_range => time_range,
@@ -151,7 +151,7 @@ module Emarsys
           :sources => sources,
           :analysis_fields => analysis_fields
         )
-        post "email/getresponses", params
+        post account, "email/getresponses", params
       end
     end
   end

data/lib/emarsys/data_objects/email_category.rb

@@ -12,8 +12,8 @@ module Emarsys
       # @return [Hash] List of email_categories
       # @example
       #   Emarsys::EmailCategory.collection
-      def collection
-        get 'emailcategory', {}
+      def collection(account: nil)
+        get account, 'emailcategory', {}
       end
 
     end