Merge pull request #300 from ekopranototjoa/rubyv3

Update to Ruby v3.0

Author: JeremyCB

cb-api.gemspec

@@ -1,4 +1,4 @@
-$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+$LOAD_PATH.push File.expand_path('lib', __dir__)
 
 require 'cb/version'
 
@@ -17,17 +17,17 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
 
   s.add_dependency 'httparty', '~> 0.11'
-  s.add_dependency 'json', '~> 1.7', '>= 1.7.7'
+  s.add_dependency 'json', '~> 2.3', '>= 2.3.0'
   s.add_dependency 'nori', '~> 2.2'
   s.add_dependency 'nokogiri', '~> 1.0'
 
   s.add_development_dependency 'rake', '>= 0.8.7'
-  s.add_development_dependency 'webmock', '~> 1.9'
+  s.add_development_dependency 'webmock', '~> 3.14'
   s.add_development_dependency 'simplecov', '>= 0.7.1'
   s.add_development_dependency 'rspec', '~> 3.4'
-  s.add_development_dependency 'rdoc', '~> 3.12.2'
+  s.add_development_dependency 'rdoc', '~> 6.4'
   s.add_development_dependency 'rspec-pride', '~> 3.0'
-  s.add_development_dependency 'pry', '0.9.12.1'
+  s.add_development_dependency 'pry', '0.14.1'
   s.add_development_dependency 'rb-readline', '~> 0.5.0'
   s.add_development_dependency 'codeclimate-test-reporter'
 end

lib/cb/clients/base.rb

@@ -16,11 +16,11 @@ def cb_client(headers: {}, use_default_params: true)
           @cb_client ||= Cb::Utils::Api.instance(headers: headers, use_default_params: use_default_params)
         end
 
-        def headers(args, accept_header: 'application/json')
+        def headers(accept_header: 'application/json', **args)
           {
-             'Accept' => accept_header,
-             'Authorization' => "Bearer #{ args[:oauth_token] }",
-             'Content-Type' => 'application/json'
+            'Accept' => accept_header,
+            'Authorization' => "Bearer #{args[:oauth_token]}",
+            'Content-Type' => 'application/json'
           }
         end
       end

lib/cb/clients/browser_id.rb

@@ -15,7 +15,7 @@ class BrowserID < Base
       class << self
         # https://careerbuilder.readme.io/docs/consumerbrowser-id
         def get(args={})
-          cb_client.cb_get(Cb.configuration.uri_browser_id, headers: headers(args))
+          cb_client.cb_get(Cb.configuration.uri_browser_id, headers: headers(**args))
         end
       end
     end

lib/cb/clients/cover_letters.rb

@@ -16,21 +16,21 @@ class << self
         def get(args={})
           uri = Cb.configuration.uri_cover_letters
           uri += "/#{ args[:id] }" if args[:id]
-          cb_client.cb_get(uri, headers: headers(args))
+          cb_client.cb_get(uri, headers: headers(**args))
         end
 
         def create(args={})
           cb_client.cb_put(Cb.configuration.uri_cover_letters,
                            body: body(args),
-                           headers: headers(args))
+                           headers: headers(**args))
         end
 
         def delete(args={})
-          cb_client.cb_delete(uri_with_id(args), body: body(args), headers: headers(args))
+          cb_client.cb_delete(uri_with_id(args), body: body(args), headers: headers(**args))
         end
 
         def update(args={})
-          cb_client.cb_post(uri_with_id(args), body: body(args), headers: headers(args))
+          cb_client.cb_post(uri_with_id(args), body: body(args), headers: headers(**args))
         end
 
         private

lib/cb/clients/email_subscriptions.rb

@@ -14,7 +14,7 @@ module Clients
     class EmailSubscriptions < Base
       class << self
         def get(args = {})
-          cb_client.cb_get(Cb.configuration.uri_subscription_retrieve, query: query(args), headers: headers(args))
+          cb_client.cb_get(Cb.configuration.uri_subscription_retrieve, query: query(args), headers: headers(**args))
         end
 
         def post(args = {})
@@ -32,7 +32,7 @@ def query(args = {})
         end
 
         def post_headers(args = {})
-          headers(args).merge('Content-Type' => 'application/xml')
+          headers(**args).merge('Content-Type' => 'application/xml')
         end
 
         def body(args = {})

lib/cb/clients/expired_job.rb

@@ -16,7 +16,7 @@ class ExpiredJob < Base
       def self.get(args={})
         uri = Cb.configuration.uri_job_expired
         query_params = { 'JobDID' => args[:job_did] }
-        cb_client.cb_get(uri, headers: headers(args), query: query_params)
+        cb_client.cb_get(uri, headers: headers(**args), query: query_params)
       end
     end
   end

lib/cb/clients/job_insights.rb

@@ -14,7 +14,7 @@ module Clients
     class JobInsights < Base
       def self.get(args={})
         uri = "#{ Cb.configuration.uri_job_insights }/#{ args[:id] }"
-        cb_client.cb_get(uri, headers: headers(args))
+        cb_client.cb_get(uri, headers: headers(**args))
       end
     end
   end

lib/cb/clients/resume_insights.rb

@@ -14,7 +14,7 @@ module Clients
     class ResumeInsights < Base
       def self.keywords(args={})
         uri = "#{ Cb.configuration.uri_keyword_insights }/#{ args[:id] }"
-        cb_client.cb_get(uri, headers: headers(args))
+        cb_client.cb_get(uri, headers: headers(**args))
       end
     end
   end

lib/cb/clients/saved_jobs.rb

@@ -16,21 +16,21 @@ class << self
         def get(args = {})
           uri = Cb.configuration.uri_saved_job
           uri += "/#{ args[:id] }" if args[:id]
-          cb_client.cb_get(uri, headers: headers(args))
+          cb_client.cb_get(uri, headers: headers(**args))
         end
 
         def create(args = {})
           cb_client.cb_put(Cb.configuration.uri_saved_job,
                            body: body(args),
-                           headers: headers(args))
+                           headers: headers(**args))
         end
 
         def delete(args = {})
-          cb_client.cb_delete(uri_with_id(args), body: body(args), headers: headers(args))
+          cb_client.cb_delete(uri_with_id(args), body: body(args), headers: headers(**args))
         end
 
         def update(args = {})
-          cb_client.cb_post(uri_with_id(args), body: body(args), headers: headers(args))
+          cb_client.cb_post(uri_with_id(args), body: body(args), headers: headers(**args))
         end
 
         private

lib/cb/clients/user_profile.rb

@@ -15,7 +15,7 @@ class UserProfile < Base
       class << self
         # https://careerbuilder.readme.io/docs/consumeruser-profile
         def get(args={})
-          cb_client.cb_get(Cb.configuration.uri_user_profile, headers: headers(args))
+          cb_client.cb_get(Cb.configuration.uri_user_profile, headers: headers(**args))
         end
       end
     end

lib/cb/utils/validator.rb

@@ -53,7 +53,9 @@ def process_response_body(response)
       end
 
       def try_parse_json(body)
-        JSON.parse(body)
+        json = JSON.parse(body)
+        json = try_parse_json(json) if json.is_a? String
+        json
       rescue JSON::ParserError
         nil
       end

lib/cb/version.rb

@@ -9,5 +9,5 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and limitations under the License.
 module Cb
-  VERSION = '23.2.1'
+  VERSION = '24.0'
 end

spec/cb/client_spec.rb

@@ -61,7 +61,7 @@ module Cb
 
         it 'should call the api using post' do
           expect(mock_api).to receive(:timed_http_request)
-            .with(:post, base_uri, 'parts unknown', query: nil, headers: nil, body: nil)
+            .with(:post, base_uri, 'parts unknown', { query: nil, headers: nil, body: nil })
             .and_return({})
 
           @client.execute(@request)
@@ -80,7 +80,7 @@ module Cb
 
         it 'should call the api using get' do
           expect(mock_api).to receive(:timed_http_request)
-            .with(:get, base_uri, 'parts unknown', query: nil, headers: nil, body: nil)
+            .with(:get, base_uri, 'parts unknown', { query: nil, headers: nil, body: nil })
             .and_return({})
 
           @client.execute(@request)
@@ -99,7 +99,7 @@ module Cb
 
         it 'should call the api using put' do
           expect(mock_api).to receive(:timed_http_request)
-            .with(:put, base_uri, 'parts unknown', query: nil, headers: nil, body: nil)
+            .with(:put, base_uri, 'parts unknown', { query: nil, headers: nil, body: nil })
             .and_return({})
 
           @client.execute(@request)
@@ -125,7 +125,7 @@ module Cb
 
         it 'should call the api using post' do
           expect(mock_api).to receive(:timed_http_request)
-            .with(:post, base_uri, 'parts unknown', query: nil, headers: nil, body: nil)
+            .with(:post, base_uri, 'parts unknown', { query: nil, headers: nil, body: nil })
             .and_yield('test')
             .and_return({})
 
@@ -145,7 +145,7 @@ module Cb
 
         it 'should call the api using get' do
           expect(mock_api).to receive(:timed_http_request)
-            .with(:get, base_uri, 'parts unknown', query: nil, headers: nil, body: nil)
+            .with(:get, base_uri, 'parts unknown', { query: nil, headers: nil, body: nil })
             .and_yield('test')
             .and_return({})
 
@@ -165,7 +165,7 @@ module Cb
 
         it 'should call the api using put' do
           expect(mock_api).to receive(:timed_http_request)
-            .with(:put, base_uri, 'parts unknown', query: nil, headers: nil, body: nil)
+            .with(:put, base_uri, 'parts unknown', { query: nil, headers: nil, body: nil })
             .and_yield('test')
             .and_return({})
 

spec/cb/clients/base_client_spec.rb

@@ -25,17 +25,17 @@ module Cb
       end
 
       it 'defaults Accept to application/json' do
-        headers = Cb::Clients::Base.headers({})
+        headers = Cb::Clients::Base.headers()
         expect(headers['Accept']).to eq 'application/json'
       end
 
       it 'accepts an optional param to change Accept header' do
-        headers = Cb::Clients::Base.headers({}, accept_header: 'application/json;version=1.1')
+        headers = Cb::Clients::Base.headers(accept_header: 'application/json;version=1.1')
         expect(headers['Accept']).to eq 'application/json;version=1.1'
       end
 
       it 'defaults Content-Type to application/json' do
-        headers = Cb::Clients::Base.headers({})
+        headers = Cb::Clients::Base.headers()
         expect(headers['Content-Type']).to eq 'application/json'
       end
     end

spec/spec_helper.rb

@@ -17,10 +17,12 @@
   add_group 'clients', 'lib/cb/clients'
   add_group 'criteria', 'lib/cb/criteria'
   add_group 'responses', 'lib/cb/responses'
-  formatter SimpleCov::Formatter::MultiFormatter[
-                SimpleCov::Formatter::HTMLFormatter,
-                CodeClimate::TestReporter::Formatter
-            ]
+  formatter SimpleCov::Formatter::MultiFormatter.new(
+    [
+      SimpleCov::Formatter::HTMLFormatter,
+      # CodeClimate::TestReporter::Formatter
+    ]
+  )
 end
 
 require 'rubygems'

spec/support/response_stubs/application.yml

@@ -29,5 +29,5 @@ Results:
   ExternalUserID: XR******************
   redirectURL:
 Errors: []
-Timestamp: 2013-12-05T14:02:51.9490777-05:00
+Timestamp: '2013-12-05T14:02:51.9490777-05:00'
 Status: Success