tml 5.7.6 → 5.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b283d0f1375ff5f0609d372a147b301c6c1e900e29e5dbdd13e930c5a6bc69f
-  data.tar.gz: 11c154e67d9dcfb337839abecc69ba98fe55746851b8be45aaf0908901a7e606
+  metadata.gz: 8b9103c519573b8c2e5521a0c6726684354acd63be39c97f1f55f2bc88505aa3
+  data.tar.gz: 1775589ab5765b5c4769de3b1c12b5b4cec2aba287f77069970e2f92d7523c3c
 SHA512:
-  metadata.gz: '03965562121f10a108a594cd59368960c9ecb091b38b1bf95dd187ef58f7ae26d60cfcd73d02dd45ff76753c08eb41db3c53ccfa12671f3787df621358b5fa4b'
-  data.tar.gz: 9efdb8e5fefc0074477a054170d6127d5830e4700114909700f441d9c974276c08c0a568eb53d2162acdd7a8adabc4653e0aa792d1669a470464a53b3afe503f
+  metadata.gz: ab9924e386768e595b72062a577c06f3b26dc5cfed4bde4c29b13997fb8f90d2c113d53685250035cc0759080f3c271993e1b6b7a03c1ae1599bbda6facdb95f
+  data.tar.gz: c1b3aedb8700b9e7442fa371bb54b0b4cda8f0c1f521f682a0cf42e929d7350ab28ae2991ae7dede16e1add417bfabaa06ff2b96224730f9e857a075df33b3f4

data/lib/tml/api/client.rb

@@ -69,14 +69,23 @@ class Tml::Api::Client < Tml::Base
     not data['error'].nil?
   end
 
+  def api_uri
+    @api_uri ||= URI::parse(application.host)
+  end
+
   # API Host
-  def host
-    application.host
+  def api_host
+    @api_host ||= begin
+      uri = api_uri.dup
+      uri.path  = ''
+      uri.query = nil
+      uri.to_s
+    end
   end
 
   # API connection
   def connection
-    @connection ||= Faraday.new(:url => host) do |faraday|
+    @connection ||= Faraday.new(:url => api_host) do |faraday|
       faraday.request(:url_encoded) # form-encode POST params
       # faraday.response :logger                  # log requests to STDOUT
       faraday.adapter(Faraday.default_adapter) # make requests with Net::HTTP
@@ -114,6 +123,10 @@ class Tml::Api::Client < Tml::Base
     @cdn_host ||= URI.join(application.cdn_host, '/').to_s
   end
 
+  def cdn_uri
+    @cdn_host ||= URI::parse(application.cdn_host)
+  end
+
   def get_cdn_path(key, opts = {})
     base_path = URI(application.cdn_host).path
     base_path += '/' unless base_path.last == '/'
@@ -126,7 +139,6 @@ class Tml::Api::Client < Tml::Base
       adjusted_path += "#{Tml.cache.version.to_s}/#{key}.json#{opts[:uncompressed] ? '' : '.gz'}"
     end
 
-    pp adjusted_path
     adjusted_path
   end
 
@@ -138,6 +150,15 @@ class Tml::Api::Client < Tml::Base
     end
   end
 
+  def decompress_data(compressed_data)
+    data = Zlib::GzipReader.new(StringIO.new(compressed_data.to_s)).read
+    Tml.logger.debug("Compressed: #{compressed_data.length} Uncompressed: #{data.length}")
+    data
+  rescue => ex
+    Tml.logger.error("Failed to decompress data: #{ex.message[0..255]}")
+    compressed_data
+  end
+
   # get from the CDN
   def get_from_cdn(key, params = {}, opts = {})
     if Tml.cache.version.invalid? and key != 'version'
@@ -147,7 +168,7 @@ class Tml::Api::Client < Tml::Base
     response = nil
     cdn_path = get_cdn_path(key, opts)
 
-    trace_api_call(cdn_path, params, opts.merge(:host => application.cdn_host)) do
+    trace_api_call(cdn_path, params, opts.merge(:host => cdn_host)) do
       begin
         response = cdn_connection.get do |request|
           prepare_request(request, cdn_path, params, opts)
@@ -160,19 +181,17 @@ class Tml::Api::Client < Tml::Base
     return if response.status >= 500 and response.status < 600
     return if response.body.nil? or response.body == '' or response.body.match(/xml/)
 
-    compressed_data = response.body
-    return if compressed_data.nil? or compressed_data == ''
-
-    data = compressed_data
+    data = response.body
+    return if data.nil? or data == ''
 
     unless opts[:uncompressed]
-      data = Zlib::GzipReader.new(StringIO.new(compressed_data.to_s)).read
-      Tml.logger.debug("Compressed: #{compressed_data.length} Uncompressed: #{data.length}")
+      data = decompress_data(data)
     end
 
     begin
       data = JSON.parse(data)
     rescue => ex
+      Tml.logger.error("Failed to parse response: #{ex.message[0..255]}")
       return nil
     end
 
@@ -247,15 +266,19 @@ class Tml::Api::Client < Tml::Base
     end
   end
 
+  def join_uri(*string)
+    string.join('/').gsub(/\/+/, '/')
+  end
+
   # prepares API path
   def prepare_api_path(path)
     return path if path.match(/^https?:\/\//)
     clean_path = trim_prepending_slash(path)
 
     if clean_path.index('v1') == 0 || clean_path.index('v2') == 0
-      "/#{clean_path}"
+      join_uri(api_uri.path, clean_path)
     else
-      "#{API_PATH}/#{clean_path}"
+      join_uri(api_uri.path, API_PATH, clean_path)
     end
   end
 
@@ -286,7 +309,7 @@ class Tml::Api::Client < Tml::Base
 
     opts[:method] ||= :get
 
-    trace_api_call(path, params, opts.merge(:host => host)) do
+    trace_api_call(path, params, opts.merge(:host => api_host)) do
       begin
         if opts[:method] == :post
           response = connection.post(path, params)
@@ -314,14 +337,14 @@ class Tml::Api::Client < Tml::Base
       raise Tml::Exception.new("Error: #{response.body}")
     end
 
+    data = response.body
+
     if opts[:method] == :get && !opts[:uncompressed]
-      compressed_data = response.body
-      return if compressed_data.nil? or compressed_data == ''
+      return if data.nil? or data == ''
 
-      data = Zlib::GzipReader.new(StringIO.new(compressed_data.to_s)).read
-      Tml.logger.debug("Compressed: #{compressed_data.length} Uncompressed: #{data.length}")
-    else
-      data = response.body
+      unless opts[:uncompressed]
+        data = decompress_data(data)
+      end
     end
 
     return data if opts[:raw]

data/lib/tml/version.rb

@@ -31,7 +31,7 @@
 #++
 
 module Tml
-  VERSION = '5.7.6'
+  VERSION = '5.7.7'
 
   def self.full_version
     "tml-ruby v#{Tml::VERSION} (Faraday v#{Faraday::VERSION})"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tml
 version: !ruby/object:Gem::Version
-  version: 5.7.6
+  version: 5.7.7
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday