tr8n 3.1.7 → 3.1.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tr8n (3.1.7)
+    tr8n (3.1.8)
       coffee-script
       kaminari
       rails (>= 3.1.0)

data/app/controllers/tr8n/api/v1/application_controller.rb

@@ -0,0 +1,129 @@
+#--
+# Copyright (c) 2010-2012 Michael Berkovich, tr8n.net
+#
+# 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.
+#++
+
+###########################################################################
+## API for getting translations from the main server
+###########################################################################
+
+class Tr8n::Api::V1::ApplicationController < ActionController::Base
+  # for ssl access to the translator - using ssl_requirement plugin  
+  ssl_allowed :sync  if respond_to?(:ssl_allowed)
+
+  def sync
+    ensure_push_enabled
+
+    sync_log = Tr8n::SyncLog.create(:started_at => Time.now, 
+                                    :keys_received => 0, :translations_received => 0, 
+                                    :keys_sent => 0, :translations_sent => 0)
+
+    method = params[:method] || "push"
+    
+    payload = []
+    
+    if method == "push"
+      payload = push_translations(sync_log)
+    
+    elsif method == "pull"
+      payload = pull_translations(sync_log)
+      
+    end
+
+    sync_log.finished_at = Time.now
+    sync_log.save
+    
+    sanitize_api_response(:translation_keys => payload)    
+  rescue Tr8n::Exception => ex
+    sanitize_api_response("error" => ex.message)    
+  end
+
+private
+
+  def ensure_push_enabled
+    raise Tr8n::Exception.new("Push is disabled") unless Tr8n::Config.synchronization_push_enabled?
+    raise Tr8n::Exception.new("Unauthorized server push attempt") unless Tr8n::Config.synchronization_push_servers.include?(request.env['REMOTE_HOST'])
+  end
+  
+  def translator
+    @translator ||= Tr8n::Config.system_translator
+  end
+  
+  def languages
+    @languages ||= Tr8n::Language.enabled_languages
+  end
+  
+  def batch_size
+    @batch_size ||= Tr8n::Config.synchronization_batch_size
+  end
+  
+  def push_translations(sync_log, opts = {})
+    payload = []
+
+    # already parsed by Rails
+    # keys = JSON.parse(params[:translation_keys])
+    keys = params[:translation_keys]
+    return payload unless keys
+  
+    sync_log.keys_received += keys.size
+  
+    keys.each do |tkey_hash|
+      # pp tkey_hash
+      tkey, remaining_translations = Tr8n::TranslationKey.create_from_sync_hash(tkey_hash, translator)
+      next unless tkey
+
+      sync_log.translations_received += tkey_hash[:translations].size if tkey_hash[:translations]
+      sync_log.translations_sent += remaining_translations.size
+
+      tkey.mark_as_synced!
+    
+      payload << tkey.to_sync_hash(:translations => remaining_translations, :languages => languages)
+    end
+    
+    payload
+  end
+  
+  def pull_translations(sync_log, opts = {})
+    payload = []
+  
+    # find all keys that have changed since the last sync
+    changed_keys = Tr8n::TranslationKey.where("synced_at is null or updated_at > synced_at").limit(batch_size)
+    sync_log.keys_sent += changed_keys.size
+    
+    changed_keys.each do |tkey|
+      tkey_hash = tkey.to_sync_hash(:languages => languages)
+      payload << tkey_hash
+      sync_log.translations_sent += tkey_hash["translations"].size if tkey_hash["translations"]
+      tkey.mark_as_synced!
+    end
+    
+    payload
+  end  
+  
+  def sanitize_api_response(response)
+    if Tr8n::Config.api[:response_encoding] == "xml"
+      render(:text => response.to_xml)
+    else
+      render(:json => response.to_json)
+    end      
+  end
+  
+end

data/app/controllers/tr8n/api/v1/base_controller.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/controllers/tr8n/api/v1/language_controller.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/controllers/tr8n/api/v1/translation_controller.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/models/tr8n/language_rule.rb

@@ -123,7 +123,7 @@ class Tr8n::LanguageRule < ActiveRecord::Base
   ###############################################################
   ## Synchronization Methods
   ###############################################################
-  def to_sync_hash(token)
+  def to_sync_hash(token, opts = {})
     {
       "token" => token,  
       "type" => self.class.keyword,

data/app/models/tr8n/sync_log.rb

@@ -22,27 +22,39 @@
 #++
 
 class Tr8n::SyncLog < ActiveRecord::Base
-  
+  set_table_name :tr8n_sync_logs
+
   def self.sync(opts = {})
-    sync_log = Tr8n::SyncLog.create(:started_at => Time.now)
+    sync_log = Tr8n::SyncLog.create(:started_at => Time.now, 
+                                    :keys_received => 0, :translations_received => 0, 
+                                    :keys_sent => 0, :translations_sent => 0)
+    sync_log.sync(opts)
+    sync_log
+  end
+  
+  def sync(opts = {})
+    access_token
 
-    translation_count = 0
-    payload = []
+    translation_keys = []
     batch_count = 0
-    total_key_count = 0
     
     log("Begin synchronization process...")
-    log("Registering keys...")
+    log("Pushing keys...")
     
     conditions = "synced_at is null or updated_at > synced_at"
     conditions = nil if opts[:force]
 
     # STDOUT.sync = true
     
-    Tr8n::TranslationKey.find_each(:conditions => conditions, :batch_size => Tr8n::Config.synchronization_batch_size) do |key|
-      total_key_count += 1
-      sync_hash = key.to_sync_hash
-      payload << sync_hash
+    languages = Tr8n::Language.enabled_languages
+    total_key_count = Tr8n::TranslationKey.count(:conditions => conditions)
+    log("#{total_key_count} translation keys will be synchronized with the remote server in chunks of #{batch_size} keys...")
+    
+    Tr8n::TranslationKey.find_each(:conditions => conditions, :batch_size => batch_size) do |key|
+      self.keys_sent += 1
+      tkey_hash = key.to_sync_hash(:languages => languages)
+      self.translations_sent += tkey_hash["translations"].size if tkey_hash["translations"]
+      translation_keys << tkey_hash
 
       key.mark_as_synced!
       
@@ -50,49 +62,43 @@ class Tr8n::SyncLog < ActiveRecord::Base
       #   payload << sync_hash
       # end  
       
-      if payload.size == Tr8n::Config.synchronization_batch_size
-        # pp "Sending #{batch_count+1} batch of #{Tr8n::Config.synchronization_batch_size} keys..."
+      if translation_keys.size >= Tr8n::Config.synchronization_batch_size
         batch_count += 1
-        exchange(payload)
-        payload = []
+        push_translations(translation_keys, opts)
+        translation_keys = []
+        log("Sent #{self.keys_sent} keys and #{self.translations_sent} translations.")
       end
     end
 
-    if payload.size > 0
-      # pp "Sending final batch..."
+    if translation_keys.size > 0
       batch_count += 1
-      exchange(payload, opts)
+      push_translations(translation_keys, opts)
+      log("Sent #{self.keys_sent} keys with #{self.translations_sent} translations.")
     end
-
-    sync_log.keys_sent = total_key_count
     
-    log("Sent #{total_key_count} keys in #{batch_count} batches.")
+    log("Done. Sent #{total_key_count} keys with #{self.translations_sent} translations in #{batch_count} calls.")
 
     batch_count = 0
-    total_key_count = 0
     
     unless opts[:force]
-      log("Downloading translations...")
+      log("Pulling translations...")
 
-      key_count = download
+      key_count = pull_translations(opts)
       while key_count > 0
         batch_count += 1
-        total_key_count += key_count
-        key_count = download(opts)
+        key_count = pull_translations(opts)
       end
-      log("Downloaded #{total_key_count} keys in #{batch_count} batches.")
+      log("Done. Downloaded #{self.translations_received} keys with #{self.translations_received} translations.")
     end
 
-    sync_log.keys_received = total_key_count
-    sync_log.finished_at = Time.now
-    sync_log.save
-    
+    self.finished_at = Time.now
+    save
   rescue Exception => ex  
-    pp ex.message
-    pp ex.backtrace
+    log_error(ex)
+    # pp ex.backtrace
   end
   
-  def self.access_token
+  def access_token
     @access_token ||= begin
       uri = URI.parse("#{Tr8n::Config.synchronization_server}/platform/oauth/request_token?client_id=#{Tr8n::Config.synchronization_key}&client_secret=#{Tr8n::Config.synchronization_secret}&grant_type=client_credentials")
       response = Net::HTTP.get_response(uri)
@@ -102,9 +108,17 @@ class Tr8n::SyncLog < ActiveRecord::Base
     end
   end
   
-  def self.exchange(payload, opts = {})
+  def batch_size
+    @batch_size ||= Tr8n::Config.synchronization_batch_size
+  end
+  
+  def translator 
+    @translator ||= Tr8n::Config.system_translator
+  end
+  
+  def push_translations(payload, opts = {})
     uri = URI.parse("#{Tr8n::Config.synchronization_server}/api/application/sync")
-    params = {:method => "register", :batch_size => Tr8n::Config.synchronization_batch_size, :translation_keys => payload}
+    params = {:method => "push", :batch_size => batch_size, :translation_keys => payload}
     
     req = Net::HTTP::Post.new(uri.path)
     req["Content-Type"] = "application/json"
@@ -124,17 +138,21 @@ class Tr8n::SyncLog < ActiveRecord::Base
     raise Tr8n::Exception.new("Synchronization failed") unless response.is_a?(Net::HTTPOK)
     
     data = HashWithIndifferentAccess.new(JSON.parse(response.body))
+    return unless data[:translation_keys]
+    
     # pp data
+    self.keys_received += data[:translation_keys].size
     
     data[:translation_keys].each do |tkey_hash|
       # pp tkey_hash
-      Tr8n::TranslationKey.create_from_sync_hash(tkey_hash, Tr8n::Config.system_translator)
+      self.translations_received += tkey_hash["translations"].size if tkey_hash["translations"]
+      Tr8n::TranslationKey.create_from_sync_hash(tkey_hash, translator)
     end
   end
 
-  def self.download(opts = {})
+  def pull_translations(opts = {})
     uri = URI.parse("#{Tr8n::Config.synchronization_server}/api/application/sync")
-    params = {:method=>"download", :batch_size => Tr8n::Config.synchronization_batch_size}
+    params = {:method=>"pull", :batch_size => batch_size}
     params[:force] = true if opts[:force]
     
     req = Net::HTTP::Post.new(uri.path)
@@ -153,19 +171,25 @@ class Tr8n::SyncLog < ActiveRecord::Base
     raise Tr8n::Exception.new("Synchronization failed") unless response.is_a?(Net::HTTPOK)
     
     data = HashWithIndifferentAccess.new(JSON.parse(response.body))
-    # pp data
+    return 0 unless data[:translation_keys]
+
+    self.keys_received += data[:translation_keys].size
     
     data[:translation_keys].each do |tkey_hash|
-      # pp tkey_hash
-      tkey, translations = Tr8n::TranslationKey.create_from_sync_hash(tkey_hash, Tr8n::Config.system_translator)
+      self.translations_received += tkey_hash["translations"].size if tkey_hash["translations"]
+      tkey, translations = Tr8n::TranslationKey.create_from_sync_hash(tkey_hash, translator)
       tkey.mark_as_synced!
     end
     
     data[:translation_keys].size
   end
   
-  def self.log(msg)
+  def log(msg)
     pp "#{Time.now}: #{msg}"
   end
+
+  def log_error(msg)
+    pp "Error: #{msg}"
+  end
   
-end
+end

data/app/models/tr8n/translation.rb

@@ -223,41 +223,48 @@ class Tr8n::Translation < ActiveRecord::Base
   ## Synchronization Methods
   ###############################################################
   # generates the hash without rule ids, but with full definitions
-  def rules_sync_hash
-    @rules_sync_hash ||= (rules || []).collect{|rule| rule[:rule].to_sync_hash(rule[:token])}
+  def mark_as_synced!
+    update_attributes(:synced_at => Time.now + 2.seconds)
+  end
+
+  def rules_sync_hash(opts = {})
+    @rules_sync_hash ||= (rules || []).collect{|rule| rule[:rule].to_sync_hash(rule[:token], opts)}
   end
 
   # serilaize translation to API hash to be used for synchronization
-  def to_sync_hash(include_translator = true)
-    hash = {"locale" => language.locale, "label" => label, "rank" => rank, "rules" => rules_sync_hash}
-    hash["translator_id"] = translator.remote_id if include_translator and translator and translator.remote_id
+  def to_sync_hash(opts = {})
+    return {"locale" => language.locale, "label" => label, "rules" => rules_sync_hash(opts)} if opts[:comparible]
+    
+    hash = {"locale" => language.locale, "label" => label, "rank" => rank, "rules" => rules_sync_hash(opts)}
+    if translator
+      if opts[:include_translator] # tr8n.net => local = include full translator info
+        hash["translator"] = translator.to_sync_hash(opts)
+      elsif translator.remote_id  # local => tr8n.net = include only the remote id of the translator if the translator is linked 
+        hash["translator_id"] = translator.remote_id
+      end  
+    end  
     hash  
   end
 
   # create translation from API hash for a specific key
-  def self.create_from_sync_hash(tkey, translator, hash, opts = {})
-    # don't add empty translations
-    return if hash["label"].blank? 
+  def self.create_from_sync_hash(tkey, translator, thash, opts = {})
+    return if thash["label"].blank?  # don't add empty translations
     
-    lang = Tr8n::Language.for(hash["locale"])
-    # don't add translations for an unsupported language
-    return unless lang 
+    lang = Tr8n::Language.for(thash["locale"])
+    return unless lang  # don't add translations for an unsupported language
 
     # generate rules for the translation
-    rules = []
-    
-    if hash["rules"] and hash["rules"].any?
-      hash["rules"].each do |rule_hash|
-        rule = Tr8n::LanguageRule.create_from_sync_hash(lang, translator, rule_hash, opts)
-        pp rule
-        
+    rules = []    
+    if thash["rules"] and thash["rules"].any?
+      thash["rules"].each do |rhash|
+        rule = Tr8n::LanguageRule.create_from_sync_hash(lang, translator, rhash, opts)
         return unless rule # if the rule has not been created, we should not even add the translation
-        rules << {:token => rule_hash["token"], :rule_id => rule.id}
+        rules << {:token => rhash["token"], :rule_id => rule.id}
       end
     end
-    
     rules = nil if rules.empty?
-    tkey.add_translation(hash["label"], rules, lang, translator)
+    
+    tkey.add_translation(thash["label"], rules, lang, translator)
   end
     
   ###############################################################

data/app/models/tr8n/translation_key.rb

@@ -219,10 +219,7 @@ class Tr8n::TranslationKey < ActiveRecord::Base
     
   def add_translation(label, rules = nil, language = Tr8n::Config.current_language, translator = Tr8n::Config.current_translator)
     raise Tr8n::Exception.new("The sentence contains dirty words") unless language.clean_sentence?(label)
-    pp rules
     translation = Tr8n::Translation.create(:translation_key => self, :language => language, :translator => translator, :label => label, :rules => rules)
-    pp translation
-    
     translation.vote!(translator, 1)
     translation
   end
@@ -230,7 +227,9 @@ class Tr8n::TranslationKey < ActiveRecord::Base
   # returns all translations for the key, language and minimal rank
   def translations_for(language = nil, rank = nil)
     translations = Tr8n::Translation.where("translation_key_id = ?", self.id)
-    translations = translations.where("language_id = ?", language.id) if language
+    if language
+      translations = translations.where("language_id in (?)", [language].flatten.collect{|lang| lang.id})
+    end
     translations = translations.where("rank >= ?", rank) if rank
     translations.order("rank desc").all
   end
@@ -531,49 +530,59 @@ class Tr8n::TranslationKey < ActiveRecord::Base
   ## Synchronization Methods
   ###############################################################
   def mark_as_synced!
-    update_attributes(:synced_at => Time.now + 5.seconds)
+    update_attributes(:synced_at => Time.now + 2.seconds)
   end
     
-  def to_sync_hash(default_translation_hashes = nil)
+  def to_sync_hash(opts = {})
     { 
       "key" => self.key, 
       "label" => self.label, 
       "description" => self.description, 
       "locale" => (locale || Tr8n::Config.default_locale), 
-      "translations" => default_translation_hashes || translations_for(nil, Tr8n::Config.translation_threshold).collect{|t| t.to_sync_hash}
+      "translations" => opts[:translations] || translations_for(opts[:languages], opts[:threshold] || Tr8n::Config.translation_threshold).collect{|t| t.to_sync_hash(opts)}
     }
   end
 
-  def transations_sync_hashes
-    @transations_sync_hashes ||= translations.collect{|t| t.to_sync_hash(false)}
+  def transations_sync_hashes(opts = {})
+    @transations_sync_hashes ||= begin
+      translations.collect{|t| t.to_sync_hash(:comparible => true)}
+    end  
   end
     
+  def self.can_create_from_sync_hash?(tkey_hash, translator, opts = {})
+    return false if tkey_hash["key"].blank? or tkey_hash["label"].blank? or tkey_hash["locale"].blank?
+    true
+  end
+      
   # create translation key from API hash
-  def self.create_from_sync_hash(tkey_hash, translator, opts = {})
-    return if tkey_hash["key"].blank? or tkey_hash["label"].blank? or tkey_hash["locale"].blank?
-     
+  def self.create_from_sync_hash(tkey_hash, default_translator, opts = {})
+    return unless can_create_from_sync_hash?(tkey_hash, default_translator, opts)
+    
+    # find or create translation key  
     tkey = Tr8n::TranslationKey.find_or_create(tkey_hash["label"], tkey_hash["description"])
 
-    # return unless tkey.key==tkey_hash[:key] # need to warn the user that the key methods don't match
+    # we will keep the translations that need to be sent back
+    remaining_translations = tkey.transations_sync_hashes(opts).dup
 
-    # opts[:force_create] = Tr8n::Config.synchronization_create_rules? if opts[:force_create].nil?
-
-    remaining_translations = tkey.transations_sync_hashes.dup
-    # pp :before, remaining_sync_hashes
-    
     added_trans = []
-    (tkey_hash["translations"] || []).each do |t_hash|
+    (tkey_hash["translations"] || []).each do |thash|
+      remaining_translations.delete(thash)
+
       # if the translation came from a linked translator, use the translator
-      translation_translator = translator
-      if t_hash["translator_id"]
-        translation_translator = Tr8n::Translator.find_by_id(t_hash["translator_id"])
-        t_hash.delete("translator_id")
-        translation_translator ||= translator
+      translator = default_translator
+      if thash["translator_id"] # incoming translations from the remote server
+        translator = Tr8n::Translator.find_by_id(thash["translator_id"]) || default_translator
+      elsif thash["translator"]
+        translator = Tr8n::Translator.create_from_sync_hash(thash["translator"], opts) || default_translator
       end
-
-      remaining_translations.delete(t_hash)
-      next if tkey.transations_sync_hashes.include?(t_hash)
-      trans = Tr8n::Translation.create_from_sync_hash(tkey, translation_translator, t_hash, opts)
+      
+      # don't insert duplicate translations
+      comparible_hash = thash.slice("locale", "label", "rules")
+      next if tkey.transations_sync_hashes.include?(comparible_hash)
+      
+      translation = Tr8n::Translation.create_from_sync_hash(tkey, translator, thash, opts)
+      
+      translation.mark_as_synced! if translation
     end
 
     # need to send back translations that have not been added, but exist in the system

data/app/models/tr8n/translator.rb

@@ -190,6 +190,12 @@ class Tr8n::Translator < ActiveRecord::Base
     false
   end
 
+  # for translators registered on the exchange server
+  def remote?
+    return false if user
+    not remote_id.nil?
+  end
+
   def system?
     level == Tr8n::Config.system_level
   end
@@ -204,13 +210,14 @@ class Tr8n::Translator < ActiveRecord::Base
   
   def name
     return "Tr8n Network" if system?
+    return super if remote?
     
     unless Tr8n::Config.site_user_info_enabled?
       translator_name = super
       return translator_name unless translator_name.blank?
       return "No Name"
     end  
-    
+
     return "Deleted User" unless user
     user_name = Tr8n::Config.user_name(user)
     return "No Name" if user_name.blank?
@@ -220,6 +227,7 @@ class Tr8n::Translator < ActiveRecord::Base
 
   def gender
     return "unknown" if system?
+    return super if remote?
     
     unless Tr8n::Config.site_user_info_enabled?
       translator_gender = super
@@ -230,9 +238,10 @@ class Tr8n::Translator < ActiveRecord::Base
     Tr8n::Config.user_gender(user)
   end
 
+  # TODO: change db to mugshot_url
   def mugshot
     return Tr8n::Config.system_image if system?
-    
+    return super if remote?
     return super unless Tr8n::Config.site_user_info_enabled?
     return Tr8n::Config.silhouette_image unless user
     img_url = Tr8n::Config.user_mugshot(user)
@@ -240,7 +249,9 @@ class Tr8n::Translator < ActiveRecord::Base
     img_url
   end
 
+  # TODO: change db to link_url
   def link
+    # return super if remote? 
     return super unless Tr8n::Config.site_user_info_enabled?
     return Tr8n::Config.default_url unless user
     Tr8n::Config.user_link(user)
@@ -263,12 +274,14 @@ class Tr8n::Translator < ActiveRecord::Base
 
   def level
     return Tr8n::Config.admin_level if admin?
+    return super if remote?
     return 0 if super.nil?
     super
   end
 
   def title
     return 'admin' if admin?
+    return super if remote?
     Tr8n::Config.translator_levels[level.to_s] || 'unknown'
   end
 
@@ -303,4 +316,29 @@ class Tr8n::Translator < ActiveRecord::Base
   def to_s
     name
   end
+  
+  ###############################################################
+  ## Synchronization Methods
+  ###############################################################
+  def to_sync_hash(opts = {})
+    { 
+      "id" => opts[:remote] ? self.remote_id : self.id, 
+      "name" => self.name, 
+      "gender" => self.gender, 
+      "mugshot" => self.mugshot, 
+      "link" => self.link
+    }
+  end
+
+  def self.create_from_sync_hash(thash, opts = {})
+    Tr8n::Translator.find_by_remote_id(thash[:id]) || Tr8n::Translator.create(
+      :user_id => 0,
+      :remote_id => thash[:id], 
+      :name => thash[:name], 
+      :gender => thash[:gender], 
+      :mugshot => thash[:mugshot], 
+      :link => thash[:link]
+    )
+  end
+  
 end

data/config/routes.rb

@@ -32,7 +32,7 @@ Tr8n::Engine.routes.draw do
     match "admin/#{ctrl}(/:action)", :controller => "admin/#{ctrl}"
   end
   
-  [:language, :translation, :translator].each do |ctrl|
+  [:application, :language, :translation, :translator].each do |ctrl|
     match "api/v1/#{ctrl}(/:action)", :controller => "api/v1/#{ctrl}"
   end
   

data/db/migrate/20111003194443_create_tr8n_sync_tables.rb

@@ -34,7 +34,9 @@ class CreateTr8nSyncTables < ActiveRecord::Migration
     end
     
     add_column :tr8n_translation_keys, :synced_at, :timestamp
+    add_index :tr8n_translation_keys, :synced_at
     add_column :tr8n_translations, :synced_at, :timestamp
+    add_index :tr8n_translations, :synced_at
   end
 
   def down

data/lib/generators/tr8n/templates/config/tr8n/config.yml

@@ -264,13 +264,14 @@ defaults:
   # You can run this command as often as your account on tr8n.net permits you.
   #############################################################################
   synchronization:
-    server:                   "http://tr8n.net"  # alternative, regional locations will be available in the future
-    key:                      "YOUR APP KEY"     # replace this with your key
-    secret:                   "YOUR APP SECRET"  # replace this with your secret   
-    batch_size:               50     # how many kesy to send to the server at a time
-    create_rules:             true   # force rules creation, or skip translations for rules that don't exist
-    all_languages:            false  # use only enabled languages, or all languages
- 
+    server:                   "http://tr8n.net"  # visit this url to register your application
+    key:                      "YOUR APP KEY"     # replace with your application key
+    secret:                   "YOUR APP SECRET"  # replace with your application secret   
+    batch_size:               50                 # how many keys to send to the server at a time - if your site supports many language, decrease the batch size
+    all_languages:            false              # use only enabled languages, or all languages
+    enable_push:              false              # allows translations to be pushed from the main server using the sync API        
+    push_servers:             ["tr8n.net"]       # only allows those servers to push translations
+          
 #############################################################################
 # Environment Settings
 # You can overload any feature defined in the defaults for any environment

data/lib/generators/tr8n/templates/db/create_tr8n_tables.rb

@@ -104,7 +104,7 @@ class CreateTr8nTables < ActiveRecord::Migration
     add_index :tr8n_language_metrics, [:created_at], :name => :tr8n_lm_c
     
     create_table :tr8n_translators do |t|
-      t.integer :user_id,     :null => false
+      t.integer :user_id
       t.boolean :inline_mode, :default => false
       t.boolean :blocked,     :default => false
       t.boolean :reported,    :default => false

data/lib/tr8n/config.rb

@@ -100,7 +100,7 @@ module Tr8n
          Tr8n::Translator, Tr8n::TranslatorLog, Tr8n::TranslatorMetric, 
          Tr8n::TranslatorFollowing, Tr8n::TranslatorReport, 
          Tr8n::LanguageForumTopic, Tr8n::LanguageForumMessage, Tr8n::LanguageForumAbuseReport,
-         Tr8n::Glossary, Tr8n::IpLocation
+         Tr8n::Glossary, Tr8n::IpLocation, Tr8n::SyncLog
       ]    
     end
 
@@ -763,12 +763,17 @@ module Tr8n
       synchronization[:secret]
     end
 
-    def self.synchronization_create_rules?
-      synchronization[:create_rules]
-    end
-
     def self.synchronization_all_languages?
       synchronization[:all_languages]
     end
+
+    def self.synchronization_push_enabled?
+      synchronization[:enable_push]
+    end
+    
+    def self.synchronization_push_servers
+      synchronization[:push_servers]
+    end
+    
   end
 end

data/lib/tr8n/version.rb

@@ -1,3 +1,3 @@
 module Tr8n
-  VERSION = "3.1.7"
+  VERSION = "3.1.8"
 end

data/local/tr8n_server/config/tr8n/config.yml

@@ -258,18 +258,27 @@ defaults:
   # You can run this command as often as your account on tr8n.net permits you.
   #############################################################################
   synchronization:
-    server:                   "http://tr8n.net"  # alternative, regional locations will be available in the future
-    key:                      "iKjOrZjor68a4UeCD3Cq2r9t9ibBC4HnYoMNMrN7" # replace this with your key
-    secret:                   "iKjOrZjor68a4UeCD3Cq2r9t9ibBC4HnYoMNMrN7" # replace this with your secret   
-    batch_size:               50     # how many kesy to send to the server at a time
-    create_rules:             true   # force rules creation, or skip translations for rules that don't exist
-    all_languages:            false  # use only enabled languages, or all languages
+    server:                   "http://tr8n.net"  # visit this url to register your application
+    key:                      "YOUR APP KEY"     # replace with your application key
+    secret:                   "YOUR APP SECRET"  # replace with your application secret   
+    batch_size:               50                 # how many keys to send to the server at a time - if your site supports many language, decrease the batch size
+    all_languages:            false              # use only enabled languages, or all languages
+    enable_push:              false              # allows translations to be pushed from the main server using the sync API        
+    push_servers:             ["tr8n.net"]       # only allows those servers to push translations
 
 #############################################################################
 # Environment Settings
 # You can overload any feature defined in the defaults for any environment
 #############################################################################
 development:
+  # synchronization:
+  #   server:                   "http://localhost:3000"  # alternative, regional locations will be available in the future
+  #   key:                      "14ngS3YadRF54PArKR8mre3MJfPzJA0jxW2j2RJu" # replace this with your key
+  #   secret:                   "ycFdAAQOEmxtpb8gE9M4gqQrgfU4SR1LetkXnLDZ" # replace this with your secret   
+  #   batch_size:               50     # how many kesy to send to the server at a time
+  #   all_languages:            false  # use only enabled languages, or all languages
+  #   enable_push:              true               # allows translations to be pushed from the main server using the sync API        
+  #   push_servers:             ["localhost", "tr8n.net"]       # only allows those servers to push translations
   
 test:
       

data/local/tr8n_server/db/migrate/20110930041150_create_tr8n_tables.rb

@@ -104,7 +104,7 @@ class CreateTr8nTables < ActiveRecord::Migration
     add_index :tr8n_language_metrics, [:created_at], :name => :tr8n_lm_c
     
     create_table :tr8n_translators do |t|
-      t.integer :user_id,     :null => false
+      t.integer :user_id
       t.boolean :inline_mode, :default => false
       t.boolean :blocked,     :default => false
       t.boolean :reported,    :default => false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tr8n
 version: !ruby/object:Gem::Version
-  version: 3.1.7
+  version: 3.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-12 00:00:00.000000000Z
+date: 2012-01-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2161020140 !ruby/object:Gem::Requirement
+  requirement: &2161128960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2161020140
+  version_requirements: *2161128960
 - !ruby/object:Gem::Dependency
   name: will_filter
-  requirement: &2161018480 !ruby/object:Gem::Requirement
+  requirement: &2161122860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2161018480
+  version_requirements: *2161122860
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &2161017580 !ruby/object:Gem::Requirement
+  requirement: &2161121960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161017580
+  version_requirements: *2161121960
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2161016440 !ruby/object:Gem::Requirement
+  requirement: &2161120940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161016440
+  version_requirements: *2161120940
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2161015140 !ruby/object:Gem::Requirement
+  requirement: &2161120060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161015140
+  version_requirements: *2161120060
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2161013980 !ruby/object:Gem::Requirement
+  requirement: &2161119400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161013980
+  version_requirements: *2161119400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2161012960 !ruby/object:Gem::Requirement
+  requirement: &2161118620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2161012960
+  version_requirements: *2161118620
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2161011440 !ruby/object:Gem::Requirement
+  requirement: &2161117900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161011440
+  version_requirements: *2161117900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161009940 !ruby/object:Gem::Requirement
+  requirement: &2161117200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161009940
+  version_requirements: *2161117200
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2161008580 !ruby/object:Gem::Requirement
+  requirement: &2161116420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161008580
+  version_requirements: *2161116420
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2161006680 !ruby/object:Gem::Requirement
+  requirement: &2161115780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161006680
+  version_requirements: *2161115780
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2161005100 !ruby/object:Gem::Requirement
+  requirement: &2161115020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161005100
+  version_requirements: *2161115020
 - !ruby/object:Gem::Dependency
   name: steak
-  requirement: &2161003840 !ruby/object:Gem::Requirement
+  requirement: &2161114300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161003840
+  version_requirements: *2161114300
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2161002700 !ruby/object:Gem::Requirement
+  requirement: &2161113340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161002700
+  version_requirements: *2161113340
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2161001520 !ruby/object:Gem::Requirement
+  requirement: &2161112380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161001520
+  version_requirements: *2161112380
 - !ruby/object:Gem::Dependency
   name: memcache-client
-  requirement: &2161000540 !ruby/object:Gem::Requirement
+  requirement: &2161111320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +186,7 @@ dependencies:
         version: 1.8.5
   type: :development
   prerelease: false
-  version_requirements: *2161000540
+  version_requirements: *2161111320
 description: Crowd-sourced translation and localization engine for Rails.
 email:
 - michael@tr8n.net
@@ -588,6 +588,7 @@ files:
 - app/controllers/tr8n/admin/translation_controller.rb
 - app/controllers/tr8n/admin/translation_key_controller.rb
 - app/controllers/tr8n/admin/translator_controller.rb
+- app/controllers/tr8n/api/v1/application_controller.rb
 - app/controllers/tr8n/api/v1/base_controller.rb
 - app/controllers/tr8n/api/v1/language_controller.rb
 - app/controllers/tr8n/api/v1/translation_controller.rb
@@ -1007,7 +1008,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3500293524521491792
+      hash: -1543792512908225439
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -1016,7 +1017,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3500293524521491792
+      hash: -1543792512908225439
 requirements: []
 rubyforge_project: tr8n
 rubygems_version: 1.8.11