tml 5.5.1 → 5.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: caf33060b73c70df64aaec5d6c65af53e5a79fa5
-  data.tar.gz: 8943817182ebd7a933122e8599c44606a02a291c
+  metadata.gz: 067d6c379b9fa534efe1d4976a661e944be70b32
+  data.tar.gz: 1e8fda1be403bd5c23ed4dbb7db013540b8ff92b
 SHA512:
-  metadata.gz: 9a852cc091ec891903b91ebbd6438e87aedb431146e2b4a73fe0e24a2ee82e771fbe04a989fd0165d21ff1889167b19298f8506f6af856af957e65dfb6f39177
-  data.tar.gz: a8063602bb5db4c83ed368281a0a107d5889d62c80a0fd509406a5a589fef30aa65aac308dc1c379c7b2c259e8f64921402ad1203b4d409015562518999c99ee
+  metadata.gz: 5cec2539d2c255bfefdbad7b7c61504e7592fef50a842d14e61055625d9feabcf894d345227e2949d5b2c0efef6411d9e5c03bd41516e937164dbc5f25a111dc
+  data.tar.gz: 60b3cd035e5018c58b1af4896c3087c1cf249cb0c68c2b7a4b635426b4342cfc4b632a41d579a49bdf94747543cb230e3c7504d585d85a81423ba7297478e30e

data/lib/tml/api/client.rb

@@ -205,7 +205,8 @@ class Tml::Api::Client < Tml::Base
 
     # get request uses local cache, then CDN
     data = Tml.cache.fetch(opts[:cache_key]) do
-      Tml.cache.read_only? ? nil : get_from_cdn(opts[:cache_key])
+      fetched_data = get_from_cdn(opts[:cache_key]) unless Tml.cache.read_only?
+      fetched_data || {}
     end
 
     process_response(data, opts)

data/lib/tml/cache.rb

@@ -136,6 +136,7 @@ module Tml
       # do nothing
     end
 
+    # Pulls cache version from CDN
     def extract_version(app, version = nil)
       if version
         Tml.cache.version.set(version.to_s)
@@ -151,12 +152,55 @@ module Tml
       end
     end
 
-    # warmup cache
-    def warmup(version = nil)
+    # Warms up cache from CDN or local files
+    def warmup(version = nil, cache_path = nil)
+      if cache_path.nil?
+        warmup_from_cdn(version)
+      else
+        warmup_from_files(version, cache_path)
+      end
+    end
+
+    # Warms up cache from local files
+    def warmup_from_files(version = nil, cache_path = nil)
+      t0 = Time.now
+      Tml.logger = Logger.new(STDOUT)
+
+      Tml.logger.debug('Starting cache warmup from local files...')
+      version ||= Tml.config.cache[:version]
+      cache_path ||= Tml.config.cache[:path]
+      cache_path = "#{cache_path}/#{version}"
+
+      Tml.cache.version.set(version.to_s)
+      Tml.logger.debug("Warming Up Version: #{Tml.cache.version}")
+
+      application = JSON.parse(File.read("#{cache_path}/application.json"))
+      Tml.cache.store(Tml::Application.cache_key, application)
+
+      sources = JSON.parse(File.read("#{cache_path}/sources.json"))
+
+      application['languages'].each do |lang|
+        locale = lang['locale']
+
+        language = JSON.parse(File.read("#{cache_path}/#{locale}/language.json"))
+        Tml.cache.store(Tml::Language.cache_key(locale), language)
+
+        sources.each do |src|
+          source = JSON.parse(File.read("#{cache_path}/#{locale}/sources/#{src}.json"))
+          Tml.cache.store(Tml::Source.cache_key(locale, src), source)
+        end
+      end
+
+      t1 = Time.now
+      Tml.logger.debug("Cache warmup took #{t1-t0}s")
+    end
+
+    # Warms up cache from CDN
+    def warmup_from_cdn(version = nil)
       t0 = Time.now
       Tml.logger = Logger.new(STDOUT)
 
-      Tml.logger.debug('Starting cache warmup...')
+      Tml.logger.debug('Starting cache warmup from CDN...')
       app = Tml::Application.new(key: Tml.config.application[:key], cdn_host: Tml.config.application[:cdn_host])
       extract_version(app, version)
 

data/lib/tml/cache_version.rb

@@ -61,6 +61,11 @@ module Tml
 
     # validate that current cache version hasn't expired
     def validate_cache_version(version)
+      # if cache version is hardcoded, use it
+      if Tml.config.cache[:version]
+        return Tml.config.cache[:version]
+      end
+
       return version unless version.is_a?(Hash)
       return 'undefined' unless version['t'].is_a?(Numeric)
       return version['version'] if cache.read_only?

data/lib/tml/version.rb

@@ -31,7 +31,7 @@
 #++
 
 module Tml
-  VERSION = '5.5.1'
+  VERSION = '5.5.2'
 
   def self.full_version
     "tml-ruby v#{Tml::VERSION} (Faraday v#{Faraday::VERSION})"

data/tasks/tml/cache.rake

@@ -14,7 +14,7 @@ namespace :tml do
 
       desc 'warms up dynamic cache'
       task :warmup => :environment do
-        Tml.cache.warmup
+        Tml.cache.warmup(ENV['version'], ENV['path'])
       end
     end
 
@@ -23,9 +23,12 @@ namespace :tml do
       ## Local Cache Management
       ##########################################
 
-      desc 'downloads local file cache'
+      desc 'downloads file cache to local storage'
       task :download => :environment do
-        Tml.cache.download
+        cache_path = ENV['path'] || Tml.cache.default_cache_path
+        version = ENV['version']
+        pp "Downloading #{version} to #{cache_path}..."
+        Tml.cache.download(cache_path, version)
       end
 
       desc 'rolls back to the previous version'

metadata

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