tml 4.4.1 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 219ec288ae06a6e1f41055d5a43911f912a9a60b
-  data.tar.gz: af5bb4eb638a821d605611fe3dfdb0eb3bfd1ef1
+  metadata.gz: c5b559306971c39fdd4df874f01174dd53af720f
+  data.tar.gz: 64df8e8b2fabc6b1bdab21461b72f0ae0f373687
 SHA512:
-  metadata.gz: 284ba13aed6ef6aff3a8b016edf77d8e9e844e587fd80e4d8029e8fe2904552f7c5d75b91e31ea7173ab0bdcae24f8ffc6f3e19396d632322f566e120b5e3b85
-  data.tar.gz: a53fe934ba88ef001c8ab23c8f8ac14344397f5240d0ffb330bf5ac8d6967a02943c97505bea742ca0ea3d7b6a8bd023863eb29a40639b8e44d41e4f9d2c2656
+  metadata.gz: 43033def0b0187721cb8c0020c5ca60958c62228c992ad11e23092c2872f5ad9118a6a8d159854475e5c3636183043b0f9181d021076423ed60a3859e973ae43
+  data.tar.gz: acbcb86d03f2abf4c5d16a6af803228af8df3dfdb671f0453ca84a9d085d3ad7526c15d2e4d1b1b043b2d949cbc0aaa3ddbf31f05c79ba3297dd2465e66919b0

data/lib/tml/api/client.rb

@@ -68,6 +68,10 @@ class Tml::Api::Client < Tml::Base
     application.host || API_HOST
   end
 
+  def cdn_host
+    CDN_HOST
+  end
+
   def connection
     @connection ||= Faraday.new(:url => host) do |faraday|
       faraday.request(:url_encoded)               # form-encode POST params
@@ -76,12 +80,16 @@ class Tml::Api::Client < Tml::Base
     end
   end
 
+  def get_cache_version
+    execute_request('applications/current/version', {}, {:raw => true})
+  end
+
   def verify_cache_version
     return if Tml.cache.version and Tml.cache.version != 'undefined'
 
     current_version = Tml.cache.fetch_version
     if current_version == 'undefined'
-      Tml.cache.store_version(execute_request('applications/current/version', {}, {:raw => true}))
+      Tml.cache.store_version(get_cache_version)
     else
       Tml.cache.version = current_version
     end
@@ -89,7 +97,7 @@ class Tml::Api::Client < Tml::Base
   end
 
   def cdn_connection
-    @cdn_connection ||= Faraday.new(:url => CDN_HOST) do |faraday|
+    @cdn_connection ||= Faraday.new(:url => cdn_host) do |faraday|
       faraday.request(:url_encoded)               # form-encode POST params
       faraday.adapter(Faraday.default_adapter)    # make requests with Net::HTTP
     end

data/lib/tml/generators/base.rb

@@ -40,11 +40,21 @@ class Tml::Generators::Base
   end
 
   def cache_path
-    raise Tml::Exception.new('Must be implemented by the subclass')
+    @cache_path ||= begin
+      path = Tml.config.cache[:path]
+      path ||= 'config/tml'
+      FileUtils.mkdir_p(path)
+      FileUtils.chmod(0777, path)
+      path
+    end
+  end
+
+  def current_path
+    "#{cache_path}/current"
   end
 
   def cache_version
-    @started_at.strftime('%Y%m%d%H%M%S')
+    @cache_version ||= api_client.get_cache_version
   end
 
   def cache(key, data)
@@ -64,7 +74,6 @@ class Tml::Generators::Base
   def prepare
     @started_at = Time.now
     Tml.session.init
-    cache_path
   end
 
   def api_client
@@ -81,37 +90,33 @@ class Tml::Generators::Base
 
   def finalize
     @finished_at = Time.now
-    log("Cache has been stored in #{cache_path}")
     log("Cache generation took #{@finished_at - @started_at} mls.")
     log('Done.')
   end
 
-  def cache_application
-    log('Downloading application...')
-    cache(Tml::Application.cache_key, application)
-    log('Application has been cached.')
+  def ungzip(tarfile)
+    z = Zlib::GzipReader.new(tarfile)
+    unzipped = StringIO.new(z.read)
+    z.close
+    unzipped
   end
 
-  def cache_languages
-    log('Downloading languages...')
-    unless application['languages']
-      log('No languages are available...')
-      return
+  def untar(io, destination)
+    Gem::Package::TarReader.new io do |tar|
+      tar.each do |tarfile|
+        destination_file = File.join destination, tarfile.full_name
+
+        if tarfile.directory?
+          FileUtils.mkdir_p destination_file
+        else
+          destination_directory = File.dirname(destination_file)
+          FileUtils.mkdir_p destination_directory unless File.directory?(destination_directory)
+          File.open destination_file, "wb" do |f|
+            f.print tarfile.read
+          end
+        end
+      end
     end
-    languages.each do |lang|
-      language = api_client.get("languages/#{lang['locale']}", :definition => true)
-      cache(Tml::Language.cache_key(language['locale']), language)
-    end
-    log("#{application['languages'].count} languages have been cached.")
-  end
-
-  def symlink_path
-    "#{Tml.config.cache[:path]}/current"
   end
 
-  def generate_symlink
-    FileUtils.rm(symlink_path) if File.exist?(symlink_path)
-    FileUtils.ln_s(cache_version, symlink_path)
-    log('Symlink has been updated.')
-  end
 end

data/lib/tml/generators/file.rb

@@ -29,131 +29,43 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-class Tml::Generators::File < Tml::Generators::Base
-
-  def cache_path
-    @cache_path ||= begin
-      path = "#{Tml.config.cache[:path]}/#{cache_version}"
-      log("Cache will be stored in #{path}")
-      FileUtils.mkdir_p(path)
-      FileUtils.chmod(0777, path)
-      path
-    end
-  end
+require 'rubygems'
+require 'rubygems/package'
+require 'open-uri'
+require 'zlib'
+require 'fileutils'
 
-  def file_path(key)
-    path = key.split('/')
-    if path.count > 1
-      filename = path.pop
-      path = File.join(cache_path, path)
-      FileUtils.mkdir_p(path)
-      File.join(path, "#{filename}.json")
-    else
-      File.join(cache_path, "#{path.first}.json")
-    end
-  end
-
-  def cache(key, data)
-    File.open(file_path(key), 'w') { |file| file.write(JSON.pretty_generate(data)) }
-  end
+class Tml::Generators::File < Tml::Generators::Base
 
   def execute
-    cache_application
-    cache_languages
-    cache_translations
-    generate_symlink
-  end
-
-  def cache_translations
-    log('Downloading translations...')
-
-    languages.each do |language|
-      log("Downloading #{language['english_name']} language...")
-
-      if Tml.config.cache[:segmented]
-        api_client.paginate('applications/current/sources') do |source|
-          next unless source['source']
-
-          cache_path = Tml::Source.cache_key(language['locale'], source['source'])
-          log("Downloading #{source['source']} in #{language['locale']} to #{cache_path}...")
-
-          data = api_client.get("sources/#{source['key']}/translations", {:locale => language['locale'], :original => true, :per_page => 1000})
-          cache(cache_path, data)
-        end
-      else
-        cache_path = Tml::Application.translations_cache_key(language['locale'])
-        log("Downloading translations in #{language['locale']} to #{cache_path}...")
-        data = {}
-        api_client.paginate('applications/current/translations', {:locale => language['locale'], :original => true, :per_page => 1000}) do |translations|
-          data.merge!(translations)
-        end
-        cache(cache_path, data)
-      end
-    end
-  end
-
-  def rollback
-    folders = Dir["#{Tml.config.cache[:path]}/*"]
-    folders.delete_if{|e| e.index('current')}.sort!
-
-    if File.exist?(symlink_path)
-      current_dest = File.readlink("#{Tml.config.cache[:path]}/current")
-      current_dest = "#{Tml.config.cache[:path]}/#{current_dest}"
+    if cache_version == '0'
+      log("No releases have been generated yet. Please visit your Dashboard and publish translations.")
     else
-      current_dest = 'undefined'
-    end
-
-    index = folders.index(current_dest)
-
-    if index == 0
-      log('There are no earlier cache versions')
-      return
-    end
-
-    if index.nil?
-      new_version_path = folders[folders.size-1]
-    else
-      new_version_path = folders[index-1]
-    end
-
-    new_version_path = new_version_path.split('/').last
-
-    FileUtils.rm(symlink_path) if File.exist?(symlink_path)
-    FileUtils.ln_s(new_version_path, symlink_path)
-
-    log("Cache has been rolled back to version #{new_version_path}.")
-  end
-
-  def rollup
-    folders = Dir["#{Tml.config.cache[:path]}/*"]
-    folders.delete_if{|e| e.index('current')}.sort!
-
-    if File.exist?(symlink_path)
-      current_dest = File.readlink("#{Tml.config.cache[:path]}/current")
-      current_dest = "#{Tml.config.cache[:path]}/#{current_dest}"
-    else
-      current_dest = 'undefined'
-    end
+      log("Current cache version: #{cache_version}")
+
+      archive_name = "#{cache_version}.tar.gz"
+      path = "#{cache_path}/#{archive_name}"
+      url = "#{api_client.cdn_host}/#{Tml.config.access_token}/#{archive_name}"
+      log("Downloading cache file: #{url}")
+      open(path, 'wb') do |file|
+        file << open(url).read
+      end
+      log('Extracting cache file...')
 
-    index = folders.index(current_dest)
+      version_path = "#{cache_path}/#{cache_version}"
+      untar(ungzip(File.new(path)), version_path)
+      log("Cache has been stored in #{version_path}")
 
-    if index == (folders.size - 1)
-      log('You are on the latest version of the cache already. No further versions are available')
-      return
-    end
+      File.unlink(path)
 
-    if index.nil?
-      new_version_path = folders[0]
-    else
-      new_version_path = folders[index+1]
+      begin
+        FileUtils.rm(current_path) if File.exist?(current_path)
+        FileUtils.ln_s(cache_version, current_path)
+        log('The new cache path has been marked as current')
+      rescue
+        log('Could not generate current symlink to the cach path. Please indicate the version manually in the Tml initializer.')
+      end
     end
-
-    new_version_path = new_version_path.split('/').last
-
-    FileUtils.rm(symlink_path) if File.exist?(symlink_path)
-    FileUtils.ln_s(new_version_path, symlink_path)
-
-    log("Cache has been upgraded to version #{new_version_path}.")
   end
 
 end

data/lib/tml/version.rb

@@ -30,5 +30,5 @@
 #++
 
 module Tml
-  VERSION = '4.4.1'
+  VERSION = '4.4.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tml
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.4.2
 platform: ruby
 authors:
 - Michael Berkovich