booker_ruby 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b39923daabcfec1bb62dd8c6c0a479249cd6846
-  data.tar.gz: cd5967c5745415270ea1d9d16f53b58b2a5d11f0
+  metadata.gz: 41e10ed27065b0384388bc2534403a150f85b241
+  data.tar.gz: d4d0cb86460f39b8b1672b82ded24c7b46b17831
 SHA512:
-  metadata.gz: bc9b5ff26181dcb216b03755ac25467e87ee928a9156a6f726692bf741bbfd5ccb1bfc321076aa8f1cd68283d53e9fe6e3d9f0f4aa0fa38f1ac634717f2f1867
-  data.tar.gz: 3013213b0f4c4d360ddabbf8877b1d68a079bbc24a0872c9a3c763e20410293c8cfff9ea82607784086f27637ab8d82c0bdcf5d6273984df874d2f17ded0b6e9
+  metadata.gz: 45ff3bbbf13e5f33c60fd33510806c90f8d4a83097b28f6f484e48f4d089b2e475b6cf064f0efac703d62c3cb2e8299e896102819257b12e9ae1410d01fba447
+  data.tar.gz: 4c141bb19dc240ad23c118fc7f2d4f2d7a5b063911c3615feabb9d6942f592b8c84fca3b856a959d90786d5ecd300f355347d2c63688c9cb7cdbbbad0578f2f6

data/lib/booker/business_client.rb

@@ -2,31 +2,21 @@ module Booker
   class BusinessClient < Client
     include Booker::BusinessREST
 
-    attr_accessor :booker_account_name, :booker_username, :booker_password
-
-    def initialize(options={})
-      self.base_url = ENV['BOOKER_BUSINESS_SERVICE_URL'] || 'https://apicurrent-app.booker.ninja/webservice4/json/BusinessService.svc'
-      super
-    end
+    ACCESS_TOKEN_HTTP_METHOD = :post
+    ACCESS_TOKEN_ENDPOINT = '/accountlogin'.freeze
 
-    def get_access_token
-      http_options = {
-        client_id: self.client_id,
-        client_secret: self.client_secret,
-        'AccountName' => self.booker_account_name,
-        'UserName' => self.booker_username,
-        'Password' => self.booker_password
-      }
-      response = post('/accountlogin', http_options, nil).parsed_response
-
-      raise Booker::InvalidApiCredentials.new(http_options, response) unless response.present?
+    attr_accessor :booker_account_name, :booker_username, :booker_password
 
-      self.temp_access_token_expires_at = Time.now + response['expires_in'].to_i.seconds
-      self.temp_access_token = response['access_token']
+    def env_base_url_key; 'BOOKER_BUSINESS_SERVICE_URL'; end
 
-      update_token_store
+    def default_base_url; 'https://apicurrent-app.booker.ninja/webservice4/json/BusinessService.svc'; end
 
-      self.temp_access_token
+    def access_token_options
+      super.merge!(
+          'AccountName' => self.booker_account_name,
+          'UserName' => self.booker_username,
+          'Password' => self.booker_password
+      )
     end
   end
 end

data/lib/booker/client.rb

@@ -1,15 +1,19 @@
 module Booker
   class Client
-    attr_accessor :base_url, :client_id, :client_secret, :temp_access_token, :temp_access_token_expires_at, :token_store, :token_store_callback_method
+    attr_accessor :base_url, :client_id, :client_secret, :temp_access_token, :temp_access_token_expires_at,
+                  :token_store, :token_store_callback_method
 
+    ACCESS_TOKEN_HTTP_METHOD = :get
+    ACCESS_TOKEN_ENDPOINT = '/access_token'.freeze
     TimeZone = 'Eastern Time (US & Canada)'.freeze
 
     def initialize(options = {})
-      options.each do |key, value|
-        send(:"#{key}=", value)
-      end
+      options.each { |key, value| send(:"#{key}=", value) }
+      self.base_url ||= get_base_url
     end
 
+    def get_base_url; ENV[try(:env_base_url_key).to_s] || try(:default_base_url); end
+
     def get(path, params, booker_model=nil)
       booker_resources = get_booker_resources(:get, path, params, nil, booker_model)
 
@@ -123,6 +127,33 @@ module Booker
       end
     end
 
+    def access_token_options
+      {
+          client_id: self.client_id,
+          client_secret: self.client_secret
+      }
+    end
+
+    def update_token_store
+      if self.token_store.present? && self.token_store_callback_method.present?
+        self.token_store.send(self.token_store_callback_method, self.temp_access_token, self.temp_access_token_expires_at)
+      end
+    end
+
+    def get_access_token
+      http_options = access_token_options
+      response = send(self.class::ACCESS_TOKEN_HTTP_METHOD, self.class::ACCESS_TOKEN_ENDPOINT, http_options, nil).parsed_response
+
+      raise Booker::InvalidApiCredentials.new(http_options, response) unless response.present?
+
+      self.temp_access_token_expires_at = Time.now + response['expires_in'].to_i.seconds
+      self.temp_access_token = response['access_token']
+
+      update_token_store
+
+      self.temp_access_token
+    end
+
     private
       def request_options(query=nil, body=nil)
         options = {
@@ -132,14 +163,8 @@ module Booker
           timeout: 120
         }
 
-        if body.present?
-          options[:body] = body
-        end
-
-        if query.present?
-          options[:query] = query
-        end
-
+        options[:body] = body if body.present?
+        options[:query] = query if query.present?
         options
       end
 
@@ -159,12 +184,6 @@ module Booker
         self.temp_access_token_expires_at.nil? || self.temp_access_token_expires_at <= Time.now
       end
 
-      def update_token_store
-        if self.token_store && self.token_store_callback_method
-          token_store.send(token_store_callback_method, self.temp_access_token, self.temp_access_token_expires_at)
-        end
-      end
-
       def results_from_response(response, booker_model=nil)
         return response['Results'] unless response['Results'].nil?
 

data/lib/booker/customer_client.rb

@@ -3,29 +3,15 @@ module Booker
     include Booker::CustomerREST
 
     def initialize(options={})
-      self.base_url = ENV['BOOKER_CUSTOMER_SERVICE_URL'] || 'https://apicurrent-app.booker.ninja/webservice4/json/CustomerService.svc'
-      self.token_store = GenericTokenStore
-      self.token_store_callback_method = :update_booker_access_token!
       super
+      self.token_store ||= GenericTokenStore
+      self.token_store_callback_method ||= :update_booker_access_token!
     end
 
-    def get_access_token
-      http_options = {
-        client_id: self.client_id,
-        client_secret: self.client_secret,
-        grant_type: 'client_credentials'
-      }
+    def env_base_url_key; 'BOOKER_CUSTOMER_SERVICE_URL'; end
 
-      response = get("/access_token", http_options, nil).parsed_response
+    def default_base_url; 'https://apicurrent-app.booker.ninja/webservice4/json/CustomerService.svc'; end
 
-      raise Booker::InvalidApiCredentials.new(http_options, response) unless response.present?
-
-      self.temp_access_token_expires_at = Time.now + response['expires_in'].to_i.seconds
-      self.temp_access_token = response['access_token']
-
-      update_token_store
-
-      self.temp_access_token
-    end
+    def access_token_options; super.merge!(grant_type: 'client_credentials'); end
   end
 end

data/lib/booker/version.rb

@@ -1,3 +1,3 @@
 module Booker
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

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