tml 5.0.2 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bfad1df09bdc30e9dff8ae24cfc73dd044cc1b7
-  data.tar.gz: db29aecf3e0e719844ed5366262e843fa36cf194
+  metadata.gz: 66fdea16ab7a949df955b07b84cff3e12ff4ce6c
+  data.tar.gz: c534611d08ce4f130ba280b6b6c4a69567f60ddd
 SHA512:
-  metadata.gz: ec1a8dd025cd3b506f519e72550d8c891342bee71127531e8cbf00de7710f90706e2b679df58a8ce3b5a66c38f77d88a327a5fcbfa7c6063e47c663b8e4b3e90
-  data.tar.gz: b5f76143c7c34632dcd4c3193f822640916b62786b53c4a21fd8ef5dbea3fec83cbadedbf426b923e43df66e4a420a9f3adaa73f27ae91088812aa8801336efe
+  metadata.gz: 35e492c0334f46220d7f85fd68465c03f70b11a22106d601176009f92edb21cb52bc55bb0ce1d79f1e310d5f780a1baa8f35e4a2957a43eda0a8278c311fe448
+  data.tar.gz: 3d6ae9f883fd21971e928f76aeae05cb969b448f5cee9af26b1b04e6bbc85bb04518d911cc2778ff00af3c567bb58ebead7fd6710c8fec8bac8eaa9d923669a3

data/lib/tml/application.rb

@@ -135,8 +135,8 @@ class Tml::Application < Tml::Base
   end
 
   # Normalizes and returns current language
-  # TODO: verify usage
   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('-')

data/lib/tml/config.rb

@@ -80,7 +80,7 @@ module Tml
 
     # Used by Rails and Sinatra extensions
     attr_accessor :current_locale_method, :current_user_method, :translator_options, :i18n_backend
-    attr_accessor :invalidator
+    attr_accessor :invalidator, :agent
 
     # Used for IRB only
     attr_accessor :submit_missing_keys_realtime
@@ -100,6 +100,11 @@ module Tml
         extension:  false
       }
 
+      @agent = {
+        enabled: true,
+        type:    'agent'
+      }
+
       # if running from IRB, make it default to TRUE
       @submit_missing_keys_realtime = (%w(irb pry).include?($0 || ''))
 
@@ -131,7 +136,7 @@ module Tml
         },
         data_tokens: {
           special: {
-            enable: true,
+            enabled: true,
             regex: /(&[^;]*;)/
           },
           date: {

data/lib/tml/decorators/base.rb

@@ -41,12 +41,31 @@ class Tml::Decorators::Base < Tml::Base
     raise Tml::Exception.new('Must be implemented by the extending class')
   end
 
+  def decorate_language_case(language_case, rule, original, transformed, options = {})
+    raise Tml::Exception.new('Must be implemented by the extending class')
+  end
+
+  def decorate_token(token, value, options = {})
+    raise Tml::Exception.new('Must be implemented by the extending class')
+  end
+
+  def decorate_element(token, value, options = {})
+    raise Tml::Exception.new('Must be implemented by the extending class')
+  end
+
   def inline_mode?
     Tml.session.current_translator and Tml.session.current_translator.inline?
   end
 
-  def decorate_language_case(language_case, rule, original, transformed, options = {})
-    raise Tml::Exception.new('Must be implemented by the extending class')
+  def enabled?(options)
+    return false if options[:skip_decorations]
+    inline_mode?
   end
-  
+
+  def decoration_element(default, options)
+    return 'span' if options[:use_span]
+    return 'div' if options[:use_div]
+    default
+  end
+
 end

data/lib/tml/decorators/default.rb

@@ -40,4 +40,12 @@ class Tml::Decorators::Default < Tml::Decorators::Base
     transformed
   end
 
+  def decorate_token(token, value, options = {})
+    value
+  end
+
+  def decorate_element(token, value, options = {})
+    value
+  end
+
 end

data/lib/tml/decorators/html.rb

@@ -35,9 +35,10 @@ class Tml::Decorators::Html < Tml::Decorators::Base
   def decorate(translated_label, translation_language, target_language, translation_key, options = {})
     #Tml.logger.info("Decorating #{translated_label} of #{translation_language.locale} to #{target_language.locale}")
 
+    return translated_label unless enabled?(options)
+
     # if translation key language is the same as target language - skip decorations
-    if options[:skip_decorations] or not inline_mode? or
-       (translation_key.application.feature_enabled?(:lock_original_content) and translation_key.language == target_language)
+    if translation_key.application.feature_enabled?(:lock_original_content) and translation_key.language == target_language
       return translated_label
     end
 
@@ -59,9 +60,7 @@ class Tml::Decorators::Html < Tml::Decorators::Base
       classes << 'tml_fallback'
     end
 
-    element = 'tml:label'
-    element = 'span' if options[:use_span]
-    element = 'div' if options[:use_div]
+    element = decoration_element('tml:label', options)
 
     html = "<#{element} class='#{classes.join(' ')}' data-translation_key='#{translation_key.key}' data-target_locale='#{target_language.locale}'>"
     html << translated_label
@@ -70,8 +69,7 @@ class Tml::Decorators::Html < Tml::Decorators::Base
   end
 
   def decorate_language_case(language_case, rule, original, transformed, options = {})
-    return transformed if options[:skip_decorations] or language_case.language.default?
-    return transformed unless inline_mode?
+    return transformed unless enabled?(options)
 
     data = {
       'keyword'       => language_case.keyword,
@@ -93,9 +91,7 @@ class Tml::Decorators::Html < Tml::Decorators::Base
       attrs << "#{key}=\"#{value.to_s.gsub('"', "\"")}\""
     end
 
-    element = 'tml:label'
-    element = 'span' if options[:use_span]
-    element = 'div' if options[:use_div]
+    element = decoration_element('tml:case', options)
 
     html = "<#{element} #{attrs.join(' ')}>"
     html << transformed
@@ -103,4 +99,31 @@ class Tml::Decorators::Html < Tml::Decorators::Base
     html
   end
 
+  def decorate_token(token, value, options = {})
+    return value unless enabled?(options)
+
+    element = decoration_element('tml:token', options)
+
+    classes = ['tml_token', "tml_token_#{token.decoration_name}"]
+
+    html = "<#{element} class='#{classes.join(' ')}' data-name='#{token.name}'"
+    html << " data-context='#{token.context_keys.join(',')}'" if token.context_keys.any?
+    html << " data-case='#{token.case_keys.join(',')}'" if token.case_keys.any?
+    html << '>'
+    html << value
+    html << "</#{element}>"
+    html
+  end
+
+  def decorate_element(token, value, options = {})
+    return value unless enabled?(options)
+
+    element = decoration_element('tml:element', options)
+
+    html = "<#{element}>"
+    html << value
+    html << "</#{element}>"
+    html
+  end
+
 end

data/lib/tml/session.rb

@@ -71,6 +71,7 @@ module Tml
     end
 
     def preferred_locale(locales)
+      return application.default_locale unless locales
       locales = locales.is_a?(String) ? locales.split(',') : locales
       locales.each do |locale|
         return locale if application.locales.include?(locale)

data/lib/tml/tokenizers/dom.rb

@@ -259,18 +259,17 @@ module Tml
         rules = option('data_tokens.rules')
         if rules
           rules.each do |rule|
-            if rule[:enabled]
-              matches = text.scan(rule[:regex])
-
-              if matches
-                matches.each do |match|
-                  next if match.first.nil? or match.first == ''
-                  value = match.first.strip
-
-                  unless value == ''
-                    token = contextualize(rule[:name], value.gsub(/[.,;\s]/, '').to_i)
-                    text = text.gsub(value, value.gsub(value, "{#{token}}"))
-                  end
+            next unless rule[:enabled]
+            matches = text.scan(rule[:regex])
+
+            if matches
+              matches.each do |match|
+                next if match.first.nil? or match.first == ''
+                value = match.first.strip
+
+                unless value == ''
+                  token = contextualize(rule[:name], value.gsub(/[.,;\s]/, '').to_i)
+                  text = text.gsub(value, value.gsub(value, "{#{token}}"))
                 end
               end
             end

data/lib/tml/tokens/data.rb

@@ -160,14 +160,14 @@ module Tml
 
         values = objects.collect do |obj|
           if method.is_a?(String)
-            method.gsub("{$0}", sanitize(obj.to_s, obj, language, options.merge(:safe => false)))
+            element = method.gsub("{$0}", sanitize(obj.to_s, obj, language, options.merge(:safe => false)))
           elsif method.is_a?(Symbol)
             if obj.is_a?(Hash)
               value = Tml::Utils.hash_value(obj, method)
             else
               value = obj.send(method)
             end
-            sanitize(value, obj, language, options.merge(:safe => false))
+            element = sanitize(value, obj, language, options.merge(:safe => false))
           elsif method.is_a?(Hash)
             attr = Tml::Utils.hash_value(method, :attribute) || Tml::Utils.hash_value(method, :property)
             if obj.is_a?(Hash)
@@ -178,13 +178,15 @@ module Tml
 
             hash_value = Tml::Utils.hash_value(method, :value)
             if hash_value
-              hash_value.gsub("{$0}", sanitize(value, obj, language, options.merge(:safe => false)))
+              element = hash_value.gsub("{$0}", sanitize(value, obj, language, options.merge(:safe => false)))
             else
-              sanitize(value, obj, language, options.merge(:safe => false))
+              element = sanitize(value, obj, language, options.merge(:safe => false))
             end
           elsif method.is_a?(Proc)
-            sanitize(method.call(obj), obj, language, options.merge(:safe => true))
+            element = sanitize(method.call(obj), obj, language, options.merge(:safe => true))
           end
+
+          Tml::Decorators::Base.decorator.decorate_element(self, element, options)
         end
 
         return values.first if objects.size == 1
@@ -384,13 +386,21 @@ module Tml
         return label.gsub(full_name, '') if object.nil?
 
         value = token_value(object, language, options)
-        label.gsub(full_name, value)
+        label.gsub(full_name, decorate(value, options))
+      end
+
+      def decorate(value, options = {})
+        Tml::Decorators::Base.decorator.decorate_token(self, value, options)
       end
 
       def sanitized_name
         name(:parens => true)
       end
 
+      def decoration_name
+        self.class.name.split('::').last.downcase
+      end
+
       def to_s
         full_name
       end

data/lib/tml/tokens/method.rb

@@ -56,6 +56,6 @@ class Tml::Tokens::Method < Tml::Tokens::Data
     object = Tml::Utils.hash_value(context, object_name)
     return label unless object
     object_value = sanitize(object.send(object_method_name), object, language, options.merge(:safe => false))
-    label.gsub(full_name, object_value)
+    label.gsub(full_name, decorate(object_value, options))
   end
 end

data/lib/tml/tokens/transform.rb

@@ -208,16 +208,22 @@ class Tml::Tokens::Transform < Tml::Tokens::Data
 
     return label unless value
 
+    decorated_value = decorate(token_value(Tml::Utils.hash_value(context, key), language, options), options)
+
     substitution_value = []
     if displayed_in_translation?
-      substitution_value << token_value(Tml::Utils.hash_value(context, key), language, options)
+      substitution_value << decorated_value
       substitution_value << ' '
     else
-      value = value.gsub("##{short_name}#", token_value(Tml::Utils.hash_value(context, key), language, options))
+      value = value.gsub("##{short_name}#", decorated_value)
     end
     substitution_value << value
 
     label.gsub(full_name, substitution_value.join(''))
   end
-  
+
+  def decoation_name
+    'piped'
+  end
+
 end

data/lib/tml/utils.rb

@@ -84,24 +84,21 @@ module Tml
       yaml['defaults'].rmerge(yaml[env] || {})
     end
 
-    def self.decode(data, secret = nil)
-      payload = URI::decode(data)
+    def self.decode(payload, secret = nil)
+      # payload = URI::decode(payload)
       payload = Base64.decode64(payload)
       data = JSON.parse(payload)
-
       # TODO: Verify signature
-
       data
     rescue Exception => ex
       {}
     end
 
     def self.encode(params, secret = nil)
-
       # TODO: Add signature
-
       payload = Base64.encode64(params.to_json)
-      URI::encode(payload)
+      # URI::encode(payload)
+      payload
     rescue Exception => ex
       ''
     end

data/lib/tml/version.rb

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

metadata

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