tml 5.1.1 → 5.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66fdea16ab7a949df955b07b84cff3e12ff4ce6c
-  data.tar.gz: c534611d08ce4f130ba280b6b6c4a69567f60ddd
+  metadata.gz: c4ae1644d633f0f8ead496d5ac732ccd9dcbc34c
+  data.tar.gz: b92c379114a8878d85a27b997c098319cd756eca
 SHA512:
-  metadata.gz: 35e492c0334f46220d7f85fd68465c03f70b11a22106d601176009f92edb21cb52bc55bb0ce1d79f1e310d5f780a1baa8f35e4a2957a43eda0a8278c311fe448
-  data.tar.gz: 3d6ae9f883fd21971e928f76aeae05cb969b448f5cee9af26b1b04e6bbc85bb04518d911cc2778ff00af3c567bb58ebead7fd6710c8fec8bac8eaa9d923669a3
+  metadata.gz: 9fd13088aa2fbc7f9f02a5c424e62c35111ec4f2edcba5cb2b8e2d02f1a9839e9d199b9545c20ae001ad82190b3546fe1e61e1e0d65ca241f3d7fdd6cb5d81a5
+  data.tar.gz: e4b4cd7014d4c3fb5bc6a8b81f94532ce036054338912d802dce3c8e8c4c249238a1121d7d58e51e903e98531c2485513dd0e021c83247f17c79fb0f8c7ceb10

data/lib/tml/api/client.rb

@@ -35,8 +35,6 @@ require 'zlib'
 require 'stringio'
 
 class Tml::Api::Client < Tml::Base
-  CDN_HOST = 'https://cdn.translationexchange.com'
-  API_HOST = 'https://api.translationexchange.com'
   API_PATH = '/v1'
 
   attributes :application
@@ -66,16 +64,8 @@ class Tml::Api::Client < Tml::Base
     not data['error'].nil?
   end
 
-  def host
-    application.host || API_HOST
-  end
-
-  def cdn_host
-    CDN_HOST
-  end
-
   def connection
-    @connection ||= Faraday.new(:url => host) do |faraday|
+    @connection ||= Faraday.new(:url => application.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
@@ -99,7 +89,7 @@ class Tml::Api::Client < Tml::Base
   end
 
   def cdn_connection
-    @cdn_connection ||= Faraday.new(:url => cdn_host) do |faraday|
+    @cdn_connection ||= Faraday.new(:url => application.cdn_host) do |faraday|
       faraday.request(:url_encoded)               # form-encode POST params
       faraday.adapter(Faraday.default_adapter)    # make requests with Net::HTTP
     end
@@ -109,8 +99,8 @@ class Tml::Api::Client < Tml::Base
     return nil if Tml.cache.version == 'undefined' || Tml.cache.version.to_s == '0'
 
     response = nil
-    cdn_path = "/#{Tml.config.application[:key]}/#{Tml.cache.version}/#{key}.json.gz"
-    trace_api_call(cdn_path, params, opts.merge(:host => cdn_host)) do
+    cdn_path = "/#{application.key}/#{Tml.cache.version}/#{key}.json.gz"
+    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)
@@ -138,10 +128,19 @@ class Tml::Api::Client < Tml::Base
     data
   end
 
+  def enable_cache?(opts)
+    return false unless opts[:method] == :get
+    return false if opts[:cache_key].nil?
+    return false unless Tml.cache.enabled?
+    return false if Tml.session.inline_mode?
+    return false if Tml.session.block_option(:live)
+    true
+  end
+
   def api(path, params = {}, opts = {})
     # inline mode should always bypass API calls
     # get request uses local cache, then CDN, the API
-    if opts[:method] == :get and opts[:cache_key] and Tml.cache.enabled? and not Tml.session.inline_mode?
+    if enable_cache?(opts)
       verify_cache_version
       data = Tml.cache.fetch(opts[:cache_key]) do
         if Tml.cache.read_only?
@@ -195,18 +194,16 @@ class Tml::Api::Client < Tml::Base
     response = nil
     error = nil
 
-    token = Tml.config.application ? Tml.config.application[:token] : ''
-
     # oauth path is separate from versioned APIs
     path = prepare_api_path(path)
-    params = params.merge(:access_token => token) unless path.index('oauth')
+    params = params.merge(:access_token => application.token) unless path.index('oauth')
 
     if opts[:method] == :post
       params = params.merge(:api_key => application.key)
     end
 
     @compressed = false
-    trace_api_call(path, params, opts.merge(:host => host)) do
+    trace_api_call(path, params, opts.merge(:host => application.host)) do
       begin
         if opts[:method] == :post
           response = connection.post(path, params)

data/lib/tml/application.rb

@@ -33,6 +33,10 @@
 require 'faraday'
 
 class Tml::Application < Tml::Base
+
+  CDN_HOST = 'https://cdn.translationexchange.com'
+  API_HOST = 'https://api.translationexchange.com'
+
   attributes :host, :id, :key, :access_token,  :name, :description, :threshold, :default_locale, :default_level, :tools
   has_many :features, :languages, :languages_by_locale, :sources, :tokens, :css, :shortcuts, :translations, :extensions
 
@@ -46,6 +50,18 @@ class Tml::Application < Tml::Base
     "#{locale}/translations"
   end
 
+  def token
+    access_token
+  end
+
+  def host
+    super || API_HOST
+  end
+
+  def cdn_host
+    CDN_HOST
+  end
+
   # Fetches application definition from the service
   def fetch
     data = api_client.get('projects/current/definition',{

data/lib/tml/config.rb

@@ -102,7 +102,7 @@ module Tml
 
       @agent = {
         enabled: true,
-        type:    'agent'
+        type:    'tools'
       }
 
       # if running from IRB, make it default to TRUE

data/lib/tml/language.rb

@@ -109,7 +109,7 @@ class Tml::Language < Tml::Base
   end
 
   def current_source(options)
-    (options[:source] || Tml.session.block_options[:source] || Tml.session.current_source || 'undefined').to_s
+    (options[:source] || Tml.session.block_option(:source) || Tml.session.current_source || 'undefined').to_s
   end
 
   #######################################################################################################
@@ -137,8 +137,8 @@ class Tml::Language < Tml::Base
       :application  => application,
       :label        => params[:label],
       :description  => params[:description],
-      :locale       => hash_value(params[:options], :locale) || hash_value(Tml.session.block_options, :locale) || Tml.config.default_locale,
-      :level        => hash_value(params[:options], :level) || hash_value(Tml.session.block_options, :level) || Tml.config.default_level,
+      :locale       => hash_value(params[:options], :locale) || Tml.session.block_option(:locale) || Tml.config.default_locale,
+      :level        => hash_value(params[:options], :level) || Tml.session.block_option(:level) || Tml.config.default_level,
       :translations => []
     })
 
@@ -166,13 +166,13 @@ class Tml::Language < Tml::Base
     current_source_path = source_path
 
     # Dynamic sources are never registered under the parent source
-    if hash_value(Tml.session.block_options, :dynamic)
+    if Tml.session.block_option(:dynamic)
       current_source_path = source_key
     else
       application.verify_source_path(source_key, current_source_path)
     end
 
-    # Tml.logger.debug("#{params[:label]}, #{source_key}")
+    # Tml.logger.debug("#{params[:label]} : #{source_key}")
 
     source = application.source(source_key, locale)
     cached_translations = source.cached_translations(locale, translation_key.key)

data/lib/tml/session.rb

@@ -41,9 +41,11 @@ module Tml
     attr_accessor :current_user, :current_locale, :current_language, :current_translator, :current_source
 
     def init(opts = {})
-      return unless Tml.config.enabled? and Tml.config.application
+      return if Tml.config.disabled?
 
-      host = opts[:host] || Tml.config.application[:host]
+      key   = opts[:key]    || Tml.config.application[:key]
+      token = opts[:token]  || Tml.config.application[:token]
+      host  = opts[:host]   || Tml.config.application[:host]
 
       Tml.cache.reset_version
 
@@ -52,13 +54,7 @@ module Tml
       self.current_locale = opts[:locale]
       self.current_translator = opts[:translator]
 
-      self.application = Tml::Application.new(:host => host).fetch
-
-      # if inline mode don't use any app cache
-      # if inline_mode?
-      #   self.application = self.application.dup
-      #   self.application.reset_translation_cache
-      # end
+      self.application = Tml::Application.new(:key => key, :access_token => token, :host => host).fetch
 
       if self.current_translator
         self.current_translator.application = self.application
@@ -97,19 +93,13 @@ module Tml
     end
 
     def source_language
-      (@block_options || []).reverse.each do |opts|
-        return application.language(opts[:locale]) unless opts[:locale].nil?
-      end
-
-      application.language
+      locale = block_option(:locale)
+      locale ? application.language(locale) : application.language
     end
 
     def target_language
-      (@block_options || []).reverse.each do |opts|
-        return application.language(opts[:target_locale]) unless opts[:target_locale].nil?
-      end
-
-      current_language
+      target_locale = block_option(:target_locale)
+      target_locale ? application.language(target_locale) : current_language
     end
 
     def inline_mode?
@@ -120,8 +110,19 @@ module Tml
     ## Block Options
     #########################################################
 
+    def block_option(key, lookup = true)
+      if lookup
+        block_options_queue.reverse.each do |options|
+          value = options[key.to_s] || options[key.to_sym]
+          return value if value
+        end
+        return nil
+      end
+      block_options[key]
+    end
+
     def push_block_options(opts)
-      (@block_options ||= []).push(opts)
+      block_options_queue.push(opts)
     end
 
     def pop_block_options
@@ -129,12 +130,12 @@ module Tml
       @block_options.pop
     end
 
-    def block_options
-      (@block_options ||= []).last || {}
+    def block_options_queue
+      @block_options ||= []
     end
 
-    def block_options_queue
-      @block_options
+    def block_options
+      block_options_queue.last || {}
     end
 
     def with_block_options(opts)
@@ -146,13 +147,5 @@ module Tml
       ret
     end
 
-    def current_source_from_block_options
-      arr = @block_options || []
-      arr.reverse.each do |opts|
-        return application.source_by_key(opts[:source]) unless opts[:source].blank?
-      end
-      nil
-    end
-
   end
 end

data/lib/tml/tokens/data.rb

@@ -333,7 +333,7 @@ module Tml
       def sanitize(value, object, language, options)
         value = value.to_s
 
-        unless Tml.session.block_options[:skip_html_escaping]
+        unless Tml.session.block_option(:skip_html_escaping)
           if options[:safe] == false
             value = CGI.escapeHTML(value)
           end

data/lib/tml/translation_key.rb

@@ -41,7 +41,7 @@ class Tml::TranslationKey < Tml::Base
     super
 
     self.attributes[:key] ||= self.class.generate_key(label, description)
-    self.attributes[:locale] ||= Tml.session.block_options[:locale] || (application ? application.default_locale : Tml.config.default_locale)
+    self.attributes[:locale] ||= Tml.session.block_option(:locale) || (application ? application.default_locale : Tml.config.default_locale)
     self.attributes[:language] ||= application ? application.language(locale) : Tml.config.default_language
     self.attributes[:translations] = {}
 

data/lib/tml/translator.rb

@@ -41,7 +41,7 @@ class Tml::Translator < Tml::Base
   end
 
   def inline?
-    return Tml.session.block_options[:inline] unless Tml.session.block_options[:inline].nil?
-    super
+    Tml.session.block_option(:inline) || super
   end
+
 end

data/lib/tml/version.rb

@@ -30,5 +30,5 @@
 #++
 
 module Tml
-  VERSION = '5.1.1'
+  VERSION = '5.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tml
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.1.2
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2015-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday