cb-api 5.6.1 → 6.0.0

data/lib/cb/clients/saved_search.rb

@@ -20,14 +20,15 @@ module Cb
         Responses::SavedSearch::Delete.new(json)
       end
 
-      def retrieve(external_user_id, external_id, host_site)
-        query = retrieve_query(external_user_id, external_id, host_site)
-        json = cb_client.cb_get(Cb.configuration.uri_saved_search_retrieve, :query => query)
-        singular_model_response(json, external_user_id, external_id)
+      def retrieve(oauth_token, external_id)
+        query = retrieve_query(oauth_token)
+        uri = replace_uri_field(Cb.configuration.uri_saved_search_retrieve, ':did', external_id)
+        json = cb_client.cb_get(uri, :query => query)
+        Responses::SavedSearch::Retrieve.new(json)
       end
 
-      def list(external_user_id, host_site)
-        query = list_query(external_user_id, host_site)
+      def list(oauth_token, hostsite)
+        query = list_query(oauth_token, hostsite)
         json = cb_client.cb_get(Cb.configuration.uri_saved_search_list, :query => query)
         Responses::SavedSearch::List.new(json)
       end
@@ -38,20 +39,18 @@ module Cb
         @cb_client ||= Cb::Utils::Api.instance
       end
 
-      def retrieve_query(external_user_id, external_id, host_site)
+      def retrieve_query(oauth_token)
         {
-          :developerkey   => Cb.configuration.dev_key,
-          :externalid     => external_id,
-          :externaluserid => external_user_id,
-          :hostsite       => host_site
+            :developerkey   => Cb.configuration.dev_key,
+            :useroauthtoken => oauth_token
         }
       end
 
-      def list_query(external_user_id, host_site)
+      def list_query(oauth_token, hostsite)
         {
-          :developerkey   => Cb.configuration.dev_key,
-          :externaluserid => external_user_id,
-          :hostsite       => host_site
+            :developerkey   => Cb.configuration.dev_key,
+            :useroauthtoken => oauth_token,
+            :hostsite => hostsite
         }
       end
 
@@ -60,6 +59,10 @@ module Cb
         json_hash['ExternalID'] = external_id unless external_id.nil?
         Responses::SavedSearch::Singular.new(json_hash)
       end
+
+      def replace_uri_field(uri_string, field, replacement)
+        uri_string.gsub(field, replacement)
+      end
     end
 
   end

data/lib/cb/config.rb

@@ -52,11 +52,11 @@ module Cb
       @uri_resume_create                  ||= '/v2/resume/create'
       @uri_resume_update                  ||= '/v2/resume/update'
       @uri_resume_delete                  ||= '/v2/resume/delete'
-      @uri_saved_search_retrieve          ||= '/v1/savedsearch/retrieve'
+      @uri_saved_search_retrieve          ||= '/cbapi/savedsearches/:did'
       @uri_saved_search_create            ||= '/v2/savedsearch/create'
       @uri_saved_search_update            ||= '/v2/savedsearch/update'
       @uri_saved_search_delete            ||= '/v1/savedsearch/delete'
-      @uri_saved_search_list              ||= '/v1/savedsearch/list'
+      @uri_saved_search_list              ||= '/cbapi/savedsearches'
       @uri_anon_saved_search_create       ||= '/v1/anonymoussavedjobsearch/create'
       @uri_anon_saved_search_delete       ||= '/v1/anonymoussavedjobsearch/delete'
       @uri_tn_join_questions              ||= '/talentnetwork/config/join/questions'

data/lib/cb/models/implementations/saved_search.rb

@@ -6,7 +6,7 @@ module Cb
                     :keywords, :order_by, :order_direction, :radius, :pay_high, :pay_low, :posted_within,
                     :pay_info_only, :location, :job_category, :company, :city, :state, :is_daily_email, :external_id,
                     :external_user_id, :job_search_url, :jrdid, :errors, :browser_id, :session_id, :test, :email_address,
-                    :saved_search_parameters, :country, :search_parameters
+                    :country, :search_parameters, :did
 
       def initialize(args={})
         @host_site                  = args['HostSite']         || String.new
@@ -15,11 +15,13 @@ module Cb
         @site_id                    = args['SiteId']           || String.new
         @is_daily_email             = args['IsDailyEmail']     || String.new
         @email_delivery_day         = args['EmailDeliveryDay'] || String.new
+        @job_search_url             = args['JobSearchUrl']     || String.new
         @external_id                = args['ExternalID']       || String.new
         @external_user_id           = args['ExternalUserID']   || String.new
         @browser_id                 = args['BrowserID']        || nil
         @session_id                 = args['SessionID']        || String.new
         @email_address              = args['EmailAddress']     || String.new
+        @did                        = args['DID']              || String.new
         @search_parameters          = SearchParameters.new(args['SavedSearchParameters'] || {})
       end
 
@@ -102,7 +104,8 @@ module Cb
         attr_accessor :boolean_operator, :category, :education_code, :emp_type, :exclude_company_names, :exclude_job_titles,
                       :exclude_keywords, :exclude_national, :industry_codes, :job_title, :keywords, :location, :order_by,
                       :order_direction, :pay_high, :pay_info_only, :pay_low, :posted_within, :radius, :specific_education,
-                      :country
+                      :city, :state, :country, :company, :job_category,
+                      :jc_position_level, :jc_location, :jc_advertiser_flags, :jc_job_nature
 
         def initialize(args = {})
           @boolean_operator      = args['BooleanOperator']     || String.new
@@ -113,7 +116,7 @@ module Cb
           @exclude_company_names = args['ExcludeCompanyNames'] || String.new
           @exclude_job_titles    = args['ExcludeJobTitles']    || String.new
           @exclude_keywords      = args['ExcludeKeywords']     || String.new
-          @country               = args['Country']             || String.new
+          @exclude_national      = args['ExcludeNational'].nil?   ? false : args['ExcludeNational']
           @industry_codes        = args['IndustryCodes']       || String.new
           @job_title             = args['JobTitle']            || String.new
           @keywords              = args['Keywords']            || String.new
@@ -122,11 +125,18 @@ module Cb
           @order_direction       = args['OrderDirection']      || String.new
           @pay_high              = args['PayHigh']             || 0
           @pay_low               = args['PayLow']              || 0
+          @pay_info_only         = args['PayInfoOnly'].nil?       ? false : args['PayInfoOnly']
           @posted_within         = args['PostedWithin']        || 30
           @radius                = args['Radius']              || 30
           @specific_education    = args['SpecificEducation'].nil? ? false : args['SpecificEducation']
-          @exclude_national      = args['ExcludeNational'].nil?   ? false : args['ExcludeNational']
-          @pay_info_only         = args['PayInfoOnly'].nil?       ? false : args['PayInfoOnly']
+          @city                  = args['City']                || String.new
+          @state                 = args['State']               || String.new
+          @country               = args['Country']             || String.new
+          @company               = args['Company']             || String.new
+          @jc_position_level     = args['JCPositionLevel']     || String.new
+          @jc_location           = args['JCLocation']          || String.new
+          @jc_advertiser_flags   = args['JCAdvertiserFlags']   || String.new
+          @jc_job_nature         = args['JCJobNature']         || String.new
         end
 
         def to_xml

data/lib/cb/responses/saved_search/list.rb

@@ -1,14 +1,12 @@
 module Cb
   module Responses
     module SavedSearch
-
       class List < ApiResponse
+       
         protected
 
         def validate_api_hash
-          required_response_field(root_node, response)
-          required_response_field(outer_collection_node, response[root_node])
-          required_response_field(inner_collection_node, response[root_node][outer_collection_node])
+          required_response_field(collection_node, response)
         end
 
         def hash_containing_metadata
@@ -21,20 +19,12 @@ module Cb
 
         private
 
-        def root_node
-          'SavedJobSearches'
-        end
-
-        def outer_collection_node
-          'SavedSearches'
-        end
-
-        def inner_collection_node
-          'SavedSearch'
+        def collection_node
+          'Results'
         end
 
         def model_hashes
-          Utils::ResponseArrayExtractor.extract(response[root_node], outer_collection_node, inner_collection_node)
+          response[collection_node]
         end
       end
 

data/lib/cb/responses/saved_search/retrieve.rb

@@ -0,0 +1,33 @@
+module Cb
+  module Responses
+    module SavedSearch
+
+      class Retrieve < ApiResponse
+        protected
+
+        def validate_api_hash
+          required_response_field(root_node, response)
+        end
+
+        def hash_containing_metadata
+          response
+        end
+
+        def extract_models
+          Models::SavedSearch.new(model_hash)
+        end
+
+        private
+
+        def root_node
+          'Results'
+        end
+
+        def model_hash
+          response[root_node][0]
+        end
+      end
+
+    end
+  end
+end

data/lib/cb/utils/api.rb

@@ -24,6 +24,7 @@ module Cb
                                   :outputjson => Cb.configuration.use_json.to_s
 
         self.class.default_timeout Cb.configuration.time_out
+        self.class.headers.merge! ({'developerkey' => Cb.configuration.dev_key})
         self.class.headers.merge! ({'accept-encoding' => 'deflate, gzip'}) unless Cb.configuration.debug_api
       end
 

data/lib/cb/version.rb

@@ -1,3 +1,3 @@
 module Cb
-  VERSION = '5.6.1'
+  VERSION = '6.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cb-api
 version: !ruby/object:Gem::Version
-  version: 5.6.1
+  version: 6.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -224,6 +224,7 @@ files:
 - lib/cb/responses/saved_search/list.rb
 - lib/cb/responses/saved_search/singular.rb
 - lib/cb/responses/saved_search/delete.rb
+- lib/cb/responses/saved_search/retrieve.rb
 - lib/cb/responses/employee_types/search.rb
 - lib/cb/responses/errors.rb
 - lib/cb/exceptions.rb