tml 4.3.10 → 4.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd726ec4d8e669b5260eeef038dc0329e6806bd9
-  data.tar.gz: fbf200f5e07562a46cf3430f0b88776beef69d19
+  metadata.gz: 543c3402b5a22496ef6c01bddae3e2d9a88e1b96
+  data.tar.gz: 9ac59ac29ad476a0d3908b8230fabef85178ab81
 SHA512:
-  metadata.gz: 6af904753661a742074b7a0a0e8965029a259c4544d6c7dc7e92d1f916e99ca897672b3b311ec3216a4f6cfc38fabf9b94c27819540a019bf2068e6d270f5d38
-  data.tar.gz: c0cb5917de547073873dd50e78360c660face599c1ff19aeb6de362e44edd7c427d62f9580a0da5492795e9c47df32c24dc04eabbcb0dba4eb22e23612d437d0
+  metadata.gz: 5c3f93c9a88c7be4007b75c9ac871f0ffb61ac207f2dce5ef8036a920e848a10277b9d2900efc30475e2ba977a78bc39f147fa8cad188d94f867f55d83fb5a28
+  data.tar.gz: 275ea0ced9791048f00f12df818e902aa73f508a8cd769825f22770eabd6b673f148f9de1f1fbe108de397b4985317679ba5258ee608b6d3d57c20080a40d06f

data/lib/tml/cache_adapters/cdn.rb

@@ -0,0 +1,101 @@
+# encoding: UTF-8
+#--
+# Copyright (c) 2015 Translation Exchange, Inc
+#
+#  _______                  _       _   _             ______          _
+# |__   __|                | |     | | (_)           |  ____|        | |
+#    | |_ __ __ _ _ __  ___| | __ _| |_ _  ___  _ __ | |__  __  _____| |__   __ _ _ __   __ _  ___
+#    | | '__/ _` | '_ \/ __| |/ _` | __| |/ _ \| '_ \|  __| \ \/ / __| '_ \ / _` | '_ \ / _` |/ _ \
+#    | | | | (_| | | | \__ \ | (_| | |_| | (_) | | | | |____ >  < (__| | | | (_| | | | | (_| |  __/
+#    |_|_|  \__,_|_| |_|___/_|\__,_|\__|_|\___/|_| |_|______/_/\_\___|_| |_|\__,_|_| |_|\__, |\___|
+#                                                                                        __/ |
+#                                                                                       |___/
+# 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.
+#++
+
+class Tml::CacheAdapters::Cdn < Tml::Cache
+
+  def self.cache
+    @cache ||= {}
+  end
+
+  def self.cache_path
+    "#{Tml.config.cache[:base_url]}/#{Tml.config.cache[:version]}"
+  end
+
+  def self.cdn_path(key)
+    File.join(cache_path, "#{key}.json")
+  end
+
+  def cache_name
+    'cdn'
+  end
+
+  def segmented?
+    return true if Tml.config.cache[:segmented].nil?
+    Tml.config.cache[:segmented]
+  end
+
+  def fetch(key, opts = {})
+    if self.class.cache[key]
+      info("Memory hit: #{key}")
+      return self.class.cache[key]
+    end
+
+    path = self.class.cdn_path(key)
+
+
+    # load data from cdn
+
+
+    if File.exists?(path)
+      info("Cache hit: #{key}")
+      self.class.cache[key] = JSON.parse(File.read(path))
+      return self.class.cache[key]
+    end
+
+    info("Cache miss: #{key}")
+
+    return nil unless block_given?
+
+    yield
+  end
+
+  def store(key, data, opts = {})
+    warn('This is a readonly cache')
+  end
+
+  def delete(key, opts = {})
+    warn('This is a readonly cache')
+  end
+
+  def exist?(key, opts = {})
+    File.exists?(self.class.file_path(key))
+  end
+
+  def clear(opts = {})
+    warn('This is a readonly cache')
+  end
+
+  def read_only?
+    true
+  end
+
+end

data/lib/tml/logger.rb

@@ -36,16 +36,18 @@ module Tml
 
   def self.logger
     @logger ||= begin
+      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
+
+      logger = 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)
+        logger.external_logger = Rails.logger
       end
+
+      logger
     end
   end
 
@@ -54,11 +56,52 @@ module Tml
   end
 
   class Logger < ::Logger
+    attr_accessor :external_logger
+
+    def info(message)
+      if external_logger
+        return external_logger.info(format_message(Logger::Severity::INFO, Time.new, nil, message))
+      end
+
+      super
+    end
+
+    def debug(message)
+      if external_logger
+        return external_logger.debug(format_message(Logger::Severity::DEBUG, Time.new, nil, message))
+      end
+
+      super
+    end
+
+    def warn(message)
+      if external_logger
+        return external_logger.warn(format_message(Logger::Severity::WARN, Time.new, nil, message))
+      end
+
+      super
+    end
+
+    def error(message)
+      if external_logger
+        return external_logger.error(format_message(Logger::Severity::ERROR, Time.new, nil, message))
+      end
+
+      super
+    end
+
+    def fatal(message)
+      if external_logger
+        return external_logger.fatal(format_message(Logger::Severity::FATAL, Time.new, nil, message))
+      end
+
+      super
+    end
 
     def format_message(severity, timestamp, progname, msg)
       return "" unless Tml.config.logger[:enabled]
       # TODO: check for severity/level
-      "[#{timestamp.strftime("%D %T")}]: #{"  " * stack.size}#{msg}\n"
+      "[#{timestamp.strftime("%D %T")}]: tml: #{' ' * stack.size}#{msg}\n"
     end
 
     def add(severity, message = nil, progname = nil, &block)

data/lib/tml/version.rb

@@ -30,5 +30,5 @@
 #++
 
 module Tml
-  VERSION = '4.3.10'
+  VERSION = '4.3.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tml
 version: !ruby/object:Gem::Version
-  version: 4.3.10
+  version: 4.3.11
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-08 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -54,6 +54,7 @@ files:
 - lib/tml/application.rb
 - lib/tml/base.rb
 - lib/tml/cache.rb
+- lib/tml/cache_adapters/cdn.rb
 - lib/tml/cache_adapters/file.rb
 - lib/tml/cache_adapters/memcache.rb
 - lib/tml/cache_adapters/redis.rb