emarsys 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2f8428e2c40d3634ec723d6344c78b04ecc42ef4
+  data.tar.gz: 1e68cfc41427960d604cc562ceb05a7a30b2cdf5
+SHA512:
+  metadata.gz: 683eba0ca8b1166136a8943e8a9381c6d58f563899f020cc60fb063bc0febcc62919e7b2c61e5ca48f2f9e604a9abc08d179c85ec0bc236e97cbf4fced9fad07
+  data.tar.gz: c680377e2abe42b2e03f70c46bbe5446669825438db4776a5f1d4ce8c496aa951a5dffa74b09a83909eee8abca251e4bdcf98c739a05133d2776f214bbf4f165

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+sudo: false
+cache:
+  bundler: true
+rvm:
+- jruby-9.0.5.0
+- 2.2.2
+- 2.3.1

data/Gemfile

@@ -2,10 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in emarsys.gemspec
 
-group :test do
-  gem 'rspec', '~> 2.13.0'
-  gem 'webmock', '~> 1.9.0'
-end
-
-
 gemspec

data/README.md

@@ -1,4 +1,4 @@
-# emarsys-rb
+# emarsys-rb [![Build Status](https://travis-ci.org/Absolventa/emarsys-rb.svg?branch=master)](https://travis-ci.org/Absolventa/emarsys-rb)
 
 Simple Ruby wrapper for the Emarsys API.
 
@@ -23,38 +23,58 @@ This gem tries to work around this by letting you specify a field mapping consta
 * Return values differ from method to method due to the way the Emarsys API is implemented.
 Thus, a Hash as a return value or an Array of Hashes was choosen as the global return object. Basically it is a parsed JSON response.
 * Please refer to the Emarsys API documentation for detailed information on parameters, return values or error codes.
+* The list of available countries is defined by Emarsys, and uses internal Emarsys-specific IDs.  A utility class is
+provided to map [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 "ISO 3166-1 alpha-2") data (aka 2-letter country codes) to internal Emarsys country IDs.
 
 ## Configuration and Setup
 ### Authentication
 
 Authenticate with the api credentials provided by your Emarsys account manager.
 
-    Emarsys.configure do |c|
-      c.api_username = 'my_username'
-      c.api_password = 'my_password'
-      # OPTIONAL, defaults to https://suite5.emarsys.net/api/v2
-      c.api_endpoint = 'https://www.emarsys.net/api/v2'
-    end
+```ruby
+Emarsys.configure do |c|
+  c.api_username = 'my_username'
+  c.api_password = 'my_password'
+  # OPTIONAL, defaults to https://api.emarsys.net/api/v2
+  c.api_endpoint = 'https://suite5.emarsys.net/api/v2'
+end
+```
 
 ### Field Mapping
 
-As said before, Emarsys loves IDs. For using an APi, they are evil. This Gem provides
+As said before, Emarsys loves IDs. For using an API, they are evil. This gem provides
 an easy way to adjust the individual field settings. Internally a Ruby Mapping Constant is used,
 which that can be overwritten. It will be picked up automatically. E.g.:
 
-    # Complete overwrite
-    Emarsys::FieldMapping::ATTRIBUTES = [
-      {:id => 0, :identifier => 'interests', :name => 'Interests'},
-      {:id => 1, :identifier => 'firstname', :name => 'First Name'},
-      {:id => 2, :identifier => 'lastname',  :name => 'Last Name'},
-    ]
+```ruby
+# Complete overwrite
+Emarsys::FieldMapping::ATTRIBUTES = [
+  {:id => 0, :identifier => 'interests', :name => 'Interests'},
+  {:id => 1, :identifier => 'firstname', :name => 'First Name'},
+  {:id => 2, :identifier => 'lastname',  :name => 'Last Name'},
+]
 
-    # Add to the Mapping-Constant
-    Emarsys::FieldMapping::ATTRIBUTES << {:id => 100, :identifier => 'user_id', :name => "User-ID"}
+# Add to the Mapping-Constant
+Emarsys::FieldMapping::ATTRIBUTES << {:id => 100, :identifier => 'user_id', :name => "User-ID"}
+```
 
 All Emarsys predefined system fields are prefixed with an underscore, e.g. '_firstname' or '_revenue' in order to not
 clash with individual mappings.
 
+### Mapping Country IDs from ISO country codes
+
+A utility method is provided to map to Emarsys internal country IDs from ISO 3166-1 alpha-2 two-letter country codes.  You can pass a symbol or a string, and case is ignored.
+
+```ruby
+>> Emarsys::Country.from_iso('GB')
+=> {:id=>184, :name=>"United Kingdom"}
+
+>> Emarsys::Country.from_iso(:af)
+=> {:id=>1, :name=>"Afghanistan"}
+
+>> Emarsys::Country.from_iso('us')
+=> {:id=>185, :name=>"United States of America"}
+```
 
 ## Interacting with the API
 
@@ -62,100 +82,134 @@ You can interact with the API on the provided data objects:
 
 #### Condition
 
-    # Get all conditions
-    Emarsys::Condition.collection
+```ruby
+# Get all conditions
+Emarsys::Condition.collection
+```
 
 #### Contact
 
-    # 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"})
+```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"})
 
-    # 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"})
+# 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"})
+```
 
 #### ContactList
 
-    # Get all contact_lists
-    Emarsys::ContactList.collection
+```ruby
+# Get all contact_lists
+Emarsys::ContactList.collection
 
-    # Create a contact list
-    Emarsys::ContactList.create
+# Create a contact list
+Emarsys::ContactList.create
+```
 
 #### Emails
 
-    # Get all email campaigns, optional filter
-    Emarsys::Email.collection
-    Emarsys::Email.collection(status: 3)
+```ruby
+# Get all email campaigns, optional filter
+Emarsys::Email.collection
+Emarsys::Email.collection(status: 3)
 
-    # Get a single email resource
-    Emarsys::Email.resource(1)
+# Get a single email resource
+Emarsys::Email.resource(1)
 
-    # Create a new email campaign
-    Emarsys::Email.create({})
+# Create a new email campaign
+Emarsys::Email.create({})
 
-    Emarsys::Email.launch({})
+Emarsys::Email.launch({})
+```
 
 #### Event
 
-    Emarsys::Event.collection
+```ruby
+Emarsys::Event.collection
 
-    # Trigger a custom event
-    Emarsys::Event.trigger(65, 3, ["test@example.com"])
+# Trigger a custom event
+Emarsys::Event.trigger(65, 3, ["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"}})
+# 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"}})
+```
 
 #### Export
 
-    Emarsys::Export.resource(1)
+```ruby
+Emarsys::Export.resource(1)
+```
 
 #### Field
 
-    Emarsys::Field.collection
-    Emarsys::Field.choice(1)
+```ruby
+Emarsys::Field.collection
+Emarsys::Field.choice(1)
+```
 
 #### Folder
 
-    # Get all forms, optional filter parameters
-    Emarsys::Folder.collection
-    Emarsys::Folder.collection(:folder => 3)
+```ruby
+# Get all forms, optional filter parameters
+Emarsys::Folder.collection
+Emarsys::Folder.collection(:folder => 3)
+```
 
 #### Form
 
-    # Get all forms
-    Emarsys::Form.collection
+```ruby
+# Get all forms
+Emarsys::Form.collection
+```
 
 #### Language
 
-    # Get all languages
-    Emarsys::Language.collection
+```ruby
+# Get all languages
+Emarsys::Language.collection
+```
 
 #### Segment
 
-    # Get all segments
-    Emarsys::Segment.collection
+```ruby
+# Get all segments
+Emarsys::Segment.collection
+```
 
 #### Source
 
-    # Get all sources
-    Emarsys::Source.collection
+```ruby
+# Get all sources
+Emarsys::Source.collection
 
-    # Create a new source
-    Emarsys::Source.create("New Source")
-
-    # Destroy a source
-    Emarsys::Source.destroy(123)
+# Create a new source
+Emarsys::Source.create("New Source")
 
+# Destroy a source
+Emarsys::Source.destroy(123)
+```
 
 Please refer to the code for detailed instructions of each method.
 
-## Ruby Versions
 
-This gem was developed and tested with versions 1.9.3 and 2.0.0
+## Changelog
+
+### HEAD (not yet released)
+
+### 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
 
@@ -168,4 +222,4 @@ This gem was developed and tested with versions 1.9.3 and 2.0.0
 
 ## Copyright
 
-Copyright (c) 2013 Daniel Schoppmann. See LICENSE.txt for details.
+Copyright (c) 2013 Daniel Schoppmann. See LICENSE.txt for details.

data/emarsys.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["daniel.schoppmann@absolventa.de"]
   spec.description   = %q{A Ruby library for interacting with the Emarsys API.}
   spec.summary       = %q{Easy to use ruby library for Emarsys Marketing Suite.}
-  spec.homepage      = "http://www.absolventa.de"
+  spec.homepage      = "https://github.com/Absolventa/emarsys-rb"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -22,4 +22,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec", ">= 3.5.0"
+  spec.add_development_dependency "webmock", "< 2.0"
 end

data/lib/emarsys/client.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Emarsys
   class Client
 
@@ -12,12 +13,9 @@ module Emarsys
     end
 
     def x_wsse_string
-      string = 'UsernameToken '
-      string += 'Username = "' + username + '", '
-      string += 'PasswordDigest = "' + header_password_digest + '", '
-      string += 'Nonce = "' + header_nonce + '", '
-      string += 'Created = "' + header_created + '"'
-      string
+      <<-STRING.strip
+      UsernameToken Username="#{username}", PasswordDigest="#{header_password_digest}", Nonce="#{header_nonce}", Created="#{header_created}"
+      STRING
     end
 
     def header_password_digest
@@ -25,11 +23,11 @@ module Emarsys
     end
 
     def header_nonce
-      Digest::MD5.hexdigest(Time.new.to_i.to_s)
+      @header_nonce ||= Random::DEFAULT.bytes(16).each_byte.map { |b| sprintf("%02X",b) }.join
     end
 
     def header_created
-      Time.new.strftime("%Y-%m-%d %H:%M:%S")
+      Time.now.utc.iso8601
     end
 
     def calculated_digest
@@ -37,4 +35,4 @@ module Emarsys
     end
 
   end
-end
+end

data/lib/emarsys/country.rb

@@ -0,0 +1,220 @@
+# frozen_string_literal: true
+module Emarsys
+  module Country
+
+    module_function
+
+    def from_iso(iso)
+      MAPPING[iso.to_s.upcase]
+    end
+
+    MAPPING = {
+        'AF' => {id: 1, name: 'Afghanistan'},
+        'AL' => {id: 2, name: 'Albania'},
+        'DZ' => {id: 3, name: 'Algeria'},
+        'AD' => {id: 4, name: 'Andorra'},
+        'AO' => {id: 5, name: 'Angola'},
+        'AG' => {id: 6, name: 'Antigua and Barbuda'},
+        'AR' => {id: 7, name: 'Argentina'},
+        'AM' => {id: 8, name: 'Armenia'},
+        'AU' => {id: 9, name: 'Australia'},
+        'AT' => {id: 10, name: 'Austria'},
+        'AZ' => {id: 11, name: 'Azerbaijan'},
+        'BS' => {id: 12, name: 'Bahamas'},
+        'BH' => {id: 13, name: 'Bahrain'},
+        'BD' => {id: 14, name: 'Bangladesh'},
+        'BB' => {id: 15, name: 'Barbados'},
+        'BY' => {id: 16, name: 'Belarus'},
+        'BE' => {id: 17, name: 'Belgium'},
+        'BZ' => {id: 18, name: 'Belize'},
+        'BJ' => {id: 19, name: 'Benin'},
+        'BT' => {id: 20, name: 'Bhutan'},
+        'BO' => {id: 21, name: 'Bolivia'},
+        'BA' => {id: 22, name: 'Bosnia and Herzegovina'},
+        'BW' => {id: 23, name: 'Botswana'},
+        'BR' => {id: 24, name: 'Brazil'},
+        'BN' => {id: 25, name: 'Brunei Darussalam'},
+        'BG' => {id: 26, name: 'Bulgaria'},
+        'BF' => {id: 27, name: 'Burkina Faso'},
+        # id 28 is 'Burma' - instead, use Myanmar (120)
+        'BI' => {id: 29, name: 'Burundi'},
+        'KH' => {id: 30, name: 'Cambodia'},
+        'CM' => {id: 31, name: 'Cameroon'},
+        'CA' => {id: 32, name: 'Canada'},
+        'CV' => {id: 33, name: 'Cape Verde'},
+        'CF' => {id: 34, name: 'Central African Republic'},
+        'TD' => {id: 35, name: 'Chad'},
+        'CL' => {id: 36, name: 'Chile'},
+        'CN' => {id: 37, name: 'China'},
+        'CO' => {id: 38, name: 'Colombia'},
+        'KM' => {id: 39, name: 'Comoros'},
+        'CG' => {id: 40, name: 'Congo'},
+        'CD' => {id: 41, name: 'Congo, Democratic Republic of the'},
+        'CR' => {id: 42, name: 'Costa Rica'},
+        'CI' => {id: 43, name: 'Cote d’Ivoire'},
+        'HR' => {id: 44, name: 'Croatia'},
+        'CU' => {id: 45, name: 'Cuba'},
+        'CY' => {id: 46, name: 'Cyprus'},
+        'CZ' => {id: 47, name: 'Czech Republic'},
+        'DK' => {id: 48, name: 'Denmark'},
+        'DJ' => {id: 49, name: 'Djibouti'},
+        'DM' => {id: 50, name: 'Dominica'},
+        'DO' => {id: 51, name: 'Dominican Republic'},
+        'EC' => {id: 52, name: 'Ecuador'},
+        'EG' => {id: 53, name: 'Egypt'},
+        'SV' => {id: 54, name: 'El Salvador'},
+        'GQ' => {id: 55, name: 'Equatorial Guinea'},
+        'ER' => {id: 56, name: 'Eritrea'},
+        'EE' => {id: 57, name: 'Estonia'},
+        'ET' => {id: 58, name: 'Ethiopia'},
+        'FJ' => {id: 59, name: 'Fiji'},
+        'FI' => {id: 60, name: 'Finland'},
+        'FR' => {id: 61, name: 'France'},
+        'GA' => {id: 62, name: 'Gabon'},
+        'GM' => {id: 63, name: 'Gambia, The'},
+        'GE' => {id: 64, name: 'Georgia'},
+        'DE' => {id: 65, name: 'Germany'},
+        'GH' => {id: 66, name: 'Ghana'},
+        'GR' => {id: 67, name: 'Greece'},
+        'GD' => {id: 68, name: 'Grenada'},
+        'GT' => {id: 69, name: 'Guatemala'},
+        'GN' => {id: 70, name: 'Guinea'},
+        'GW' => {id: 71, name: 'Guinea-Bissau'},
+        'GY' => {id: 72, name: 'Guyana'},
+        'HT' => {id: 73, name: 'Haiti'},
+        'HN' => {id: 74, name: 'Honduras'},
+        'HU' => {id: 75, name: 'Hungary'},
+        'IS' => {id: 76, name: 'Iceland'},
+        'IN' => {id: 77, name: 'India'},
+        'ID' => {id: 78, name: 'Indonesia'},
+        'IR' => {id: 79, name: 'Iran'},
+        'IQ' => {id: 80, name: 'Iraq'},
+        'IE' => {id: 81, name: 'Ireland'},
+        'IL' => {id: 82, name: 'Israel'},
+        'IT' => {id: 83, name: 'Italy'},
+        'JM' => {id: 84, name: 'Jamaica'},
+        'JP' => {id: 85, name: 'Japan'},
+        'JO' => {id: 86, name: 'Jordan'},
+        'KZ' => {id: 87, name: 'Kazakhstan'},
+        'KE' => {id: 88, name: 'Kenya'},
+        'KI' => {id: 89, name: 'Kiribati'},
+        'KP' => {id: 90, name: 'Korea, North'},
+        'KR' => {id: 91, name: 'Korea, South'},
+        'KW' => {id: 92, name: 'Kuwait'},
+        'KG' => {id: 93, name: 'Kyrgyzstan'},
+        'LO' => {id: 94, name: 'Laos'},
+        'LV' => {id: 95, name: 'Latvia'},
+        'LB' => {id: 96, name: 'Lebanon'},
+        'LS' => {id: 97, name: 'Lesotho'},
+        'LR' => {id: 98, name: 'Liberia'},
+        'LY' => {id: 99, name: 'Libya'},
+        'LI' => {id: 100, name: 'Liechtenstein'},
+        'LT' => {id: 101, name: 'Lithuania'},
+        'LU' => {id: 102, name: 'Luxembourg'},
+        'MK' => {id: 103, name: 'Macedonia'},
+        'MG' => {id: 104, name: 'Madagascar'},
+        'MW' => {id: 105, name: 'Malawi'},
+        'MY' => {id: 106, name: 'Malaysia'},
+        'MV' => {id: 107, name: 'Maldives'},
+        'ML' => {id: 108, name: 'Mali'},
+        'MT' => {id: 109, name: 'Malta'},
+        'MH' => {id: 110, name: 'Marshall Islands'},
+        'MR' => {id: 111, name: 'Mauritania'},
+        'MU' => {id: 112, name: 'Mauritius'},
+        'MX' => {id: 113, name: 'Mexico'},
+        'MI' => {id: 114, name: 'Micronesia'},
+        'MD' => {id: 115, name: 'Moldova'},
+        'MC' => {id: 116, name: 'Monaco'},
+        'MN' => {id: 117, name: 'Mongolia'},
+        'MA' => {id: 118, name: 'Morocco'},
+        'MZ' => {id: 119, name: 'Mozambique'},
+        'MM' => {id: 120, name: 'Myanmar'},
+        'NA' => {id: 121, name: 'Namibia'},
+        'NR' => {id: 122, name: 'Nauru'},
+        'NP' => {id: 123, name: 'Nepal'},
+        'NL' => {id: 124, name: 'The Netherlands'},
+        'NZ' => {id: 125, name: 'New Zealand'},
+        'NI' => {id: 126, name: 'Nicaragua'},
+        'NE' => {id: 127, name: 'Niger'},
+        'NG' => {id: 128, name: 'Nigeria'},
+        'NO' => {id: 129, name: 'Norway'},
+        'OM' => {id: 130, name: 'Oman'},
+        'PK' => {id: 131, name: 'Pakistan'},
+        'PW' => {id: 132, name: 'Palau'},
+        'PA' => {id: 134, name: 'Panama'},
+        'PG' => {id: 135, name: 'Papua New Guinea'},
+        'PU' => {id: 136, name: 'Paraguay'},
+        'PE' => {id: 137, name: 'Peru'},
+        'PH' => {id: 138, name: 'Philippines'},
+        'PL' => {id: 139, name: 'Poland'},
+        'PT' => {id: 140, name: 'Portugal'},
+        'QA' => {id: 141, name: 'Qatar'},
+        'RO' => {id: 142, name: 'Romania'},
+        'RU' => {id: 143, name: 'Russia'},
+        'RW' => {id: 144, name: 'Rwanda'},
+        'KN' => {id: 145, name: 'St. Kitts and Nevis'},
+        'LC' => {id: 146, name: 'St. Lucia'},
+        'VC' => {id: 147, name: 'St. Vincent and The Grenadines'},
+        'WS' => {id: 148, name: 'Samoa'},
+        'SM' => {id: 149, name: 'San Marino'},
+        'ST' => {id: 150, name: 'São Tomé and Príncipe'},
+        'SA' => {id: 151, name: 'Saudi Arabia'},
+        'SN' => {id: 152, name: 'Senegal'},
+        'RS' => {id: 153, name: 'Serbia'},
+        'SC' => {id: 154, name: 'Seychelles'},
+        'SL' => {id: 155, name: 'Sierra Leone'},
+        'SG' => {id: 156, name: 'Singapore'},
+        'SK' => {id: 157, name: 'Slovakia'},
+        'SI' => {id: 158, name: 'Slovenia'},
+        'SB' => {id: 159, name: 'Solomon Islands'},
+        'SO' => {id: 160, name: 'Somalia'},
+        'ZA' => {id: 161, name: 'South Africa'},
+        'ES' => {id: 162, name: 'Spain'},
+        'LK' => {id: 163, name: 'Sri Lanka'},
+        'SD' => {id: 164, name: 'Sudan'},
+        'SR' => {id: 165, name: 'Suriname'},
+        'SZ' => {id: 166, name: 'Swaziland'},
+        'SE' => {id: 167, name: 'Sweden'},
+        'CH' => {id: 168, name: 'Switzerland'},
+        'SY' => {id: 169, name: 'Syria'},
+        'TW' => {id: 170, name: 'Taiwan'},
+        'TJ' => {id: 171, name: 'Tajikistan'},
+        'TZ' => {id: 172, name: 'Tanzania'},
+        'TH' => {id: 173, name: 'Thailand'},
+        'TG' => {id: 174, name: 'Togo'},
+        'TO' => {id: 175, name: 'Tonga'},
+        'TT' => {id: 176, name: 'Trinidad and Tobago'},
+        'TU' => {id: 177, name: 'Tunisia'},
+        'TR' => {id: 178, name: 'Turkey'},
+        'TM' => {id: 179, name: 'Turkmenistan'},
+        'TV' => {id: 180, name: 'Tuvalu'},
+        'UG' => {id: 181, name: 'Uganda'},
+        'UA' => {id: 182, name: 'Ukraine'},
+        'AE' => {id: 183, name: 'United Arab Emirates'},
+        'GB' => {id: 184, name: 'United Kingdom'},
+        'US' => {id: 185, name: 'United States of America'},
+        'UY' => {id: 186, name: 'Uruguay'},
+        'UZ' => {id: 187, name: 'Uzbekistan'},
+        'VU' => {id: 188, name: 'Vanuatu'},
+        'VA' => {id: 189, name: 'Vatican City'},
+        'VE' => {id: 190, name: 'Venezuela'},
+        'VN' => {id: 191, name: 'Vietnam'},
+        'EH' => {id: 192, name: 'Western Sahara'},
+        'YE' => {id: 193, name: 'Yemen'},
+        # id 194 is 'Yugoslavia', which hasn't existed since 1992
+        'ZR' => {id: 195, name: 'Zaire'},
+        'ZM' => {id: 196, name: 'Zambia'},
+        'ZW' => {id: 197, name: 'Zimbabwe'},
+        'GL' => {id: 198, name: 'Greenland'},
+        'VI' => {id: 199, name: 'Virgin Islands'},
+        'IC' => {id: 201, name: 'Canary Islands'},
+        'ME' => {id: 202, name: 'Montenegro'},
+        'GI' => {id: 203, name: 'Gibraltar'},
+        'AN' => {id: 204, name: 'Netherlands Antilles'},
+        'HK' => {id: 205, name: 'Hong Kong'},
+        'MO' => {id: 206, name: 'Macau'},
+        'TP' => {id: 258, name: 'East Timor'},
+        'KO' => {id: 259, name: 'Kosovo'}
+    }
+  end
+end

data/lib/emarsys/data_object.rb

@@ -1,3 +1,4 @@
+## frozen_string_literal: true
 #require 'hashie'
 
 module Emarsys
@@ -47,9 +48,17 @@ module Emarsys
       # Custom Parameterizer for Emarsys
       #
       # @param params [Hash] custom params hash
-      # @return [String] key => value is returned as key=value
+      # @return [String] {key1 => value1, key2 => value2 is returned as ?key1=value1&key2=value2
       def parameterize_params(params)
-        params.inject(""){|string, (k, v)| string << "#{k}=#{v}"; string << "&"; string}[0..-2]
+        '?' + params.map{|k, v| "#{url_encode(k)}=#{url_encode(v)}"}.join('&')
+      end
+
+
+      private
+
+      # Encode params like Emarsys does
+      def url_encode(param)
+        ERB::Util.url_encode(param)
       end
     end
 
@@ -75,4 +84,4 @@ module Emarsys
     #   end
     # end
   end
-end
+end

data/lib/emarsys/data_objects/condition.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Emarsys
 
   # Methods for the Condition API
@@ -17,4 +18,4 @@ module Emarsys
     end
 
   end
-end
+end

data/lib/emarsys/data_objects/contact.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Emarsys
 
   # Methods for the Contact API
@@ -29,7 +30,7 @@ module Emarsys
       #   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.to_s}", {}
+        get "contact", {"#{transform_key_id(key_id).to_s}" => key_value}
       end
 
       # Update a contact. The given params are transformed to emarsys ids.
@@ -118,4 +119,4 @@ module Emarsys
 
     end
   end
-end
+end

data/lib/emarsys/data_objects/contact_list.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Emarsys
 
   # Methods for the ContactList API
@@ -44,4 +45,4 @@ module Emarsys
 
     end
   end
-end
+end

data/lib/emarsys/data_objects/email.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Emarsys
 
   # Methods for the Email API
@@ -130,4 +131,4 @@ module Emarsys
       end
     end
   end
-end
+end