cb-api 18.1.0 → 18.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd9955d0ae203d1d2aa704d67a0472d092a471a6
-  data.tar.gz: 97019dd5061c292b061aa0351b05fb787fab79bd
+  metadata.gz: 4422245ed4eaaac2561e4f9ec9c18078f992bd34
+  data.tar.gz: d14f587db18a9feeaaed78f1b8b9c4add9caaa49
 SHA512:
-  metadata.gz: 45c01620e0e656308309d478360bdb8311c3fc70bb29b8d87ef723c5d6244a772eedd5d3fac042da60f063d5a90f78778568b1e091c2d1eaa339ab09080619ec
-  data.tar.gz: d5891a94017457bb3933527d54d852749bfdfb36137515d4ba51cdf4d9e99f61d71b769c630de9f514ed5fb9ca9407567462ae695140972f5bc0b7c83d425d4f
+  metadata.gz: d065b64369a899f2212bbd8844e18765dd8a89a82e8e3adb908909a97a733be65ced6310ef3ecb7fd72bf646b58e3b8002ab83a2f4988db354ff7776da1e76f9
+  data.tar.gz: 46dcd4006752094bc49d8e520bdaf646f7e76b0e2b75353d6dfdb2fdeb5e39144340614ef3d2d2fdb6c98216dc601df20830a2910558824517b4c95e5432c8e9

data/CHANGELOG.md

@@ -3,6 +3,7 @@ Version History
     * All Version bumps are required to update this file as well!!
 ----
 
+* 18.2.0 Collect API caller info a level above lib/cb/client.rb and get timings on errors as well.
 * 18.1.0 Adding report a job endpoint
 * 18.0.2 Updating contact info in the gemspec
 * 18.0.1 Adding job search version 3 query parameters

data/lib/cb/utils/api.rb

@@ -57,10 +57,14 @@ 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)
+        response = nil
         start_time = Time.now.to_f
-        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, api_caller, response, Time.now.to_f - start_time, &block)
+        cb_event(:"cb_#{ http_method }_before", path, options, api_caller, response, 0.0, &block)
+        begin
+          response = self.class.method(http_method).call(path, options)
+        ensure
+          cb_event(:"cb_#{ http_method }_after", path, options, api_caller, response, Time.now.to_f - start_time, &block)
+        end
         validate_response(response)
       end
 
@@ -115,11 +119,15 @@ module Cb
       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)
+        filename, method_name = call_list.find { |l| use_this_api_caller?(l[filename_regex]) }[0..-2].split(linenum_regex)
         simplified_filename = filename.include?('/lib/') ? filename[/\/lib\/.*/] : filename
         { file: simplified_filename, method: method_name }
       end
 
+      def use_this_api_caller?(calling_file)
+        (calling_file == __FILE__ || calling_file.include?('/lib/cb/client.rb')) ? false : true
+      end
+
       def validate_response(response)
         validated_response = ResponseValidator.validate(response)
         set_api_error(validated_response)

data/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 = '18.1.0'
+  VERSION = '18.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cb-api
 version: !ruby/object:Gem::Version
-  version: 18.1.0
+  version: 18.2.0
 platform: ruby
 authors:
 - The CareerBuilder.com Niche and Consumer Development teams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty