Update savon to ~> 2.3

Gemfile.lock

@@ -4,15 +4,17 @@ PATH
     sfmc-fuelsdk-ruby (1.3.0)
       json (~> 1.8, >= 1.8.1)
       jwt (~> 1.0, >= 1.0.0)
-      savon (= 2.2.0)
+      savon (~> 2.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    akami (1.2.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    akami (1.3.1)
       gyoku (>= 0.4.0)
       nokogiri
-    builder (3.2.3)
+    builder (3.2.4)
     coderay (1.1.2)
     diff-lcs (1.3)
     ffi (1.9.25)
@@ -28,10 +30,11 @@ GEM
     guard-rspec (2.6.0)
       guard (>= 1.8)
       rspec (~> 2.13)
-    gyoku (1.0.0)
+    gyoku (1.3.1)
       builder (>= 2.1.2)
-    httpi (2.0.2)
+    httpi (2.4.5)
       rack
+      socksify
     json (1.8.6)
     jwt (1.5.6)
     listen (1.3.1)
@@ -41,13 +44,18 @@ GEM
     lumberjack (1.0.13)
     method_source (0.9.0)
     mini_portile2 (2.4.0)
-    nokogiri (1.10.1-x64-mingw32)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    nori (2.1.0)
+    nokogiri (1.10.10-x64-mingw32)
+      mini_portile2 (~> 2.4.0)
+    nokogiri (1.10.10-x86-mingw32)
+      mini_portile2 (~> 2.4.0)
+    nori (2.6.0)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rack (2.0.6)
+    public_suffix (4.0.6)
+    rack (2.2.3)
     rake (0.9.6)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
@@ -62,18 +70,20 @@ GEM
     rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.99.4)
-    savon (2.2.0)
-      akami (~> 1.2.0)
+    savon (2.12.1)
+      akami (~> 1.2)
       builder (>= 2.1.2)
-      gyoku (~> 1.0.0)
-      httpi (~> 2.0.2)
-      nokogiri (>= 1.4.0)
-      nori (~> 2.1.0)
-      wasabi (~> 3.1.0)
+      gyoku (~> 1.2)
+      httpi (~> 2.3)
+      nokogiri (>= 1.8.1)
+      nori (~> 2.4)
+      wasabi (~> 3.4)
+    socksify (1.7.1)
     thor (0.20.0)
-    wasabi (3.1.0)
+    wasabi (3.6.1)
+      addressable
       httpi (~> 2.0)
-      nokogiri (>= 1.4.0)
+      nokogiri (>= 1.4.2)
 
 PLATFORMS
   ruby
@@ -89,4 +99,4 @@ DEPENDENCIES
   sfmc-fuelsdk-ruby!
 
 BUNDLED WITH
-   1.17.1
+   1.17.3

lib/marketingcloudsdk/objects.rb

@@ -303,7 +303,7 @@ def cleanProps
 			# If the ID property is specified for the destination then it must be a list import
 			if properties.has_key?('DestinationObject') then
 				if properties['DestinationObject'].has_key?('ID') then
-					properties[:attributes!] = { 'DestinationObject' => { 'xsi:type' => 'tns:List'}}
+					properties['DesintationObject'][:'@xsi:type'] = 'tns:List'
 				end
 			end
 		end

lib/marketingcloudsdk/soap.rb

@@ -129,8 +129,10 @@ def header
 			else
 				raise 'Require legacy token for soap header' unless internal_token
 				{
-						'oAuth' => {'oAuthToken' => internal_token},
-						:attributes! => { 'oAuth' => { 'xmlns' => 'http://exacttarget.com' }}
+					'oAuth' => {
+						:'@xmlns' => 'http://exacttarget.com',
+						'oAuthToken' => internal_token
+					}
 				}
 			end
 		end
@@ -180,7 +182,7 @@ def soap_perform object_type, action, properties
 			message = {}
 			message['Action'] = action
 			message['Definitions'] = {'Definition' => properties}
-			message['Definitions'][:attributes!] = { 'Definition' => { 'xsi:type' => ('tns:' + object_type) }}
+			message['Definitions'][:'@xsi:type'] = 'tns:' + object_type
 
 			soap_request :perform, message
 		end
@@ -198,7 +200,7 @@ def soap_configure  object_type, action, properties
 			else
 				message['Configurations'] = {'Configuration' => properties}
 			end
-			message['Configurations'][:attributes!] = { 'Configuration' => { 'xsi:type' => ('tns:' + object_type) }}
+			message['Configurations'][:'@xsi:type'] = 'tns:' + object_type
 
 			soap_request :configure, message
 		end
@@ -222,13 +224,12 @@ def soap_get object_type, properties=nil, filter=nil
 
 			if filter and filter.kind_of? Hash
 				message['Filter'] = filter
-				message[:attributes!] = { 'Filter' => { 'xsi:type' => 'tns:SimpleFilterPart' } }
+				message['Filter'][:'@xsi:type'] = 'tns:SimpleFilterPart'
 
 				if filter.has_key?('LogicalOperator')
-					message[:attributes!] = { 'Filter' => { 'xsi:type' => 'tns:ComplexFilterPart' }}
-					message['Filter'][:attributes!] = {
-						'LeftOperand' => { 'xsi:type' => 'tns:SimpleFilterPart' },
-					'RightOperand' => { 'xsi:type' => 'tns:SimpleFilterPart' }}
+					message['Filter'][:'@xsi:type'] = 'tns:ComplexFilterPart'
+					message['Filter']['LeftOperand']['@xsi:type'] = 'tns:SimpleFilterPart'
+					message['Filter']['RightOperand']['@xsi:type'] = 'tns:SimpleFilterPart'
 				end
 			end
 			message = {'RetrieveRequest' => message}
@@ -274,10 +275,13 @@ def soap_cud action, object_type, properties, upsert=nil
 			#   end
 			#
 
-			message = {
-				'Objects' => properties,
-				:attributes! => { 'Objects' => { 'xsi:type' => ('tns:' + object_type) } }
-			}
+			message = {'Objects' => properties}
+
+			if properties.is_a? Array
+				properties.each { |p| p[:'@xsi:type'] = ('tns:' + object_type) }
+			else
+				message['Objects'][:'@xsi:type'] = 'tns:' + object_type
+			end
 
 			if upsert
 				message['Options'] = {"SaveOptions" => {"SaveOption" => {"PropertyName"=> "*", "SaveAction" => "UpdateAdd"}}}

lib/new.rb

@@ -190,8 +190,10 @@ def initialize(getWSDL = true, debug = false, params = nil)
 
           self.determineStack
 
-          @authObj = {'oAuth' => {'oAuthToken' => @internalAuthToken}}
-          @authObj[:attributes!] = { 'oAuth' => { 'xmlns' => 'http://exacttarget.com' }}
+          @authObj = {'oAuth' => {
+            :@xmlns => 'http://exacttarget.com',
+            'oAuthToken' => @internalAuthToken
+          }}
 
           myWSDL = File.read(@path + '/ExactTargetWSDL.xml')
           @auth = Savon.client(
@@ -257,8 +259,10 @@ def refreshToken(force = nil)
             self.determineStack
           end
 
-          @authObj = {'oAuth' => {'oAuthToken' => @internalAuthToken}}
-          @authObj[:attributes!] = { 'oAuth' => { 'xmlns' => 'http://exacttarget.com' }}
+          @authObj = {'oAuth' => {
+            :@xmlns => 'http://exacttarget.com',
+            'oAuthToken' => @internalAuthToken
+          }}
 
           myWSDL = File.read(@path + '/ExactTargetWSDL.xml')
           @auth = Savon.client(
@@ -362,24 +366,20 @@ def initialize(authStub = nil, objType = nil)
   end
 
   class ET_Post < ET_Constructor
-    def initialize(authStub, objType, props = nil)
+    def initialize(authStub, objType, props = {})
       @results = []
 
       begin
         authStub.refreshToken
         if props.is_a? Array then
-          obj = {
-            'Objects' => [],
-            :attributes! => { 'Objects' => { 'xsi:type' => ('tns:' + objType) } }
-          }
+          obj = { 'Objects' => [] }
           props.each{ |p|
+            p[':@xsi:type'] = 'tns:' + objType
             obj['Objects'] << p
           }
         else
-          obj = {
-            'Objects' => props,
-            :attributes! => { 'Objects' => { 'xsi:type' => ('tns:' + objType) } }
-          }
+          obj = { 'Objects' => props }
+          obj['Objects']['@xsi:type'] = 'tns:' + objType
         end
 
         response = authStub.auth.call(:create, :message => obj)
@@ -410,18 +410,14 @@ def initialize(authStub, objType, props = nil)
       begin
         authStub.refreshToken
         if props.is_a? Array then
-          obj = {
-            'Objects' => [],
-            :attributes! => { 'Objects' => { 'xsi:type' => ('tns:' + objType) } }
-          }
+          obj = { 'Objects' => [] }
           props.each{ |p|
+            p[':@xsi:type'] = 'tns:' + objType
             obj['Objects'] << p
           }
         else
-          obj = {
-            'Objects' => props,
-            :attributes! => { 'Objects' => { 'xsi:type' => ('tns:' + objType) } }
-          }
+          obj = { 'Objects' => props }
+          obj['Objects']['@xsi:type'] = 'tns:' + objType
         end
 
         response = authStub.auth.call(:delete, :message => obj)
@@ -447,18 +443,14 @@ def initialize(authStub, objType, props = nil)
       begin
         authStub.refreshToken
         if props.is_a? Array then
-          obj = {
-            'Objects' => [],
-            :attributes! => { 'Objects' => { 'xsi:type' => ('tns:' + objType) } }
-          }
+          obj = { 'Objects' => [] }
           props.each{ |p|
+            p[':@xsi:type'] = 'tns:' + objType
             obj['Objects'] << p
            }
         else
-          obj = {
-            'Objects' => props,
-            :attributes! => { 'Objects' => { 'xsi:type' => ('tns:' + objType) } }
-          }
+          obj = { 'Objects' => props }
+          obj['Objects']['@xsi:type'] = 'tns:' + objType
         end
 
         response = authStub.auth.call(:update, :message => obj)
@@ -537,11 +529,12 @@ def initialize(authStub, objType, props = nil, filter = nil)
       if filter then
         if filter.has_key?('LogicalOperator') then
           obj['Filter'] = filter
-          obj[:attributes!] = { 'Filter' => { 'xsi:type' => 'tns:ComplexFilterPart' }}
-          obj['Filter'][:attributes!] = { 'LeftOperand' => { 'xsi:type' => 'tns:SimpleFilterPart' }, 'RightOperand' => { 'xsi:type' => 'tns:SimpleFilterPart' }}
+          obj['Filter'][:'@xsi:type'] = 'tns:ComplexFilterPart'
+          obj['Filter']['LeftOperand'][:'@xsi:type'] = 'tns:SimpleFilterPart'
+          obj['Filter']['RightOperand'][:'@xsi:type'] = 'tns:SimpleFilterPart'
         else
           obj['Filter'] = filter
-          obj[:attributes!] = { 'Filter' => { 'xsi:type' => 'tns:SimpleFilterPart' } }
+          obj['Filter'][:'@xsi:type'] = 'tns:SimpleFilterPart'
         end
       end
 

marketingcloudsdk.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
 	spec.add_development_dependency "guard",'~> 1.1'
 	spec.add_development_dependency "guard-rspec",'~> 2.0'
 
-	spec.add_dependency "savon", "2.2.0"
+	spec.add_dependency "savon", "~> 2.3"
 	spec.add_dependency "json", "~>1.8",">= 1.8.1" 
 	spec.add_dependency "jwt", "~>1.0",">= 1.0.0"
 end

spec/soap_spec.rb

@@ -41,9 +41,9 @@
       client.internal_token = 'innerspace'
       expect(client.header).to eq(
         {
-          'oAuth' => { 'oAuthToken' => 'innerspace' },
-          :attributes! => {
-            'oAuth' => { 'xmlns' => 'http://exacttarget.com' }
+          'oAuth' => {
+            :@xmlns => 'http://exacttarget.com',
+            'oAuthToken' => 'innerspace'
           }
         }
       )
@@ -76,27 +76,28 @@
       it 'formats soap :create message for single object' do
         expect(subject.soap_post 'Subscriber', 'EmailAddress' => '[email protected]' ).to eq([:create,
           {
-            'Objects' => {'EmailAddress' => '[email protected]'},
-            :attributes! => {'Objects' => {'xsi:type' => ('tns:Subscriber')}}
+            'Objects' => {:'@xsi:type' => 'tns:Subscriber', 'EmailAddress' => '[email protected]'}
           }])
       end
 
       it 'formats soap :create message for multiple objects' do
         expect(subject.soap_post 'Subscriber', [{'EmailAddress' => '[email protected]'}, {'EmailAddress' => '[email protected]'}] ).to eq([:create,
           {
-            'Objects' => [{'EmailAddress' => '[email protected]'}, {'EmailAddress' => '[email protected]'}],
-            :attributes! => {'Objects' => {'xsi:type' => ('tns:Subscriber')}}
+            'Objects' => [
+              {:'@xsi:type' => 'tns:Subscriber', 'EmailAddress' => '[email protected]'},
+              {:'@xsi:type' => 'tns:Subscriber', 'EmailAddress' => '[email protected]'}
+            ],
           }])
       end
 
       it 'formats soap :create message for single object with an attribute' do
         expect(subject.soap_post 'Subscriber', {'EmailAddress' => '[email protected]', 'Attributes'=> [{'Name'=>'First Name', 'Value'=>'first'}]}).to eq([:create,
           {
             'Objects' => {
+              :'@xsi:type' => 'tns:Subscriber',
               'EmailAddress' => '[email protected]',
               'Attributes' => [{'Name' => 'First Name', 'Value' => 'first'}],
-            },
-            :attributes! => {'Objects' => {'xsi:type' => ('tns:Subscriber')}}
+            }
           }])
       end
 
@@ -110,8 +111,8 @@
                 {'Name' => 'First Name', 'Value' => 'first'},
                 {'Name' => 'Last Name', 'Value' => 'subscriber'},
               ],
-            },
-            :attributes! => {'Objects' => {'xsi:type' => ('tns:Subscriber')}}
+              :'@xsi:type' => 'tns:Subscriber'
+            }
           }])
       end
 
@@ -120,19 +121,23 @@
           {'EmailAddress' => '[email protected]', 'Attributes'=> [{'Name'=>'First Name', 'Value'=>'second'}, {'Name'=>'Last Name', 'Value'=>'subscriber'}]}]).to eq([:create,
           {
             'Objects' => [
-              {'EmailAddress' => '[email protected]',
+              {
+                'EmailAddress' => '[email protected]',
                 'Attributes' => [
                   {'Name' => 'First Name', 'Value' => 'first'},
                   {'Name' => 'Last Name', 'Value' => 'subscriber'},
-                ]
+                ],
+                :'@xsi:type' => 'tns:Subscriber'
               },
-              {'EmailAddress' => '[email protected]',
+              {
+                'EmailAddress' => '[email protected]',
                 'Attributes' => [
                   {'Name' => 'First Name', 'Value' => 'second'},
                   {'Name' => 'Last Name', 'Value' => 'subscriber'},
-                ]
-              }],
-            :attributes! => {'Objects' => {'xsi:type' => ('tns:Subscriber')}}
+                ],
+                :'@xsi:type' => 'tns:Subscriber'
+              }
+            ]
           }])
       end
     end