cb-api 4.3.0 → 5.0.0

data/lib/cb/clients/job.rb

@@ -3,69 +3,32 @@ require 'json'
 module Cb
   module Clients
     class Job
+      class << self
 
-      attr_accessor :cb_client
-
-      def initialize
-        @cb_client ||= Cb.api_client.new
-      end
-
-      def self.search(api_args_hash)
-        my_api = Cb::Utils::Api.new
-        json_hash = my_api.cb_get(Cb.configuration.uri_job_search, :query => api_args_hash)
-
-        jobs = Array.new
-        if !json_hash['ResponseJobSearch'].nil? && !json_hash['ResponseJobSearch']['Results'].nil?
-          job_results = json_hash['ResponseJobSearch']['Results']['JobSearchResult']
-          job_results = [job_results] unless job_results.is_a?(Array)
-          job_results.each { |job_hash| jobs.push(Models::Job.new(job_hash)) }
-          my_api.append_api_responses(jobs, json_hash['ResponseJobSearch'])
-
-          if response_has_search_metadata?(json_hash['ResponseJobSearch'])
-            my_api.append_api_responses(jobs, json_hash['ResponseJobSearch']['SearchMetaData']['SearchLocations']['SearchLocation'])
-          end
+        def search(args)
+          response = api_client.cb_get(Cb.configuration.uri_job_search, query: args)
+          Cb::Responses::Job::Search.new(response)
         end
 
-        my_api.append_api_responses(jobs, json_hash)
-      end
-
-      def self.find_by_criteria(criteria)
-        my_api = Cb::Utils::Api.new
-        params = my_api.class.criteria_to_hash(criteria)
-        json_hash = my_api.cb_get(Cb.configuration.uri_job_find, :query => params)
-
-        if json_hash.has_key?('ResponseJob')
-          if json_hash['ResponseJob'].has_key?('Job')
-            job = Models::Job.new(json_hash['ResponseJob']['Job'])
-          end
-          my_api.append_api_responses(job, json_hash['ResponseJob'])
+        def find_by_criteria(criteria)
+          query = api_client.class.criteria_to_hash(criteria)
+          json_response = api_client.cb_get(Cb.configuration.uri_job_find, query: query)
+          Responses::Job::Singular.new(json_response)
         end
-        my_api.append_api_responses(job, json_hash)
-      end
-
-      def find_by_criteria(criteria)
-        query = cb_client.class.criteria_to_hash(criteria)
-        json_response = cb_client.cb_get(Cb.configuration.uri_job_find, :query => query)
-        singular_model_response(json_response, criteria.did)
-      end
 
-      def self.find_by_did(did)
-        criteria = Cb::Criteria::Job::Details.new
-        criteria.did = did
-        criteria.show_custom_values = true
-        return find_by_criteria(criteria)
-      end
+        def find_by_did(did)
+          criteria = Cb::Criteria::Job::Details.new
+          criteria.did = did
+          criteria.show_custom_values = true
+          find_by_criteria(criteria)
+        end
 
-      private
+        private
 
-      def self.response_has_search_metadata?(response_hash)
-        response_hash['SearchMetaData'] &&
-        response_hash['SearchMetaData']['SearchLocations'] &&
-        response_hash['SearchMetaData']['SearchLocations']['SearchLocation']
-      end
+        def api_client
+          @api ||= Cb::Utils::Api.new
+        end
 
-      def singular_model_response(json_hash, did = nil)
-        Responses::Job::Singular.new(json_hash)
       end
     end
   end

data/lib/cb/convenience.rb

@@ -9,7 +9,7 @@ module Cb
       def job
         Cb::Clients::Job
       end
-  
+
       def job_details_criteria
         Cb::Criteria::Job::Details.new
       end

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

@@ -0,0 +1,27 @@
+module Cb
+  module Models
+    class JobResults
+      attr_reader :args_hash, :jobs, :total_count, :last_item_index, :city, :state_code, :postal_code, :search_location
+      def initialize(args_hash, job_hashes)
+        @args_hash = args_hash
+        @jobs = extract_jobs(job_hashes)
+        @total_count = args_hash['TotalCount']
+        @last_item_index = args_hash['LastItemIndex']
+        @city = args_hash['City']
+        @state_code = args_hash['StateCode']
+        @postal_code = args_hash['PostalCode']
+        @search_location = args_hash['SearchMetaData']['SearchLocations']['SearchLocation'] rescue nil
+      end
+
+      private
+
+      def extract_jobs(job_hashes)
+        job_hashes.collect do |job_hash|
+          Job.new(job_hash)
+        end
+      end
+
+
+    end
+  end
+end

data/lib/cb/responses/job/search.rb

@@ -0,0 +1,39 @@
+module Cb
+  module Responses
+    module Job
+      class Search < ApiResponse
+
+        protected
+
+        def validate_api_hash
+          required_response_field(root_node, response)
+        end
+
+        def hash_containing_metadata
+          response[root_node]
+        end
+
+        def extract_models
+          Models::JobResults.new(response[root_node], job_hashes)
+        end
+
+        private
+
+        def root_node
+          'ResponseJobSearch'
+        end
+
+        def job_hashes
+          hashes = response[root_node]['Results']['JobSearchResult'] rescue []
+
+          if hashes.is_a?(Array)
+            hashes
+          else
+            [hashes]
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/cb/version.rb

@@ -1,3 +1,3 @@
 module Cb
-  VERSION = '4.3.0'
+  VERSION = '5.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cb-api
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 5.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -224,6 +224,7 @@ files:
 - lib/cb/responses/application.rb
 - lib/cb/responses/metadata.rb
 - lib/cb/responses/job/singular.rb
+- lib/cb/responses/job/search.rb
 - lib/cb/responses/spot/retrieve_response.rb
 - lib/cb/responses/api_response.rb
 - lib/cb/responses/user/check_existing.rb
@@ -243,6 +244,7 @@ files:
 - lib/cb/models/implementations/application/response.rb
 - lib/cb/models/implementations/job.rb
 - lib/cb/models/implementations/user.rb
+- lib/cb/models/implementations/job_results.rb
 - lib/cb/models/implementations/education.rb
 - lib/cb/models/implementations/application_external.rb
 - lib/cb/models/implementations/saved_search.rb