tr8n_core 4.0.1 → 4.0.2

data/lib/tr8n/language_case.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -95,7 +95,8 @@ class Tr8n::LanguageCase < Tr8n::Base
   def decorate(word, case_value, case_rule, options = {})
     return case_value if options[:skip_decorations]
     return case_value if language.default?
-    return case_value unless Tr8n.config.current_translator and Tr8n.config.current_translator.inline?
+    return case_value unless Tr8n.session.current_translator
+    return case_value unless Tr8n.session.current_translator.inline?
 
     "<span class='tr8n_language_case' data-case_id='#{id}' data-rule_id='#{case_rule ? case_rule.id : ''}' data-case_key='#{word.gsub("'", "\'")}'>#{case_value}</span>"
   end
@@ -105,7 +106,7 @@ class Tr8n::LanguageCase < Tr8n::Base
   #######################################################################################################
 
   def to_cache_hash
-    hash = to_hash(:id, :keyword, :description, :latin_name, :native_name)
+    hash = to_hash(:id, :keyword, :description, :latin_name, :native_name, :application)
     hash["rules"] = []
     rules.each do |rule|
       hash["rules"] << rule.to_cache_hash

data/lib/tr8n/language_case_rule.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tr8n/language_context.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -40,7 +40,7 @@ class Tr8n::LanguageContext < Tr8n::Base
 
   def config
     context_rules = Tr8n.config.context_rules
-    hash_value(context_rules, keyword) || {}
+    hash_value(context_rules, keyword.to_sym) || {}
   end
 
   def token_expression
@@ -86,6 +86,8 @@ class Tr8n::LanguageContext < Tr8n::Base
       else
         vars[key] = obj
       end
+
+      vars[key] = vars[key].to_s if vars[key].is_a?(Symbol)
     end
     vars
   end

data/lib/tr8n/language_context_rule.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tr8n/logger.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -27,7 +27,7 @@ module Tr8n
 
   def self.logger
     @logger ||= begin
-      logfile_path = File.expand_path(Tr8n.config.log_path)
+      logfile_path = File.expand_path(Tr8n.config.logger[:path])
       logfile_dir = logfile_path.split("/")[0..-2].join("/")
       FileUtils.mkdir_p(logfile_dir) unless File.exist?(logfile_dir)
       logfile = File.open(logfile_path, 'a')
@@ -39,11 +39,13 @@ module Tr8n
   class Logger < ::Logger
 
     def format_message(severity, timestamp, progname, msg)
+      return "" unless Tr8n.config.logger[:enabled]
+      # TODO: check for severity/level
       "[#{timestamp.strftime("%D %T")}]: #{"  " * stack.size}#{msg}\n"
     end
 
     def add(severity, message = nil, progname = nil, &block)
-      return unless Tr8n.config.logger_enabled?
+      return unless Tr8n.config.logger[:enabled]
       super
     end
 
@@ -52,6 +54,9 @@ module Tr8n
     end
 
     def trace_api_call(path, params)
+      [:client_secret, :access_token].each do |param|
+        params = params.merge(param => "##filtered##")
+      end
       debug("api: [/#{path}] #{params.inspect}")
       stack.push(caller)
       t0 = Time.now

data/lib/tr8n/rules_engine/evaluator.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -31,7 +31,7 @@ module Tr8n
         @vars = {}
         @env = {
             # McCarthy's Elementary S-functions and Predicates
-            'label'   => lambda { |l, r|      @env[l] = @vars[l] = r },
+            'label'   => lambda { |l, r|      @vars[l] = r },
             'quote'   => lambda { |expr|      expr },
             'car'     => lambda { |list|      list[1] },
             'cdr'     => lambda { |list|      list.drop(1) },
@@ -58,7 +58,7 @@ module Tr8n
             '||'      => lambda { |*expr|     expr.any?{|e| evaluate(e)} },                         # ['||', [], [], ...]
             'or'      => lambda { |*expr|     expr.any?{|e| evaluate(e)} },                         # ['or', [], [], ...]
             'if'      => lambda { |c, t, f|   evaluate(c) ? evaluate(t) : evaluate(f) },            # ['if', 'cond', 'true', 'false']
-            'let'     => lambda { |l, r|      @env[l] = @vars[l] = r },                             # ['let', 'n', 5]
+            'let'     => lambda { |l, r|      @vars[l] = r },                                       # ['let', 'n', 5]
             'true'    => lambda { true },                                                           # ['true']
             'false'   => lambda { false },                                                          # ['false']
 
@@ -125,9 +125,6 @@ module Tr8n
       end
 
       def reset!
-        @vars.each do |var|
-          @env.delete(var)
-        end
         @vars = {}
       end
 
@@ -138,7 +135,7 @@ module Tr8n
 
       def evaluate(expr)
         if @env['atom'].call(expr)
-          return @env[expr] if @env[expr]
+          return @vars[expr] if expr.is_a?(String) and @vars[expr]
           return expr
         end
 

data/lib/tr8n/rules_engine/parser.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -50,33 +50,6 @@ module Tr8n
         tokens.shift
         list
       end
-
-      def class_for(token)
-        {
-          /^[\(]$/    => 'open_paren',
-          /^[\)]$/    => 'close_paren',
-          /^['|"]/    => 'string',
-          /^@/        => 'variable',
-          /^[\d|.]+$/ => 'number',
-        }.each do |regexp, cls|
-          return cls if regexp.match(token)
-        end
-        'symbol'
-      end
-
-      def decorate
-        html = ["<span class='tr8n_sexp'>"]
-        if tokens
-          html << tokens.collect do |token|
-            "<span class='#{class_for(token)}'>#{token}</span>"
-          end.join('')
-        else
-          html << "<span class='#{class_for(expression)}'>#{expression}</span>"
-        end
-        html << '</span>'
-        html.join('').html_safe
-      end
-
     end
 
   end

data/lib/tr8n/session.rb

@@ -0,0 +1,87 @@
+#--
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+module Tr8n
+
+  def self.session
+    Thread.current[:session] ||= Tr8n::Session.new
+  end
+
+  # Acts as a global singleton that holds all Tr8n configuration
+  # The class can be extended with a different implementation, as long as the interface is supported
+  class Session
+    # Session Attributes - Move to Session
+    attr_accessor :application, :current_user, :current_language, :current_translator,
+                  :current_source, :current_component, :block_options
+
+    def init
+      Tr8n::Application.init(Tr8n.config.application[:key], Tr8n.config.application[:secret], Tr8n.config.application[:host])
+      self.current_source = "/tr8n/core"
+    end
+
+    def reset
+      self.application= nil
+      self.current_user= nil
+      self.current_language= nil
+      self.current_translator= nil
+      self.current_source= nil
+      self.current_component= nil
+      self.block_options= nil
+    end
+
+    #########################################################
+    ## Block Options
+    #########################################################
+
+    def block_options
+      (@block_options ||= []).last || {}
+    end
+
+    def with_block_options(opts)
+      @block_options ||= []
+      @block_options.push(opts)
+      if block_given?
+        ret = yield
+      end
+      @block_options.pop
+      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
+
+    def current_component_from_block_options
+      arr = @block_options || []
+      arr.reverse.each do |opts|
+        return application.component_by_key(opts[:component]) unless opts[:component].blank?
+      end
+      Tr8n.config.current_component
+    end
+
+  end
+end

data/lib/tr8n/source.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tr8n/tokens/data.rb

@@ -92,13 +92,13 @@ class Tr8n::Tokens::Data < Tr8n::Base
   def sanitize(object, value, options, language)
     value = "#{value.to_s}" unless value.is_a?(String)
 
-    unless Tr8n.config.block_options[:skip_html_escaping]
+    unless Tr8n.session.block_options[:skip_html_escaping]
       if options[:sanitize_values]
         value = ERB::Util.html_escape(value)
       end
     end
 
-    if Tr8n.config.application and not Tr8n.config.application.feature_enabled?(:language_cases)
+    if Tr8n.session.application and not Tr8n.session.application.feature_enabled?(:language_cases)
       return value
     end
 

data/lib/tr8n/tokens/data_tokenizer.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tr8n/tokens/decoration_tokenizer.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tr8n/tokens/hidden.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tr8n/tokens/method.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tr8n/tokens/transform.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -137,7 +137,7 @@ class Tr8n::Tokens::Transform < Tr8n::Tokens::Data
 
         # apply settings cases
         value = params[index]
-        if Tr8n.config.application.feature_enabled?(:language_cases)
+        if Tr8n.session.application.feature_enabled?(:language_cases)
           parts[1..-1].each do |case_key|
             lcase = context.language.language_case_by_keyword(case_key)
             unless lcase

data/lib/tr8n/translation.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -98,7 +98,7 @@ class Tr8n::Translation < Tr8n::Base
   #######################################################################################################
 
   def to_cache_hash
-    to_hash(:label, :context)
+    to_hash(:locale, :label, :context, :precedence)
   end
 
 end

data/lib/tr8n/translation_key.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -32,7 +32,7 @@ class Tr8n::TranslationKey < Tr8n::Base
     super
 
     self.attributes[:key] ||= self.class.generate_key(label, description)
-    self.attributes[:locale] ||= Tr8n.config.block_options[:locale] || application.default_locale
+    self.attributes[:locale] ||= Tr8n.session.block_options[:locale] || application.default_locale
     self.attributes[:language] ||= application.language(locale)
     self.attributes[:translations] = {}
 
@@ -61,7 +61,7 @@ class Tr8n::TranslationKey < Tr8n::Base
   def fetch_translations(language, options = {})
     return self if self.id and has_translations_for_language?(language)
 
-    if options[:dry] or Tr8n.config.block_options[:dry]
+    if options[:dry] or Tr8n.session.block_options[:dry]
       return application.cache_translation_key(self)
     end
 
@@ -192,7 +192,7 @@ class Tr8n::TranslationKey < Tr8n::Base
   end
 
   def to_cache_hash
-    hash = to_hash(:id, :key, :label, :description, :locale, :level)
+    hash = to_hash(:id, :key, :label, :description, :locale, :level, :locked)
     if translations and translations.any?
       hash["translations"] = {}
       translations.each do |locale, locale_translations|

data/lib/tr8n/translator.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tr8n/utils.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tr8n_core/ext/array.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -24,7 +24,7 @@
 class Array
 
   # translates an array of options for a select tag
-  def tro(description = "", options = {}, language = Tr8n.config.current_language)
+  def tro(description = "", options = {}, language = Tr8n.session.current_language)
     return [] if empty?
 
     collect do |opt|
@@ -39,7 +39,7 @@ class Array
   end
 
   # translate array values 
-  def trl(description = "", options = {}, language = Tr8n.config.current_language)
+  def trl(description = "", options = {}, language = Tr8n.session.current_language)
     return [] if empty?
 
     collect do |opt|
@@ -52,7 +52,7 @@ class Array
   end
 
   # creates a sentence with tr "and" joiner
-  def tr_sentence(options = {}, language = Tr8n.config.current_language)
+  def tr_sentence(options = {}, language = Tr8n.session.current_language)
     return "" if empty?
     return first if size == 1
 

data/lib/tr8n_core/ext/date.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -23,18 +23,43 @@
 
 class Date
 
-  def translate(format = :default, language = Tr8n.config.current_language, options = {})
+  # The translation of the date can use one of the formats:
+  #
+  # Using the Symbol to pull the default format defined in the config:
+  #
+  #  date.translate(:verbose)
+  #
+  # Using a string with format with native Date elements
+  #
+  #  date.translate("%m/%d/%Y")
+  #
+  # Or using a string with tokens:
+  #
+  #  date.translate("{month_name} {days::ord}")
+  #
+  # The last allows you to use language cases to get something like "on March 1st".
+
+  def translate(format = :default, language = Tr8n.session.current_language, options = {})
     label = (format.is_a?(String) ? format.clone : Tr8n.config.default_date_formats[format].clone)
-    symbols = label.scan(/(%\w)/).flatten.uniq
 
     selected_tokens = []
-    symbols.each do |symbol|
-      token = Tr8n.config.strftime_symbol_to_token(symbol)
-      next unless token
-      selected_tokens << token
-      label.gsub!(symbol, token)
+    using_tokens = label.index('{')
+
+    if using_tokens
+      selected_tokens = Tr8n::Tokens::Data.parse(label).collect{ |token| token.name(:parens => true) }
+
+    else
+      symbols = label.scan(/(%\w)/).flatten.uniq
+
+      symbols.each do |symbol|
+        token = Tr8n.config.strftime_symbol_to_token(symbol)
+        next unless token
+        selected_tokens << token
+        label.gsub!(symbol, token)
+      end
     end
 
+
     tokens = {}
     selected_tokens.each do |token|
       case token
@@ -45,10 +70,10 @@ class Date
         when "{week_days}"            then tokens[:week_days] = strftime("%w")
         when "{short_years}"          then tokens[:short_years] = strftime("%y")
         when "{years}"                then tokens[:years] = year
-        when "{short_week_day_name}"  then tokens[:short_week_day_name] = language.tr(Tr8n.config.default_abbr_day_names[wday], "Short name for a day of a week", {}, options)
-        when "{week_day_name}"        then tokens[:week_day_name] = language.tr(Tr8n.config.default_day_names[wday], "Day of a week", {}, options)
-        when "{short_month_name}"     then tokens[:short_month_name] = language.tr(Tr8n.config.default_abbr_month_names[month - 1], "Short month name", {}, options)
-        when "{month_name}"           then tokens[:month_name] = language.tr(Tr8n.config.default_month_names[month - 1], "Month name", {}, options)
+        when "{short_week_day_name}"  then tokens[:short_week_day_name] = language.tr(Tr8n.config.default_abbr_day_name(wday), "Short name for a day of a week", {}, options)
+        when "{week_day_name}"        then tokens[:week_day_name] = language.tr(Tr8n.config.default_day_name(wday), "Day of a week", {}, options)
+        when "{short_month_name}"     then tokens[:short_month_name] = language.tr(Tr8n.config.default_abbr_month_name(month - 1), "Short month name", {}, options)
+        when "{month_name}"           then tokens[:month_name] = language.tr(Tr8n.config.default_month_name(month - 1), "Month name", {}, options)
         when "{day_of_month}"         then tokens[:day_of_month] = strftime("%e")
       end
     end
@@ -57,7 +82,7 @@ class Date
   end
   alias :tr :translate  
   
-  def trl(format = :default, language = Tr8n.config.current_language, options = {})
+  def trl(format = :default, language = Tr8n.session.current_language, options = {})
     tr(format, language, options.merge!(:skip_decorations => true))
   end
 end

data/lib/tr8n_core/ext/fixnum.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -27,12 +27,12 @@ class Fixnum
     (to_i < 10 ? "0#{to_s}" : to_s)
   end
 
-  def translate(desc = "", tokens = {}, options = {}, language = Tr8n.config.current_language)
+  def translate(desc = "", tokens = {}, options = {}, language = Tr8n.session.current_language)
     to_s.translate(desc, tokens, options, language)
   end
   alias tr translate
   
-  def trl(desc = "", tokens = {}, options = {}, language = Tr8n.config.current_language)
+  def trl(desc = "", tokens = {}, options = {}, language = Tr8n.session.current_language)
     to_s.trl(desc, tokens, options, language)
   end
 

data/lib/tr8n_core/ext/hash.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/tr8n_core/ext/string.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2013 Michael Berkovich, tr8nhub.com
+# Copyright (c) 2014 Michael Berkovich, tr8nhub.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -23,11 +23,11 @@
 
 class String
 
-  def translate(desc = "", tokens = {}, options = {}, language = Tr8n.config.current_language)
+  def translate(desc = "", tokens = {}, options = {}, language = Tr8n.session.current_language)
     language.translate(self, desc, tokens, options)
   end
 
-  def trl(desc = "", tokens = {}, options = {}, language = Tr8n.config.current_language)
+  def trl(desc = "", tokens = {}, options = {}, language = Tr8n.session.current_language)
     translate(desc, tokens, options.merge(:skip_decorations => true), language)
   end