tml 4.3.4 → 4.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c93181c73e8d51d0547614c850cd4f1902397a5
-  data.tar.gz: 8388206c002b497ee3210f6cc07860374c0aaeee
+  metadata.gz: b305529c8b1fefe33c3d8ba0fd445566a6f7667a
+  data.tar.gz: 1fe8c90ddcd2d26edc1b7e70894085cf3d8e6470
 SHA512:
-  metadata.gz: e6f3cb0e93280f4fba083a262f54996e464712ca57caf597a22a46b361315768b0f6f32e20d2a827c64a832e1170de167738985dece40d88317b9aecb150c02a
-  data.tar.gz: 977bfea69f9e79248688fab4b9b48d62d803c8931cac356a32e6471c0bf55cf46b7e8a39ac3780066bb688255e39eec1f20fbb5e4501d0b60e8f6f21330d02d1
+  metadata.gz: 1f8535261a61e58a53fa9bd5e6101ec13b80819adb79a58b89eb4c916fb0d58fa7555b5e359222b6999542b608ad4d638a38fa4a9a731b28993e0163ad842aeb
+  data.tar.gz: 6c7af851ad4066fa6701704ba3ee06e36b3678d195e30acccbdbbb8cc933fef989c5488752b1fc3e7dd7ea82df660a531e1cee92402c6e495ed602a089be5c8f

data/lib/tml/api/client.rb

@@ -97,7 +97,7 @@ class Tml::Api::Client < Tml::Base
 
     if opts[:method] == :get and opts[:cache_key]
       data = Tml.cache.fetch(opts[:cache_key]) do
-        Tml.cache.read_only? ? {} : execute_request(path, params, opts)
+        Tml.cache.read_only? ? nil : execute_request(path, params, opts)
       end
       process_response(data, opts)
     else
@@ -143,7 +143,7 @@ class Tml::Api::Client < Tml::Base
       params = params.merge(:api_key => application.key)
     end
 
-    Tml.logger.trace_api_call(path, params, opts) do
+    trace_api_call(path, params, opts) do
       begin
         if opts[:method] == :post
           response = connection.post(path, params)
@@ -187,6 +187,7 @@ class Tml::Api::Client < Tml::Base
   end
 
   def process_response(data, opts)
+    return nil if data.nil?
     return data if opts['raw']
 
     if data.is_a?(Hash) and data['results']
@@ -203,4 +204,33 @@ class Tml::Api::Client < Tml::Base
     object_class(opts).new(data.merge(opts[:attributes] || {}))
   end
 
+  def to_query(hash)
+    query = []
+    hash.each do |key, value|
+      query << "#{key}=#{value}"
+    end
+    query.join('&')
+  end
+
+  def trace_api_call(path, params, opts = {})
+    #[:client_secret, :access_token].each do |param|
+    #  params = params.merge(param => "##filtered##") if params[param]
+    #end
+
+    if opts[:method] == :post
+      Tml.logger.debug("post: [#{path}] #{params.inspect}")
+    else
+      Tml.logger.debug("get: #{path}?#{to_query(params)}")
+    end
+
+    t0 = Time.now
+    if block_given?
+      ret = yield
+    end
+    t1 = Time.now
+
+    Tml.logger.debug("call took #{t1 - t0} seconds")
+    ret
+  end
+
 end

data/lib/tml/application.rb

@@ -33,7 +33,7 @@
 require 'faraday'
 
 class Tml::Application < Tml::Base
-  attributes :host, :id, :key, :secret, :access_token, :name, :description, :threshold, :default_locale, :default_level, :tools
+  attributes :host, :id, :key, :access_token,  :name, :description, :threshold, :default_locale, :default_level, :tools
   has_many :features, :languages, :featured_locales, :sources, :components, :tokens, :css, :shortcuts, :translations
 
   def self.cache_key
@@ -81,6 +81,14 @@ class Tml::Application < Tml::Base
     @languages_by_locale[locale] = Tml.config.default_language
   end
 
+  def current_language(locale)
+    locale = locale.gsub('_', '-')
+    lang = language(locale)
+    lang ||= language(locale.split('-').first) if locale.index('-')
+    lang ||= Tml.config.default_language
+    lang
+  end
+
   # Mostly used for testing
   def add_language(new_language)
     @languages_by_locale ||= {}

data/lib/tml/cache.rb

@@ -41,7 +41,7 @@ module Tml
   def self.cache
     @cache ||= begin
       if Tml.config.cache_enabled?
-        klass = Tml::CacheAdapters.const_get(Tml.config.cache[:adapter].camelcase)
+        klass = Tml::CacheAdapters.const_get(Tml.config.cache[:adapter].to_s.camelcase)
         klass.new
       else
         # blank implementation
@@ -77,7 +77,7 @@ module Tml
     end
 
     def upgrade_version
-      update_version(version + 1)
+      update_version((version || Tml.config.cache[:version] || 0).to_i + 1)
       @version = nil
     end
 

data/lib/tml/cache_adapters/redis.rb

@@ -36,11 +36,18 @@ require 'redis' if defined?(::Redis)
 class Tml::CacheAdapters::Redis < Tml::Cache
 
   def initialize
-    cache_host, cache_port = Tml.config.cache[:host].split(':') if Tml.config.cache[:host]
-    cache_host ||= 'localhost'
-    cache_port ||= 6379
+    config = Tml.config.cache
 
-    @cache = ::Redis.new(host: cache_host, port: cache_port)
+    config[:host] ||= 'localhost'
+    config[:port] ||= 6379
+
+    if config[:host].index(':')
+      parts = config[:host].split(':')
+      config[:host] = parts.first
+      config[:port] = parts.last
+    end
+
+    @cache = ::Redis.new(config)
   end
 
   def cache_name
@@ -74,7 +81,6 @@ class Tml::CacheAdapters::Redis < Tml::Cache
     data
   rescue Exception => ex
     warn("Failed to retrieve data: #{ex.message}")
-    pp ex, ex.backtrace
     return nil unless block_given?
     yield
   end

data/lib/tml/logger.rb

@@ -36,15 +36,23 @@ module Tml
 
   def self.logger
     @logger ||= begin
-      logfile_path = File.expand_path(Tml.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')
-      logfile.sync = true
-      Tml::Logger.new(logfile)
+      if Tml.config.logger[:type].to_s == 'rails'
+        Rails.logger
+      else
+        logfile_path = File.expand_path(Tml.config.logger[:path] || './log/tml.log')
+        logfile_dir = logfile_path.split("/")[0..-2].join("/")
+        FileUtils.mkdir_p(logfile_dir) unless File.exist?(logfile_dir)
+        logfile = File.open(logfile_path, 'a')
+        logfile.sync = true
+        Tml::Logger.new(logfile)
+      end
     end
   end
 
+  def self.logger=(logger)
+    @logger = logger
+  end
+
   class Logger < ::Logger
 
     def format_message(severity, timestamp, progname, msg)
@@ -62,34 +70,6 @@ module Tml
       @stack ||= []
     end
 
-    def trace_api_call(path, params, opts = {})
-      #[:client_secret, :access_token].each do |param|
-      #  params = params.merge(param => "##filtered##") if params[param]
-      #end
-      if opts[:method] == :post
-        debug("post: [#{path}] #{params.inspect}")
-      else
-        debug("get: #{path}?#{to_query(params)}")
-      end
-      stack.push(caller)
-      t0 = Time.now
-      if block_given?
-        ret = yield
-      end
-      t1 = Time.now
-      stack.pop
-      debug("call took #{t1 - t0} seconds")
-      ret
-    end
-
-    def to_query(hash)
-      query = []
-      hash.each do |key, value|
-        query << "#{key}=#{value}"
-      end
-      query.join('&')
-    end
-
     def trace(message)
       debug(message)
       stack.push(caller)

data/lib/tml/session.rb

@@ -49,12 +49,14 @@ module Tml
       @access_token = token
     end
 
+    def cookie_name
+      "trex_#{self.application.key}"
+    end
+
     def init(opts = {})
       return unless Tml.config.enabled? and Tml.config.application
 
-      key     = opts[:key]    || Tml.config.application[:key]
-      secret  = opts[:secret] || Tml.config.application[:secret]
-      host    = opts[:host]   || Tml.config.application[:host]
+      host = opts[:host] || Tml.config.application[:host]
 
       Tml::Session.access_token ||= begin
         self.access_token = opts[:token] || Tml.config.application[:token]
@@ -64,7 +66,7 @@ module Tml
       Tml.cache.reset_version
 
       self.application = Tml.memory.fetch(Tml::Application.cache_key) do
-        Tml::Application.new(:host => host, :key => key, :secret => secret, :access_token => Tml::Session.access_token).fetch
+        Tml::Application.new(:host => host, :access_token => Tml::Session.access_token).fetch
       end
 
       if Tml.cache.read_only?
@@ -74,10 +76,11 @@ module Tml
       # Tml.logger.info(self.cookie_params.inspect)
 
       self.cookie_params = begin
-        cookie_name = "trex_#{self.application.key}"
         if opts[:cookies] and opts[:cookies][cookie_name]
           begin
-            HashWithIndifferentAccess.new(Tml::Utils.decode_and_verify_params(opts[:cookies][cookie_name], secret))
+            params = HashWithIndifferentAccess.new(Tml::Utils.decode(opts[:cookies][cookie_name]))
+            params[:locale] = opts[:locale] if opts[:change_locale]
+            params
           rescue Exception => ex
             Tml.logger.error("Failed to parse tml cookie: #{ex.message}")
             {}
@@ -89,9 +92,9 @@ module Tml
 
       self.tools_enabled = opts[:tools_enabled]
       self.current_user = opts[:user]
-      self.current_source = opts[:source] || '/tml/core'
+      self.current_source = opts[:source] || 'index'
       self.current_component = opts[:component]
-      self.current_locale = opts[:locale] || self.cookie_params[:locale] || Tml.config.default_locale
+      self.current_locale = self.cookie_params[:locale] || opts[:locale] || Tml.config.default_locale
 
       if self.cookie_params['translator']
         self.current_translator = Tml::Translator.new(self.cookie_params['translator'])
@@ -107,7 +110,10 @@ module Tml
         self.current_translator.application = self.application
       end
 
-      self.current_language = self.application.language(self.current_locale)
+      self.current_language = self.application.current_language(self.current_locale)
+      self.current_locale = self.current_language.locale
+
+      self
     end
 
     def tools_enabled?

data/lib/tml/source.rb

@@ -89,6 +89,7 @@ class Tml::Source < Tml::Base
 
     self
   rescue Tml::Exception => ex
+    self.translations = {}
     self
   end
 

data/lib/tml/utils.rb

@@ -91,18 +91,21 @@ module Tml
       yaml['defaults'].rmerge(yaml[env] || {})
     end
 
-    def self.sign_and_encode_params(params, secret)
-      URI::encode(Base64.encode64(params.to_json))
-    end
-
-    def self.decode_and_verify_params(signed_request, secret)
-      payload = URI::decode(signed_request)
+    def self.decode(data)
+      payload = URI::decode(data)
       payload = Base64.decode64(payload)
       JSON.parse(payload)
     rescue Exception => ex
       {}
     end
 
+    def self.encode(params)
+      payload = Base64.encode64(params.to_json)
+      URI::encode(payload)
+    rescue Exception => ex
+      ''
+    end
+
     def self.split_sentences(paragraph)
       sentence_regex = /[^.!?\s][^.!?]*(?:[.!?](?![\'"]?\s|$)[^.!?]*)*[.!?]?[\'"]?(?=\s|$)/
       paragraph.match(sentence_regex)

data/lib/tml/version.rb

@@ -30,5 +30,5 @@
 #++
 
 module Tml
-  VERSION = '4.3.4'
+  VERSION = '4.3.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tml
 version: !ruby/object:Gem::Version
-  version: 4.3.4
+  version: 4.3.6
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday