tml 5.7.5 → 5.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f22472b3451faaa34531f1a366b002b3c0fcb6836a6511f249428bd696b3f913
-  data.tar.gz: d0b282b91dc07cc90aa1542daa363d643aecb1ecef8ee50e982c02a819a96844
+  metadata.gz: 9026636ec030714b79ad8afe340acdcbfb29eeaa3339507649dbc6f52ec69a7c
+  data.tar.gz: 9ef3bdeb5f1037475cebbf3a8347d65ce46b851f63208393fccb045b008a870d
 SHA512:
-  metadata.gz: 5a7ac88acae16bf896ec80bd9b05e45843fb0975f6ba3ed8d6d7f525916930ab7efbf28cc0541413bdab9d230bff15a44357debbc32efee00cce6149b5be3050
-  data.tar.gz: 4a5880962f6c461cafcb7c9f88343632db6eba4c870c048763e2b8277f6f8a7af3b62e83801bb6760f22bb8ccd13cc947304b7dca9b06716ff326c4e54aa0ce4
+  metadata.gz: d808a5cbdb34c2c7e7c0383f319458749ed85cadf3102896ed1d449ac4d6b3093b664f0ecda8413ebb643614a2fe2c7088fccde9dd5284e5d369ceef0b19d547
+  data.tar.gz: 86823e1dd30d4ca934231ccd42a7fda2490c3e61f01d63acbab1f29716a35cd29395df2859b64fc5812cb7892f853eb6a9ddfed7a480ef89d54c1ff82599ac20

data/README.md

@@ -8,6 +8,7 @@ TML Library For Ruby
 [![Coverage Status](https://coveralls.io/repos/translationexchange/tml-ruby/badge.png?branch=master)](https://coveralls.io/r/translationexchange/tml-ruby?branch=master)
 [![Dependency Status](https://www.versioneye.com/user/projects/54c1457a6c00352081000416/badge.svg?style=flat)](https://www.versioneye.com/user/projects/54c1457a6c00352081000416)
 [![Gem Version](https://badge.fury.io/rb/tml.svg)](http://badge.fury.io/rb/tml)
+[![Open Source Helpers](https://www.codetriage.com/translationexchange/tml-ruby/badges/users.svg)](https://www.codetriage.com/translationexchange/tml-ruby)
 
 TML library for Ruby is a set of classes that provide translation functionality for any Ruby based application.
 The library uses Translation Markup Language that allows you to encode complex language structures in simple, yet powerful forms.

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
@@ -110,14 +119,47 @@ class Tml::Api::Client < Tml::Base
     Tml.logger.info("Cache Version: #{Tml.cache.version}")
   end
 
+  def cdn_host
+    @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
+    # Remove usage of String#last for clients who do not use ActiveSupport
+    base_path += '/' unless base_path.size > 0 && base_path[-1..-1] == '/'
+
+    adjusted_path = "#{base_path}#{application.key}/"
+
+    if key == 'version'
+      adjusted_path += "#{key}.json"
+    else
+      adjusted_path += "#{Tml.cache.version.to_s}/#{key}.json#{opts[:uncompressed] ? '' : '.gz'}"
+    end
+
+    adjusted_path
+  end
+
   # cdn_connection
   def cdn_connection
-    @cdn_connection ||= Faraday.new(:url => application.cdn_host) do |faraday|
+    @cdn_connection ||= Faraday.new(:url => cdn_host) do |faraday|
       faraday.request(:url_encoded) # form-encode POST params
       faraday.adapter(Faraday.default_adapter) # make requests with Net::HTTP
     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'
@@ -125,20 +167,14 @@ class Tml::Api::Client < Tml::Base
     end
 
     response = nil
-    cdn_path = "/#{application.key}"
-
-    if key == 'version'
-      cdn_path += "/#{key}.json"
-    else
-      cdn_path += "/#{Tml.cache.version.to_s}/#{key}.json#{opts[:uncompressed] ? '' : '.gz'}"
-    end
+    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)
         end
-      rescue Exception => ex
+      rescue => ex
         Tml.logger.error("Failed to execute request: #{ex.message[0..255]}")
         return nil
       end
@@ -146,19 +182,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
 
@@ -233,15 +267,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
 
@@ -272,7 +310,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)
@@ -300,14 +338,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.5'
+  VERSION = '5.7.9'
 
   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.5
+  version: 5.7.9
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2018-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday