tml 5.7.5 → 5.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f22472b3451faaa34531f1a366b002b3c0fcb6836a6511f249428bd696b3f913
-  data.tar.gz: d0b282b91dc07cc90aa1542daa363d643aecb1ecef8ee50e982c02a819a96844
+  metadata.gz: 5b283d0f1375ff5f0609d372a147b301c6c1e900e29e5dbdd13e930c5a6bc69f
+  data.tar.gz: 11c154e67d9dcfb337839abecc69ba98fe55746851b8be45aaf0908901a7e606
 SHA512:
-  metadata.gz: 5a7ac88acae16bf896ec80bd9b05e45843fb0975f6ba3ed8d6d7f525916930ab7efbf28cc0541413bdab9d230bff15a44357debbc32efee00cce6149b5be3050
-  data.tar.gz: 4a5880962f6c461cafcb7c9f88343632db6eba4c870c048763e2b8277f6f8a7af3b62e83801bb6760f22bb8ccd13cc947304b7dca9b06716ff326c4e54aa0ce4
+  metadata.gz: '03965562121f10a108a594cd59368960c9ecb091b38b1bf95dd187ef58f7ae26d60cfcd73d02dd45ff76753c08eb41db3c53ccfa12671f3787df621358b5fa4b'
+  data.tar.gz: 9efdb8e5fefc0074477a054170d6127d5830e4700114909700f441d9c974276c08c0a568eb53d2162acdd7a8adabc4653e0aa792d1669a470464a53b3afe503f

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

@@ -110,9 +110,29 @@ 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 get_cdn_path(key, opts = {})
+    base_path = URI(application.cdn_host).path
+    base_path += '/' unless base_path.last == '/'
+
+    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
+
+    pp adjusted_path
+    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
@@ -125,20 +145,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
       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

data/lib/tml/version.rb

@@ -31,7 +31,7 @@
 #++
 
 module Tml
-  VERSION = '5.7.5'
+  VERSION = '5.7.6'
 
   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.6
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday