tr8n_client_sdk 4.2.1 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2c5d0fc6b0b1a8f19a0c1d744e67421eef4c2ba
-  data.tar.gz: c30856b2d4f36db9dfafdfa04cc835519858b4fd
+  metadata.gz: fd5aa83a24c9660d520dcc59cd80d85ba26baf7e
+  data.tar.gz: ff1d3a4ffa0d04cdf3024e94840d5527084cdff2
 SHA512:
-  metadata.gz: eea75b84daa691897516b52147b90f20df8cb5239d7ef58ebe198d09deb4f8d3669f813740232c8b1ad33784f67764213d9a0d3da566bc2bcfec0349177f8c1d
-  data.tar.gz: de278681dbd09b56b8d23f440456996a3c7fb2df4ee776818d1bc70a0587f7d2bdaa9b41edcb4b843749bee5ea3f5cddf6d70611fe2d9efbfb2b07c126c56c94
+  metadata.gz: a4512dbccb63ab1fce2317dbe286632092ad9da2706fee4ae09012039cb5fe362b104c845eea1cf6d4620bd4802cf442517322ad908e3829e85977e631e9cbe2
+  data.tar.gz: 72ee88658fc1f34c68333e12c9e2257f440c325e470a2eaaade6108f291f53a41b7a16eb4ade1f1154d2b6d2c728913f44452a8d520ba4a315272570e3d768a5

data/README.md

@@ -15,18 +15,18 @@ This Client SDK provides tools for translating Rails applications into any langu
 Installation
 ===================================
 
-To integrate Tr8n SDK into your own application, all you need to do is:
+To integrate Tr8n SDK into your own application, add the gem to your app:
 
 Add the following gem to your Gemfile:
 
 ```ruby
-  gem 'tr8n_client_sdk'
+gem 'tr8n_client_sdk'
 ```
 
 Install the gems:
 
 ```sh
-  $ bundle
+$ bundle install
 ```
 
 
@@ -38,106 +38,113 @@ Create a tr8n initializer file with the following configuration:
 config/initializers/tr8n.rb
 
 ```ruby
-    Tr8n.configure do |config|
-      config.application = {
-          :key => YOUR_APP_KEY,
-          :secret => YOUR_APP_SECRET
-      }
-    end
+Tr8n.configure do |config|
+  config.application = {
+      :key => YOUR_APP_KEY,
+      :secret => YOUR_APP_SECRET
+  }
+end
 ```
 
-Tr8n should be run with caching enabled. You can specify the cache you want to use by providing it in the initializer.
+For best performance, you must enable caching for Tr8n. You can specify the cache in the initializer.
 
-If you are already using Rails caching, you can use it for Tr8n as well:
+If you are already using Rails caching, you probably already specify it in your production file, like the following:
 
 config/environments/production.rb
 
 ```ruby
-    config.cache_store = :mem_cache_store, Dalli::Client.new('localhost:11211', {:namespace => 'myapplication'})
-    config.identity_cache_store = :mem_cache_store, Dalli::Client.new('localhost:11211', {:namespace => 'myapplication'})
-
+config.cache_store = :mem_cache_store, Dalli::Client.new('localhost:11211', {:namespace => 'myapplication'})
+config.identity_cache_store = :mem_cache_store, Dalli::Client.new('localhost:11211', {:namespace => 'myapplication'})
 ```
 
+Then all you need to do is specify that you want to use the Rails cache adapter in your Tr8n initializer:
+
 config/initializers/tr8n.rb
 
 ```ruby
-    Tr8n.configure do |config|
-      config.cache = {
-        :enabled    => true,
-        :adapter    => 'rails',
-        :version    => 1
-      }
-    end
+Tr8n.configure do |config|
+  config.cache = {
+    :enabled    => true,
+    :adapter    => 'rails',
+    :version    => 1
+  }
+end
 ```
 
 Alternatively, you can provide a separate memcache server specifically for translations:
 
 ```ruby
-    Tr8n.configure do |config|
-      config.cache = {
-          :enabled  => true,
-          :adapter  => 'memcache',
-          :host     => 'localhost:11211',
-          :version  => 1,
-          :timeout  => 3600
-      }
-    end
+Tr8n.configure do |config|
+  config.cache = {
+      :enabled  => true,
+      :adapter  => 'memcache',
+      :host     => 'localhost:11211',
+      :version  => 1,
+      :timeout  => 3600
+  }
+end
 ```
 
 You can also use Redis to persist your translations cache:
 
 ```ruby
-    Tr8n.configure do |config|
-      config.cache = {
-          :enabled  => true,
-          :adapter  => 'redis',
-          :host     => 'localhost:6379',
-          :version  => 1,
-          :timeout  => 3600
-      }
-    end
+Tr8n.configure do |config|
+  config.cache = {
+      :enabled  => true,
+      :adapter  => 'redis',
+      :host     => 'localhost:6379',
+      :version  => 1,
+      :timeout  => 3600
+  }
+end
 ```
 
 The above examples use shared caching model - all your Rails processes on all your servers share the same translation cache. This approach
 will save you memory space, as well as allow you to invalidate/redeploy your translations cache without having to redeploy your application.
 
-To update the cache, run the following line of code from any application instance (for example, an admin tool):
+To update the cache, execute the following line of code:
 
 ```ruby
-  Tr8n.cache.upgrade_version
+Tr8n.cache.upgrade_version
 ```
 
-Or you can run the rake command:
+Or you can run the rake command from any of your app instances:
 
 ```sh
- $ bundle exec rake tr8n:cache:upgrade
+$ bundle exec rake tr8n:cache:upgrade
 ```
 
-This will effectively invalidate your current cache and rebuilt it with the latest translations from Translation Exchange's CDN.
+This will effectively invalidate your current cache and rebuilt it with the latest translations from Translation Exchange CDN.
 
 An alternative approach is to pre-generate all your cache files when you deploy your application. The translation cache will be loaded and stored in every process on every server,
 but it will be faster at serving translations and this approach does not require cache warmup.
 
-If you prefer to use in-memory caching, you can specify the file based cache using:
+To specify in-memory, file-based cache, provide the following configuration:
 
 ```ruby
-    Tr8n.configure do |config|
-      config.cache = {
-          :enabled    => true,
-          :adapter    => 'file',
-          :path       => 'config/tr8n',
-          :version    => 'current',
-          :segmented  => false
-        }
-    end
+Tr8n.configure do |config|
+  config.cache = {
+      :enabled    => true,
+      :adapter    => 'file',
+      :path       => 'config/tr8n',
+      :version    => 'current',
+      :segmented  => false
+    }
+end
 ```
 
-If you set ':segmented' to 'true' it will generate cache files per language per source, instead of one file per language for the entire application.
+If you set ':segmented' to 'true', the cache will be generated for each source in your application. Otherwise, a single cache file will be generated per language for the entire application.
 
 The file based cache must be generated before you deploy your application using the following command:
 
 ```sh
-  $ bundle exec rake tr8n:cache:generate
+$ bundle exec rake tr8n:cache:generate
+```
+
+You can also rollback to the previous file cache using:
+
+```sh
+$ bundle exec rake tr8n:cache:rollback
 ```
 
 
@@ -147,15 +154,13 @@ Integration
 In the HEAD section of your layout, add:
 
 ```ruby
-  <%= tr8n_scripts_tag %>
+<%= tr8n_scripts_tag %>
 ```
 
-You are done, tr8n is now running in your app.
-
 Now you can simply add the default language selector anywhere on your page using:
 
 ```ruby
-  <%= tr8n_language_selector_tag %>
+<%= tr8n_language_selector_tag %>
 ```
 
 The default language selector is used to enable/disable translation modes. It may be useful on staging or translation
@@ -165,19 +170,19 @@ To use a dropdown language selector that uses locale in the url parameter, use:
 
 ```ruby
 <%= tr8n_language_selector_tag(
-        :type => :dropdown,
-        :style => "margin-top:15px",
-        :language => :english
-    ) %>
+    :type => :dropdown,
+    :style => "margin-top:15px",
+    :language => :english
+) %>
 ```
 
 Now you can use Tr8n's helper methods and TML (Translation Markup Language) to translate your strings:
 
 ```ruby
-  <%= tr("Hello World") %>
-  <%= tr("You have {count || message}", count: 5) %>
-  <%= tr("{actor} sent {target} [bold: {count || gift}]", actor: actor_user, target: target_user, count: 5) %>
-  <%= tr("{actor} uploaded [bold: {count || photo}] to {actor | his, her} photo album.", actor: current_user, count: 5) %>
+<%= tr("Hello World") %>
+<%= tr("You have {count || message}", count: 5) %>
+<%= tr("{actor} sent {target} [bold: {count || gift}]", actor: actor_user, target: target_user, count: 5) %>
+<%= tr("{actor} uploaded [bold: {count || photo}] to {actor | his, her} photo album.", actor: current_user, count: 5) %>
   ...
 ```
 
@@ -185,9 +190,7 @@ There are some additional methods that can be very useful. For instance, if you
 you can simply use:
 
 ```ruby
-
-  "Hello World".translate
-
+"Hello World".translate
 ```
 
 Learn more about TML at: http://TranslationExchange.com/docs
@@ -202,7 +205,7 @@ you need to set the i18n backend to Tr8n. Add the following line to your tr8n in
 config/initializers/tr8n.rb
 
 ```ruby
-  I18n.backend = I18n::Backend::Tr8n.new
+I18n.backend = I18n::Backend::Tr8n.new
 ```
 
 Now the "t" function will automatically fallback onto "tr" function. If you have the following in your base language file:
@@ -210,25 +213,25 @@ Now the "t" function will automatically fallback onto "tr" function. If you have
 config/locales/en.yml
 
 ```ruby
-  en:
-    hello: "Hello world"
-    my:
-      nested:
-        key: "This is a nested key"
+en:
+  hello: "Hello world"
+  my:
+    nested:
+      key: "This is a nested key"
 ```
 
 Then you can call:
 
 ```ruby
-  <%= t(:hello) %>
-  <%= t("my.nested.key") %>
+<%= t(:hello) %>
+<%= t("my.nested.key") %>
 ```
 
 And the i18n will use Translation Exchange as the backend for your translations. On top of it, you can continue using Tr8n's extensions:
 
 ```ruby
-  <%= tr("Hello World") %>
-  <%= tr("This is a nested key") %>
+<%= tr("Hello World") %>
+<%= tr("This is a nested key") %>
 ```
 
 The above calls are equivalent. 
@@ -240,29 +243,28 @@ Logging
 Tr8n comes with its own logger. If you would like to see what the SDK is doing behind the scene, enable the logger and provide the file path for the log file:
 
 ```ruby
-    Tr8n.configure do |config|
+Tr8n.configure do |config|
 
-      config.logger  = {
-          :enabled  => true,
-          :path     => "#{Rails.root}/log/tr8n.log",
-          :level    => 'debug'
-      }
+  config.logger  = {
+      :enabled  => true,
+      :path     => "#{Rails.root}/log/tr8n.log",
+      :level    => 'debug'
+  }
 
-    end
+end
 ```
 
-
 Customization
 ===================================
 
 Tr8n comes with default settings for the rules engine. For example, it assumes that you have the following methods in your ApplicationController:
 
 ```ruby
-  def current_user
-  end
+def current_user
+end
 
-  def current_locale
-  end
+def current_locale
+end
 ```
 
 Tr8n only needs the current_user method if your site needs to use gender based rules for the viewing user.
@@ -272,13 +274,13 @@ Similarly, if you prefer to use your own mechanism for storing and retrieving us
 If you need to adjust those method names, you can set them in the config:
 
 ```ruby
-    Tr8n.configure do |config|
+Tr8n.configure do |config|
 
-      config.current_user_method = :my_user
+  config.current_user_method = :my_user
 
-      config.current_locale_method = :my_locale
+  config.current_locale_method = :my_locale
 
-    end
+end
 ```
 
 
@@ -288,9 +290,9 @@ Tr8n Client SDK Sample
 The best way to start using the SDK is to run a sample application that comes bundled with this SDK.
 
 ```sh
-  $ git clone https://github.com/tr8n/tr8n_rails_clientsdk.git
-  $ cd tr8n_rails_clientsdk/spec/dummy
-  $ bundle
+$ git clone https://github.com/tr8n/tr8n_rails_clientsdk.git
+$ cd tr8n_rails_clientsdk/spec/dummy
+$ bundle
 ```
 
 Before you running the application, visit TranslationExchange.com, register as a new user and create a new application.
@@ -298,16 +300,16 @@ Before you running the application, visit TranslationExchange.com, register as a
 Update your key and secret in the following file:  config/initializers/tr8n.rb
 
 ```ruby
-  config.application = {
-      :key => YOUR_KEY,
-      :secret => YOUR_SECRET
-  }
+config.application = {
+    :key => YOUR_KEY,
+    :secret => YOUR_SECRET
+}
 ```
 
 Now you can start the application by running:
 
 ```sh
-  $ bundle exec rails s
+$ bundle exec rails s
 ```
 
 
@@ -319,9 +321,9 @@ http://localhost:3000
 Links
 ==================
 
-* Register on TranslationExchange.com: https://translationexchange.com
+* Register on TranslationExchange.com: http://translationexchange.com
 
-* Read TranslationExchange's documentation: https://translationexchange.com/docs
+* Read Translation Exchange documentation: http://translationexchange.com/docs
 
 * Follow TranslationExchange on Twitter: https://twitter.com/translationx
 
@@ -333,7 +335,7 @@ Links
 Copyright and license
 ==================
 
-Copyright (c) 2014 Michael Berkovich, TranslationExchange.com
+Copyright (c) 2015 Translation Exchange Inc, TranslationExchange.com
 
 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_client_sdk/{cache_controller.rb → tools_controller.rb}

@@ -30,9 +30,26 @@
 #++
 
 module Tr8nClientSdk
-  class CacheController < ApplicationController
+  class ToolsController < ApplicationController
+
     def upgrade
       Tr8n.cache.upgrade_version
+      redirect_back
+    end
+
+    def enable
+      tr8n_toggle_tools(true)
+      redirect_back
+    end
+
+    def disable
+      tr8n_toggle_tools(false)
+      redirect_back
+    end
+
+    private
+
+    def redirect_back
       redirect_to(request.env['HTTP_REFERER'] || '/')
     end
   end

data/app/views/tr8n_client_sdk/tags/_language_selector.html.erb

@@ -1,4 +1,45 @@
-<% if opts[:type] == :dropdown %>
+<% if tr8n_session.tools_enabled? or type.blank? %>
+  <%
+     if tr8n_session.tools_enabled?
+       opts[:method] = 'Tr8n.UI.LanguageSelector.show(); return false;'
+     end
+  %>
+
+  <%= link_to('#',
+        :onclick => (opts[:method] || "alert('Custom language selector can be specified by passing it in the method attribute of the language selector tag.');"),
+        :style => (opts[:style] || 'padding-right:5px;text-decoration:none'),
+        :class => opts[:class]
+      ) do %>
+    <% unless opts[:hide_flag] %>
+      <%= image_tag(tr8n_current_language.flag_url, :style => "align:middle") %>
+      &nbsp;
+    <% end %>
+    <% if opts[:language] == :native %>
+      <%= tr8n_current_language.native_name %>
+    <% elsif opts[:language] == :english %>
+      <%= tr8n_current_language.english_name %>
+    <% else %>
+      <%= tr8n_current_language.english_name %>
+    <% end %>
+  <% end %>
+
+<% elsif type == :list %>
+  <div style="padding-top:10px;">
+    <% tr8n_application.languages.each_with_index do |lang, index| %>
+      <% next if opts[:limit] and index >= opts[:limit] %>
+      <%= link_to(params.merge(:locale => lang.locale), :style => (opts[:style] || 'padding-right:5px;text-decoration:none'), :class => opts[:class]) do %>
+        <% if opts[:flags_only] or opts[:flags] %>
+          <%= image_tag(lang.flag_url) %>
+        <% end %>
+        <% unless opts[:flags_only] %>
+          <%= lang.english_name %>
+        <% end %>
+      <% end %>
+    <% end %>
+  </div>
+
+<% elsif type == :dropdown %>
+
   <script>
     function tr8n_change_locale(selector) {
       var query_parts = window.location.href.split('?');
@@ -23,31 +64,19 @@
       window.location = destination;
     }
   </script>
+
   <select id="tr8n_language_selector" onchange="tr8n_change_locale(this)" style="<%=opts[:style]%>" class="<%=opts[:class]%>">
     <% tr8n_application.languages.each do |lang| %>
       <option dir='ltr' value="<%=lang.locale%>" <%="selected" if lang.locale == tr8n_current_locale %>>
         <% if opts[:language] == :native %>
           <%= lang.native_name %>
         <% elsif opts[:language] == :english %>
-           <%= lang.english_name %>
+          <%= lang.english_name %>
         <% else %>
           <%= lang.english_name %>
         <% end %>
       </option>
     <% end %>
   </select>
-<% else %>
-  <a href="#" onClick="Tr8n.UI.LanguageSelector.show(); return false;">
-    <% unless opts[:hide_flag] %>
-      <%= image_tag(tr8n_current_language.flag_url, :style => "align:middle") %>
-      &nbsp;
-    <% end %>
-    <% if opts[:language] == :native %>
-      <%= tr8n_current_language.native_name %>
-    <% elsif opts[:language] == :english %>
-      <%= tr8n_current_language.english_name %>
-    <% else %>
-      <%= tr8n_current_language.english_name %>
-    <% end %>
-  </a>
-<% end %>
+
+<% end %>

data/app/views/tr8n_client_sdk/tags/_scripts.html.erb

@@ -6,40 +6,39 @@
     .tr8n_txtl {<%=tr8n_style_attribute_tag('text-align', 'left')%> !important;}
   </style>
 
-  <script>
-    (function() {
-      if (window.tr8n_already_initialized) return;
-      window.tr8n_already_initialized = true;
+  <% if tr8n_session.tools_enabled? %>
+    <script>
+      (function() {
+        if (window.tr8n_already_initialized) return;
+        window.tr8n_already_initialized = true;
 
-      var script = window.document.createElement('script');
-      script.setAttribute('id', 'tr8n-tools');
-      script.setAttribute('type', 'application/javascript');
-      script.setAttribute('src', '<%= tr8n_application.tools['javascript'] %>');
-      script.setAttribute('charset', 'UTF-8');
-      script.onload = function() {
-        Tr8n.Utils.insertCSS(window.document, "<%= tr8n_application.tools['stylesheet'] %>", false);
-        Tr8n.Utils.insertCSS(window.document, "<%= tr8n_application.css %>", true);
-        Tr8n.app_key = '<%= tr8n_application.key %>';
-        Tr8n.host = '<%= tr8n_application.tools['host'] %>';
-        Tr8n.locale = '<%= tr8n_current_language.locale %>';
-        Tr8n.sources = [];
-        <%
-          if tr8n_application.feature_enabled?(:shortcuts)
-             tr8n_application.shortcuts.each do |key, script|
-        %>
-        shortcut.add('<%=key.html_safe%>', function() {
-          <%= script.html_safe %>
-        });
-        <%
-             end
-          end
-        %>
-        if (typeof(tr8n_on_ready) === 'function') {
-          tr8n_on_ready();
-        }
-      };
-
-      window.document.getElementsByTagName('head')[0].appendChild(script);
-    })();
-  </script>
+        var script = window.document.createElement('script');
+        script.setAttribute('id', 'tr8n-tools');
+        script.setAttribute('type', 'application/javascript');
+        script.setAttribute('src', '<%= tr8n_application.tools['javascript'] %>');
+        script.setAttribute('charset', 'UTF-8');
+        script.onload = function() {
+          Tr8n.Utils.insertCSS(window.document, "<%= tr8n_application.tools['stylesheet'] %>", false);
+          Tr8n.Utils.insertCSS(window.document, "<%= tr8n_application.css %>", true);
+          Tr8n.app_key = '<%= tr8n_application.key %>';
+          Tr8n.host = '<%= tr8n_application.tools['host'] %>';
+          Tr8n.locale = '<%= tr8n_current_language.locale %>';
+          Tr8n.sources = [];
+          <%
+            if tr8n_application.feature_enabled?(:shortcuts)
+               tr8n_application.shortcuts.each do |key, script|
+          %>
+          shortcut.add('<%=key.html_safe%>', function() {<%= script.html_safe %>});
+          <%
+               end
+            end
+          %>
+          if (typeof(tr8n_on_ready) === 'function') {
+            tr8n_on_ready();
+          }
+        };
+        window.document.getElementsByTagName('head')[0].appendChild(script);
+      })();
+    </script>
+  <% end %>
 <% end %>

data/config/routes.rb

@@ -30,5 +30,7 @@
 #++
 
 Rails.application.routes.draw do
-  get '/tr8n/upgrade' => 'tr8n_client_sdk/cache#upgrade'
+  get '/tr8n/upgrade' => 'tr8n_client_sdk/tools#upgrade'
+  get '/tr8n/on' => 'tr8n_client_sdk/tools#enable'
+  get '/tr8n/off' => 'tr8n_client_sdk/tools#disable'
 end

data/lib/tasks/tr8n_client_sdk.rake

@@ -0,0 +1,47 @@
+#--
+# Copyright (c) 2014 Michael Berkovich, 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.
+#++
+
+namespace :tr8n_client_sdk do
+
+  task :init => :environment do
+
+  end
+
+  task :cache do
+    require "tr8n_client_sdk/config"
+    Tr8n.config = Tr8nClientSdk::Config.new
+
+    Tr8n.config.init_application
+    g = Tr8nCore::Generators::Cache::File.new
+    g.run
+  end
+
+end

data/lib/tr8n_client_sdk/extensions/action_controller_extension.rb

@@ -71,40 +71,54 @@ module Tr8nClientSdk
       # Overwrite this method in a controller to assign a custom component for all views
       def tr8n_component
         nil
-      end  
+      end
+
+      def tr8n_toggle_tools(flag)
+        session[:tr8n_tools_disabled] = !flag
+      end
 
-      def tr8n_translator_locale
-        tr8n_cookie_params['locale']
+      def tr8n_tools_enabled?
+        not session[:tr8n_tools_disabled]
       end
 
       def tr8n_locale
         self.send(Tr8n.config.current_locale_method) if Tr8n.config.current_locale_method
       rescue
-        # fallback to the default session based locale implementation
-        # choose the first language from the accepted languages header
         session[:locale] = tr8n_user_preferred_locale unless session[:locale]
         session[:locale] = params[:locale] if params[:locale]
         session[:locale] || Tr8n.config.default_locale
       end
 
-      def tr8n_user
-        self.send(Tr8n.config.current_user_method) if Tr8n.config.current_user_method
-      rescue
-        nil
-      end
-
       def tr8n_init_client_sdk
         return if Tr8n.config.disabled?
 
         @tr8n_started_at = Time.now
 
-        Tr8n.session.init(
-          :cookies => request.cookies,
-          :locale => tr8n_locale,
-          :user => tr8n_user,
-          :source => tr8n_source,
-          :component => tr8n_component
-        )
+        if params[:tr8n]
+          tr8n_toggle_tools(params[:tr8n] == 'on')
+        end
+
+        tr8n_session_params = {
+          :tools_enabled    => tr8n_tools_enabled?,
+          :source           => tr8n_source,
+          :component        => tr8n_component
+        }
+
+        if Tr8n.config.current_user_method
+          begin
+            tr8n_session_params.merge!(:user => self.send(Tr8n.config.current_user_method))
+          rescue
+            # Tr8n.logger.error('Current user method is specified but not provided')
+          end
+        end
+
+        if tr8n_tools_enabled? # gets translator and locale from the cookie
+          tr8n_session_params.merge!(:cookies => request.cookies)
+        else # uses default locale
+          tr8n_session_params.merge!(:locale => tr8n_locale)
+        end
+
+        Tr8n.session.init(tr8n_session_params)
 
         I18n.enforce_available_locales = false
         I18n.locale = Tr8n.session.current_language.locale

data/lib/tr8n_client_sdk/extensions/action_view_extension.rb

@@ -83,9 +83,9 @@ module Tr8nClientSdk
       html.html_safe
     end
 
-    def tr8n_language_selector_tag(opts = {})
+    def tr8n_language_selector_tag(type = nil, opts = {})
       return unless Tr8n.config.enabled?
-      render(:partial => '/tr8n_client_sdk/tags/language_selector', :locals => {:opts => opts})
+      render(:partial => '/tr8n_client_sdk/tags/language_selector', :locals => {:type => type, :opts => opts})
     end
 
     def tr8n_language_strip_tag(opts = {})

data/lib/tr8n_client_sdk/version.rb

@@ -30,5 +30,5 @@
 #++
 
 module Tr8nClientSdk
-  VERSION = '4.2.1'
+  VERSION = '4.3.1'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tr8n_client_sdk
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.3.1
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: tr8n_core
   requirement: !ruby/object:Gem::Requirement
@@ -48,7 +48,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/controllers/tr8n_client_sdk/cache_controller.rb
+- app/controllers/tr8n_client_sdk/tools_controller.rb
 - app/views/tr8n_client_sdk/tags/_language_selector.html.erb
 - app/views/tr8n_client_sdk/tags/_language_strip.html.erb
 - app/views/tr8n_client_sdk/tags/_powered_by_tr8n.html.erb
@@ -56,6 +56,7 @@ files:
 - config/routes.rb
 - lib/i18n/backend/tr8n.rb
 - lib/tasks/tr8n.rake
+- lib/tasks/tr8n_client_sdk.rake
 - lib/tr8n/cache_adapters/rails.rb
 - lib/tr8n_client_sdk.rb
 - lib/tr8n_client_sdk/core/string.rb