cb-api 1.0.4 → 1.1.0

data/lib/cb/clients/email_subscription_api.rb

@@ -12,7 +12,7 @@ module Cb
       my_api = Cb::Utils::Api.new()
       json_hash = my_api.cb_get(Cb.configuration.uri_subscription_retrieve, :query => {:ExternalID => did, :Hostsite => host_site})
 
-      if json_hash.has_key?('SubscriptionValues') && json_hash['SubscriptionValues'].present?
+      if json_hash.has_key?('SubscriptionValues') && !json_hash['SubscriptionValues'].nil?
         subscription = CbEmailSubscription.new(json_hash['SubscriptionValues'])
         my_api.append_api_responses(subscription, json_hash['SubscriptionValues'])
       end
@@ -56,7 +56,7 @@ module Cb
       json_hash = my_api.cb_post(Cb.configuration.uri_subscription_modify,
                                   :body => xml_body)
 
-      if json_hash.has_key?('SubscriptionValues') && json_hash['SubscriptionValues'].present?
+      if json_hash.has_key?('SubscriptionValues') && !json_hash['SubscriptionValues'].nil?
         subscription = CbEmailSubscription.new(json_hash['SubscriptionValues'])
         my_api.append_api_responses(subscription, json_hash['SubscriptionValues'])
       end

data/lib/cb/clients/employee_types_api.rb

@@ -23,7 +23,7 @@ module Cb
 			employee_types = []
 			if json_hash.has_key?('ResponseEmployeeTypes')
         if json_hash['ResponseEmployeeTypes'].has_key?('EmployeeTypes') &&
-            json_hash['ResponseEmployeeTypes']['EmployeeTypes'].present?
+            !json_hash['ResponseEmployeeTypes']['EmployeeTypes'].nil?
 
           if json_hash['ResponseEmployeeTypes']['EmployeeTypes']['EmployeeType'].is_a?(Array)
 

data/lib/cb/clients/job_api.rb

@@ -17,7 +17,7 @@ module Cb
         jobs = []
         if json_hash.has_key?('ResponseJobSearch')
           if json_hash['ResponseJobSearch'].has_key?('Results') &&
-             json_hash['ResponseJobSearch']['Results'].present?
+             !json_hash['ResponseJobSearch']['Results'].nil?
 
             json_hash['ResponseJobSearch']['Results']['JobSearchResult'].each do | cur_job |
               jobs << CbJob.new(cur_job)

data/lib/cb/clients/recommendation_api.rb

@@ -17,7 +17,7 @@ module Cb
       jobs = []
       if json_hash.has_key?('ResponseRecommendJob')
         if json_hash['ResponseRecommendJob'].has_key?('RecommendJobResults') &&
-           json_hash['ResponseRecommendJob']['RecommendJobResults'].present?
+           !json_hash['ResponseRecommendJob']['RecommendJobResults'].nil?
 
           json_hash['ResponseRecommendJob']['RecommendJobResults']['RecommendJobResult'].each do |cur_job|
             jobs << CbJob.new(cur_job)
@@ -47,7 +47,7 @@ module Cb
       if json_hash.has_key?('ResponseRecommendUser')
 
         if json_hash['ResponseRecommendUser'].has_key?('RecommendJobResults') &&
-         json_hash['ResponseRecommendUser']['RecommendJobResults'].present?
+          !json_hash['ResponseRecommendUser']['RecommendJobResults'].nil?
 
           json_hash['ResponseRecommendUser']['RecommendJobResults']['RecommendJobResult'].each do |cur_job|
             jobs << CbJob.new(cur_job)

data/lib/cb/clients/saved_search_api.rb

@@ -117,7 +117,7 @@ module Cb
       if json_hash.has_key?('SavedJobSearches') && json_hash['SavedJobSearches'].has_key?('SavedSearches')
         saved_search_hash = json_hash['SavedJobSearches']['SavedSearches']
 
-        if saved_search_hash.present?
+        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)

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

@@ -2,21 +2,21 @@ module Cb
   class CbCategory
   	attr_accessor :code, :name, :language
   	def initialize(args={})
-  	  @code					= args["Code"] || ""
-  	  @name					= args["Name"]["#text"] || ""
-      @language     = args["Name"]["@language"] || ""
+  	  @code					= args["Code"]              || String.new
+  	  @name					= args["Name"]["#text"]     || String.new
+      @language     = args["Name"]["@language"] || String.new
     end
 
     def CategoryName()
-      return @name if @name.present?
+      @name unless @name.nil?
     end
 
     def CategoryCode()
-      return @code if @code.present?
+      @code unless @code.nil?
     end
 
     def CategoryLanguage()
-      return @language if @language.present?
+      @language unless @language.nil?
     end
   end
 end

data/lib/cb/utils/validator.rb

@@ -1,5 +1,4 @@
 require 'json'
-require 'active_support/core_ext/hash'
 
 module Cb
   module ResponseValidator
@@ -17,13 +16,9 @@ module Cb
 
       begin
         json = JSON.parse(response.response.body)
-        if json.keys.any?
-          return json
-        else
-          return self.get_empty_json_hash
-        end
+        json.keys.any? ? json : self.get_empty_json_hash
       rescue JSON::ParserError
-        return self.handle_parser_error(response.response.body)
+        self.handle_parser_error(response.response.body)
       end
     end
 
@@ -35,7 +30,7 @@ module Cb
         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)
+        xml_hash = nori.parse(xml.to_s)
         if xml_hash.has_key?('Response') && xml_hash['Response'].has_key?('Errors')
           return self.get_empty_json_hash
         else
@@ -45,8 +40,12 @@ module Cb
     end
 
     def self.get_empty_json_hash
-      return JSON.parse('{}')
+      Hash.new
+    end
+
+    def self.nori
+      @nori ||= Nori.new
     end
 
   end
-end
+end

data/lib/cb/version.rb

@@ -1,3 +1,3 @@
 module Cb
-  VERSION = '1.0.4'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cb-api
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -19,7 +19,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -85,22 +85,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.0
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.11
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.11
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -242,7 +226,6 @@ files:
 - lib/cb/utils/validator.rb
 - lib/cb/version.rb
 - lib/cb.rb
-- lib/memory.rb
 - README.md
 homepage: http://api.careerbuilder.com
 licenses:
@@ -265,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.28
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper around Careerbuilder Public API.

data/lib/memory.rb

@@ -1,86 +0,0 @@
-module Memory
-  # sizes are guessed, I was too lazy to look
-  # them up and then they are also platform
-  # dependent
-  REF_SIZE = 4 # ?
-  OBJ_OVERHEAD = 4 # ?
-  FIXNUM_SIZE = 4 # ?
-
-  # informational output from analysis
-  MemoryInfo = Struct.new :roots, :objects, :bytes, :loops
-
-  def self.analyze(*roots)
-    an = Analyzer.new
-    an.roots = roots
-    an.analyze
-  end
-
-  class Analyzer
-    attr_accessor :roots
-    attr_reader   :result
-
-    def analyze
-      @result = MemoryInfo.new roots, 0, 0, 0
-      @objs = {}
-
-      queue = roots.dup
-
-      until queue.empty?
-        obj = queue.shift
-
-        case obj
-        # special treatment for some types
-        # some are certainly missing from this
-        when IO
-          visit(obj)
-        when String
-          visit(obj) { @result.bytes += obj.size }
-        when Fixnum
-          @result.bytes += FIXNUM_SIZE
-        when Array
-          visit(obj) do
-            @result.bytes += obj.size * REF_SIZE
-            queue.concat(obj)
-          end
-        when Hash
-          visit(obj) do
-            @result.bytes += obj.size * REF_SIZE * 2
-            obj.each {|k,v| queue.push(k).push(v)}
-          end
-        when Enumerable
-          visit(obj) do
-            obj.each do |o|
-              @result.bytes += REF_SIZE
-              queue.push(o)
-            end
-          end
-        else
-          visit(obj) do
-            obj.instance_variables.each do |var|
-              @result.bytes += REF_SIZE
-              queue.push(obj.instance_variable_get(var))
-            end
-          end
-        end
-      end
-
-      @result
-    end
-
-  private
-    def visit(obj)
-      id = obj.object_id
-
-      if @objs.has_key? id
-        @result.loops += 1
-        false
-      else
-        @objs[id] = true
-        @result.bytes += OBJ_OVERHEAD
-        @result.objects += 1
-        yield obj if block_given?
-        true
-      end
-    end
-  end
-end