tr8n_core 4.0.10 → 4.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd3eb7989301e2c1d7d8734911a9ca036f0d5d51
-  data.tar.gz: eef105b2a1f9ace58ce79f4acfc3f44c5cfdf7fc
+  metadata.gz: a984c2942575807bbf4d7e6b3b340ce2c2428020
+  data.tar.gz: 5cd3e83a8c544fb42a390a9218b1350f4ba66d01
 SHA512:
-  metadata.gz: 6ec1c94fe137730ca4c2d5365f980e43ceeaa9abdb39dfaa07ae750acb8662de91b85105f4c494a3e6fd0636e4dcb7afc74813e51bf0ee6bad429540ccb59998
-  data.tar.gz: 5e9c34a75ecb81b1d1059b27524c3061f284b649a649810336a8dd818d4fec0f0908881a5f982035984c22400ed3074e4f8696c243949fc9bf4bac22658bb155
+  metadata.gz: 936c126d175de897ac02f4635c6052db44f4314ec3ed745d4e2a150b5ecc99514f1f64e54d8e58735a85f3dbc5a4a290fd9e3d4162923b67c3a36cf38a77435d
+  data.tar.gz: 91c3092764f4a26a38d9a0b731daac3b1fe686b257a3b53d62889b7c735d6fa47edb771b134a755fcfc6e9d1490caeb8ff16604886eaee55e9adca95b64d9815

data/lib/tr8n/api_client.rb

@@ -91,13 +91,22 @@ class Tr8n::ApiClient < Tr8n::Base
 
   def execute_request(path, params = {}, opts = {})
     response = nil
+    error = nil
     Tr8n.logger.trace_api_call(path, params) do
-      if opts[:method] == :post
-        response = connection.post("#{API_PATH}#{path}", params)
-      else
-        response = connection.get("#{API_PATH}#{path}", params)
+      begin
+        if opts[:method] == :post
+          response = connection.post("#{API_PATH}#{path}", params)
+        else
+          response = connection.get("#{API_PATH}#{path}", params)
+        end
+      rescue Faraday::ConnectionFailed => ex
+        Tr8n.logger.error("Failed to execute request: #{ex}")
+        error = ex
+        nil
       end
     end
+    raise Tr8n::Exception.new("Error: #{error}") if error
+
     data = JSON.parse(response.body)
     raise Tr8n::Exception.new("Error: #{data["error"]}") unless data["error"].nil?
     data

data/lib/tr8n/application.rb

@@ -38,6 +38,9 @@ class Tr8n::Application < Tr8n::Base
 
   def fetch
     update_attributes(api_client.get("application", {:definition => true}, {:cache_key => key}))
+  rescue Tr8n::Exception => ex
+    Tr8n.logger.error("Failed to load application: #{ex}")
+    self
   end
 
   def update_attributes(attrs)
@@ -73,8 +76,24 @@ class Tr8n::Application < Tr8n::Base
   def language(locale = nil)
     locale ||= default_locale || Tr8n.config.default_locale
     @languages_by_locale ||= {}
-    return @languages_by_locale[locale] if @languages_by_locale[locale]
-    @languages_by_locale[locale] = Tr8n::Language.new(:locale => locale, :application => self).fetch
+
+    unless Tr8n.session.current_translator and Tr8n.session.current_translator.inline?
+      cache_key = "#{locale}/language"
+    end
+
+    @languages_by_locale[locale] ||= api_client.get(
+        'language',
+        {:locale => locale},
+        {
+            :class => Tr8n::Language,
+            :attributes => {:locale => locale, :application => self},
+            :cache_key => cache_key
+        }
+    )
+  rescue Tr8n::Exception => e
+    Tr8n.logger.error(e)
+    Tr8n.logger.error(e.backtrace)
+    @languages_by_locale[locale] = Tr8n.config.default_language
   end
 
   # Mostly used for testing
@@ -103,19 +122,17 @@ class Tr8n::Application < Tr8n::Base
       cache_key = Tr8n::Source.cache_key(key, locale)
     end
 
-    begin
-      @sources_by_key[key] ||= api_client.get(
-          "source",
-          {:source => key, :locale => locale, :translations => true},
-          {
-            :class => Tr8n::Source,
-            :attributes => {:application => self},
-            :cache_key => cache_key
-          }
-      )
-    rescue
-      @sources_by_key[key] ||= Tr8n::Source.new(:source => key)
-    end
+    @sources_by_key[key] ||= api_client.get(
+        "source",
+        {:source => key, :locale => locale, :translations => true},
+        {
+          :class => Tr8n::Source,
+          :attributes => {:application => self},
+          :cache_key => cache_key
+        }
+    )
+  rescue
+    @sources_by_key[key] = Tr8n::Source.new(:source => key)
   end
 
   def component(key, register = true)
@@ -187,16 +204,14 @@ class Tr8n::Application < Tr8n::Base
 
   def featured_languages
     @featured_languages ||= begin
-      locales = Tr8n.cache.fetch("featured_locales") do
-        api_client.get("application/featured_locales")
-      end
+      locales = api_client.get("application/featured_locales", {}, {:cache_key => "featured_locales"})
       # use app languages, there is no need for rules for this call
       (locales.nil? or locales.empty?) ? [] : languages.select{|l| locales.include?(l.locale)}
     end
   end
  
   def translators
-    api_client.get("application/translators", {}, {:class => Tr8n::Translator, :attributes => {:application => self}})
+    @translators ||= api_client.get("application/translators", {}, {:class => Tr8n::Translator, :attributes => {:application => self}})
   end
 
   def default_decoration_token(token)
@@ -207,10 +222,6 @@ class Tr8n::Application < Tr8n::Base
     hash_value(tokens, "data.#{token.to_s}")
   end
 
-  def js_boot_url
-    "#{host}/tr8n/api/proxy/boot.js?client_id=#{key}"
-  end
-
   def feature_enabled?(key)
     hash_value(features, key.to_s)
   end

data/lib/tr8n/cache.rb

@@ -36,7 +36,7 @@ module Tr8n
 
   def self.cache
     @cache ||= begin
-      if Tr8n.config.cache[:enabled]
+      if Tr8n.config.cache_enabled?
         klass = Tr8n::CacheAdapters.const_get(Tr8n.config.cache[:adapter].camelcase)
         klass.new
       else
@@ -55,10 +55,21 @@ module Tr8n
         end
         v['version']
       end
+
+      if Tr8n.config.cache[:version] > @version
+        update_version(Tr8n.config.cache[:version])
+        @version = Tr8n.config.cache[:version]
+      end
+
+      @version
+    end
+
+    def update_version(new_version)
+      store(CACHE_VERSION_KEY, {'version' => new_version}, :ttl => 0)
     end
 
     def upgrade_version
-      store(CACHE_VERSION_KEY, {'version' => version + 1}, :ttl => 0)
+      update_version(version + 1)
       @version = nil
     end
 

data/lib/tr8n/config.rb

@@ -314,6 +314,10 @@ module Tr8n
       nested_value(self.translator_options, key)
     end
 
+    def cache_enabled?
+      cache[:enabled].nil? || Tr8n.config.cache[:enabled]
+    end
+
     #########################################################
     ## Application
     #########################################################

data/lib/tr8n/language.rb

@@ -37,6 +37,8 @@ class Tr8n::Language < Tr8n::Base
 
   def fetch
     update_attributes(application.api_client.get("language", {:locale => locale}, {:cache_key => "#{locale}/language"}))
+  rescue Tr8n::Exception => ex
+    Tr8n.logger.error("Failed to load language: #{ex}")
     self
   end
 

data/lib/tr8n_core/languages/en-US.json

@@ -1,5 +1,6 @@
 {"locale":"en-US",
   "name":"English (US)",
+  "flag_url": "https://translationexchange.com/media/7/55/1/27/c9262c9538cda82c6.png",
   "contexts":{
     "date":{
       "keyword":"date",

data/lib/tr8n_core/version.rb

@@ -30,5 +30,5 @@
 #++
 
 module Tr8nCore
-  VERSION = '4.0.10'
+  VERSION = '4.0.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tr8n_core
 version: !ruby/object:Gem::Version
-  version: 4.0.10
+  version: 4.0.12
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday