booker_ruby 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acebcfc164a02fa0ce5264a09a6bfbbfe1aa608d
-  data.tar.gz: 2492aa2d227abe18e05f7eddfaab206158e18467
+  metadata.gz: b87fef997d139ba93a730c4d6cb2d8958316d233
+  data.tar.gz: 5f2457eeb14aca8ed0d260690aaa0331b56db506
 SHA512:
-  metadata.gz: 2493497b9b1db8063ac0234defbe6942b4768253bf3124148f65b68c56cdd83c1fee8c85485c69e3a410acc55ce39da658e1ecc056cd8630994c76d9eed4a661
-  data.tar.gz: c4f15663ca74d3139789952564b2d2d4fc2b7b9305e919000c60ee1d1d2e8c450acc3fc079757b6af2ea5979610623661a7255b61ea3488db4183c2d1b4b187a
+  metadata.gz: 7bc6460b6adc7f22525dc39915127c8d044ebb99859f42284bc0f51cce5524ca5b83c2a6da25c9eced8a47a1e2e2678047969da0d0dd0fa6bc9267b2506e5710
+  data.tar.gz: 9604fc0de4482c71c5bcd6fd9353dd4eba1cf48cff6c68e4ef177abcaa0c8bb4ec35f3ec9ab0a6af33cd552f23e75d3189e7c367fe540aa58d8f85c0495db219

data/lib/booker/client.rb

@@ -82,7 +82,7 @@ module Booker
 
       # Allow it to retry the first time unless it is an authorization error
       begin
-        booker_resources = handle_errors!(http_options, HTTParty.send(http_method, url, http_options))
+        booker_resources = handle_errors!(url, http_options, HTTParty.send(http_method, url, http_options))
       rescue Booker::Error, Net::ReadTimeout => ex
         if ex.is_a? Booker::InvalidApiCredentials
           raise ex
@@ -93,9 +93,9 @@ module Booker
       end
 
       return results_from_response(booker_resources, booker_model) if booker_resources.present?
-      booker_resources = handle_errors!(http_options, HTTParty.send(http_method, url, http_options))
+      booker_resources = handle_errors!(url, http_options, HTTParty.send(http_method, url, http_options))
       return results_from_response(booker_resources, booker_model) if booker_resources.present?
-      raise Booker::Error.new(http_options, booker_resources)
+      raise Booker::Error.new(url: url, request: http_options, response: booker_resources)
     end
 
     def full_url(path)
@@ -103,14 +103,14 @@ module Booker
       uri.scheme ? path : "#{self.base_url}#{path}"
     end
 
-    def handle_errors!(request, response)
+    def handle_errors!(url, request, response)
       puts "BOOKER RESPONSE: #{response}" if ENV['BOOKER_API_DEBUG'] == 'true'
 
-      ex = Booker::Error.new(request, response)
+      ex = Booker::Error.new(url: url, request: request, response: response)
       if ex.error.present? || !response.success?
         case ex.error
           when 'invalid_client'
-            raise Booker::InvalidApiCredentials.new(request, response)
+            raise Booker::InvalidApiCredentials.new(url: url, request: request, response: response)
           when 'invalid access token'
             get_access_token
             return nil
@@ -157,7 +157,7 @@ module Booker
       if (response = ex.response).present?
         raise ex
       else
-        raise Booker::InvalidApiCredentials.new(ex.request, response)
+        raise Booker::InvalidApiCredentials.new(url: ex.url, request: ex.request, response: response)
       end
     end
 

data/lib/booker/errors.rb

@@ -1,8 +1,8 @@
 module Booker
   class Error < StandardError
-    attr_accessor :error, :description, :request, :response
+    attr_accessor :error, :description, :url, :request, :response
 
-    def initialize(request = nil, response = nil)
+    def initialize(url: nil, request: nil, response: nil)
       if request.present?
         self.request = request
       end
@@ -12,6 +12,8 @@ module Booker
         self.error = response['error'] || response['ErrorMessage']
         self.description = response['error_description']
       end
+
+      self.url = url
     end
   end
 

data/lib/booker/version.rb

@@ -1,3 +1,3 @@
 module Booker
-  VERSION = '1.8.1'
+  VERSION = '1.8.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: booker_ruby
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Frederick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-24 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty