booker_ruby 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c32d18a501108616082cfd6f1c4d9a9bb77c4acf
-  data.tar.gz: 1b518f4e5395d7a9221d34e36cb23c2cdcf42db5
+  metadata.gz: 088c7a05c2013cac483d93837359785744c458ce
+  data.tar.gz: 48ff6f27165a65c8690b3c20111a01283a4732ba
 SHA512:
-  metadata.gz: 5c8fe78924f6479548746e2b428b97beed68012a8f4baebd628c382dc1738d31a1294cfc63ad46a881967ca8487cdf52e38aa8b0e48ce4ff1fa8a356e8b11860
-  data.tar.gz: c3882ef8de57340214414ccdc1dd19605ea73c94ec1ba6e666fde98f4f910f1b1e9115e50c00a2bede580d692ff26c0ab6c9b6cfd66217e4d5ced3adbbf9c9be
+  metadata.gz: 3318fe007b44a8ff692226cb431e927622f5f47f87fbf9ff7378ad739158aa1140b658b5dd0328c1b287360fba47d3cfd94760c209f3f31be5f25e5ad53eb64a
+  data.tar.gz: 3b69c38ea9c2392dae8974d6be4658c536ff6f290a38da1f4adbc1ec963dbee7027b2d4739eed64b88cf7e0c6e5d93f04a31183a29b67e9d0cc0e6be6abbf788

data/lib/booker/client.rb

@@ -67,11 +67,12 @@ module Booker
 
     def get_booker_resources(http_method, path, params=nil, body=nil, booker_model=nil)
       http_options = request_options(params, body)
-      puts "BOOKER REQUEST: #{http_method} #{path} #{http_options}" if ENV['BOOKER_API_DEBUG'] == 'true'
+      url = full_url(path)
+      puts "BOOKER REQUEST: #{http_method} #{url} #{http_options}" if ENV['BOOKER_API_DEBUG'] == 'true'
 
       # Allow it to retry the first time unless it is an authorization error
       begin
-        booker_resources = handle_errors!(http_options, HTTParty.send(http_method, "#{self.base_url}#{path}", http_options))
+        booker_resources = handle_errors!(http_options, HTTParty.send(http_method, url, http_options))
       rescue Booker::Error, Net::ReadTimeout => ex
         if ex.is_a? Booker::InvalidApiCredentials
           raise ex
@@ -81,17 +82,15 @@ module Booker
         end
       end
 
-      if booker_resources
-        results_from_response(booker_resources, booker_model)
-      else
-        booker_resources = handle_errors!(http_options, HTTParty.send(http_method, "#{self.base_url}#{path}", http_options))
+      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))
+      return results_from_response(booker_resources, booker_model) if booker_resources.present?
+      raise Booker::Error.new(http_options, booker_resources)
+    end
 
-        if booker_resources
-          results_from_response(booker_resources, booker_model)
-        else
-          raise Booker::Error.new(http_options, booker_resources)
-        end
-      end
+    def full_url(path)
+      uri = URI(path)
+      uri.scheme ? path : "#{self.base_url}#{path}"
     end
 
     def handle_errors!(request, response)
@@ -114,11 +113,7 @@ module Booker
     end
 
     def access_token
-      if self.temp_access_token && !temp_access_token_expired?
-        self.temp_access_token
-      else
-        get_access_token
-      end
+      (self.temp_access_token && !temp_access_token_expired?) ? self.temp_access_token : get_access_token
     end
 
     def access_token_options

data/lib/booker/version.rb

@@ -1,3 +1,3 @@
 module Booker
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

metadata

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