cb-api 7.8.0 → 8.0.0

data/lib/cb/clients/user.rb

@@ -45,19 +45,12 @@ module Cb
           my_api.append_api_responses result, json_hash
         end
 
-        def delete(external_id, password, test_mode = false)
-          result = false
+        def delete(delete_criteria)
           my_api = Cb::Utils::Api.instance
-          json_hash = my_api.cb_post Cb.configuration.uri_user_delete, :body => build_delete_request(external_id, password, test_mode)
-
-          if json_hash.has_key? 'ResponseUserDelete'
-            if json_hash['ResponseUserDelete'].has_key?('Status') && json_hash['ResponseUserDelete']['Status'].include?('Success')
-              result = true
-            end
-            my_api.append_api_responses result, json_hash['ResponseUserDelete']
-          end
+          uri = Cb::configuration.uri_user_delete
+          response = my_api.cb_post(uri, :body => delete_criteria.to_xml)
 
-          my_api.append_api_responses result, json_hash
+          Cb::Responses::User::Delete.new(response) if response.has_key?('ResponseUserDelete')
         end
 
         private
@@ -95,17 +88,6 @@ module Cb
           eos
         end
 
-        def build_delete_request(external_id, password, test_mode)
-          <<-eos
-            <Request>
-              <DeveloperKey>#{Cb.configuration.dev_key}</DeveloperKey>
-              <ExternalID>#{external_id}</ExternalID>
-              <Test>#{test_mode.to_s}</Test>
-              <Password>#{password}</Password>
-            </Request>
-          eos
-        end
-
         def api_client
           Cb::Utils::Api.instance
         end

data/lib/cb/criteria/user/delete.rb

@@ -0,0 +1,31 @@
+require 'nokogiri'
+
+module Cb
+  module Criteria
+    module User
+
+      class Delete
+        attr_accessor :external_id, :password, :test
+
+        def initialize(args = {})
+          @external_id                  = args[:external_id]   || ''
+          @password                     = args[:password]      || ''
+          @test                         = args[:test]          || 'false'
+        end
+
+        def to_xml
+          Nokogiri::XML::Builder.new do |xml|
+            xml.Request {
+              xml.DeveloperKey Cb.configuration.dev_key
+              xml.Password     password
+              xml.ExternalID   external_id
+              xml.Test         self.test # ruby has a builtin called test, confusion occurs :(
+            }
+          end.to_xml
+        end
+
+      end
+
+    end
+  end
+end

data/lib/cb/responses/user/delete.rb

@@ -19,7 +19,7 @@ module Cb
         end
 
         def hash_containing_metadata
-          response
+          response[root_node]
         end
 
         private

data/lib/cb/version.rb

@@ -1,3 +1,3 @@
 module Cb
-  VERSION = '7.8.0'
+  VERSION = '8.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cb-api
 version: !ruby/object:Gem::Version
-  version: 7.8.0
+  version: 8.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -65,6 +65,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -209,6 +225,7 @@ files:
 - lib/cb/criteria/application/response.rb
 - lib/cb/criteria/application/create.rb
 - lib/cb/criteria/spot/retrieve.rb
+- lib/cb/criteria/user/delete.rb
 - lib/cb/responses/anonymous_saved_search/delete.rb
 - lib/cb/responses/anonymous_saved_search/create.rb
 - lib/cb/responses/application.rb