tr8n_core 4.0.17 → 4.2

data/lib/tr8n/translation_key.rb

@@ -59,7 +59,7 @@ class Tr8n::TranslationKey < Tr8n::Base
     end
   end
 
-  def self.generate_key(label, desc = "")
+  def self.generate_key(label, desc = '')
     "#{Digest::MD5.hexdigest("#{label};;;#{desc}")}~"[0..-2].to_s
   end
 
@@ -67,39 +67,27 @@ class Tr8n::TranslationKey < Tr8n::Base
     translations and translations[language.locale] and translations[language.locale].any?
   end
 
-  def fetch_translations(language, options = {})
-    return self if self.id and has_translations_for_language?(language)
-
-    if options[:dry] or Tr8n.session.block_options[:dry]
-      return application.cache_translation_key(self)
+  def set_translations(locale, translations)
+    translations.each do |translation|
+      translation.locale ||= locale
+      translation.translation_key = self
+      translation.language = self.application.language(translation.locale)
     end
-
-    tkey = application.post("translation_key/translations",
-                            {:key => key, :label => label, :description => description, :locale => language.locale},
-                            {:class => Tr8n::TranslationKey, :attributes => {:application => application}})
-
-    application.cache_translation_key(tkey)
+    self.translations[locale] = translations
   end
 
   # switches to a new application
   def set_application(app)
     self.application = app
     translations.values.each do |locale_translations|
-      locale_translations.each do |t|
-        t.set_translation_key(self)
+      locale_translations.each do |translation|
+        translation.translation_key = self
+        translation.language = self.application.language(translation.locale)
       end
     end
     self
   end
 
-  def set_language_translations(language, translations)
-    translations.each do |translation|
-      translation.locale = language.locale
-      translation.set_translation_key(self)
-    end
-    self.translations[language.locale] = translations
-  end
-
   ###############################################################
   ## Translation Methods
   ###############################################################

data/lib/tr8n/translator.rb

@@ -30,31 +30,29 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-require 'digest/md5'
-
 class Tr8n::Translator < Tr8n::Base
   belongs_to :application
-  attributes :id, :name, :email, :gender, :mugshot, :link, :inline, :features
+  attributes :id, :name, :email, :gender, :mugshot, :link, :inline, :features, :image_url
   attributes :voting_power, :rank, :level, :locale, :manager, :code, :access_token 
 
   def self.authorize(application, username, password, options = {})
-    data = application.get('oauth/request_token', {:grant_type => :password, :username => username, :password => password})
+    data = application.api_client.get('oauth/request_token', {:grant_type => :password, :username => username, :password => password})
     init(application, data['access_token'])
   end
 
   def self.init(application, access_token)
-    application.get('translator', {:access_token => access_token}, {:class => Tr8n::Translator, :attributes => {
+    application.api_client.get('translator', {:access_token => access_token}, {:class => Tr8n::Translator, :attributes => {
       :application => application, 
       :access_token => access_token
     }})
   end
 
   def applications
-    application.get("translator/applications", {:access_token => access_token}, {:class => Tr8n::Application})
+    application.api_client.get('translator/applications', {:access_token => access_token}, {:class => Tr8n::Application})
   end  
 
   def translations
-    application.get("translator/translations", {:access_token => access_token}, {:class => Tr8n::Application})
+    application.api_client.get('translator/translations', {:access_token => access_token}, {:class => Tr8n::Application})
   end
 
   def feature_enabled?(key)
@@ -62,12 +60,6 @@ class Tr8n::Translator < Tr8n::Base
     hash_value(features, key)
   end
 
-  def mugshot_url
-    return nil unless email
-    gravatar_id = Digest::MD5.hexdigest(email.downcase)
-    "http://gravatar.com/avatar/#{gravatar_id}.png?s=48"
-  end
-
   def inline?
     return Tr8n.session.block_options[:inline] unless Tr8n.session.block_options[:inline].nil?
     super

data/lib/tr8n/utils.rb

@@ -105,11 +105,15 @@ module Tr8n
       signed_request = URI::decode(signed_request)
       signed_request = Base64.decode64(signed_request)
 
-      encoded_sig, payload = signed_request.split('.', 2)
+      parts = signed_request.split('.')
+      return JSON.parse(Base64.decode64(parts.first)) if parts.size == 1
+
+      encoded_sig = parts.first
+      payload = parts.last
       expected_sig = OpenSSL::HMAC.digest('sha256', secret, payload)
       expected_sig = Base64.encode64(expected_sig)
       if expected_sig != encoded_sig
-        raise Tr8n::Exception.new("Bad signature")
+        raise Tr8n::Exception.new('Bad signature')
       end
 
       JSON.parse(Base64.decode64(payload))

data/lib/tr8n_core.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #--
-# Copyright (c) 2014 Michael Berkovich, TranslationExchange.com
+# Copyright (c) 2015 Translation Exchange Inc. http://translationexchange.com
 #
 #  _______                  _       _   _             ______          _
 # |__   __|                | |     | | (_)           |  ____|        | |
@@ -38,6 +38,7 @@ module Tr8nCore
 end
 
 module Tr8n
+  module Api end
   module Tokens end
   module Tokenizers end
   module Rules end
@@ -45,7 +46,7 @@ module Tr8n
   module CacheAdapters end
 end
 
-%w(tr8n/base.rb tr8n tr8n/rules_engine tr8n/tokens tr8n/tokenizers tr8n/decorators tr8n/cache_adapters tr8n/cache tr8n/cache/generators tr8n_core/ext tr8n_core/modules tr8n_core/generators/cache).each do |f|
+%w(tr8n/base.rb tr8n tr8n/api tr8n/rules_engine tr8n/tokens tr8n/tokenizers tr8n/decorators tr8n/cache_adapters tr8n/cache tr8n/cache/generators tr8n_core/ext tr8n_core/modules tr8n_core/generators/cache).each do |f|
   if f.index('.rb')
     require(File.expand_path(File.join(File.dirname(__FILE__), f)))
     next

data/lib/tr8n_core/ext/array.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2014 Michael Berkovich, TranslationExchange.com
+# Copyright (c) 2015 Translation Exchange Inc. http://translationexchange.com
 #
 #  _______                  _       _   _             ______          _
 # |__   __|                | |     | | (_)           |  ____|        | |

data/lib/tr8n_core/ext/date.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2014 Michael Berkovich, TranslationExchange.com
+# Copyright (c) 2015 Translation Exchange Inc. http://translationexchange.com
 #
 #  _______                  _       _   _             ______          _
 # |__   __|                | |     | | (_)           |  ____|        | |
@@ -69,7 +69,6 @@ class Date
       end
     end
 
-
     tokens = {}
     selected_tokens.each do |token|
       case token

data/lib/tr8n_core/ext/fixnum.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2014 Michael Berkovich, TranslationExchange.com
+# Copyright (c) 2015 Translation Exchange Inc. http://translationexchange.com
 #
 #  _______                  _       _   _             ______          _
 # |__   __|                | |     | | (_)           |  ____|        | |

data/lib/tr8n_core/ext/hash.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2014 Michael Berkovich, TranslationExchange.com
+# Copyright (c) 2015 Translation Exchange Inc. http://translationexchange.com
 #
 #  _______                  _       _   _             ______          _
 # |__   __|                | |     | | (_)           |  ____|        | |

data/lib/tr8n_core/ext/string.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2014 Michael Berkovich, TranslationExchange.com
+# Copyright (c) 2015 Translation Exchange Inc. http://translationexchange.com
 #
 #  _______                  _       _   _             ______          _
 # |__   __|                | |     | | (_)           |  ____|        | |

data/lib/tr8n_core/ext/time.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2014 Michael Berkovich, TranslationExchange.com
+# Copyright (c) 2015 Translation Exchange Inc. http://translationexchange.com
 #
 #  _______                  _       _   _             ______          _
 # |__   __|                | |     | | (_)           |  ____|        | |

data/lib/tr8n_core/generators/cache/base.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2014 Michael Berkovich, TranslationExchange.com
+# Copyright (c) 2015 Translation Exchange Inc. http://translationexchange.com
 #
 #  _______                  _       _   _             ______          _
 # |__   __|                | |     | | (_)           |  ____|        | |
@@ -34,19 +34,25 @@ class Tr8nCore::Generators::Cache::Base
   attr_accessor :started_at, :finished_at
 
   def log(msg)
-    Tr8n.logger.debug("#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}: #{msg}\n")
+    msg = "#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}: #{msg}"
+    puts msg
+    Tr8n.logger.debug(msg)
   end
 
   def cache_path
-    raise Tr8n::Exception.new("Must be implemented by the subclass")
+    raise Tr8n::Exception.new('Must be implemented by the subclass')
+  end
+
+  def cache_version
+    @started_at.strftime('%Y%m%d%H%M%S')
   end
 
   def cache(key, data)
-    raise Tr8n::Exception.new("Must be implemented by the subclass")
+    raise Tr8n::Exception.new('Must be implemented by the subclass')
   end
 
   def execute
-    raise Tr8n::Exception.new("Must be implemented by the subclass")
+    raise Tr8n::Exception.new('Must be implemented by the subclass')
   end
 
   def run
@@ -57,39 +63,55 @@ class Tr8nCore::Generators::Cache::Base
 
   def prepare
     @started_at = Time.now
+    Tr8n.session.init
+    cache_path
+  end
+
+  def api_client
+    Tr8n.session.application.api_client
+  end
+
+  def application
+    @application ||= api_client.get('applications/current', {:definition => true})
+  end
+
+  def languages
+    application['languages']
   end
 
   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.")
+    log('Done.')
   end
 
   def cache_application
-    log("Downloading application...")
-    app = Tr8n.session.application.get("application", :definition => true)
-    cache(Tr8n::Application.cache_key(app["key"]), app)
-    log("Application has been cached.")
-    app
+    log('Downloading application...')
+    cache(Tr8n::Application.cache_key, application)
+    log('Application has been cached.')
   end
 
   def cache_languages
-    log("Downloading languages...")
-    languages = Tr8n.session.application.get("application/languages", :definition => true)
+    log('Downloading languages...')
+    unless application['languages']
+      log('No languages are available...')
+      return
+    end
     languages.each do |lang|
-      cache(Tr8n::Language.cache_key(lang["locale"]), lang)
+      language = api_client.get("languages/#{lang['locale']}", :definition => true)
+      cache(Tr8n::Language.cache_key(language['locale']), language)
     end
-    log("#{languages.count} languages have been cached.")
-    languages
+    log("#{application['languages'].count} languages have been cached.")
   end
 
   def symlink_path
-    raise Tr8n::Exception.new("Must be implemented by the subclass")
+    "#{Tr8n.config.cache[:path]}/current"
   end
 
   def generate_symlink
     FileUtils.rm(symlink_path) if File.exist?(symlink_path)
-    FileUtils.ln_s(cache_path, symlink_path)
+    FileUtils.ln_s(cache_version, symlink_path)
+    log('Symlink has been updated.')
   end
 end

data/lib/tr8n_core/generators/cache/cdb.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2014 Michael Berkovich, TranslationExchange.com
+# Copyright (c) 2015 Translation Exchange Inc. http://translationexchange.com
 #
 #  _______                  _       _   _             ______          _
 # |__   __|                | |     | | (_)           |  ____|        | |

data/lib/tr8n_core/generators/cache/file.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2014 Michael Berkovich, TranslationExchange.com
+# Copyright (c) 2015 Translation Exchange Inc. http://translationexchange.com
 #
 #  _______                  _       _   _             ______          _
 # |__   __|                | |     | | (_)           |  ____|        | |
@@ -33,7 +33,7 @@ class Tr8nCore::Generators::Cache::File < Tr8nCore::Generators::Cache::Base
 
   def cache_path
     @cache_path ||= begin
-      path = "#{Tr8n.config.cache[:path]}/files/tr8n_#{Tr8n.session.application.key}_#{@started_at.strftime('%Y_%m_%d_%H_%M_%S')}"
+      path = "#{Tr8n.config.cache[:path]}/#{cache_version}"
       log("Cache will be stored in #{path}")
       FileUtils.mkdir_p(path)
       FileUtils.chmod(0777, path)
@@ -42,40 +42,118 @@ class Tr8nCore::Generators::Cache::File < Tr8nCore::Generators::Cache::Base
   end
 
   def file_path(key)
-    "#{cache_path}/#{Tr8n::CacheAdapters::File.file_name(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
 
-  def symlink_path
-    Tr8n::CacheAdapters::File.cache_path
-  end
-
   def execute
-    Tr8n.session.init_application
     cache_application
-    @languages = cache_languages
+    cache_languages
     cache_translations
     generate_symlink
   end
 
   def cache_translations
-    log("Downloading translations...")
-    sources = Tr8n.config.application.get("application/sources")
-    @languages.each do |language|
-      log("--------------------------------------------------------------")
-      log("Downloading #{language["locale"]} language...")
-      log("--------------------------------------------------------------")
-
-      sources.each do |source|
-        log("Downloading #{source["source"]} in #{language["locale"]}...")
-        translation_keys = Tr8n.session.application.get("source/translations", {:source => source["source"], :locale => language["locale"]})
-        data = {:source => source["source"], :translation_keys => translation_keys}
-        cache(Tr8n::Source.cache_key(source["source"], language["locale"]), data)
+    log('Downloading translations...')
+
+    languages.each do |language|
+      log("Downloading #{language['english_name']} language...")
+
+      if Tr8n.config.cache[:segmented]
+        api_client.paginate('applications/current/sources') do |source|
+          next unless source['source']
+
+          cache_path = Tr8n::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 = Tr8n::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["#{Tr8n.config.cache[:path]}/*"]
+    folders.delete_if{|e| e.index('current')}.sort!
+
+    if File.exist?(symlink_path)
+      current_dest = File.readlink("#{Tr8n.config.cache[:path]}/current")
+      current_dest = "#{Tr8n.config.cache[:path]}/#{current_dest}"
+    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["#{Tr8n.config.cache[:path]}/*"]
+    folders.delete_if{|e| e.index('current')}.sort!
+
+    if File.exist?(symlink_path)
+      current_dest = File.readlink("#{Tr8n.config.cache[:path]}/current")
+      current_dest = "#{Tr8n.config.cache[:path]}/#{current_dest}"
+    else
+      current_dest = 'undefined'
+    end
+
+    index = folders.index(current_dest)
+
+    if index == (folders.size - 1)
+      log('You are on the latest version of the cache already. No further versions are available')
+      return
+    end
+
+    if index.nil?
+      new_version_path = folders[0]
+    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 upgraded to version #{new_version_path}.")
+  end
+
 end