tml-rails 4.3.12 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b99954162afccc06283b59f526bf8ebb2eb735e
-  data.tar.gz: eba2b34a477f65e4af4a79417f61546b42c1124e
+  metadata.gz: c160510b6789f81b1b1851264330c2940c4a5d40
+  data.tar.gz: 4ca5ca0a5a41ff31480bb230dbfd90bc595ba402
 SHA512:
-  metadata.gz: 2a47c866518fda743e215354f77e9124c08925c16ada7d1c632b3d1d7973955a93815dd46ca0b899be572c369d8433f7ed778cca8a8c500e07a0e95536792392
-  data.tar.gz: 441257c0e155cff8c6246e5ff48ec4e04bcc18f03cd4276e0e98c61a789661c8cbbe5d377848c9707493548c09be040f1fc127e4d1fc300390e0d6de3d389bf2
+  metadata.gz: 0b0b11adeeee73c5ffd57ba1bda1e01a90cd22303dd6066c82fdfc60a2b0df00d73b3f86dc9309365a27788101a40ec7584534347aeb30413fa7073e187f30fc
+  data.tar.gz: d92eaf0a10c479498fceba9432b05e7cc7eed772311c42de7648ee28192fad8f53d476d0e88225556d7cf7afffa21ef492d630dcab6cf2f08fb3b13575d18635

data/app/controllers/tml_rails/tools_controller.rb

@@ -33,17 +33,9 @@ module TmlRails
   class ToolsController < ApplicationController
 
     def upgrade
-      Tml.cache.upgrade_version
-      redirect_back
-    end
-
-    def enable
-      tml_toggle_tools(true)
-      redirect_back
-    end
-
-    def disable
-      tml_toggle_tools(false)
+      if params[:access_token] == Tml.config.access_token
+        Tml.cache.upgrade_version
+      end
       redirect_back
     end
 

data/app/views/tml_rails/tags/_powered_by_trex.html.erb

@@ -1,5 +1,5 @@
 <div style="padding-top:40px; color: #ccc; text-align:center; width:100%">
-  <%= tr("Powered by {trex}", :trex => link_to("TranslationExchange.com", "http://translationexchange.com", :style=>"color:#ccc;")) %>
+  <%= tr('Powered by {company}', :company => link_to('TranslationExchange.com', 'http://translationexchange.com', :style=>"color:#ccc;")) %>
 
   <style>
     .trex_logo {

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

@@ -7,38 +7,36 @@
     <%= tml_application.css %>
   </style>
 
-  <% if tml_session.tools_enabled? %>
-    <script>
-      (function() {
-        if (window.tml_already_initialized) return;
-        window.tml_already_initialized = true;
+  <script>
+    (function() {
+      if (window.tml_already_initialized) return;
+      window.tml_already_initialized = true;
 
-        var script = window.document.createElement('script');
-        script.setAttribute('id', 'tml-tools');
-        script.setAttribute('type', 'application/javascript');
-        script.setAttribute('src', '<%= tml_application.tools['javascript'] %>');
-        script.setAttribute('charset', 'UTF-8');
-        script.onload = function() {
-          Tml.Utils.insertCSS(window.document, "<%= tml_application.tools['stylesheet'] %>", false);
-          Tml.app_key = '<%= tml_application.key %>';
-          Tml.host = '<%= tml_application.tools['host'] %>';
-          Tml.locale = '<%= tml_current_language.locale %>';
-          Tml.sources = [];
-          <%
-            if tml_application.feature_enabled?(:shortcuts)
-               tml_application.shortcuts.each do |key, script|
-          %>
-          shortcut.add('<%=key.html_safe%>', function() {<%= script.html_safe %>});
-          <%
-               end
-            end
-          %>
-          if (typeof(tml_on_ready) === 'function') {
-            tml_on_ready();
-          }
-        };
-        window.document.getElementsByTagName('head')[0].appendChild(script);
-      })();
-    </script>
-  <% end %>
+      var script = window.document.createElement('script');
+      script.setAttribute('id', 'tml-tools');
+      script.setAttribute('type', 'application/javascript');
+      script.setAttribute('src', '<%= tml_application.tools['javascript'] %>');
+      script.setAttribute('charset', 'UTF-8');
+      script.onload = function() {
+        Tml.Utils.insertCSS(window.document, "<%= tml_application.tools['stylesheet'] %>", false);
+        Tml.app_key = '<%= tml_application.key %>';
+        Tml.host = '<%= tml_application.tools['host'] %>';
+        Tml.locale = '<%= tml_current_language.locale %>';
+        Tml.sources = [];
+        <%
+          if tml_application.feature_enabled?(:shortcuts)
+             tml_application.shortcuts.each do |key, script|
+        %>
+        shortcut.add('<%=key.html_safe%>', function() {<%= script.html_safe %>});
+        <%
+             end
+          end
+        %>
+        if (typeof(tml_on_ready) === 'function') {
+          tml_on_ready();
+        }
+      };
+      window.document.getElementsByTagName('head')[0].appendChild(script);
+    })();
+  </script>
 <% end %>

data/config/routes.rb

@@ -31,6 +31,4 @@
 
 Rails.application.routes.draw do
   get '/tml/upgrade' => 'tml_rails/tools#upgrade'
-  get '/tml/on' => 'tml_rails/tools#enable'
-  get '/tml/off' => 'tml_rails/tools#disable'
 end

data/lib/tml/cache_adapters/rails.rb

@@ -94,4 +94,5 @@ class Tml::CacheAdapters::Rails < Tml::Cache
   rescue Exception => ex
     warn("Failed to clear cache: #{ex.message}")
   end
+
 end

data/lib/tml_rails/extensions/action_controller_extension.rb

@@ -68,32 +68,13 @@ module TmlRails
         self.class.name
       end
 
-      # Overwrite this method in a controller to assign a custom component for all views
-      def tml_component
-        nil
-      end
-
-      def tml_toggle_tools(flag)
-        session[:tml_tools_disabled] = !flag
-      end
-
-      def tml_tools_enabled?
-        not session[:tml_tools_disabled]
-      end
-
       def tml_init_client_sdk
         return if Tml.config.disabled?
 
         @tml_started_at = Time.now
 
-        if params[:tml]
-          tml_toggle_tools(params[:tml] == 'on')
-        end
-
         tml_session_params = {
-          :tools_enabled    => tml_tools_enabled?,
-          :source           => tml_source,
-          :component        => tml_component
+          :source => tml_source
         }
 
         if Tml.config.current_user_method
@@ -125,10 +106,12 @@ module TmlRails
           cookies[Tml.session.cookie_name] = Tml::Utils.encode(Tml.session.cookie_params)
         end
 
-        if defined? I18n.enforce_available_locales
-          I18n.enforce_available_locales = false
+        if I18n.backend.class.name == 'I18n::Backend::Tml'
+          if defined? I18n.enforce_available_locales
+            I18n.enforce_available_locales = false
+          end
+          I18n.locale = Tml.session.current_language.locale
         end
-        I18n.locale = Tml.session.current_language.locale
       end
 
       def tml_reset_client_sdk
@@ -136,6 +119,7 @@ module TmlRails
         @tml_finished_at = Time.now
         tml_application.submit_missing_keys
         Tml.session.reset
+        Tml.cache.reset_version
         Tml.logger.info("Request took #{@tml_finished_at - @tml_started_at} mls") if @tml_started_at
       end
 

data/lib/tml_rails/version.rb

@@ -30,5 +30,5 @@
 #++
 
 module TmlRails
-  VERSION = '4.3.12'
+  VERSION = '4.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tml-rails
 version: !ruby/object:Gem::Version
-  version: 4.3.12
+  version: 4.4.1
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4.4'
 description: Client SDK for Translation Exchange.
 email:
 - michael@translationexchange.com