cb-api 0.2.9 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTE0YTQ1OTdhMWEzODVkMzRiNGVkY2M2ZTE4N2QyY2VhNWM4ZTY5Mw==
+    MWMzNTY1M2QxOTc2OGViODU2MDhjZGQyNjkwMDRjMWFmNTNhM2IwYg==
   data.tar.gz: !binary |-
-    MTJhM2FiODZmY2EwZjE3MmFhMzljYjkxMjBlNjA3MzNhYzE4MDUyYg==
+    NDk1NDlkZDY2NWQ0MThhNjJkMDU3MzQxZDVjZWUxNDNjZjIzNDlkOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MzRkNDQ4MmZiMGRhNGRkZDY4OWY5ZmUzNzgyZDI0MDczMWMzYzU0Zjg4MmM5
-    YjYxNDA4MWQ2MWVjNjFmMGI3ZGIyMTRhNGU0NjFiZjlkYjE4ZTkwMjJhYTgy
-    Mzg5M2EwODA0ZTg5YjA3MWViOTIxZjcxYmRlYWVlMDJjYTA2YzA=
+    NDJjNGFiZWRkZWFiZmFmNzQ0ZDk0ODhjMjAyZTVjMTIzODg0YjI5NTMyMjA1
+    NTAwYzA2ZWM5YzE1YmRkYWQ4NDU1MTlkYzNiOGM2YjNiZGQ2MzQ3YWFlYWVm
+    ZTEwYmJiY2VjOGY3ZGE4OTc5YzI2NzVlZjg3YzljNjU0NmJlNzA=
   data.tar.gz: !binary |-
-    N2JiNjhiZDI4YzZhN2M2ZDUxOWM1ODZlNThiZTQ1NjNiZDdmMWMxOGRjOGE1
-    ODIwOGYwNTNmN2I0Yzk1ZTE4MzE4ZjMyNTExYjZiNzdkOTUzZjg5MDBiMWEz
-    MGU5YjYwYWVkNjQ5YjhhMmY0NDg0NjcxYTk3NTI5YmEwN2ViMmI=
+    YjYzZGE4MWZmYTJiZDBmNDJlYmUzNjM2NGViZDg1YTg1MDY0NDAzZTRjOGMx
+    MWE4ZDQ4YjJlM2NkZGEwMzYyMTM4ZWNkMzYxMWFmMDlhYmVmNmMwMDNjZmRk
+    MmM1ZjQyNGI5MTljOWUxZjgyMzExZjVkMzA4ZWM2ODFlMTY4OTQ=

data/lib/cb/clients/category_api.rb

@@ -4,32 +4,37 @@ module Cb
   class CategoryApi
   	def self.search
       my_api = Cb::Utils::Api.new()
-      cb_response = my_api.cb_get(Cb.configuration.uri_job_category_search)
-      json_hash = JSON.parse(cb_response.response.body)
+      json_hash = my_api.cb_get(Cb.configuration.uri_job_category_search)
 
       categoryList = []
-      json_hash["ResponseCategories"]["Categories"]["Category"].each do |cat|
-        categoryList << CbCategory.new(cat)
+      if json_hash.has_key?('ResponseCategories') && json_hash['ResponseCategories'].has_key?('Categories')
+        json_hash["ResponseCategories"]["Categories"]["Category"].each do |cat|
+          categoryList << CbCategory.new(cat)
+        end
       end
+
+      my_api.append_api_responses(categoryList, json_hash)
+
       return categoryList
     end
 
     def self.search_by_host_site(host_site)
       my_api = Cb::Utils::Api.new()
-      cb_response = my_api.cb_get(Cb.configuration.uri_job_category_search, :query => {:CountryCode => host_site})
-      json_hash = JSON.parse(cb_response.response.body)
+      json_hash = my_api.cb_get(Cb.configuration.uri_job_category_search, :query => {:CountryCode => host_site})
 
       categoryList = []
-      unless json_hash.empty?
-        if json_hash["ResponseCategories"]["Categories"]["Category"].is_a?(Array)
-          json_hash["ResponseCategories"]["Categories"]["Category"].each do |cat|
+      if json_hash.has_key?('ResponseCategories') && json_hash['ResponseCategories'].has_key?('Categories')
+        if json_hash['ResponseCategories']['Categories']['Category'].is_a?(Array)
+          json_hash['ResponseCategories']['Categories']['Category'].each do |cat|
             categoryList << CbCategory.new(cat)
           end
-        elsif json_hash["ResponseCategories"]["Categories"]["Category"].is_a?(Hash) && json_hash.length < 2
-          categoryList << CbCategory.new(json_hash["ResponseCategories"]["Categories"]["Category"])
+        elsif json_hash['ResponseCategories']['Categories']['Category'].is_a?(Hash) && json_hash.length < 2
+          categoryList << CbCategory.new(json_hash['ResponseCategories']['Categories']['Category'])
         end
       end
 
+      my_api.append_api_responses(categoryList, json_hash)
+
       return categoryList
     end
   end  

data/lib/cb/clients/recommendation_api.rb

@@ -13,6 +13,7 @@ module Cb
       cb_response = my_api.cb_get(Cb.configuration.uri_recommendation_for_job,
                                   :query => {:JobDID => did, :CountLimit => countlimit, :SiteID => site_id,
                                              :CoBrand => co_brand, :HostSite => Cb.configuration.host_site})
+
       json_hash = JSON.parse(cb_response.response.body)
 
       jobs = []

data/lib/cb/clients/saved_search_api.rb

@@ -12,15 +12,16 @@ module Cb
     def self.create *args
       args = args[0] if args.is_a?(Array) && args.count == 1
       my_api = Cb::Utils::Api.new
-      cb_response = my_api.cb_post Cb.configuration.uri_saved_search_create, :body => CbSavedSearch.new(args).create_to_xml
-      json_hash = JSON.parse cb_response.response.body
-      unless json_hash['SavedJobSearch']['SavedSearch'].nil?
-        saved_search = CbSavedSearch.new json_hash['SavedJobSearch']['SavedSearch']
-      else
-        saved_search = CbSavedSearch.new json_hash['SavedJobSearch']
-      end
+      json_hash = my_api.cb_post Cb.configuration.uri_saved_search_create, :body => CbSavedSearch.new(args).create_to_xml
 
-      my_api.append_api_responses saved_search, json_hash['SavedJobSearch']
+      if json_hash.has_key? 'SavedJobSearch'
+        if json_hash['SavedJobSearch'].has_key? 'SavedSearch'
+          saved_search = CbSavedSearch.new json_hash['SavedJobSearch']['SavedSearch']
+        else
+          saved_search = CbSavedSearch.new json_hash['SavedJobSearch']
+        end
+        my_api.append_api_responses saved_search, json_hash['SavedJobSearch']
+      end
 
       return saved_search
     end
@@ -34,10 +35,12 @@ module Cb
     def self.update *args
       args = args[0] if args.is_a?(Array) && args.count == 1
       my_api = Cb::Utils::Api.new
-      cb_response = my_api.cb_post Cb.configuration.uri_saved_search_update, :body => CbSavedSearch.new(args).update_to_xml
-      json_hash = JSON.parse cb_response.response.body
-      saved_search = CbSavedSearch.new json_hash['SavedJobSearch']
-      my_api.append_api_responses saved_search, json_hash['SavedJobSearch']
+      json_hash = my_api.cb_post Cb.configuration.uri_saved_search_update, :body => CbSavedSearch.new(args).update_to_xml
+
+      if json_hash.has_key?('SavedJobSearch')
+        saved_search = CbSavedSearch.new json_hash['SavedJobSearch']
+        my_api.append_api_responses saved_search, json_hash['SavedJobSearch']
+      end
 
       return saved_search
     end
@@ -52,10 +55,12 @@ module Cb
     def self.delete *args
       args = args[0] if args.is_a?(Array) && args.count == 1
       my_api = Cb::Utils::Api.new
-      cb_response = my_api.cb_post Cb.configuration.uri_saved_search_delete, :body=>CbSavedSearch.new(args).delete_to_xml
-      json_hash = JSON.parse cb_response.response.body
-      saved_search = CbSavedSearch.new json_hash
-      my_api.append_api_responses saved_search, json_hash
+      json_hash = my_api.cb_post Cb.configuration.uri_saved_search_delete, :body=>CbSavedSearch.new(args).delete_to_xml
+
+      if json_hash.keys.any?
+        saved_search = CbSavedSearch.new json_hash
+        my_api.append_api_responses saved_search, json_hash
+      end
 
       return saved_search
     end
@@ -76,10 +81,12 @@ module Cb
     #############################################################
     def self.retrieve developer_key, external_user_id, external_id, host_site
       my_api = Cb::Utils::Api.new
-      cb_response = my_api.cb_get Cb.configuration.uri_saved_search_retrieve, :query => {:developerkey=> developer_key, :externaluserid=> external_user_id, :externalid=> external_id, :hostsite=> host_site}
-      json_hash = JSON.parse cb_response.response.body
-      saved_search = CbSavedSearch.new json_hash['SavedJobSearch']['SavedSearch']
-      my_api.append_api_responses saved_search, json_hash['SavedJobSearch']['SavedSearch']
+      json_hash = my_api.cb_get Cb.configuration.uri_saved_search_retrieve, :query => {:developerkey=> developer_key, :externaluserid=> external_user_id, :externalid=> external_id, :hostsite=> host_site}
+
+      if json_hash.has_key?('SavedJobSearch') && json_hash['SavedJobSearch'].has_key?('SavedSearch')
+        saved_search = CbSavedSearch.new json_hash['SavedJobSearch']['SavedSearch']
+        my_api.append_api_responses saved_search, json_hash['SavedJobSearch']['SavedSearch']
+      end
 
       return saved_search
     end
@@ -92,22 +99,24 @@ module Cb
     #############################################################
     def self.list developer_key, external_user_id
       my_api = Cb::Utils::Api.new
-      cb_response = my_api.cb_get Cb.configuration.uri_saved_search_list, :query => {:developerkey=>developer_key, :ExternalUserId=>external_user_id}
-      json_hash = JSON.parse cb_response.response.body
-      saved_search_hash = json_hash['SavedJobSearches']['SavedSearches']
-
-      saved_searches = []
-      unless saved_search_hash.nil?
-        if saved_search_hash['SavedSearch'].is_a?(Array)
-          saved_search_hash['SavedSearch'].each do |saved_search|
-            saved_searches << CbSavedSearch.new(saved_search)
+      json_hash = my_api.cb_get Cb.configuration.uri_saved_search_list, :query => {:developerkey=>developer_key, :ExternalUserId=>external_user_id}
+
+     if json_hash.has_key?('SavedJobSearches') && json_hash['SavedJobSearches'].has_key?('SavedSearches')
+        saved_search_hash = json_hash['SavedJobSearches']['SavedSearches']
+
+        saved_searches = []
+        if saved_search_hash.present?
+          if saved_search_hash['SavedSearch'].is_a?(Array)
+            saved_search_hash['SavedSearch'].each do |saved_search|
+              saved_searches << CbSavedSearch.new(saved_search)
+            end
+          elsif saved_search_hash['SavedSearch'].is_a?(Hash) && json_hash.length < 2
+            saved_searches << CbSavedSearch.new(saved_search_hash['SavedSearch'])
           end
-        elsif saved_search_hash['SavedSearch'].is_a?(Hash) && json_hash.length < 2
-          saved_searches << CbSavedSearch.new(saved_search_hash['SavedSearch'])
         end
-      end
 
-      my_api.append_api_responses saved_searches, json_hash['SavedJobSearches']
+        my_api.append_api_responses saved_searches, json_hash['SavedJobSearches']
+      end
 
       return saved_searches
     end

data/lib/cb/clients/talent_network_api.rb

@@ -8,8 +8,7 @@ module Cb
 		def self.join_form_questions(tndid)
 			## Load the join form questions for a TalentNetworkDID
 			my_api = Cb::Utils::Api.new()
-			cb_response = my_api.cb_get_secure("#{Cb.configuration.uri_tn_join_questions}/#{tndid}/json")
-			json_hash = JSON.parse(cb_response.response.body)
+			json_hash = my_api.cb_get_secure("#{Cb.configuration.uri_tn_join_questions}/#{tndid}/json")
 
 			tn_questions_collection = TalentNetwork.new(json_hash)
 			my_api.append_api_responses(tn_questions_collection, json_hash)
@@ -21,8 +20,7 @@ module Cb
 			## Gets branding information (stylesheets, copytext, etc...) for the join form.
 			my_api = Cb::Utils::Api.new
 
-			cb_response = my_api.cb_get_secure("#{Cb.configuration.uri_tn_join_form_branding}/#{tndid}/json")
-			json_hash = JSON.parse(cb_response.response.body)
+			json_hash = my_api.cb_get_secure("#{Cb.configuration.uri_tn_join_form_branding}/#{tndid}/json")
 
 			tn_join_form_branding = TalentNetwork::JoinFormBranding.new(json_hash['Branding'])
 			my_api.append_api_responses(tn_join_form_branding, json_hash)
@@ -34,8 +32,7 @@ module Cb
 		def self.join_form_geography(tnlanguage="USEnglish")
 			## Gets locations needed to fill the Geography question from the Join Form Question API
 			my_api = Cb::Utils::Api.new
-			cb_response = my_api.cb_get_secure("#{Cb.configuration.uri_tn_join_form_geo}", :query=>{:TNLanguage=>"#{tnlanguage}"})
-			json_hash = JSON.parse(cb_response.response.body)
+			json_hash = my_api.cb_get_secure("#{Cb.configuration.uri_tn_join_form_geo}", :query=>{:TNLanguage=>"#{tnlanguage}"})
 
 			geo_dropdown = TalentNetwork::JoinFormGeo.new(json_hash)
 			my_api.append_api_responses(geo_dropdown, json_hash)
@@ -50,20 +47,17 @@ module Cb
 			cb_response = my_api.cb_post("#{Cb.configuration.uri_tn_member_create}/json", :body => tn_member.to_xml )
 			json_hash = JSON.parse(cb_response.response.body)
 
-			my_api.append_api_responses(tn_member, json_hash)
+      if json_hash['Errors'].first.nil?
+        return json_hash['MemberDID']
+      end
 
-			if cb_response.success? && cb_response['Errors'].size == 0
-				return cb_response["MemberDID"]
-			end
-				
-			return cb_response['Errors'].first
+			return json_hash['Errors'].first
 		end
 
 		def self.tn_job_information(job_did, join_form_intercept="true")
 			my_api = Cb::Utils::Api.new
-			cb_response = my_api.cb_get_secure("#{Cb.configuration.uri_tn_job_info}/#{job_did}/json", :query=> {
+			json_hash = my_api.cb_get_secure("#{Cb.configuration.uri_tn_job_info}/#{job_did}/json", :query=> {
 				 :RequestJoinFormIntercept=>join_form_intercept})
-			json_hash = JSON.parse(cb_response.response.body)
 		
 			tn_job_info = TalentNetwork::JobInfo.new(json_hash['Response'])
 			my_api.append_api_responses(tn_job_info, json_hash)

data/lib/cb/clients/user_api.rb

@@ -12,13 +12,14 @@ module Cb
     def self.retrieve external_id, test_mode = false
       my_api = Cb::Utils::Api.new
 
-      cb_response = my_api.cb_post Cb.configuration.uri_user_retrieve, :body => build_retrieve_request(external_id, test_mode)
+      json_hash = my_api.cb_post Cb.configuration.uri_user_retrieve, :body => build_retrieve_request(external_id, test_mode)
 
-      json_hash = JSON.parse cb_response.response.body
-
-      user = CbUser.new json_hash['ResponseUserInfo']['UserInfo']
-
-      my_api.append_api_responses user, json_hash['ResponseUserInfo']
+      if json_hash.has_key? 'ResponseUserInfo'
+        if json_hash['ResponseUserInfo'].has_key? 'UserInfo'
+          user = CbUser.new json_hash['ResponseUserInfo']['UserInfo']
+        end
+        my_api.append_api_responses user, json_hash['ResponseUserInfo']
+      end
 
       return user
     end
@@ -33,14 +34,14 @@ module Cb
       result = false
 
       my_api = Cb::Utils::Api.new
-      cb_response = my_api.cb_post Cb.configuration.uri_user_change_password, :body => build_change_password_request(external_id, old_password, new_password, test_mode)
-      json_hash = JSON.parse cb_response.response.body
+      json_hash = my_api.cb_post Cb.configuration.uri_user_change_password, :body => build_change_password_request(external_id, old_password, new_password, test_mode)
 
-      my_api.append_api_responses result, json_hash['ResponseUserChangePW']
-
-      if result.cb_response.status.include? 'Success'
-        result = true
+      if json_hash.has_key? 'ResponseUserChangePW'
         my_api.append_api_responses result, json_hash['ResponseUserChangePW']
+        if result.cb_response.status.include? 'Success'
+          result = true
+          my_api.append_api_responses result, json_hash['ResponseUserChangePW']
+        end
       end
 
       result
@@ -56,14 +57,15 @@ module Cb
       result = false
 
       my_api = Cb::Utils::Api.new
-      cb_response = my_api.cb_post Cb.configuration.uri_user_delete, :body => build_delete_request(external_id, password, test_mode)
-      json_hash = JSON.parse cb_response.response.body
-
-      my_api.append_api_responses result, json_hash['ResponseUserDelete']
+      json_hash = my_api.cb_post Cb.configuration.uri_user_delete, :body => build_delete_request(external_id, password, test_mode)
 
-      if result.cb_response.status.include? 'Success'
-        result = true
+      if json_hash.has_key? 'ResponseUserDelete'
         my_api.append_api_responses result, json_hash['ResponseUserDelete']
+
+        if result.cb_response.status.include? 'Success'
+          result = true
+          my_api.append_api_responses result, json_hash['ResponseUserDelete']
+        end
       end
 
       result

data/lib/cb/models/cb_talent_network.rb

@@ -22,10 +22,7 @@ module Cb
       @accept_privacy         = args['AcceptPrivacy'] || true
       @accept_terms           = args['AcceptTerms'] || true
       @resume_word_doc        = args['ResumeWordDoc'] || ''
-      @join_values            = Hash.new
-      if args.has_key?('JoinValues') 
-        @join_values = Hash[args['JoinValues'].each_slice(2).to_a]
-      end
+      @join_values            = args['JoinValues'] || Array.new
     end
 
     def to_xml

data/lib/cb/utils/api.rb

@@ -4,6 +4,7 @@ module Cb
   module Utils
     class Api
       include HTTParty
+
       base_uri 'http://api.careerbuilder.com'
 
       def initialize
@@ -16,17 +17,32 @@ module Cb
 
       def cb_get(*args, &block)
         self.class.base_uri Cb.configuration.base_uri
-        self.class.get(*args, &block)
+        response = self.class.get(*args, &block)
+        #validated_response = ResponseValidator.validate(response)
+        #set_api_error(validated_response)
+
+        #return validated_response
+        return response
       end
 
-      def cb_get_secure(*args, &block)
+      def cb_post(*args, &block)
         self.class.base_uri Cb.configuration.base_uri_secure
-        self.class.get(*args, &block)
+        response = self.class.post(*args, &block)
+        #validated_response = ResponseValidator.validate(response)
+        #set_api_error(validated_response)
+
+        #return validated_response
+        return response
       end
 
-      def cb_post(*args, &block)
+      def cb_get_secure(*args, &block)
         self.class.base_uri Cb.configuration.base_uri_secure
-        self.class.post(*args, &block)
+        response = self.class.get(*args, &block)
+        #validated_response = ResponseValidator.validate(response)
+        #set_api_error(validated_response)
+
+        #return validated_response
+        return response
       end
 
       def append_api_responses(obj, resp)
@@ -51,6 +67,9 @@ module Cb
           end
         end
 
+        obj.class.send(:attr_reader, 'api_error')
+        obj.instance_variable_set(:@api_error, @api_error)
+
         obj.class.send(:attr_reader, 'cb_response')
         obj.instance_variable_set(:@cb_response, meta_class)
       end
@@ -79,6 +98,14 @@ module Cb
         input.gsub(/(?:_|(\/))([a-z\d]*)/) { "#{$2.capitalize}" }.gsub('/', '::')
       end
 
+      def set_api_error(validated_response)
+        if validated_response.keys.any?
+          @api_error = false
+        else
+          @api_error = true
+        end
+      end
+
       def get_meta_name_for(api_key)
         key_map = {
                     'Errors' =>                     'errors',

data/lib/cb/utils/validator.rb

@@ -1,28 +1,46 @@
 require 'json'
+require 'active_support/core_ext/hash'
 
 module Cb
   module ResponseValidator
 
     def self.validate(response)
       if response.blank? || response.response.body.blank?
-        return false
-      end
-
-      if response.code != 200
-        return false
+        return self.get_empty_json_hash
       end
 
       begin
         json = JSON.parse(response.response.body)
-        if json.keys.any? && json[json.keys[0]].empty?
-          return false
+        if json.keys.any?
+          return json
+        else
+          return self.get_empty_json_hash
         end
       rescue JSON::ParserError
-        return false
+        return self.handle_parser_error(response.response.body)
       end
+    end
 
-      return true
+    def self.handle_parser_error(response)
+      # if it's not JSON, try XML
+      xml = Nokogiri::XML.parse(response).elements.to_s
+      if xml.blank?
+        # if i wasn't xml either, give up and return an empty json hash
+        return self.get_empty_json_hash
+      else
+        # if it was, return a hash from the xml UNLESS it was a generic
+        xml_hash = Hash.from_xml(xml.to_s)
+        if xml_hash.has_key?('Response') && xml_hash['Response'].has_key?('Errors')
+          return self.get_empty_json_hash
+        else
+          return xml_hash
+        end
+      end
+    end
 
+    def self.get_empty_json_hash
+      return JSON.parse('{}')
     end
+
   end
 end

data/lib/cb/version.rb

@@ -1,3 +1,3 @@
 module Cb
-  VERSION = '0.2.9'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cb-api
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Jesse Retchko
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty