tr8n 3.1.8 → 3.2.0

data/lib/tr8n/key_registration_exception.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/lib/tr8n/keyboard_mapping.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #--
-# 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/lib/tr8n/logger.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/lib/tr8n/railtie.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/lib/tr8n/site_map.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/lib/tr8n/site_map_section.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/lib/tr8n/token.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/lib/tr8n/token_exception.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/lib/tr8n/tokenized_label.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
@@ -63,7 +63,7 @@ module Tr8n
         hash
       end
     end
-  
+
     def tokens?
       tokens.any?
     end
@@ -125,16 +125,6 @@ module Tr8n
         parts
       end
     end
-
-    def sanitized_tokens_hash
-      @sanitized_tokens_hash ||= begin
-        hash = {}
-        tokens.each do |token|
-          hash[token.sanitized_name] = token
-        end
-        hash
-      end
-    end
   
     def allowed_token?(token)
       not sanitized_tokens_hash[token.sanitized_name].nil?

data/lib/tr8n/tokens/data_token.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/lib/tr8n/tokens/decoration_token.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/lib/tr8n/tokens/hidden_token.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/lib/tr8n/tokens/method_token.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/lib/tr8n/tokens/transform_token.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/lib/tr8n/version.rb

@@ -1,3 +1,27 @@
+#--
+# 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.
+#++
+
+
 module Tr8n
-  VERSION = "3.1.8"
+  VERSION = "3.2.0"
 end

data/local/tr8n_server/app/models/user.rb

@@ -11,6 +11,7 @@ class User < ActiveRecord::Base
   end
   
   def name
+    return first_name if last_name.blank?
     [first_name, last_name].join(" ")
   end
   

data/local/tr8n_server/config/environments/test.rb

@@ -5,7 +5,7 @@ Tr8nServer::Application.configure do
   # test suite.  You never need to work with it otherwise.  Remember that
   # your test database is "scratch space" for the test suite and is wiped
   # and recreated between test runs.  Don't rely on the data there!
-  config.cache_classes = true
+  config.cache_classes = false
 
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_assets = true

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

@@ -7,11 +7,17 @@
 # environment settings at the bottom of the file. 
 #
 # Alternatively, you can overload any of the methods of Tr8n::Config
+#
+# If you would like to manage the configurations on the live site, 
+# try out the Registry gem, located here:
+#
+# http://www.github.com/berk/registry
+#
 #############################################################################
 
-defaults:
+defaults: 
   enable_tr8n:                true      # enables the engine
-  enable_key_source_tracking: false     # builds the site map sources
+  enable_key_source_tracking: false     # builds the site map sources - must be enabled for the API
   enable_key_caller_tracking: false     # tracks all calls to labels with their traces - for debugging only
   
   enable_glossary_hints:      true      # shows glossary in the translator    
@@ -26,13 +32,16 @@ defaults:
   enable_language_stats:      true      # shows percent completion of a language
   
   enable_admin_translations:  true      # registers tr8n admin keys in the system
-  enable_admin_inline_mode:   false     # allows tr8n engine sections to be inline translated
+  enable_admin_inline_mode:   true      # allows tr8n engine sections to be inline translated
   
   enable_language_cases:      true      # enables support for language cases
-  enable_client_sdk:          false     # allows javascript to use tr8nProxy object
+  enable_client_sdk:          true      # allows javascript to use tr8nProxy object
+  enable_browser_cache:       true      # caches translations in the browser
   
   enable_country_tracking:    true      # tracks and reports translator countries 
 
+  enable_translator_tabs:     true      # enables translation tools tabs 
+
   #############################################################################
   # Google translation suggestions is now a paid feature by Google.
   # 
@@ -45,7 +54,7 @@ defaults:
   #############################################################################
   enable_google_suggestions:  false      # uses google for suggestions
   google_api_key: "YOUR GOOGLE API KEY"  # get this API key from Google.
-  
+
   #############################################################################
   # Featured languages can be added as a bottom strip bar on all pages using
   #
@@ -66,7 +75,9 @@ defaults:
   # translation. If the flag is set to false, then a user must be promoted to
   # be a translator in order to submit or vote on translations.
   #############################################################################
-  open_registration_mode:     true
+  open_registration_mode:           true
+  enable_registration_disclaimer:   false
+  registration_disclaimer_path:     "/tr8n/common/terms_of_service"
 
   #############################################################################
   # Tr8n best run with caching enabled 
@@ -88,7 +99,7 @@ defaults:
   # You can also provide your own implementation of the adapter:
   #
   # cache_adapter:  YOUR_CACHE_ADAPTER_CLASS
-  #
+  # 
   # Note: Make sure you enable config.class_caching in your environment file
   #
   #############################################################################
@@ -104,7 +115,7 @@ defaults:
   #############################################################################
   logger:
     enabled:                  true
-    log_path:                 log/tr8n.log          # location of the log file
+    log_path:                 "log/tr8n.log"          # location of the log file
     enable_paranoia_mode:     true                  # logs every translator action
 
   #############################################################################
@@ -114,7 +125,7 @@ defaults:
     title:                    "Tr8n"                            # site title - provide your site title here
     contact_email:            "support@tr8n.net"                # contact email for questions about translations
     current_locale_method:    "current_locale"                  # application controller method that sets and returns current locale
-    default_url:              "/home"                           # default site url where to redirect the user if Tr8n is disabled            
+    default_url:              "/"                               # default site url where to redirect the user if Tr8n is disabled            
     default_locale:           "en-US"                           # locale of the site default language
     sitemap_path:             "/config/tr8n/site/sitemap.json"  # location of the sitemap definition file
     splash_screen:            "/tr8n/common/splash_screen"      # location of the Tr8n splash screen  
@@ -138,7 +149,7 @@ defaults:
         mugshot:              mugshot
         link:                 link
         locale:               locale
-        
+
   #############################################################################
   # Rules Engine Settings
   #############################################################################
@@ -148,33 +159,33 @@ defaults:
     decoration_token_classes: ["Tr8n::Tokens::DecorationToken"]
     allow_nil_token_values:   true
     numeric_rule:             
-      token_suffixes:         [count, num, age, hours, minutes, years, seconds]
-      object_method:          to_i
+      token_suffixes:         ["count", "num", "age", "hours", "minutes", "years", "seconds"]
+      object_method:          "to_i"
     gender_rule:  
-      token_suffixes:         [user, profile, actor, target]
-      object_method:          gender
+      token_suffixes:         ["user", "profile", "actor", "target", "partner"]
+      object_method:          "gender"
       method_values:  
-        female:               female
-        male:                 male
-        neutral:              neutral
-        unknown:              unknown
+        female:               "female"
+        male:                 "male"
+        neutral:              "neutral"
+        unknown:              "unknown"
     list_rule:                # use list_rule if your site does not support user genders 
-      object_method:          size
-      token_suffixes:         [list]
+      object_method:          "size"
+      token_suffixes:         ["list"]
     gender_list_rule:         # similiar to list rule, but works together with gender rule 
-      object_method:          size
-      token_suffixes:         [list]
+      object_method:          "size"
+      token_suffixes:         ["list"]
     date_rule:                
-      token_suffixes:         [date]
-      object_method:          to_date
+      token_suffixes:         ["date"]
+      object_method:          "to_date"
     value_rule:               
       token_suffixes:         "*"
-      object_method:          to_s
+      object_method:          "to_s"
     
     # minimal rank makes the translation acceptable for subsitution and counts towards the translator rank
     translation_threshold:    1
     
-    viewing_user_token:       viewing_user
+    viewing_user_token:       "viewing_user"
     translation_rank_styles:  
       -1000..-5:              "color:red;font-weight:bold;"
       -4..-1:                 "color:red;"
@@ -186,8 +197,11 @@ defaults:
   #############################################################################
   api:  
     enabled:                  true
-    response_encoding:        json     # options: xml, json
+    response_encoding:        "json"     # options: xml, json
     allow_key_registration:   true
+    skip_before_filters:      []       # filters from application controller
+    before_filters:           []       # filters from application controller
+    after_filters:            []       # filters from application controller
   
   #############################################################################
   # Translator Roles         - manager level is set at 1000 and anything above
@@ -243,11 +257,11 @@ defaults:
       date_time:              '%m/%d/%Y at %H:%M'   # 01/03/1010 at 5:30
  
   #############################################################################
-  # You can synchronize your translation keys and translations with other 
-  # sites that use Tr8n. This way you can get your site translated by 
+  # You can synchronize your translation keys and translations with the 
+  # tr8n.net service. This way you can get your site translated by 
   # millions of users from around the internet. Visit the following url and 
   # register as a developer, register your application and copy your app key
-  # in the line below:
+  # and secret in the lines below:
   #
   #  http://tr8n.net
   # 
@@ -265,20 +279,12 @@ defaults:
     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/config/tr8n/site/shortcuts.yml

@@ -8,7 +8,7 @@ Ctrl+Shift+I:
   
 Ctrl+Shift+L:       
   description:  Shows/hides language selector 
-  script:       "tr8nLanguageSelector.toggle();"
+  script:       "tr8nLightbox.show('/tr8n/language/select?lightbox=true', {height:500, width:400});"
   
 Ctrl+Shift+A:       
   description:  Displays all available languages  

data/local/tr8n_server/db/schema.rb

@@ -260,6 +260,7 @@ ActiveRecord::Schema.define(:version => 20111026230545) do
   end
 
   add_index "tr8n_translation_keys", ["key"], :name => "index_tr8n_translation_keys_on_key", :unique => true
+  add_index "tr8n_translation_keys", ["synced_at"], :name => "index_tr8n_translation_keys_on_synced_at"
 
   create_table "tr8n_translation_source_languages", :force => true do |t|
     t.integer  "language_id"
@@ -304,6 +305,7 @@ ActiveRecord::Schema.define(:version => 20111026230545) do
   end
 
   add_index "tr8n_translations", ["created_at"], :name => "tr8n_trans_created_at"
+  add_index "tr8n_translations", ["synced_at"], :name => "index_tr8n_translations_on_synced_at"
   add_index "tr8n_translations", ["translation_key_id", "translator_id", "language_id"], :name => "tr8n_trans_key_id_translator_id_lang_id"
   add_index "tr8n_translations", ["translator_id"], :name => "r8n_trans_translator_id"
 

data/spec/controllers/awards_controller_spec.rb

@@ -0,0 +1,22 @@
+require File.expand_path('../spec_helper', File.dirname(__FILE__))
+
+describe Tr8n::AwardsController do  
+  
+  describe "guest user" do 
+	  it "should be redirect to homepage" do
+	    get :index
+	    response.should redirect_to('/')
+	  end
+  end	  
+
+  describe "logged in user" do
+	  it "should redirect the guest user to homepage" do
+	    @user = User.create(:first_name => "Mike", :gender => "male")
+	    request.session[:user_id] = @user.id
+
+	    get :index
+	    response.should be_success
+	  end
+	end
+	  
+ end 

data/spec/controllers/base_controller_spec.rb

@@ -0,0 +1,6 @@
+require File.expand_path('../spec_helper', File.dirname(__FILE__))
+
+describe Tr8n::BaseController do  
+  
+
+ end 

data/spec/controllers/dashboard_controller_spec.rb

@@ -0,0 +1,23 @@
+require File.expand_path('../spec_helper', File.dirname(__FILE__))
+
+describe Tr8n::DashboardController do  
+
+  describe "guest user" do 
+	  it "should be redirect to homepage" do
+	    get :index
+	    response.should redirect_to('/')
+	  end
+  end	  
+
+  describe "logged in user" do
+	  it "should redirect the guest user to homepage" do
+	    @user = User.create(:first_name => "Mike", :gender => "male")
+	    request.session[:user_id] = @user.id
+
+	    get :index
+	    response.should be_success
+	  end
+	end
+
+
+end