tml 5.5.4 → 5.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01627bae72095f4b9e7ce0e7075321bf8c6354fa
-  data.tar.gz: a2a539378307191e667ce9624a9c4708c3904412
+  metadata.gz: 5346ec2d7d296d5fda202794dde03edb2fac349e
+  data.tar.gz: e97d96c35d07372e8cb0188c38b44758ca460a90
 SHA512:
-  metadata.gz: 40bb60e7df1e3a58d41c5fd8eec56848c7290e553646701d1895c69b73c37f51481fbb3be1aa96973b869804f16838458e565a135e2578ee0fab08f4be140372
-  data.tar.gz: f469500ca7422f2f43e58f11b8184ebd832c2aeb6a501482d83c89bb0b1dd443132204676e70525f4bbca1180ce2161cd62a544a3a722b859a8859141c42da94
+  metadata.gz: 17559b2cd7a8b668a81de85d96f3315643587352084f8f367fe34a27989c951a965d12ab482483483f558a161a3127f785689161097d2701025304e080aa375c
+  data.tar.gz: 37ea474a9f2502c584c5f87672261bf77587370dfddce5571b402c59a287ab37a7f30affe4f02205440d902b544b03978a16bc204233bf395f33d5a630332cec

data/lib/tml.rb

@@ -38,6 +38,30 @@ module Tml
   module Decorators end
   module CacheAdapters end
   module Generators end
+
+  def self.default_language
+    Tml.config.default_language
+  end
+
+  def self.current_language
+    Tml.session.current_language
+  end
+
+  def self.language(locale)
+    Tml.session.application.language(locale)
+  end
+
+  def self.translate(label, description = '', tokens = {}, options = {})
+    Tml.session.translate(label, description, tokens, options)
+  end
+
+  def self.with_options(opts)
+    Tml.session.with_options(opts) do
+      if block_given?
+        yield
+      end
+    end
+  end
 end
 
 %w(tml/base.rb tml tml/api tml/rules_engine tml/tokens tml/tokenizers tml/decorators tml/cache_adapters tml/cache tml/ext).each do |f|

data/lib/tml/application.rb

@@ -194,7 +194,7 @@ class Tml::Application < Tml::Base
   # Returns source by key
   def source(key, locale)
     self.sources ||= {}
-    self.sources[key] ||= Tml::Source.new(
+    self.sources["#{locale}/#{key}"] ||= Tml::Source.new(
       :application  => self,
       :source       => key
     ).fetch_translations(locale)

data/lib/tml/config.rb

@@ -76,7 +76,7 @@ module Tml
   class Config
     # Configuration Attributes
     attr_accessor :enabled, :locale, :default_level, :format, :application, :postoffice, :context_rules, :logger, :cache, :default_tokens, :localization
-    attr_accessor :auto_init, :source_separator
+    attr_accessor :auto_init, :source_separator, :domain
 
     # Used by Rails and Sinatra extensions
     attr_accessor :current_locale_method, :current_user_method, :translator_options, :i18n_backend
@@ -89,21 +89,29 @@ module Tml
       @enabled = true
       @default_level  = 0
       @format = :html
-      @subdomains = false
       @auto_init = true
       @source_separator = '@:@'
 
       @api_client = {
-          class: Tml::Api::Client,
-          timeout: 5,
-          open_timeout: 2
+        class: Tml::Api::Client,
+        timeout: 5,
+        open_timeout: 2
       }
 
       @locale = {
-        default:    'en',
-        method:     'current_locale',
-        subdomain:  false,
-        extension:  false
+        default:      'en',       # default locale
+        method:       'current_locale', # method to use for user selected locale, if nil, the rest will be a fallback
+        param:        'locale',   # the way to name the param
+        strategy:     'param',    # approach param, pre-path, pre-domain, custom-domain
+        redirect:     true,       # if TML should handle locale logic redirects
+        skip_default: false,      # if the default locales should not be visible
+        browser:      true,       # if you want to use a browser header to determine the locale
+        cookie:       true,       # if you want to store user selected locale in the cookie
+        # default_host: '',         # if user wants to not display default locale, we need to know the default host
+        # mapping: {                # domain to locale mapping
+        #   en: '',
+        #   ru: '',
+        # }
       }
 
       @agent = {
@@ -240,7 +248,7 @@ module Tml
             :em     =>  '<em>{$0}</em>',
             :italic =>  '<i>{$0}</i>',
             :i      =>  '<i>{$0}</i>',
-            :link   =>  "<a href='{$href}'>{$0}</a>",
+            :link   =>  "<a href='{$href}' class='{$class}' style='{$style}' title='{$title}'>{$0}</a>",
             :br     =>  '<br>{$0}',
             :strike =>  '<strike>{$0}</strike>',
             :div    =>  "<div id='{$id}' class='{$class}' style='{$style}'>{$0}</div>",
@@ -339,6 +347,41 @@ module Tml
       not enabled?
     end
 
+    def locale_expression
+      /^[a-z]{2}(-[A-Z]{2,3})?$/
+    end
+
+    def locale_strategy
+      locale[:strategy] || 'param'
+    end
+
+    def agent_locale_strategy
+      locale.merge(param: locale_param)
+    end
+
+    def locale_param
+      locale[:param] || 'locale'
+    end
+
+    def current_locale_method
+      locale[:method] || @current_locale_method
+    end
+
+    def locale_cookie_enabled?
+      if %w(pre-domain custom-domain).include?(locale[:strategy])
+        return false
+      end
+      locale[:cookie].nil? || locale[:cookie]
+    end
+
+    def locale_browser_enabled?
+      locale[:browser].nil? || locale[:browser]
+    end
+
+    def locale_redirect_enabled?
+      locale[:redirect].nil? || locale[:redirect]
+    end
+
     def nested_value(hash, key, default_value = nil)
       parts = key.split('.')
       parts.each do |part|

data/lib/tml/ext/string.rb

@@ -50,7 +50,7 @@ class String
   end
 
   def tml_translated?
-    @tml_translated
+    @tml_translated || index('<tml:label')
   end
 
 end

data/lib/tml/language.rb

@@ -118,7 +118,8 @@ class Tml::Language < Tml::Base
   end
 
   def current_source(options)
-    (options[:source] || Tml.session.block_option(:source) || Tml.session.current_source || 'undefined').to_s
+    return options[:source] if options and options[:source]
+    (Tml.session.block_option(:source) || Tml.session.current_source || 'undefined').to_s
   end
 
   #######################################################################################################
@@ -181,7 +182,7 @@ class Tml::Language < Tml::Base
     end
 
     # fetch translations grouped by source
-    source_key = current_source(options)
+    source_key = current_source(params[:options])
     current_source_path = source_path
 
     # Dynamic sources are never registered under the parent source for fast retrieval

data/lib/tml/session.rb

@@ -121,6 +121,34 @@ module Tml
       current_translator and current_translator.inline?
     end
 
+    def translate(label, description = '', tokens = {}, options = {})
+      params = Tml::Utils.normalize_tr_params(label, description, tokens, options)
+      return params[:label] if params[:label].tml_translated?
+
+      params[:options][:caller] ||= caller
+
+      if Tml.config.disabled?
+        return Tml.config.default_language.translate(params[:label], params[:tokens], params[:options]).tml_translated
+      end
+
+      # Translate individual sentences
+      if params[:options][:split]
+        text = params[:label]
+        sentences = Tml::Utils.split_sentences(text)
+        sentences.each do |sentence|
+          text = text.gsub(sentence, target_language.translate(sentence, params[:description], params[:tokens], params[:options]))
+        end
+        return text.tml_translated
+      end
+
+      target_language.translate(params).tml_translated
+    rescue Tml::Exception => ex
+      #pp ex, ex.backtrace
+      Tml.logger.error(ex.message)
+      #Tml.logger.error(ex.message + "\n=> " + ex.backtrace.join("\n=> "))
+      label
+    end
+
     #########################################################
     ## Block Options
     #########################################################
@@ -161,6 +189,7 @@ module Tml
       pop_block_options
       ret
     end
+    alias_method :with_options, :with_block_options
 
   end
 end

data/lib/tml/tokenizers/decoration.rb

@@ -155,6 +155,8 @@ module Tml
           end
         end
 
+        # remove unused attributes
+        default_decoration = default_decoration.gsub(/\{\$[^}]*\}/, '')
         default_decoration
       end
 

data/lib/tml/utils.rb

@@ -46,15 +46,15 @@ module Tml
           :label        => label,
           :description  => nil,
           :tokens       => description,
-          :options      => tokens
+          :options      => tokens || {}
         }
       end
 
       {
         :label        => label,
         :description  => description,
-        :tokens       => tokens,
-        :options      => options
+        :tokens       => tokens || {},
+        :options      => options || {}
       }
     end
 

data/lib/tml/version.rb

@@ -31,7 +31,7 @@
 #++
 
 module Tml
-  VERSION = '5.5.4'
+  VERSION = '5.6.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.4
+  version: 5.6.1
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday