cb-api 6.2.3 → 6.3.0

data/lib/cb/clients/saved_search.rb

@@ -4,37 +4,44 @@ module Cb
     class SavedSearch
       def create(saved_search)
         body = saved_search.create_to_xml
-        json = cb_client.cb_post(Cb.configuration.uri_saved_search_create, :body => body)
+        json = cb_client.cb_post(Cb.configuration.uri_saved_search_create, body: body)
         singular_model_response(json, saved_search.external_user_id)
       end
 
       def update(saved_search)
-        body = saved_search.update_to_xml
-        json = cb_client.cb_post(Cb.configuration.uri_saved_search_update, :body => body)
-        singular_model_response(json, saved_search.external_user_id, saved_search.external_id)
+        body = saved_search.update_to_json
+        json = cb_client.cb_put(Cb.configuration.uri_saved_search_update, body: body, headers: headers)
+        Responses::SavedSearch::Update.new(json)
       end
 
       def delete(saved_search)
         body = saved_search.delete_to_xml
-        json = cb_client.cb_post(Cb.configuration.uri_saved_search_delete, :body => body)
+        json = cb_client.cb_post(Cb.configuration.uri_saved_search_delete, body: body)
         Responses::SavedSearch::Delete.new(json)
       end
 
       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)
+        json = cb_client.cb_get(uri, query: query)
         Responses::SavedSearch::Retrieve.new(json)
       end
 
       def list(oauth_token, hostsite)
         query = list_query(oauth_token, hostsite)
-        json = cb_client.cb_get(Cb.configuration.uri_saved_search_list, :query => query)
+        json = cb_client.cb_get(Cb.configuration.uri_saved_search_list, query: query)
         Responses::SavedSearch::List.new(json)
       end
 
       private
 
+      def headers
+        {
+            "developerkey" => Cb.configuration.dev_key,
+            'Content-Type' => "application/json"
+        }
+      end
+
       def cb_client
         @cb_client ||= Cb::Utils::Api.instance
       end

data/lib/cb/config.rb

@@ -55,7 +55,7 @@ module Cb
       @uri_resume_delete                  ||= '/v2/resume/delete'
       @uri_saved_search_retrieve          ||= '/cbapi/savedsearches/:did'
       @uri_saved_search_create            ||= '/v2/savedsearch/create'
-      @uri_saved_search_update            ||= '/v2/savedsearch/update'
+      @uri_saved_search_update            ||= '/cbapi/SavedSearches'
       @uri_saved_search_delete            ||= '/v1/savedsearch/delete'
       @uri_saved_search_list              ||= '/cbapi/savedsearches'
       @uri_anon_saved_search_create       ||= '/v1/anonymoussavedjobsearch/create'

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

@@ -6,22 +6,23 @@ 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,
-                    :country, :search_parameters, :did
+                    :country, :search_parameters, :did, :user_oauth_token, :email_delivery_day
 
       def initialize(args={})
-        @host_site                  = args['HostSite']         || String.new
-        @cobrand                    = args['Cobrand']          || String.new
-        @search_name                = args['SearchName']       || String.new
-        @site_id                    = args['SiteId']           || String.new
-        @is_daily_email             = args['IsDailyEmail']     || false
-        @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
+        @host_site                  = args['HostSite']         || args[:host_site]            || String.new
+        @cobrand                    = args['Cobrand']          || args[:cobrand]              || String.new
+        @search_name                = args['SearchName']       || args[:search_name]          || String.new
+        @site_id                    = args['SiteId']           || args[:site_id]              || String.new
+        @is_daily_email             = args['IsDailyEmail']     || args[:is_daily_email]       || false
+        @email_delivery_day         = args['EmailDeliveryDay'] || args[:email_delivery_day]   || String.new
+        @job_search_url             = args['JobSearchUrl']     || args[:job_search_url]       || String.new
+        @external_id                = args['ExternalID']       || args[:external_id]          || String.new
+        @external_user_id           = args['ExternalUserID']   || args[:external_user_id]     || String.new
+        @browser_id                 = args['BrowserID']        || args[:browser_id]           || nil
+        @session_id                 = args['SessionID']        || args[:session_id]           || String.new
+        @email_address              = args['EmailAddress']     || args[:email_address]        || String.new
+        @did                        = args['DID']              || args[:did]                  || String.new
+        @user_oauth_token           = args['userOAuthToken']   || args[:user_oauth_token]     || String.new
         @search_parameters          = SearchParameters.new(args['SavedSearchParameters'] || {})
       end
 
@@ -56,19 +57,19 @@ module Cb
         eos
       end
 
-      def update_to_xml
-        <<-eos
-          <Request>
-            <HostSite>#{host_site}</HostSite>
-            <Cobrand>#{cobrand}</Cobrand>
-            <SearchName>#{search_name}</SearchName>
-            #{search_parameters.to_xml}
-            <IsDailyEmail>#{is_daily_email.to_s.upcase}</IsDailyEmail>
-            <ExternalID>#{external_id}</ExternalID>
-            <ExternalUserID>#{external_user_id}</ExternalUserID>
-            <DeveloperKey>#{Cb.configuration.dev_key}</DeveloperKey>
-          </Request>
-        eos
+      def update_to_json
+        hash = {
+            "DID" => did,
+            "SearchName" => search_name,
+            "HostSite" => host_site,
+            "SiteID" => site_id,
+            "Cobrand" => cobrand,
+            "IsDailyEmail" => is_daily_email,
+            "userOAuthToken" => user_oauth_token,
+            "SavedSearchParameters" => search_parameters.to_hash
+        }
+        hash["EmailDeliveryDay"] = email_delivery_day unless is_daily_email
+        hash.to_json
       end
 
       def delete_to_xml
@@ -166,6 +167,31 @@ module Cb
             </SearchParameters>
           eos
         end
+
+        def to_hash
+          {
+              "BooleanOperator" => boolean_operator,
+              "JobCategory" => job_category,
+              "EducationCode" => education_code,
+              "EmpType" => emp_type,
+              "ExcludeCompanyNames" => exclude_company_names,
+              "ExcludeJobTitles" => exclude_job_titles,
+              "Country" => country,
+              "IndustryCodes" => industry_codes,
+              "JobTitle" => job_title,
+              "Keywords" => keywords,
+              "Location" => location,
+              "OrderBy" => order_by,
+              "OrderDirection" => order_direction,
+              "PayHigh" => pay_high,
+              "PayLow" => pay_low,
+              "PostedWithin" => posted_within,
+              "Radius" => radius,
+              "SpecificEducation" => specific_education,
+              "ExcludeNational" => exclude_national,
+              "PayInfoOnly" => pay_info_only
+          }
+        end
       end
     end
 

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

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

data/lib/cb/utils/api.rb

@@ -33,9 +33,7 @@ module Cb
         cb_event(:cb_get_before, path, options, nil)
         response = self.class.get(path, options)
         cb_event(:cb_get_after, path, options, response)
-        validated_response = ResponseValidator.validate(response)
-        set_api_error(validated_response)
-        validated_response
+        validate_response(response)
       end
 
       def cb_post(path, options={})
@@ -43,9 +41,7 @@ module Cb
         cb_event(:cb_post_before, path, options, nil)
         response = self.class.post(path, options)
         cb_event(:cb_post_after, path, options, response)
-        validated_response = ResponseValidator.validate(response)
-        set_api_error(validated_response)
-        validated_response
+        validate_response(response)
       end
 
       def cb_put(path, options={})
@@ -53,9 +49,7 @@ module Cb
         cb_event(:cb_put_before, path, options, nil)
         response = self.class.put(path, options)
         cb_event(:cb_put_after, path, options, response)
-        validated_response = ResponseValidator.validate(response)
-        set_api_error(validated_response)
-        validated_response
+        validate_response(response)
       end
 
       def append_api_responses(obj, resp)
@@ -106,6 +100,12 @@ module Cb
 
       private
 
+      def validate_response(response)
+        validated_response = ResponseValidator.validate(response)
+        set_api_error(validated_response)
+        validated_response
+      end
+
       def api_call_model(api_call_type, path, options, response)
         Cb::Models::ApiCall.new(api_call_type, path, options, response)
       end

data/lib/cb/version.rb

@@ -1,3 +1,3 @@
 module Cb
-  VERSION = '6.2.3'
+  VERSION = '6.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cb-api
 version: !ruby/object:Gem::Version
-  version: 6.2.3
+  version: 6.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-21 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -225,6 +225,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/update.rb
 - lib/cb/responses/saved_search/retrieve.rb
 - lib/cb/responses/employee_types/search.rb
 - lib/cb/responses/errors.rb