emarsys 0.2.3 → 0.3.0

data/lib/emarsys/data_objects/event.rb

@@ -13,13 +13,13 @@ module Emarsys
       # @return [Hash] List of events
       # @example
       #   Emarsys::Event.collection
-      def collection
-        get 'event', {}
+      def collection(account: nil)
+        get account, 'event', {}
       end
 
       # Trigger an external event
       #
-      # @param event_id [Integer, String] The internal emarsys id
+      # @param id [Integer, String] The internal emarsys id
       # @param key_id [Integer, String] The identifer of the key field (e.g. 3 for 'email')
       # @param external_id [String] The id of the given filed specified with key_id (e.g. 'test@example.com')
       # @option data [Hash] data hash for transactional mails
@@ -27,27 +27,27 @@ module Emarsys
       # @example
       #   Emarsys::Event.trigger(2, 3, 'test@example.com')
       #   Emarsys::Event.trigger(2, 'user_id', 57687, {:global => {:name => "Special Name"}})
-      def trigger(event_id, key_id, external_id, data = {})
+      def trigger(id, key_id:, external_id:, data: {}, account: nil)
         transformed_key_id = transform_key_id(key_id)
         params = {:key_id => transformed_key_id, :external_id => external_id}
         params.merge!(:data => data) if not data.empty?
-        post "event/#{event_id}/trigger", params
+        post account, "event/#{id}/trigger", params
       end
 
       # Trigger an external event for multiple contacts
       #
-      # @param event_id [Integer, String] The internal emarsys id
+      # @param id [Integer, String] The internal emarsys id
       # @param key_id [Integer, String] The identifer of the key field (e.g. 3 for 'email')
       # @param contacts [Array, Hash] An array with hashes containing the contacts and optional data per contact
       # @return [Hash] Result data
       # @example
       #   Emarsys::Event.trigger_multiple(2, 3, [{:external_id => "test@example.com"},{:external_id => "test2@example.com", :data => {:name => "Special Name"}}])
-      def trigger_multiple(event_id, key_id, contacts)
+      def trigger_multiple(id, key_id:, contacts:, account: nil)
         external_id = ""
         transformed_key_id = transform_key_id(key_id)
         params = {:key_id => transformed_key_id, :external_id => external_id, :data => nil}
         params.merge!(:contacts => contacts)
-        post "event/#{event_id}/trigger", params
+        post account, "event/#{id}/trigger", params
       end
 
       # @private

data/lib/emarsys/data_objects/export.rb

@@ -13,8 +13,8 @@ module Emarsys
       # @return [Hash] Result data
       # @example
       #   Emarsys::Export.resource(2)
-      def resource(id)
-        get "export/#{id}", {}
+      def resource(id, account: nil)
+        get account, "export/#{id}", {}
       end
 
       # Download export data
@@ -25,11 +25,11 @@ module Emarsys
       # @return [String] text/csv
       # @example
       #   Emarsys::Export.data(2)
-      def data(id, offset = nil, limit = nil)
+      def data(id, offset: nil, limit: nil, account: nil)
         params = {}
         params.merge!(:offset => offset) if offset
         params.merge!(:limit => limit) if limit
-        get "export/#{id}/data", params
+        get account, "export/#{id}/data", params
       end
     end
 

data/lib/emarsys/data_objects/field.rb

@@ -15,12 +15,12 @@ module Emarsys
       # @example
       #   Emarsys::Field.collection
       #   Emarsys::Field.collection(:translate => 'en')
-      def collection(params = {})
+      def collection(account: nil, **params)
         params = params.stringify_keys
         if params['translate']
-          get "field/translate/#{params['translate'].to_s}", {}
+          get account, "field/translate/#{params['translate'].to_s}", {}
         else
-          get 'field', {}
+          get account, 'field', {}
         end
       end
 
@@ -30,8 +30,8 @@ module Emarsys
       # @return [Hash] Result Data
       # @example
       #   Emarsys::Field.choice(3)
-      def choice(id)
-        get "field/#{id}/choice", {}
+      def choice(id, account: nil)
+        get account, "field/#{id}/choice", {}
       end
     end
 

data/lib/emarsys/data_objects/file.rb

@@ -15,23 +15,23 @@ module Emarsys
       # @example
       #   Emarsys::File.collection
       #   Emarsys::File.collection(:folder => 3)
-      def collection(params = {})
-        get 'file', params
+      def collection(account: nil, **params)
+        get account, 'file', params
       end
 
       # Upload a file to the media database
       #
       # @param filename [String] The filename
-      # @param base64_encoded_file [String] Base64 encoded version of the file
-      # @param folder_id [Integer, String] optinal folder to out te file into
+      # @param file [String] Base64 encoded version of the file
+      # @param folder [Integer, String] optinal folder to out te file into
       # @return [Hash] Result data
       # @example
       #   Emarsys::File.create("my_file.jpg", "asdhkajsh...")
       #   Emarsys::File.create("my_file.jpg", "asdhkajsh...", 3)
-      def create(filename, base64_encoded_file, folder_id = nil)
-        params = {:filename => filename, :file => base64_encoded_file}
-        params.merge!({:folder => folder_id}) unless folder_id.nil?
-        post 'file', params
+      def create(filename:, file:, folder: nil, account: nil)
+        params = {:filename => filename, :file => file}
+        params.merge!(:folder => folder) unless folder.nil?
+        post account, 'file', params
       end
     end
 

data/lib/emarsys/data_objects/folder.rb

@@ -15,8 +15,8 @@ module Emarsys
       # @example
       #   Emarsys::Folder.collection
       #   Emarsys::Folder.collection(:folder => 3)
-      def collection(params = {})
-        get 'folder', params
+      def collection(account: nil, **params)
+        get account, 'folder', params
       end
     end
 

data/lib/emarsys/data_objects/form.rb

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

data/lib/emarsys/data_objects/language.rb

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

data/lib/emarsys/data_objects/segment.rb

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

data/lib/emarsys/data_objects/source.rb

@@ -12,8 +12,8 @@ module Emarsys
       # @return [Hash] List of sources
       # @example
       #   Emarsys::Source.collection
-      def collection
-        get 'source', {}
+      def collection(account: nil)
+        get account, 'source', {}
       end
 
       # Create a new source
@@ -22,8 +22,8 @@ module Emarsys
       # @return [Hash] Result data
       # @example
       #   Emarsys::Source.create("My new source")
-      def create(name)
-        post 'source/create', {:name => name}
+      def create(name:, account: nil)
+        post account, 'source/create', {:name => name}
       end
 
       # Destroy a specific source
@@ -32,8 +32,8 @@ module Emarsys
       # @return [Hash] Result data
       # @example
       #   Emarsys::Source.destroy(2)
-      def destroy(id)
-        delete "source/#{id}", {}
+      def destroy(id, account: nil)
+        delete account, "source/#{id}", {}
       end
 
     end

data/lib/emarsys/error.rb

@@ -25,4 +25,8 @@ module Emarsys
 
   # Raised when Emarsys returns a 500 HTTP status code
   class InternalServerError < Error; end
+
+  class AccountNotConfigured < StandardError; end
+
+  class AccountRequired < StandardError; end
 end

data/lib/emarsys/request.rb

@@ -2,41 +2,42 @@
 module Emarsys
 
   class Request
-    attr_accessor :http_verb, :path, :params
+    attr_accessor :http_verb, :path, :params, :account
 
-    def initialize(http_verb, path, params = {})
+    def initialize(account, http_verb, path, params = {})
       self.path = path
       self.http_verb = http_verb
       self.params = params
+      self.account = account
     end
 
     def send_request
       case http_verb.to_sym
       when :post
         RestClient.post(emarsys_uri, converted_params.to_json, :content_type => :json, :x_wsse => client.x_wsse_string) do |response, request, result, &block|
-          Emarsys::Response.new(response).result
+          Emarsys::Response.new(response)
         end
       when :put
         RestClient.put emarsys_uri, converted_params.to_json, :content_type => :json, :x_wsse => client.x_wsse_string do |response, request, result, &block|
-          Emarsys::Response.new(response).result
+          Emarsys::Response.new(response)
         end
       when :delete
         RestClient.delete(emarsys_uri, :content_type => :json, :x_wsse => client.x_wsse_string) do |response, request, result, &block|
-          Emarsys::Response.new(response).result
+          Emarsys::Response.new(response)
         end
       else
         RestClient.get(emarsys_uri, :content_type => :json, :x_wsse => client.x_wsse_string) do |response, request, result, &block|
-          Emarsys::Response.new(response).result
+          Emarsys::Response.new(response)
         end
       end
     end
 
     def client
-      Emarsys::Client.new
+      Emarsys::Client.new(account)
     end
 
     def emarsys_uri
-      [Emarsys.api_endpoint, @path].join('/')
+      [client.endpoint, @path].join('/')
     end
 
     def converted_params

data/lib/emarsys/response.rb

@@ -13,20 +13,18 @@ module Emarsys
         self.text = json['replyText']
         self.data = json['data']
       end
+
       self.status = response.code if response.respond_to?(:code)
-    end
 
-    def result
-      if code == 0
-        data
-      elsif !status.nil? && status == 401
-        raise Emarsys::Unauthorized.new(code, text, status)
-      elsif !status.nil? && status == 429
-        raise Emarsys::TooManyRequests.new(code, text, status)
-      else
-        raise Emarsys::BadRequest.new(code, text, status)
+      if code != 0
+        if status == 401
+          raise Emarsys::Unauthorized.new(code, text, status)
+        elsif status == 429
+          raise Emarsys::TooManyRequests.new(code, text, status)
+        else
+          raise Emarsys::BadRequest.new(code, text, status)
+        end
       end
     end
-
   end
 end

data/lib/emarsys/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Emarsys
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/lib/emarsys.rb

@@ -4,6 +4,7 @@ require 'json'
 require 'rest_client'
 require 'uri'
 
+require 'emarsys/configuration'
 require 'emarsys/client'
 require 'emarsys/country'
 require 'emarsys/data_object'
@@ -36,27 +37,14 @@ require "emarsys/version"
 # Ruby toolkit for the Emarsys API
 module Emarsys
   class << self
+    extend Forwardable
 
-    # @!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_accessor :allow_default_configuration
 
-    attr_accessor :api_endpoint, :api_username, :api_password
+    def_delegators :configuration, :configure
 
-    # 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'
+    def configuration
+      @configuration ||= Emarsys::Configuration
     end
-
-    # Set configuration options using a block
-    def configure
-      yield self
-    end
-
   end
 end

data/spec/emarsys/client_spec.rb

@@ -4,23 +4,27 @@ describe Emarsys::Client do
 
   describe 'configs for username and password' do
     it 'inherits username from module' do
-      allow(Emarsys).to receive(:api_username).and_return("my_username")
       expect(Emarsys::Client.new.username).to eq("my_username")
     end
 
     it 'inherits password from module' do
-      allow(Emarsys).to receive(:api_password).and_return("my_password")
       expect(Emarsys::Client.new.password).to eq("my_password")
     end
 
-    it 'raises error if api_username is not set' do
-      allow(Emarsys).to receive(:api_username).and_return(nil)
-      expect{Emarsys::Client.new.username}.to raise_error(ArgumentError, 'Emarsys.api_username is not set')
-    end
+    context 'missing values' do
+      before do
+        Emarsys.configure do |config|
+          config.api_username = nil
+          config.api_password = nil
+        end
+      end
+      it 'raises error if api_username is not set' do
+        expect{Emarsys::Client.new.username}.to raise_error(ArgumentError, 'api_username is not set')
+      end
 
-    it 'raises error if api_password is not set' do
-      allow(Emarsys).to receive(:api_password).and_return(nil)
-      expect{Emarsys::Client.new.password}.to raise_error(ArgumentError, 'Emarsys.api_password is not set')
+      it 'raises error if api_password is not set' do
+        expect{Emarsys::Client.new.password}.to raise_error(ArgumentError, 'api_password is not set')
+      end
     end
   end
 

data/spec/emarsys/configuration_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Emarsys::Configuration do
+
+  describe ".configure" do
+    [:api_endpoint, :api_username, :api_password].each do |key|
+      it "sets the #{key.to_s.gsub('_', ' ')}" do
+        Emarsys::Configuration.configure(account: :foo) do |config|
+          config.send("#{key}=", key)
+        end
+        expect(Emarsys::Configuration.for(:foo).__send__(key)).to eq key
+      end
+    end
+  end
+
+  describe ".api_endpoint getter" do
+    it "returns specific url as default value" do
+      Emarsys.configure { |c| c.api_endpoint = nil }
+      expect(Emarsys::Configuration.for(nil).api_endpoint).to eq('https://api.emarsys.net/api/v2')
+    end
+  end
+end

data/spec/emarsys/data_object_spec.rb

@@ -5,34 +5,34 @@ describe Emarsys::DataObject do
 
     describe '.get' do
       it "delegates to the instance request method" do
-        allow_any_instance_of(Emarsys::DataObject).to receive(:request).with('get', 'test_method', {}).and_return(nil)
-        Emarsys::DataObject.get('test_method', {})
+        allow_any_instance_of(Emarsys::DataObject).to receive(:request).with(nil, 'get', 'test_method', {}).and_return(nil)
+        Emarsys::DataObject.get(nil, 'test_method', {})
       end
 
       it "transfers params to specific emarsys params format" do
-        allow_any_instance_of(Emarsys::DataObject).to receive(:request).with('get', 'test_method/?a=1&b=2', {}).and_return(nil)
-        Emarsys::DataObject.get('test_method', {'a' => 1, 'b' => 2})
+        allow_any_instance_of(Emarsys::DataObject).to receive(:request).with(nil, 'get', 'test_method/?a=1&b=2', {}).and_return(nil)
+        Emarsys::DataObject.get(nil, 'test_method', {'a' => 1, 'b' => 2})
       end
     end
 
     describe '.post' do
       it "delegates to the instance request method" do
-        allow_any_instance_of(Emarsys::DataObject).to receive(:request).with('post', 'test_method', {}).and_return(nil)
-        Emarsys::DataObject.post('test_method', {})
+        allow_any_instance_of(Emarsys::DataObject).to receive(:request).with(nil, 'post', 'test_method', {}).and_return(nil)
+        Emarsys::DataObject.post(nil, 'test_method', {})
       end
     end
 
     describe '.put' do
       it "delegates to the instance request method" do
-        allow_any_instance_of(Emarsys::DataObject).to receive(:request).with('put', 'test_method', {}).and_return(nil)
-        Emarsys::DataObject.put('test_method', {})
+        allow_any_instance_of(Emarsys::DataObject).to receive(:request).with(nil, 'put', 'test_method', {}).and_return(nil)
+        Emarsys::DataObject.put(nil, 'test_method', {})
       end
     end
 
     describe '.delete' do
       it "delegates to the instance request method" do
-        allow_any_instance_of(Emarsys::DataObject).to receive(:request).with('delete', 'test_method', {}).and_return(nil)
-        Emarsys::DataObject.delete('test_method', {})
+        allow_any_instance_of(Emarsys::DataObject).to receive(:request).with(nil, 'delete', 'test_method', {}).and_return(nil)
+        Emarsys::DataObject.delete(nil, 'test_method', {})
       end
     end
 
@@ -54,7 +54,7 @@ describe Emarsys::DataObject do
 
     it "provides a simple #request that delegates to Emarsys::Request" do
       allow_any_instance_of(Emarsys::Request).to receive(:send_request).and_return(nil)
-      data_object.request('get', 'test_method', {})
+      data_object.request(nil, 'get', 'test_method', {})
     end
   end
 end

data/spec/emarsys/data_objects/contact_spec.rb

@@ -5,7 +5,7 @@ describe Emarsys::Contact do
     it "requests contact creation with parameters" do
       stub_params = {1 => 'John', 2 => "Doe"}
       stub = stub_request(:post, "https://api.emarsys.net/api/v2/contact").with(:body => stub_params.merge!({'key_id' => 3, 3 => 'john.doe@example.com'}).to_json).to_return(standard_return_body)
-      Emarsys::Contact.create(3, "john.doe@example.com", stub_params)
+      Emarsys::Contact.create(key_id: 3, key_value: "john.doe@example.com", params: stub_params)
       expect(stub).to have_been_requested.once
     end
   end
@@ -13,7 +13,7 @@ describe Emarsys::Contact do
   describe ".emarsys_id" do
     it "requests emarsys_id of a contact" do
       stub = stub_request(:get, "https://api.emarsys.net/api/v2/contact/?3=jane.doe@example.com").to_return(standard_return_body)
-      Emarsys::Contact.emarsys_id(3, 'jane.doe@example.com')
+      Emarsys::Contact.emarsys_id(key_id: 3, key_value: 'jane.doe@example.com')
       expect(stub).to have_been_requested.once
     end
   end
@@ -22,13 +22,13 @@ describe Emarsys::Contact do
     it "requests contact update with parameters" do
       stub_params = {1 => 'Jane', 2 => "Doe"}
       stub = stub_request(:put, "https://api.emarsys.net/api/v2/contact").with(:body => stub_params.merge!({'key_id' => 3, 3 => 'jane.doe@example.com'}).to_json).to_return(standard_return_body)
-      Emarsys::Contact.update(3, 'jane.doe@example.com', stub_params)
+      Emarsys::Contact.update(key_id: 3, key_value: 'jane.doe@example.com', params: stub_params)
       expect(stub).to have_been_requested.once
     end
     it "may create non-existing contact" do
       stub_params = {1 => 'Jane', 2 => "Doe"}
       stub = stub_request(:put, "https://api.emarsys.net/api/v2/contact/?create_if_not_exists=1").with(:body => stub_params.merge!({'key_id' => 3, 3 => 'jane.doe@example.com'}).to_json).to_return(standard_return_body)
-      Emarsys::Contact.update(3, 'jane.doe@example.com', stub_params, true)
+      Emarsys::Contact.update(key_id: 3, key_value: 'jane.doe@example.com', params: stub_params, create_if_not_exists: true)
       expect(stub).to have_been_requested.once
     end
   end
@@ -37,14 +37,14 @@ describe Emarsys::Contact do
     it "requests contact batch creation with parameters" do
       stub_params = [{1 => 'Jane', 2 => "Doe"}, {1 => 'Paul', 2 => 'Tester'}]
       stub = stub_request(:post, "https://api.emarsys.net/api/v2/contact").with(:body => {'key_id' => 3, 'contacts' => stub_params}.to_json).to_return(standard_return_body)
-      Emarsys::Contact.create_batch(3, stub_params)
+      Emarsys::Contact.create_batch(key_id: 3, params: stub_params)
       expect(stub).to have_been_requested.once
     end
     it "transforms identifiers to IDs for each contact parameter set" do
       given_params = [{'_firstname' => 'Jane', '_lastname' => "Doe"}, {'_firstname' => 'Paul', '_lastname' => 'Tester'}]
       expected_params = [{1 => 'Jane', 2 => "Doe"}, {1 => 'Paul', 2 => 'Tester'}]
       stub = stub_request(:post, "https://api.emarsys.net/api/v2/contact").with(:body => {'key_id' => 3, 'contacts' => expected_params}.to_json).to_return(standard_return_body)
-      Emarsys::Contact.create_batch('_email', given_params)
+      Emarsys::Contact.create_batch(key_id: '_email', params: given_params)
       expect(stub).to have_been_requested.once
     end
   end
@@ -53,20 +53,20 @@ describe Emarsys::Contact do
     it "requests contact batch update with parameters" do
       stub_params = [{1 => 'Jane', 2 => "Doe"}, {1 => 'Paul', 2 => 'Tester'}]
       stub = stub_request(:put, "https://api.emarsys.net/api/v2/contact").with(:body => {'key_id' => 3, 'contacts' => stub_params}.to_json).to_return(standard_return_body)
-      Emarsys::Contact.update_batch(3, stub_params)
+      Emarsys::Contact.update_batch(key_id: 3, params: stub_params)
       expect(stub).to have_been_requested.once
     end
     it "transforms identifiers to IDs for each contact parameter set" do
       given_params = [{'_firstname' => 'Jane', '_lastname' => "Doe"}, {'_firstname' => 'Paul', '_lastname' => 'Tester'}]
       expected_params = [{1 => 'Jane', 2 => "Doe"}, {1 => 'Paul', 2 => 'Tester'}]
       stub = stub_request(:put, "https://api.emarsys.net/api/v2/contact").with(:body => {'key_id' => 3, 'contacts' => expected_params}.to_json).to_return(standard_return_body)
-      Emarsys::Contact.update_batch('_email', given_params)
+      Emarsys::Contact.update_batch(key_id: '_email', params: given_params)
       expect(stub).to have_been_requested.once
     end
     it "may create non-existing contacts" do
       stub_params = [{1 => 'Jane', 2 => "Doe"}, {1 => 'Paul', 2 => 'Tester'}]
       stub = stub_request(:put, "https://api.emarsys.net/api/v2/contact/?create_if_not_exists=1").with(:body => {'key_id' => 3, 'contacts' => stub_params}.to_json).to_return(standard_return_body)
-      Emarsys::Contact.update_batch(3, stub_params, true)
+      Emarsys::Contact.update_batch(key_id: 3, params: stub_params, create_if_not_exists: true)
       expect(stub).to have_been_requested.once
     end
   end
@@ -75,7 +75,7 @@ describe Emarsys::Contact do
     it "requests contact histories" do
       stub_params = [1,2,3]
       stub = stub_request(:post, "https://api.emarsys.net/api/v2/contact/getcontacthistory").with(:body => {'contacts' => stub_params}.to_json).to_return(standard_return_body)
-      Emarsys::Contact.contact_history(stub_params)
+      Emarsys::Contact.contact_history(contacts: stub_params)
       expect(stub).to have_been_requested.once
     end
   end
@@ -83,7 +83,7 @@ describe Emarsys::Contact do
   describe ".search" do
     it "requests contact data based on search params" do
       stub = stub_request(:post, "https://api.emarsys.net/api/v2/contact/getdata").with(:body => {'keyId' => '3', 'keyValues' => ['jane.doe@example.com'], 'fields' => []}.to_json).to_return(standard_return_body)
-      Emarsys::Contact.search('3', ['jane.doe@example.com'])
+      Emarsys::Contact.search(key_id: '3', key_values: ['jane.doe@example.com'])
       expect(stub).to have_been_requested.once
     end
   end
@@ -100,6 +100,6 @@ describe Emarsys::Contact do
 
 
   def contact_history(contact_ids_array)
-    post "contact/getcontacthistory", {'contacts' => contact_ids_array}
+    post account, "contact/getcontacthistory", {'contacts' => contact_ids_array}
   end
 end

data/spec/emarsys/data_objects/email_launch_status_spec.rb

@@ -22,4 +22,4 @@ describe Emarsys::EmailLaunchStatus do
       expect(Emarsys::EmailLaunchStatus.resource(100)).to eq(nil)
     end
   end
-end
+end

data/spec/emarsys/data_objects/email_spec.rb

@@ -58,9 +58,9 @@ describe Emarsys::Email do
     end
 
     it "requests an email launch with parameters" do
-      stub_params = {:schedule => "2013-12-01 23:00:00", :time_zone => "Europe/Berlin"}
+      stub_params = {schedule: "2013-12-01 23:00:00", time_zone: "Europe/Berlin"}
       stub = stub_request(:post, "https://api.emarsys.net/api/v2/email/123/launch").with(:body => stub_params.to_json).to_return(standard_return_body)
-      Emarsys::Email.launch(123, stub_params)
+      Emarsys::Email.launch(123, schedule: "2013-12-01 23:00:00", time_zone: "Europe/Berlin")
       expect(stub).to have_been_requested.once
     end
   end
@@ -69,16 +69,16 @@ describe Emarsys::Email do
     it "requests an email preview" do
       stub_params = {:version => 'html'}
       stub = stub_request(:post, "https://api.emarsys.net/api/v2/email/123/preview").with(:body => stub_params.to_json).to_return(standard_return_body)
-      Emarsys::Email.preview(123, 'html')
+      Emarsys::Email.preview(123, version: 'html')
       expect(stub).to have_been_requested.once
     end
   end
 
   describe ".send_test_mail" do
     it "requests an email test sending with custom recipient list" do
-      stub_params = {:recipientlist => 'john.doe@example.com;jane.doe@example.com'}
+      stub_params = {recipientlist: 'john.doe@example.com;jane.doe@example.com'}
       stub = stub_request(:post, "https://api.emarsys.net/api/v2/email/123/sendtestmail").with(:body => stub_params.to_json).to_return(standard_return_body)
-      Emarsys::Email.send_test_mail(123, stub_params)
+      Emarsys::Email.send_test_mail(123, recipientlist: 'john.doe@example.com;jane.doe@example.com')
       expect(stub).to have_been_requested.once
     end
   end

data/spec/emarsys/data_objects/email_status_code_spec.rb

@@ -22,4 +22,4 @@ describe Emarsys::EmailStatusCode do
       expect(Emarsys::EmailStatusCode.resource(100)).to eq(nil)
     end
   end
-end
+end

data/spec/emarsys/data_objects/event_spec.rb

@@ -12,13 +12,13 @@ describe Emarsys::Event do
   describe ".trigger" do
     it "requests event trigger with parameters" do
       stub = stub_request(:post, "https://api.emarsys.net/api/v2/event/123/trigger").with(:body => {'key_id' => 3, 'external_id' => "jane.doe@example.com"}.to_json).to_return(standard_return_body)
-      Emarsys::Event.trigger(123, 3, 'jane.doe@example.com')
+      Emarsys::Event.trigger(123, key_id: 3, external_id: 'jane.doe@example.com')
       expect(stub).to have_been_requested.once
     end
 
     it "requests event trigger with additional data parameters" do
       stub = stub_request(:post, "https://api.emarsys.net/api/v2/event/123/trigger").with(:body => {'key_id' => 3, 'external_id' => "jane.doe@example.com", :data => {'global' => {'my_placeholder' => 'Something'}}}.to_json).to_return(standard_return_body)
-      Emarsys::Event.trigger(123, 3, 'jane.doe@example.com', {'global' => {'my_placeholder' => 'Something'}})
+      Emarsys::Event.trigger(123, key_id: 3, external_id: 'jane.doe@example.com', data: {'global' => {'my_placeholder' => 'Something'}})
       expect(stub).to have_been_requested.once
     end
   end
@@ -26,7 +26,7 @@ describe Emarsys::Event do
   describe ".trigger_multiple" do
     it "requests event trigger with parameters" do
       stub = stub_request(:post, "https://api.emarsys.net/api/v2/event/123/trigger").with(:body => {'key_id' => 3, 'external_id' => "", :data => nil, :contacts => [{'external_id' => "jane.doe@example.com"}]}.to_json).to_return(standard_return_body)
-      Emarsys::Event.trigger_multiple(123,3,[{'external_id' => 'jane.doe@example.com'}])
+      Emarsys::Event.trigger_multiple(123, key_id: 3, contacts: [{'external_id' => 'jane.doe@example.com'}])
       expect(stub).to have_been_requested.once
     end
   end