tml 4.4.4 → 4.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e07af13388f61b41b40c25cea4be7bc7896430c
-  data.tar.gz: c9d05b304a9a4e48f79b38e4b9217ebabac954f0
+  metadata.gz: 2ee215776a93a3de80da5b0f4f432ea99e44e577
+  data.tar.gz: b2dd1de37941aaef3224de6a2458cbf5cc74c6ca
 SHA512:
-  metadata.gz: 1369334f7c7f1bbfcb269f8af6e1f8325b37ce9c15d0ec2c97a5bf18b71c06011865e9a3fc777c8247c0752bd1ac534c38f87611f963afafa4493dded031d7b8
-  data.tar.gz: fc82f9eed90fd0ae94afea07651efd26c5ac8eee4feb017b95150b43ca0fc08d2503a324500dd78c2d3e160575a83bbc45d552bac25b25257b6e2dae3e412b0f
+  metadata.gz: 6a3a8087e25ca982bcc9ed6ed27e74ac53bac437738512bbe1a754f9d23e0ea82e3aaceeae1a6ae425cf53767ff558454a868985b09ff14cbc11a2510ba313a0
+  data.tar.gz: cc3e5c6524a9690e774a31b3aeefeae710a567b67e1e98bd03cf99b3f12799b7c71a4e75b105cc11e0b0fa8c7ab14115a10436d332b631b2f2d849caeac687d6

data/lib/tml/application.rb

@@ -209,6 +209,7 @@ class Tml::Application < Tml::Base
           Tml::Translation.new(
             :locale => t['locale'] || locale,
             :label => t['label'],
+            :locked => t['locked'],
             :context => t['context']
           )
         end

data/lib/tml/config.rb

@@ -76,6 +76,7 @@ module Tml
   class Config
     # Configuration Attributes
     attr_accessor :enabled, :locale, :default_level, :format, :application, :context_rules, :logger, :cache, :default_tokens, :localization
+    attr_accessor :auto_init
 
     # Used by Rails and Sinatra extensions
     attr_accessor :current_locale_method, :current_user_method, :translator_options, :i18n_backend
@@ -89,6 +90,7 @@ module Tml
       @default_level  = 0
       @format = :html
       @subdomains = false
+      @auto_init = true
 
       @locale = {
         default:    'en',

data/lib/tml/decorators/html.rb

@@ -41,11 +41,10 @@ class Tml::Decorators::Html < Tml::Decorators::Base
     # if translation key language is the same as target language - skip decorations
     return translated_label if translation_key.language == target_language
     return translated_label unless inline_mode?
-    return translated_label if translation_key.locked? and not Tml.session.current_translator.manager?
 
     classes = %w(tml_translatable)
-    
-    if translation_key.locked?
+
+    if options[:locked]
       # must be a manager and enabling locking feature
       # return translated_label unless Tml.session.current_translator.feature_enabled?(:show_locked_keys)
       classes << 'tml_locked'

data/lib/tml/language.rb

@@ -153,6 +153,10 @@ class Tml::Language < Tml::Base
       return translation_key.translate(self, params[:tokens], params[:options]).tml_translated
     end
 
+    if options[:dynamic] or Tml.session.block_options[:dynamic]
+
+    end
+
     source_key = current_source(options)
 
     source = application.source(source_key, locale)

data/lib/tml/source.rb

@@ -84,6 +84,7 @@ class Tml::Source < Tml::Base
         Tml::Translation.new(
           :locale => t['locale'] || locale,
           :label => t['label'],
+          :locked => t['locked'],
           :context => t['context']
         )
       end

data/lib/tml/tokenizers/decoration.rb

@@ -44,6 +44,8 @@
 # [link: {count||message}]
 # [link: {count||person, people}]
 # [link: {user.name}]
+# [link] {user.name} [/link]
+# <link> {user.name} </link>
 #
 #######################################################################
 
@@ -57,12 +59,14 @@ module Tml
 
       RE_SHORT_TOKEN_START = '\[[\w]*:'
       RE_SHORT_TOKEN_END   = '\]'
-      RE_LONG_TOKEN_START  = '\[[\w]*\]'
-      RE_LONG_TOKEN_END    = '\[\/[\w]*\]'
-      RE_TEXT              = '[^\[\]]+' #'[\w\s!.:{}\(\)\|,?]*'
+      RE_LONG_TOKEN_START  = '\[[\w]*\]'                       # [link]
+      RE_LONG_TOKEN_END    = '\[\/[\w]*\]'                     # [/link]
+      RE_HTML_TOKEN_START  = '<[^\>]*>'                        # <link>
+      RE_HTML_TOKEN_END    = '<\/[^\>]*>'                      # </link>
+      RE_TEXT              = '[^\[\]<>]+'                        # '[\w\s!.:{}\(\)\|,?]*'
 
       def self.required?(label)
-        label.index('[')
+        label.index('[') or label.index('<')
       end
 
       def initialize(text, context = {}, opts = {})
@@ -77,6 +81,8 @@ module Tml
               RE_SHORT_TOKEN_END,
               RE_LONG_TOKEN_START,
               RE_LONG_TOKEN_END,
+              RE_HTML_TOKEN_START,
+              RE_HTML_TOKEN_END,
               RE_TEXT].join('|')
         @fragments = text.scan(/#{re}/)
         @tokens = []
@@ -94,6 +100,11 @@ module Tml
           return parse_tree(token.gsub(/[\[\]]/, ''), :long)
         end
 
+        if token.match(/#{RE_HTML_TOKEN_START}/)
+          return token if token.index('/>')
+          return parse_tree(token.gsub(/[<>]/, '').split(' ').first, :html)
+        end
+
         token.to_s
       end
 
@@ -115,6 +126,10 @@ module Tml
           until fragments.first.nil? or fragments.first.match(/#{RE_LONG_TOKEN_END}/)
             tree << parse
           end
+        elsif type == :html
+          until fragments.first.nil? or fragments.first.match(/#{RE_HTML_TOKEN_END}/)
+            tree << parse
+          end
         end
 
         fragments.shift
@@ -196,7 +211,7 @@ module Tml
       end
 
       def substitute
-        evaluate(parse)
+        evaluate(parse).gsub('[/tml]', '')
       end
 
     end

data/lib/tml/tokens/data.rb

@@ -37,7 +37,7 @@ module Tml
       attr_reader :label, :full_name, :short_name, :case_keys, :context_keys
 
       def self.expression
-        /(\{[^_:][\w]*(:[\w]+)*(::[\w]+)*\})/
+        /(%?\{{1,2}\s*\w*\s*(:\s*\w+)*\s*(::\s*\w+)*\s*\}{1,2})/
       end
 
       def self.parse(label, opts = {})

data/lib/tml/tokens/method.rb

@@ -41,7 +41,7 @@
 
 class Tml::Tokens::Method < Tml::Tokens::Data
   def self.expression
-    /(\{[^_:.][\w]*(\.[\w]+)(:[\w]+)*(::[\w]+)*\})/
+    /(%?\{{1,2}\s*[\w]*\.\w*\s*(:\s*\w+)*\s*(::\s*\w+)*\s*\}{1,2})/
   end
 
   def object_name

data/lib/tml/tokens/transform.rb

@@ -57,7 +57,7 @@ class Tml::Tokens::Transform < Tml::Tokens::Data
   attr_reader :pipe_separator, :piped_params
 
   def self.expression
-    /(\{[^_:|][\w]*(:[\w]+)*(::[\w]+)*\s*\|\|?[^{^}]+\})/
+    /(%?\{{1,2}\s*[\w]*\s*(:\s*\w+)*\s*\|\|?[^\{\}\|]+\}{1,2})/
   end
 
   def parse_elements

data/lib/tml/translation.rb

@@ -32,7 +32,7 @@
 
 class Tml::Translation < Tml::Base
   belongs_to :translation_key, :language
-  attributes :locale, :label, :context, :precedence
+  attributes :locale, :label, :context, :precedence, :locked
 
   def has_context_rules?
     context and context.any?

data/lib/tml/translation_key.rb

@@ -34,7 +34,7 @@ require 'digest/md5'
 
 class Tml::TranslationKey < Tml::Base
   belongs_to :application, :language
-  attributes :id, :key, :label, :description, :locale, :level, :locked
+  attributes :id, :key, :label, :description, :locale, :level
   has_many :translations # hashed by language
 
   def initialize(attrs = {})
@@ -118,6 +118,7 @@ class Tml::TranslationKey < Tml::Base
     decorator = Tml::Decorators::Base.decorator
 
     if translation
+      options[:locked] = translation.locked
       translated_label = substitute_tokens(translation.label, token_values, translation.language, options)
       return decorator.decorate(translated_label, translation.language, language, self, options)
     end
@@ -164,14 +165,14 @@ class Tml::TranslationKey < Tml::Base
   end
 
   def substitute_tokens(translated_label, token_values, language, options = {})
-    if Tml::Tokenizers::Data.required?(translated_label)
-      translated_label = Tml::Tokenizers::Data.new(translated_label, token_values, :allowed_tokens => data_tokens_names_map).substitute(language, options)
-    end
-
     if Tml::Tokenizers::Decoration.required?(translated_label)
       translated_label = Tml::Tokenizers::Decoration.new(translated_label, token_values, :allowed_tokens => decoration_tokens).substitute
     end
 
+    if Tml::Tokenizers::Data.required?(translated_label)
+      translated_label = Tml::Tokenizers::Data.new(translated_label, token_values, :allowed_tokens => data_tokens_names_map).substitute(language, options)
+    end
+
     translated_label
   end
 

data/lib/tml/version.rb

@@ -30,5 +30,5 @@
 #++
 
 module Tml
-  VERSION = '4.4.4'
+  VERSION = '4.4.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tml
 version: !ruby/object:Gem::Version
-  version: 4.4.4
+  version: 4.4.7
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday