booker_ruby 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b856aabaf2cd955b7a4290b1a6c7bc7d9994369
-  data.tar.gz: 9667dbdf3dc1f069e73c685a627fc8de6654520d
+  metadata.gz: 6dfa371cbaa97d8696abdc4144cfc42805526f4d
+  data.tar.gz: 2cd63a148cdb9a41b648689f690114c6b9353767
 SHA512:
-  metadata.gz: 4563c5ef729190d5b74e2a367e1717bbe69443d628eb6ce565b205ea991cf685f4a03b0c2289e8993e26d3f7189ea97830be1c40379f2d9c3d28f8b777674b36
-  data.tar.gz: 407a83f42b7240707260a3fe4234e2cda3807395bdb7f47768e801f098fbcbe10d825affe06143359d749092051c7427850620677fa7609634c81c18f692ffe1
+  metadata.gz: 1424622c5261c9384987faf599cb21097bfdae7089c1475ca26dfc1f2ba5414b54bfabd6c5760fbe6767d0a0f267590d34a04e772b7a253f05bd015f01ee6f20
+  data.tar.gz: 08a3ed00775f03f52b00b1be25f1f4ca6e3e970666d2feda2f5551a5cdd554b6973531f78732c12eee4b252ad7876d8976d2152a0aecb05f48ec74cc435e2869

data/lib/booker/client.rb

@@ -10,9 +10,19 @@ module Booker
     def initialize(options = {})
       options.each { |key, value| send(:"#{key}=", value) }
       self.base_url ||= get_base_url
+      self.client_id ||= ENV['BOOKER_CLIENT_ID']
+      self.client_secret ||= ENV['BOOKER_CLIENT_SECRET']
     end
 
-    def get_base_url; ENV[try(:env_base_url_key).to_s] || try(:default_base_url); end
+    def get_base_url
+      env_key = try(:env_base_url_key)
+
+      if env_key.present?
+        ENV[env_key] || try(:default_base_url)
+      else
+        try(:default_base_url)
+      end
+    end
 
     def get(path, params, booker_model=nil)
       booker_resources = get_booker_resources(:get, path, params, nil, booker_model)

data/lib/booker/version.rb

@@ -1,3 +1,3 @@
 module Booker
-  VERSION = '1.5.1'
+  VERSION = '1.5.2'
 end

metadata

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