tml 5.2.7 → 5.4.1

data/lib/tml/session.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #--
-# Copyright (c) 2016 Translation Exchange, Inc
+# Copyright (c) 2016           Translation Exchange, Inc
 #
 #  _______                  _       _   _             ______          _
 # |__   __|                | |     | | (_)           |  ____|        | |
@@ -33,7 +33,7 @@
 module Tml
 
   def self.session
-    Thread.current[:session] ||= Tml::Session.new
+    Thread.current[:tml_context] ||= Tml::Session.new
   end
 
   class Session
@@ -44,8 +44,9 @@ module Tml
       return if Tml.config.disabled?
 
       key   = opts[:key]    || Tml.config.application[:key]
-      token = opts[:token]  || Tml.config.application[:token]
       host  = opts[:host]   || Tml.config.application[:host]
+      # token = opts[:token]  || Tml.config.application[:token]
+      token = opts[:access_token]
 
       Tml.cache.reset_version
 
@@ -54,6 +55,8 @@ module Tml
       self.current_locale = opts[:locale]
       self.current_translator = opts[:translator]
 
+      # Tml.logger.debug(opts.inspect)
+
       self.application = Tml::Application.new(:key => key, :access_token => token, :host => host).fetch
 
       if self.current_translator

data/lib/tml/source.rb

@@ -98,7 +98,7 @@ class Tml::Source < Tml::Base
 
     data = self.application.api_client.get(
       "sources/#{self.key}/translations",
-      {:locale => locale, :all => true, :ignored => true},
+      {:locale => locale, :all => true, :ignored => true, :app_id => self.application.key},
       {:cache_key => Tml::Source.cache_key(locale, self.source), :raw_json => true}
     ) || {}
 

data/lib/tml/utils.rb

@@ -62,6 +62,11 @@ module Tml
       (0..16).to_a.map{|a| rand(16).to_s(16)}.join
     end
 
+    def self.interval_timestamp(interval)
+      t = Time.now.to_i
+      t - (t % interval.to_i)
+    end
+
     def self.cookie_name(app_key)
       "trex_#{app_key}"
     end
@@ -130,5 +135,30 @@ module Tml
       []
     end
 
+    def self.ungzip(tarfile)
+      z = Zlib::GzipReader.new(tarfile)
+      unzipped = StringIO.new(z.read)
+      z.close
+      unzipped
+    end
+
+    def self.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
+    end
+
   end
 end

data/lib/tml/version.rb

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

data/lib/tml.rb

@@ -40,7 +40,7 @@ module Tml
   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).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/ext).each do |f|
   if f.index('.rb')
     require(File.expand_path(File.join(File.dirname(__FILE__), f)))
     next

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tml
 version: !ruby/object:Gem::Version
-  version: 5.2.7
+  version: 5.4.1
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -50,13 +50,13 @@ files:
 - Rakefile
 - lib/tml.rb
 - lib/tml/api/client.rb
-- lib/tml/api/post_office.rb
 - lib/tml/application.rb
 - lib/tml/base.rb
 - lib/tml/cache.rb
 - lib/tml/cache_adapters/file.rb
 - lib/tml/cache_adapters/memcache.rb
 - lib/tml/cache_adapters/redis.rb
+- lib/tml/cache_version.rb
 - lib/tml/config.rb
 - lib/tml/decorators/base.rb
 - lib/tml/decorators/default.rb
@@ -69,8 +69,6 @@ files:
 - lib/tml/ext/hash.rb
 - lib/tml/ext/string.rb
 - lib/tml/ext/time.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/api/post_office.rb

@@ -1,71 +0,0 @@
-# encoding: UTF-8
-#--
-# Copyright (c) 2016 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::Api::PostOffice < Tml::Api::Client
-  POST_OFFICE_HOST = 'https://postoffice.translationexchange.com'
-  POST_OFFICE_API_VERSION = 'v1'
-
-  attributes :application
-
-  def templates
-    api('templates', {
-      :access_token => access_token
-    })
-  end
-
-  def channels
-    api('channels', {
-      :access_token => access_token
-    })
-  end
-
-  def deliver(template, to, tokens = {}, options = {})
-    api("templates/#{template}/deliver", {
-      :access_token => access_token,
-      :tokens => tokens,
-      :to => to,
-      :via => options[:via],
-      :from => options[:from],
-      :locale => options[:locale],
-      :realtime => options[:realtime]
-    }, options.merge(:method => :post))
-  end
-
-  def host
-    application.tools['postoffice'] || POST_OFFICE_HOST
-  end
-
-  def prepare_api_path(path)
-    "/api/#{POST_OFFICE_API_VERSION}#{path.first == '/' ? '' : '/'}#{path}"
-  end
-
-end

data/lib/tml/generators/base.rb

@@ -1,122 +0,0 @@
-#--
-# Copyright (c) 2016 Translation Exchange Inc. http://translationexchange.com
-#
-#  _______                  _       _   _             ______          _
-# |__   __|                | |     | | (_)           |  ____|        | |
-#    | |_ __ __ _ _ __  ___| | __ _| |_ _  ___  _ __ | |__  __  _____| |__   __ _ _ __   __ _  ___
-#    | | '__/ _` | '_ \/ __| |/ _` | __| |/ _ \| '_ \|  __| \ \/ / __| '_ \ / _` | '_ \ / _` |/ _ \
-#    | | | | (_| | | | \__ \ | (_| | |_| | (_) | | | | |____ >  < (__| | | | (_| | | | | (_| |  __/
-#    |_|_|  \__,_|_| |_|___/_|\__,_|\__|_|\___/|_| |_|______/_/\_\___|_| |_|\__,_|_| |_|\__, |\___|
-#                                                                                        __/ |
-#                                                                                       |___/
-# 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::Generators::Base
-
-  attr_accessor :started_at, :finished_at
-
-  def log(msg)
-    msg = "#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}: #{msg}"
-    puts msg
-    Tml.logger.debug(msg)
-  end
-
-  def cache_path
-    @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
-    @cache_version ||= api_client.get_cache_version
-  end
-
-  def cache(key, data)
-    raise Tml::Exception.new('Must be implemented by the subclass')
-  end
-
-  def execute
-    raise Tml::Exception.new('Must be implemented by the subclass')
-  end
-
-  def run
-    prepare
-    execute
-    finalize
-  end
-
-  def prepare
-    @started_at = Time.now
-    Tml.session.init
-  end
-
-  def api_client
-    Tml.session.application.api_client
-  end
-
-  def application
-    @application ||= api_client.get('projects/current/definition', {})
-  end
-
-  def languages
-    application['languages']
-  end
-
-  def finalize
-    @finished_at = Time.now
-    log("Cache generation took #{@finished_at - @started_at} mls.")
-    log('Done.')
-  end
-
-  def ungzip(tarfile)
-    z = Zlib::GzipReader.new(tarfile)
-    unzipped = StringIO.new(z.read)
-    z.close
-    unzipped
-  end
-
-  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
-  end
-
-end

data/lib/tml/generators/file.rb

@@ -1,72 +0,0 @@
-#--
-# Copyright (c) 2016 Translation Exchange Inc. http://translationexchange.com
-#
-#  _______                  _       _   _             ______          _
-# |__   __|                | |     | | (_)           |  ____|        | |
-#    | |_ __ __ _ _ __  ___| | __ _| |_ _  ___  _ __ | |__  __  _____| |__   __ _ _ __   __ _  ___
-#    | | '__/ _` | '_ \/ __| |/ _` | __| |/ _ \| '_ \|  __| \ \/ / __| '_ \ / _` | '_ \ / _` |/ _ \
-#    | | | | (_| | | | \__ \ | (_| | |_| | (_) | | | | |____ >  < (__| | | | (_| | | | | (_| |  __/
-#    |_|_|  \__,_|_| |_|___/_|\__,_|\__|_|\___/|_| |_|______/_/\_\___|_| |_|\__,_|_| |_|\__, |\___|
-#                                                                                        __/ |
-#                                                                                       |___/
-# 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.
-#++
-
-require 'rubygems'
-require 'rubygems/package'
-require 'open-uri'
-require 'zlib'
-require 'fileutils'
-
-class Tml::Generators::File < Tml::Generators::Base
-
-  def execute
-    if cache_version == '0'
-      log('No releases have been generated yet. Please visit your Dashboard and publish translations.')
-    else
-      log("Current cache version: #{cache_version}")
-
-      archive_name = "#{cache_version}.tar.gz"
-      path = "#{cache_path}/#{archive_name}"
-      url = "#{api_client.application.cdn_host}/#{Tml.config.application[:key]}/#{archive_name}"
-
-      log("Downloading cache file: #{url}")
-      open(path, 'wb') do |file|
-        file << open(url).read
-      end
-
-      log('Extracting cache file...')
-      version_path = "#{cache_path}/#{cache_version}"
-      untar(ungzip(File.new(path)), version_path)
-      log("Cache has been stored in #{version_path}")
-
-      File.unlink(path)
-
-      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
-  end
-
-end