tml 5.5.0 → 5.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7bc2c8b32d5455a156eebf41a65c19b6a7cbfd9
-  data.tar.gz: f9ee0897ad9781e22a18dc2ba9aaf3386808e9ce
+  metadata.gz: caf33060b73c70df64aaec5d6c65af53e5a79fa5
+  data.tar.gz: 8943817182ebd7a933122e8599c44606a02a291c
 SHA512:
-  metadata.gz: 47764416ebb9968bd83076755164c8189c803f9bc88d3b491ba27363b954cf1186d7b0a608e9c62b63a89d4510a9d0cd579d65d50bafef2bdf8a6df614f0e502
-  data.tar.gz: 334d36b8e44bde4865cf36a0eb10e7b58a2f2850990ef0ba090ac215329413d19c1369bf6efeb42f04121278f797f695ea65faeb5022f280153aba649900dde4
+  metadata.gz: 9a852cc091ec891903b91ebbd6438e87aedb431146e2b4a73fe0e24a2ee82e771fbe04a989fd0165d21ff1889167b19298f8506f6af856af957e65dfb6f39177
+  data.tar.gz: a8063602bb5db4c83ed368281a0a107d5889d62c80a0fd509406a5a589fef30aa65aac308dc1c379c7b2c259e8f64921402ad1203b4d409015562518999c99ee

data/lib/tml/application.rb

@@ -52,6 +52,7 @@ class Tml::Application < Tml::Base
     "#{locale}/translations"
   end
 
+  # Returns application token
   def token
     access_token
   end
@@ -136,12 +137,24 @@ class Tml::Application < Tml::Base
     end
   end
 
+  # Returns a list of application supported locales
+  def locales
+    @locales ||= languages.collect{|lang| lang.locale}
+  end
+
+  # Returns supported locale or fallback locale
+  def supported_locale(locale)
+    return default_locale if locale.to_s == ''
+    locale = Tml::Language.normalize_locale(locale)
+    unless locales.include?(locale)
+      locale = locale.split('-').first
+    end
+    locales.include?(locale) ? locale : default_locale
+  end
+
   # Returns language by locale
   def language(locale = nil)
-    locale = nil if locale and locale.strip == ''
-
-    locale ||= default_locale || Tml.config.default_locale
-    locale = locale.to_s
+    locale = supported_locale(locale)
 
     self.languages_by_locale ||= {}
     self.languages_by_locale[locale] ||= api_client.get("languages/#{locale}/definition", {
@@ -157,13 +170,10 @@ class Tml::Application < Tml::Base
   end
 
   # Normalizes and returns current language
+  # if locale is passed as nil, default locale will be used
   def current_language(locale)
     return Tml.config.default_language unless locale
-    locale = locale.gsub('_', '-') if locale
-    lang = language(locale)
-    lang ||= language(locale.split('-').first) if locale.index('-')
-    lang ||= Tml.config.default_language
-    lang
+    language(supported_locale(locale)) || Tml.config.default_language
   end
 
   # Adds a language to the application
@@ -176,11 +186,6 @@ class Tml::Application < Tml::Base
     new_language
   end
 
-  # Returns a list of application supported locales
-  def locales
-    @locales ||= languages.collect{|lang| lang.locale}
-  end
-
   # Returns source by key
   def source(key, locale)
     self.sources ||= {}

data/lib/tml/cache_version.rb

@@ -65,6 +65,13 @@ module Tml
       return 'undefined' unless version['t'].is_a?(Numeric)
       return version['version'] if cache.read_only?
 
+      # if version check interval is disabled, don't try to check for the new
+      # cache version on the CDN
+      if version_check_interval == -1
+        Tml.logger.debug('Cache version check is disabled')
+        return version['version']
+      end
+
       expires_at = version['t'] + version_check_interval
       if expires_at < Time.now.to_i
         Tml.logger.debug('Cache version is outdated, needs refresh')

data/lib/tml/language.rb

@@ -40,11 +40,18 @@ class Tml::Language < Tml::Base
     File.join(locale, 'language')
   end
 
+  # Supported locales must be of a form en, en-US, az-Cyrl-AZ
+  def self.normalize_locale(locale)
+    parts = locale.split(/[-_]/)
+    return parts.first.downcase if parts.size == 1
+    return [parts.first.downcase, parts.last.upcase].join('-') if parts.size == 2
+    ([parts.first.downcase] + parts[1..-2].collect{|part| part.downcase.capitalize} + [parts.first.upcase]).join('-')
+  end
+
   # Loads language definition from the service
   def fetch
     update_attributes(application.api_client.get(
-      "language/#{locale}/definition",
-      {},
+      "language/#{locale}/definition", {},
       {
           cache_key: self.class.cache_key(locale)
       }
@@ -73,10 +80,12 @@ class Tml::Language < Tml::Base
     end
   end
 
+  # Returns context by keyword
   def context_by_keyword(keyword)
     hash_value(contexts, keyword)
   end
 
+  # Returns context by token name
   def context_by_token_name(token_name)
     contexts.values.detect{|ctx| ctx.applies_to_token?(token_name)}
   end

data/lib/tml/session.rb

@@ -78,9 +78,14 @@ module Tml
     def preferred_locale(locales)
       return application.default_locale unless locales
       locales = locales.is_a?(String) ? locales.split(',') : locales
+
       locales.each do |locale|
+        locale = Tml::Language.normalize_locale(locale)
+        return locale if application.locales.include?(locale)
+        locale = locale.split('-').first
         return locale if application.locales.include?(locale)
       end
+
       application.default_locale
     end
 

data/lib/tml/version.rb

@@ -31,7 +31,7 @@
 #++
 
 module Tml
-  VERSION = '5.5.0'
+  VERSION = '5.5.1'
 
   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.5.0
+  version: 5.5.1
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday