leisureking 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71383dc5b6693a8c6f671ba8e800e894258f53a369524f230643dc90f78f12c7
-  data.tar.gz: 1b9635d739f1ff2fe0324bc86c9aae7798e50aebb251e27131883c25d2ae5fbc
+  metadata.gz: 499f618e750d46d238e01fa0c21a0bd85d53b463d93c14c837c3e529422c8ee0
+  data.tar.gz: ba477bf14b46fa1b3f9e6c164a3bb82a17f4f0a688b03f8d069ce1b78993d3af
 SHA512:
-  metadata.gz: 8d10dacec07fa604af2932161f66316368e1c42b727bac6f3bba6542f6918f155c2b391973b175f989e5320a3dfa1f916ba52ebde29aaf03669a369410d44c70
-  data.tar.gz: a73ffbe6d6fd8b667fe437f8ac2a84bbbd27680adbec2be091ab64de2b8e7981c6b0312e741a09d7e7568f573a0422e7d84f204f4fb27923a659912542be0379
+  metadata.gz: 190eddb9a556151c5c3c5852dfa0882d6e27864b0d7d75823414931b6cf2a49307dba95c5a352c4ef0d7d9787029e3f0c81bc20266de401e1a5762540f2ed4e2
+  data.tar.gz: 1fe3cb21fe62f02222e7b100df978ce914d10df39abee714d5ef0247b711c7cac6ea09f71d734fef9b0fd218a675f258859f5089ce20a5aed42d160a9c9a10bc

data/lib/leisureking/api.rb

@@ -17,22 +17,26 @@ module LeisureKing::API
       body[:environment] = LeisureKing::Config.environment
       begin
 
-        unless LeisureKing::Authentication.has_valid_api_key || endpoint == "authenticate"
-          LeisureKing::Authentication.get_token
+        unless LeisureKing::Authentication.has_valid_api_key
+          unless endpoint == "authenticate"
+            puts "Requesting new API Token" if LeisureKing::Config.verbose
+            LeisureKing::Authentication.get_token
+          end
         end
 
         if LeisureKing::Config.verbose
           puts "Sending request to #{url}"
-          puts "Body:\n#{body}" if body
+          puts "Body:\n#{body.to_json}" if body
         end
 
         begin
-          result = RestClient.post(url, body.to_json, headers) do |response, request, res, &block|
+          result = RestClient.post(url, body, headers) do |response, request, res, &block|
             if [301, 302, 307].include? response.code
               redirected_url = response.headers[:location]
               if LeisureKing::Config.verbose
                 puts "Redirecting request to #{redirected_url}"
-                puts "Body:\n#{body}" if body
+                puts "Headers:\n#{headers.to_json}" if headers
+                puts "Body:\n#{body.to_json}" if body
               end
               RestClient.post(redirected_url, body.to_json, headers)
             else
@@ -40,15 +44,16 @@ module LeisureKing::API
             end
           end
         rescue RestClient::Unauthorized, RestClient::Forbidden => err
-          raise "Access denied. API Response:\n#{err}"
+          if LeisureKing::Config.verbose
+            puts "Backtrace:" 
+            puts err.backtrace
+          end
+          raise "Access denied. API Response:\n#{err}."
         end
 
         puts "Result:\n#{result}" if LeisureKing::Config.verbose
-        # begin
         return JSON.parse(result)
-        # rescue
-        #   return result
-        # end
+
       rescue RestClient::BadRequest => err
         raise "Bad Request. API Response:\n#{err.response}"
       end
@@ -66,7 +71,7 @@ module LeisureKing::API
       if LeisureKing::Config.client_email && LeisureKing::Config.client_email != ''
         h[:from] = LeisureKing::Config.client_email   # email address for human communication
       end
-      if LeisureKing::Authentication.token
+      if LeisureKing::Authentication.has_valid_api_key
         h["Authorization"] = "Token #{LeisureKing::Authentication.token}"
       end
       return h

data/lib/leisureking/config.rb

@@ -8,6 +8,7 @@ module ::LeisureKing::Config
     attr_accessor :api_secret
     attr_accessor :verbose
     attr_accessor :api_version
+    attr_accessor :api_base_url
     attr_accessor :environment
     attr_accessor :client_email  # Who is making the request? For optional HTTP Header
     
@@ -21,6 +22,7 @@ module ::LeisureKing::Config
         :@api_secret    => nil,
         :@verbose       => false,
         :@environment   => :test,
+        :@api_base_url  => 'https://api.leisureking.eu',
         :@client_email  => '',
         :@api_version   => '1l'
       }

data/lib/leisureking/version.rb

@@ -1,3 +1,3 @@
 module LeisureKing
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leisureking
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Henk Meijer