tml 4.3.6 → 4.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b305529c8b1fefe33c3d8ba0fd445566a6f7667a
-  data.tar.gz: 1fe8c90ddcd2d26edc1b7e70894085cf3d8e6470
+  metadata.gz: 8c126c7ef27932c28af74a43593a02fcea2d2685
+  data.tar.gz: 0d0dee6459bfad414a1f7fd21863c2c66a239aac
 SHA512:
-  metadata.gz: 1f8535261a61e58a53fa9bd5e6101ec13b80819adb79a58b89eb4c916fb0d58fa7555b5e359222b6999542b608ad4d638a38fa4a9a731b28993e0163ad842aeb
-  data.tar.gz: 6c7af851ad4066fa6701704ba3ee06e36b3678d195e30acccbdbbb8cc933fef989c5488752b1fc3e7dd7ea82df660a531e1cee92402c6e495ed602a089be5c8f
+  metadata.gz: 8d99bae348d5a7e966c2f1e8b31a8605dff79c54abc6de099761488c42598ff83f4cfe258628e07f9bf3c5fdb41c7c72fbbf2366f5df16d54ebfc2b23fc205d6
+  data.tar.gz: f1cd165767e09da195f1fefff6f5d538003fc19d7248e4095b1408f4c6a045922cc80545c2731e043b015de392f1c1a3cdb7e226277be15abc1da07a8c31671f

data/lib/tml/application.rb

@@ -64,6 +64,7 @@ class Tml::Application < Tml::Base
 
   def language(locale = nil)
     locale = nil if locale.strip == ''
+
     locale ||= default_locale || Tml.config.default_locale
     @languages_by_locale ||= {}
     @languages_by_locale[locale] ||= api_client.get(

data/lib/tml/cache_adapters/file.rb

@@ -32,6 +32,10 @@
 
 class Tml::CacheAdapters::File < Tml::Cache
 
+  def self.cache
+    @cache ||= {}
+  end
+
   def self.cache_path
     "#{Tml.config.cache[:path]}/#{Tml.config.cache[:version]}"
   end
@@ -50,13 +54,17 @@ class Tml::CacheAdapters::File < Tml::Cache
   end
 
   def fetch(key, opts = {})
-    info("Fetching key: #{key}")
+    if self.class.cache[key]
+      info("Memory hit: #{key}")
+      return self.class.cache[key]
+    end
 
     path = self.class.file_path(key)
 
     if File.exists?(path)
       info("Cache hit: #{key}")
-      return JSON.parse(File.read(path))
+      self.class.cache[key] = JSON.parse(File.read(path))
+      return self.class.cache[key]
     end
 
     info("Cache miss: #{key}")

data/lib/tml/generators/{cache/base.rb → base.rb}

@@ -29,7 +29,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-class Tml::Generators::Cache::Base
+class Tml::Generators::Base
 
   attr_accessor :started_at, :finished_at
 

data/lib/tml/generators/{cache/file.rb → file.rb}

@@ -29,7 +29,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-class Tml::Generators::Cache::File < Tml::Generators::Cache::Base
+class Tml::Generators::File < Tml::Generators::Base
 
   def cache_path
     @cache_path ||= begin

data/lib/tml/session.rb

@@ -65,9 +65,7 @@ module Tml
 
       Tml.cache.reset_version
 
-      self.application = Tml.memory.fetch(Tml::Application.cache_key) do
-        Tml::Application.new(:host => host, :access_token => Tml::Session.access_token).fetch
-      end
+      self.application = Tml::Application.new(:host => host, :access_token => Tml::Session.access_token).fetch
 
       if Tml.cache.read_only?
         self.class.access_token = self.application.access_token

data/lib/tml/version.rb

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

data/lib/tml.rb

@@ -37,13 +37,10 @@ module Tml
   module Rules end
   module Decorators end
   module CacheAdapters end
-  module Generators
-    module Cache
-    end
-  end
+  module Generators end
 end
 
-%w(tml/base.rb tml tml/api tml/rules_engine tml/tokens tml/tokenizers tml/decorators tml/cache_adapters tml/cache tml/cache/generators tml/ext tml/modules tml/generators/cache).each do |f|
+%w(tml/base.rb tml tml/api tml/rules_engine tml/tokens tml/tokenizers tml/decorators tml/cache_adapters tml/cache tml/cache/generators tml/ext tml/modules tml/generators).each do |f|
   if f.index('.rb')
     require(File.expand_path(File.join(File.dirname(__FILE__), f)))
     next

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tml
 version: !ruby/object:Gem::Version
-  version: 4.3.6
+  version: 4.3.7
 platform: ruby
 authors:
 - Michael Berkovich
@@ -56,7 +56,6 @@ files:
 - lib/tml/cache.rb
 - lib/tml/cache_adapters/file.rb
 - lib/tml/cache_adapters/memcache.rb
-- lib/tml/cache_adapters/memory.rb
 - lib/tml/cache_adapters/redis.rb
 - lib/tml/config.rb
 - lib/tml/decorators/base.rb
@@ -69,8 +68,8 @@ files:
 - lib/tml/ext/hash.rb
 - lib/tml/ext/string.rb
 - lib/tml/ext/time.rb
-- lib/tml/generators/cache/base.rb
-- lib/tml/generators/cache/file.rb
+- lib/tml/generators/base.rb
+- lib/tml/generators/file.rb
 - lib/tml/language.rb
 - lib/tml/language_case.rb
 - lib/tml/language_case_rule.rb

data/lib/tml/cache_adapters/memory.rb

@@ -1,85 +0,0 @@
-# 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::Memory < Tml::Cache
-
-  def self.cache
-    @cache ||= {}
-  end
-
-  def self.clear_cache
-    @cache = {}
-  end
-
-  def cache_name
-    'memory'
-  end
-
-  def fetch(key, opts = {})
-    return yield if Tml.session.inline_mode?
-    return yield unless Tml.cache.read_only?
-
-    data = self.class.cache[key]
-
-    if data
-      info("Cache hit: #{key}")
-      return data
-    end
-
-    info("Cache miss: #{key}")
-
-    return nil unless block_given?
-
-    data = yield
-
-    store(key, data)
-
-    data
-  end
-
-  def store(key, data, opts = {})
-    self.class.cache[key] = data
-  end
-
-  def delete(key, opts = {})
-    self.class.cache[key] = nil
-  end
-
-  def exist?(key, opts = {})
-    not self.class.cache[key].nil?
-  end
-
-  def clear(opts = {})
-    self.class.clear_cache
-  end
-
-end