cb-api 17.1.0 → 17.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c80664abd59b880495e3a2458b5af977655840f
-  data.tar.gz: 69ea0a53a191e570883c184c26a0a8aa35d15e64
+  metadata.gz: cc361451cedcf53facb26907387a0ac7ec5f8414
+  data.tar.gz: 02ee8f06d35f76f97f31d6ac1610f8fdd1a123c1
 SHA512:
-  metadata.gz: 3e7ba492dfb8e688dd7d5a58e719ef829848a0ced9f73ce29883163f7c654dbfee574c19b30623d10204242f938eed27e197571697c3919fb831f09b978e69d2
-  data.tar.gz: afafa2a22e3a20e363dca177296c2f4e8178d88c27681daa544d4af68aa14c438e87e885e3b9b335f167e085d9eee7883aed01d5a9c747bf773edf46617aa9c4
+  metadata.gz: f38f46f69986d146be3782e52406aac88d4871b07d6d1ce5b5e15d92c30686a2ab974acbec2e17118709ddf18763186fd90b0b430d4bcb7615e702971fce916d
+  data.tar.gz: 2c72fa5e9facb62007da9124dc57ff3069a9b1ea5ac6d55bd52072a6d7ffc84a6d2e15d1d15ce533394c469a2ee919d94bb5d808b5569f2f9110eb10d7007f48

data/CHANGELOG.md

@@ -3,6 +3,7 @@ Version History
     * All Version bumps are required to update this file as well!!
 ----
 
+* 17.2.0 Give back more information about the API caller for timings
 * 17.1.0 Start sending timings to all observers for API calls
 * 17.0.2 making sure we explicitly ask for version 1 of the consumer APIs
 * 17.0.1 adding posted_time and company_did to job results

data/lib/cb/models/api_call_model.rb

@@ -1,6 +1,6 @@
 module Cb
   module Models
-    class ApiCall < Struct.new(:api_call_type, :path, :options, :response, :elapsed_time)
+    class ApiCall < Struct.new(:api_call_type, :path, :options, :api_caller, :response, :elapsed_time)
     end
   end
 end

data/lib/cb/utils/api.rb

@@ -46,10 +46,11 @@ module Cb
 
       def execute_http_request(http_method, uri, path, options={}, &block)
         self.class.base_uri(uri || Cb.configuration.base_uri)
+        api_caller = find_api_caller(caller)
         start_time = Time.now.to_f
-        cb_event(:"cb_#{ http_method }_before", path, options, nil, 0.0, &block)
+        cb_event(:"cb_#{ http_method }_before", path, options, api_caller, nil, 0.0, &block)
         response = self.class.method(http_method).call(path, options)
-        cb_event(:"cb_#{ http_method }_after", path, options, response, Time.now.to_f - start_time, &block)
+        cb_event(:"cb_#{ http_method }_after", path, options, api_caller, response, Time.now.to_f - start_time, &block)
         validate_response(response)
       end
 
@@ -101,18 +102,26 @@ module Cb
 
       private
 
+      def find_api_caller(call_list)
+        filename_regex = /.*\.rb/
+        linenum_regex = /:.*:in `/
+        filename, method_name = call_list.find { |l| l[filename_regex] != __FILE__ }[0..-2].split(linenum_regex)
+        simplified_filename = filename.include?('/lib/') ? filename[/\/lib\/.*/] : filename
+        { file: simplified_filename, method: method_name }
+      end
+
       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, time_elapsed)
-        Cb::Models::ApiCall.new(api_call_type, path, options, response, time_elapsed)
+      def api_call_model(api_call_type, path, options, api_caller, response, time_elapsed)
+        Cb::Models::ApiCall.new(api_call_type, path, options, api_caller, response, time_elapsed)
       end
 
-      def cb_event(api_call_type, path, options, response, time_elapsed, &block)
-        call_model = api_call_model(api_call_type, path, options, response, time_elapsed)
+      def cb_event(api_call_type, path, options, api_caller, response, time_elapsed, &block)
+        call_model = api_call_model(api_call_type, path, options, api_caller, response, time_elapsed)
         block.call(call_model) if block_given?
         changed(true)
         notify_observers(call_model)

data/lib/cb/version.rb

@@ -1,3 +1,3 @@
 module Cb
-  VERSION = '17.1.0'
+  VERSION = '17.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cb-api
 version: !ruby/object:Gem::Version
-  version: 17.1.0
+  version: 17.2.0
 platform: ruby
 authors:
 - The CareerBuilder.com Niche and Consumer Development teams