markety 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 579d0ef7b9f8d678e9e8b1d8933f75bb5766a84a
-  data.tar.gz: 2b5f5c737cd5337783c8c57942c105bfcb75bc3f
+  metadata.gz: a79839fea206fe31310530563f8d22a2db6fa7c1
+  data.tar.gz: 3a293a9a3ae68ef163d92e8992787053c38451d3
 SHA512:
-  metadata.gz: f751d4ffc7fe0d458f6bcecd4b849300fa29ede30c168a156c3cff634c8d84c1aa77307655023cbe9881af1b66eef49e4067d6faf7686ca6eed0aaf065485ec7
-  data.tar.gz: 5aac57074bcb70e5952d60cfe7cc689f36de923de0b7a1358f27af1cfde7d50b655009e59c1aa517997b5f6b08c916df6e9af8cedfb6958c6f8a8585f9a0c78b
+  metadata.gz: 522ed97102cdbd68b4f4c63ff2378dbbd168460fa47d736fb64827279dc2763332ef6a783efbcefbe9f3623b8eaea72ebb693765e1a1263b245d7a1fd3538ba9
+  data.tar.gz: 2a6089896d245175942dca6373a0136ca110d7456a88fdfae57cacbba0e86d262d51c5c1c67036e6ed76508209bd22ee640eb269be89f4cba65cc9350191fa29

data/lib/markety/client.rb

@@ -25,7 +25,7 @@ module Markety
         namespaces({"xmlns:ns1" => "http://www.marketo.com/mktows/"})
         env_namespace "SOAP-ENV"
         pretty_print_xml true
-        log false if options[:log] == false
+        log options.fetch(:log, false)
       end
 
       @auth_header = Markety::AuthenticationHeader.new(access_key, secret_key)

data/lib/markety/command/sync_custom_object.rb

@@ -2,11 +2,28 @@ module Markety
   module Command
     module SyncCustomObject
       def sync_custom_object(custom_object, operation="UPSERT")
+        sync_custom_objects_request(custom_object.object_type_name, operation, custom_object.to_sync_custom_object_hash)
+      end
+
+      def sync_custom_objects(custom_objects, operation="UPSERT")
+        object_type_name = custom_objects.first.object_type_name
+        sync_custom_objects_request(object_type_name, operation, multiple_custom_obj_params(custom_objects))
+      end
+
+      private
+
+      def multiple_custom_obj_params(custom_objects)
+        custom_objects.map{|custom_object| custom_object.to_sync_custom_object_hash}
+      end
+
+      def sync_custom_objects_request(object_type_name, operation, custom_obj_list)
         send_request(:sync_custom_objects,
           {
-            "objTypeName" => custom_object.object_type_name,
+            "objTypeName" => object_type_name,
             "operation" => operation,
-            "customObjList" => custom_object.to_sync_custom_object_hash
+            "customObjList" => {
+              "customObj" => custom_obj_list
+            }
           }
         )
       end

data/lib/markety/custom_object.rb

@@ -15,11 +15,8 @@ module Markety
 
     def to_sync_custom_object_hash
       {
-        "customObj" =>
-        {
-          "customObjKeyList" => key_list,
-          "customObjAttributeList" => attribute_list
-        }
+        "customObjKeyList" => key_list,
+        "customObjAttributeList" => attribute_list
       }
     end
 

data/lib/markety/response/sync_custom_object_response.rb

@@ -9,19 +9,16 @@ module Markety
       end
 
       def success?
-        @success && !failed?
+        @success
       end
 
-      def status
-        @status ||= custom_obj_hash[:status]
-      end
-
-      def error_message
-        @error_message ||= custom_obj_hash[:error]
-      end
-
-      def updated_custom_object
-        CustomObject.from_marketo_hash(object_type_name, custom_obj_hash) if success?
+      def custom_objects
+        return [] unless success?
+        @custom_objects ||= begin
+          custom_obj_hash.map do |single_custom_obj_hash|
+            CustomObject.from_marketo_hash(object_type_name, single_custom_obj_hash)
+          end
+        end
       end
 
       private
@@ -31,11 +28,11 @@ module Markety
       end
 
       def object_type_name
-        @object_type_name ||= custom_obj_hash[:obj_type_name]
+        @object_type_name ||= custom_obj_hash.first.fetch(:obj_type_name)
       end
 
       def custom_obj_hash
-        to_hash[:success_sync_custom_objects][:result][:sync_custom_obj_status_list][:sync_custom_obj_status]
+        [to_hash[:success_sync_custom_objects][:result][:sync_custom_obj_status_list][:sync_custom_obj_status]].flatten
       end
 
     end

data/lib/markety/version.rb

@@ -1,3 +1,3 @@
 module Markety
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

data/spec/fixtures/custom_objects/sync_custom_objects/multiple_syncs.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://www.marketo.com/mktows/">
+  <SOAP-ENV:Body>
+    <ns1:successSyncCustomObjects>
+      <result>
+        <syncCustomObjStatusList>
+          <syncCustomObjStatus>
+            <objTypeName>Roadshow</objTypeName>
+            <customObjKeyList>
+              <attribute>
+                <attrName>MKTOID</attrName>
+                <attrType xsi:nil="true" />
+                <attrValue>1090177</attrValue>
+              </attribute>
+              <attribute>
+                <attrName>rid</attrName>
+                <attrType xsi:nil="true" />
+                <attrValue>rid1</attrValue>
+              </attribute>
+            </customObjKeyList>
+            <status>UPDATED</status>
+            <error xsi:nil="true" />
+          </syncCustomObjStatus>
+          <syncCustomObjStatus>
+            <objTypeName>Roadshow</objTypeName>
+            <customObjKeyList>
+              <attribute>
+                <attrName>MKTOID</attrName>
+                <attrType xsi:nil="true" />
+                <attrValue>1090178</attrValue>
+              </attribute>
+              <attribute>
+                <attrName>rid</attrName>
+                <attrType xsi:nil="true" />
+                <attrValue>rid2</attrValue>
+              </attribute>
+            </customObjKeyList>
+            <status>UPDATED</status>
+            <error xsi:nil="true" />
+          </syncCustomObjStatus>
+        </syncCustomObjStatusList>
+      </result>
+    </ns1:successSyncCustomObjects>
+  </SOAP-ENV:Body>
+</SOAP-ENV:Envelope>

data/spec/markety/command/sync_custom_object_spec.rb

@@ -12,7 +12,7 @@ module Markety
             custom_object = double(CustomObject, object_type_name: "type", to_sync_custom_object_hash: {"custom_object" => "hash"})
             client.extend(SyncCustomObject)
             client.sync_custom_object(custom_object)
-            expect(client).to have_received(:send_request).with(:sync_custom_objects, {"objTypeName" => "type", "operation" => "UPSERT", "customObjList" => {"custom_object" => "hash"}})
+            expect(client).to have_received(:send_request).with(:sync_custom_objects, {"objTypeName" => "type", "operation" => "UPSERT", "customObjList" => {"customObj" => {"custom_object" => "hash"}}})
           end
         end
         context "without an operation" do
@@ -20,7 +20,29 @@ module Markety
             custom_object = double(CustomObject, object_type_name: "type", to_sync_custom_object_hash: {"custom_object" => "hash"})
             client.extend(SyncCustomObject)
             client.sync_custom_object(custom_object, "INSERT")
-            expect(client).to have_received(:send_request).with(:sync_custom_objects, {"objTypeName" => "type", "operation" => "INSERT", "customObjList" => {"custom_object" => "hash"}})
+            expect(client).to have_received(:send_request).with(:sync_custom_objects, {"objTypeName" => "type", "operation" => "INSERT", "customObjList" => {"customObj" => {"custom_object" => "hash"}}})
+          end
+        end
+      end
+
+      describe '#sync_custom_objects' do
+        context "without an operation" do
+          it "calls send_request on the client with the correct params and defaults to UPSERT" do
+            custom_object1 = double(CustomObject, object_type_name: "type", to_sync_custom_object_hash: {"custom_object" => "hash"})
+            custom_object2 = double(CustomObject, object_type_name: "type", to_sync_custom_object_hash: {"custom_object" => "hash2"})
+            client.extend(SyncCustomObject)
+            client.sync_custom_objects([custom_object1, custom_object2])
+            expect(client).to have_received(:send_request).with(:sync_custom_objects, {"objTypeName" => "type", "operation" => "UPSERT", "customObjList" => {"customObj" => [{"custom_object" => "hash"}, {"custom_object" => "hash2"}]}})
+          end
+        end
+
+        context "with an operation" do
+          it "calls send_request on the client with the operation" do
+            custom_object1 = double(CustomObject, object_type_name: "type", to_sync_custom_object_hash: {"custom_object" => "hash"})
+            custom_object2 = double(CustomObject, object_type_name: "type", to_sync_custom_object_hash: {"custom_object" => "hash2"})
+            client.extend(SyncCustomObject)
+            client.sync_custom_objects([custom_object1, custom_object2], "INSERT")
+            expect(client).to have_received(:send_request).with(:sync_custom_objects, {"objTypeName" => "type", "operation" => "INSERT", "customObjList" => {"customObj" => [{"custom_object" => "hash"}, {"custom_object" => "hash2"}]}})
           end
         end
       end

data/spec/markety/custom_object_spec.rb

@@ -39,19 +39,17 @@ module Markety
           attributes: {"name" => "Some Roadshow", "anotherAttribute" => "Bananas"})
 
         expect(custom_object.to_sync_custom_object_hash).to eq({
-          "customObj" => {
-            "customObjKeyList" => {
-              "attribute" => [
-                {"attrName" => "MKTOID", "attrValue" => 123},
-                {"attrName" => "rid", "attrValue" => 345}
-              ]
-            },
-            "customObjAttributeList" => {
-              "attribute" => [
-                {"attrName" => "name", "attrValue" => "Some Roadshow"},
-                {"attrName" => "anotherAttribute", "attrValue" => "Bananas"},
-              ]
-            }
+          "customObjKeyList" => {
+            "attribute" => [
+              {"attrName" => "MKTOID", "attrValue" => 123},
+              {"attrName" => "rid", "attrValue" => 345}
+            ]
+          },
+          "customObjAttributeList" => {
+            "attribute" => [
+              {"attrName" => "name", "attrValue" => "Some Roadshow"},
+              {"attrName" => "anotherAttribute", "attrValue" => "Bananas"},
+            ]
           }
         })
       end

data/spec/markety/response/sync_custom_object_response_spec.rb

@@ -4,65 +4,53 @@ module Markety
   module Response
     describe SyncCustomObjectResponse do
       let (:successful_response) {SavonHelper.create_response(File.read(File.expand_path("../../../fixtures/custom_objects/sync_custom_objects/successful_sync.xml", __FILE__)))}
-      let (:failed_response) {SavonHelper.create_response(File.read(File.expand_path("../../../fixtures/custom_objects/sync_custom_objects/unknown_attribute.xml", __FILE__)))}
+      let (:successful_multiple_sync_response) {SavonHelper.create_response(File.read(File.expand_path("../../../fixtures/custom_objects/sync_custom_objects/multiple_syncs.xml", __FILE__)))}
+      let (:failed_response) {SavonHelper.create_response(File.read(File.expand_path("../../../fixtures/custom_objects/sync_custom_objects/invalid_object_name.xml", __FILE__)))}
 
       describe "#success?" do
-        context "with a successful response" do
+        context "with a successful response with a single sync" do
           it "returns true" do
             response = SyncCustomObjectResponse.new(successful_response)
             expect(response.success?).to eq true
           end
         end
-        context "with a failed response" do
-          it "returns false" do
-            response = SyncCustomObjectResponse.new(failed_response)
-            expect(response.success?).to eq false
-          end
-        end
-      end
-
-      describe "#error_message" do
-        context "with a successful response" do
-          it "returns nil" do
-            response = SyncCustomObjectResponse.new(successful_response)
-            expect(response.error_message).to be_nil
+        context "with a successful response with multiple syncs" do
+          it "returns true" do
+            response = SyncCustomObjectResponse.new(successful_multiple_sync_response)
+            expect(response.success?).to eq true
           end
         end
         context "with a failed response" do
-          it "returns the error" do
+          it "returns false" do
             response = SyncCustomObjectResponse.new(failed_response)
-            expect(response.error_message).to eq "Unknown name attribute list: nameasdf"
+            expect(response.success?).to eq false
           end
         end
       end
 
-      describe "#status" do
-        context "with a successful response" do
-          it "returns nil" do
+      describe "#custom_objects" do
+        context "with a successful response with a single sync" do
+          it "returns the custom object" do
             response = SyncCustomObjectResponse.new(successful_response)
-            expect(response.status).to eq "UPDATED"
-          end
-        end
-        context "with a failed response" do
-          it "returns the status failed" do
-            response = SyncCustomObjectResponse.new(failed_response)
-            expect(response.status).to eq "FAILED"
+            custom_objects = response.custom_objects
+            expect(custom_objects.size).to eq 1
+            expect(custom_objects.first.object_type_name).to eq "Roadshow"
+            expect(custom_objects.first.keys).to eq({"MKTOID" => "1090177", "rid" => "rid1"})
           end
         end
-      end
-
-      describe "#updated_custom_object" do
-        context "with a successful response" do
-          it "returns the custom object" do
-            response = SyncCustomObjectResponse.new(successful_response)
-            expect(response.updated_custom_object.object_type_name).to eq "Roadshow"
-            expect(response.updated_custom_object.keys).to eq({"MKTOID" => "1090177", "rid" => "rid1"})
+        context "with a successful response with multiple syncs" do
+          it "returns multiple custom objects" do
+            response = SyncCustomObjectResponse.new(successful_multiple_sync_response)
+            custom_objects = response.custom_objects
+            expect(custom_objects.size).to eq 2
+            expect(custom_objects[1].object_type_name).to eq "Roadshow"
+            expect(custom_objects[1].keys).to eq({"MKTOID" => "1090178", "rid" => "rid2"})
           end
         end
         context "with a failed response" do
           it "returns nil" do
             response = SyncCustomObjectResponse.new(failed_response)
-            expect(response.updated_custom_object).to be_nil
+            expect(response.custom_objects).to eq []
           end
         end
       end

metadata

@@ -1,117 +1,117 @@
 --- !ruby/object:Gem::Specification
 name: markety
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - David Santoso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.3'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.3'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: rspec-nc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
   name: wasabi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 description: A client to allow easy integration with Marketo's SOAP API
@@ -121,10 +121,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .coveralls.yml
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENCE
@@ -167,6 +167,7 @@ files:
 - spec/fixtures/custom_objects/get_custom_objects/no_custom_objects_found.xml
 - spec/fixtures/custom_objects/get_custom_objects/one_custom_object_found.xml
 - spec/fixtures/custom_objects/sync_custom_objects/invalid_object_name.xml
+- spec/fixtures/custom_objects/sync_custom_objects/multiple_syncs.xml
 - spec/fixtures/custom_objects/sync_custom_objects/successful_sync.xml
 - spec/fixtures/custom_objects/sync_custom_objects/unknown_attribute.xml
 - spec/markety/authentication_header_spec.rb
@@ -193,17 +194,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Marketo SOAP API integration
@@ -212,6 +213,7 @@ test_files:
 - spec/fixtures/custom_objects/get_custom_objects/no_custom_objects_found.xml
 - spec/fixtures/custom_objects/get_custom_objects/one_custom_object_found.xml
 - spec/fixtures/custom_objects/sync_custom_objects/invalid_object_name.xml
+- spec/fixtures/custom_objects/sync_custom_objects/multiple_syncs.xml
 - spec/fixtures/custom_objects/sync_custom_objects/successful_sync.xml
 - spec/fixtures/custom_objects/sync_custom_objects/unknown_attribute.xml
 - spec/markety/authentication_header_spec.rb
@@ -228,3 +230,4 @@ test_files:
 - spec/markety/response/sync_lead_response_spec.rb
 - spec/spec_helper.rb
 - spec/support/savon_helper.rb
+has_rdoc: