cb-api 1.1.4 → 1.1.5

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

@@ -3,10 +3,10 @@ module Cb
   class CbSavedSearch
     attr_accessor :hostsite, :cobrand, :site_id, :search_name, :boolean_operator, :category, :education_code, :specific_education,
                   :emp_type, :exclude_company_names, :exclude_job_titles, :exclude_national, :industry_codes,
-                  :keywords, :order_by, :order_direction, :radius, :pay_high, :pay_low, :posted_within, 
+                  :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, :dev_key, :job_search_url, :jrdid, :errors, :browser_id, :session_id, :test, :email_address,
-                  :saved_search_parameters
+                  :saved_search_parameters, :country
 
     def initialize(args={})
       @hostsite                   = args['HostSite'] || ''
@@ -47,6 +47,7 @@ module Cb
       @session_id                 = args['SessionID'] || ''
       @test                       = args['Test'].to_s || false
       @email_address              = args['EmailAddress'] || ''
+      @country                    = args['Country'] || ''
       if args.has_key?('SavedSearchParameters')
         unless args['SavedSearchParameters'].empty?
           @saved_search_parameters  = CbSavedSearch.new(args['SavedSearchParameters'])
@@ -57,7 +58,8 @@ module Cb
     class CbSavedSearchParameters
       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
+                    :order_direction, :pay_high, :pay_info_only, :pay_low, :posted_within, :radius, :specific_education,
+                    :country
 
       def initialize(args = {})
           @boolean_operator           = args['BooleanOperator'] || ''
@@ -80,6 +82,7 @@ module Cb
           @posted_within              = args['PostedWithin'] || 30
           @radius                     = args['Radius'] || 30
           @specific_education         = args['SpecificEducation'] || false
+          @country                    = args['Country'] || ''
       end
     end #CbSavedSearchParameters
 
@@ -111,6 +114,7 @@ module Cb
       ret += "<Company>#{@company}</Company>"
       ret += "<City>#{@city}</City>"
       ret += "<State>#{@state}</State>"
+      ret += "<Country>#{@country}</Country>"
       ret += "</SearchParameters>"
       ret += "<IsDailyEmail>#{@is_daily_email.upcase}</IsDailyEmail>"
       ret += "<ExternalUserID>#{@external_user_id}</ExternalUserID>"
@@ -152,6 +156,7 @@ module Cb
       ret += "<Company>#{@company}</Company>"
       ret += "<City>#{@city}</City>"
       ret += "<State>#{@state}</State>"
+      ret += "<Country>#{@country}</Country>"
       ret += "</SearchParameters>"
       ret += "<IsDailyEmail>#{@is_daily_email.upcase}</IsDailyEmail>"
       ret += "<DeveloperKey>#{@dev_key}</DeveloperKey>"
@@ -188,6 +193,7 @@ module Cb
       ret += "<Company>#{@company}</Company>"
       ret += "<City>#{@city}</City>"
       ret += "<State>#{@state}</State>"
+      ret += "<Country>#{@country}</Country>"
       ret += "</SearchParameters>"
       ret += "<IsDailyEmail>#{@is_daily_email}</IsDailyEmail>"
       ret += "<ExternalID>#{@external_id}</ExternalID>"

data/lib/cb/utils/api.rb

@@ -20,8 +20,7 @@ module Cb
         response = self.class.get(*args, &block)
         validated_response = ResponseValidator.validate(response)
         set_api_error(validated_response)
-
-        return validated_response
+        validated_response
       end
 
       def cb_post(*args, &block)
@@ -29,19 +28,14 @@ module Cb
         response = self.class.post(*args, &block)
         validated_response = ResponseValidator.validate(response)
         set_api_error(validated_response)
-
-        return validated_response
+        validated_response
       end
 
       def append_api_responses(obj, resp)
-        if obj.respond_to?('cb_response')
-          meta_class = obj.cb_response
-        else
-          meta_class = Cb::Utils::MetaValues.new()
-        end
+        meta_class = obj.respond_to?('cb_response') ? obj.cb_response : Cb::Utils::MetaValues.new
 
-        resp.each do | api_key, api_value |
-          meta_name = get_meta_name_for api_key
+        resp.each do |api_key, api_value|
+          meta_name = format_hash_key(api_key)
           unless meta_name.empty?
             if meta_name == 'errors' && api_value.is_a?(Hash)
               api_value = api_value.values
@@ -76,7 +70,7 @@ module Cb
             params["#{var_name_hash_safe}"] = criteria.instance_variable_get(var)
           end
         end
-        return params
+        params
       end
 
       def self.is_numeric?(obj)
@@ -84,29 +78,20 @@ module Cb
       end
 
       private
-      #############################################################################
+
       def self.camelize(input)
         input.sub!(/^[a-z\d]*/) { $&.capitalize }
         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
+        @api_error = validated_response.keys.empty?
       end
 
-      def get_meta_name_for(api_key)
-        key_map = {
-          'MinQualityLimit'           =>  'min_quality',
-          'RecommendationsAvailable'  =>  'recs_available',
-          api_key                     =>  api_key.snakecase
-        }
-
-        key_map["#{api_key}"] ||= ''
+      def format_hash_key(api_hash_key)
+        return String.new unless api_hash_key.respond_to?(:snakecase)
+        api_hash_key.snakecase
       end
     end
   end
-end
+end

data/lib/cb/version.rb

@@ -1,3 +1,3 @@
 module Cb
-  VERSION = '1.1.4'
+  VERSION = '1.1.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cb-api
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -19,7 +19,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -248,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper around Careerbuilder Public API.