tr8n_client_sdk 4.1.3 → 4.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14deb8e0f333e52babb38244769c2e273c22ca1d
-  data.tar.gz: 1d6dcf211cd1fbd03ed5be570a7ee50fee445f1d
+  metadata.gz: 9826d9afd314a52e2df7f0b362a2365d293812b7
+  data.tar.gz: 771b6ba185227163c3dcf99a151d59162eb7685e
 SHA512:
-  metadata.gz: 7ed42b62cd2c8f9da257d5f810c41851a30d9a616cad917fc832036f98e0acedcf2866f797a2d453e9d444bddb9e3b9c4d2244ebbead91ef54e61d5ec7213f3f
-  data.tar.gz: c012cb92eb7f0f920bf6c04f76d4487995556e84e59ba48c43f3c3e76a4a2820429ca971c5e738c11ab6e76d0c3d512a3020ddbec2b0e8e56d39f44259a4e3b1
+  metadata.gz: 228ea21e988c0c8e98b3e2366858dfebbc3ec22ef2acd2c3284b362c6c0693dd36fe32eee833f6c67111f507e45884157b491689e063773826f67cd4e9d23cb6
+  data.tar.gz: 3c0af5a81b95fe4150b0e36336b0ddd1a8bb977ede7a605072d31bb9529b282e4c6fc2750aed38258df2e6f0eb3dad50648a80c9eb87a42815b2bc3afe537e3d

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

@@ -1,5 +1,53 @@
-<a href="#" onClick="Tr8n.UI.LanguageSelector.show(); return false;">
-  <%= image_tag(tr8n_current_language.flag_url, :style => "align:middle") %>
-  &nbsp;
-  <%= tr8n_current_language.name %>
-</a>
+<% if opts[:type] == :dropdown %>
+  <script>
+    function tr8n_change_locale(selector) {
+      var query_parts = window.location.href.split('?');
+      var query = query_parts.length > 1 ? query_parts[1] : null;
+      var params = {};
+      if (query) {
+        var vars = query.split('&');
+        for (var i = 0; i < vars.length; i++) {
+          var pair = vars[i].split('=');
+          params[pair[0]] = pair[1];
+        }
+      }
+      params['locale'] = selector.options[selector.selectedIndex].value;
+
+      query = [];
+      var keys = Object.keys(params);
+      for (var i = 0; i < keys.length; i++) {
+        query.push(encodeURIComponent(keys[i]) + "=" + encodeURIComponent(params[keys[i]]));
+      }
+
+      var destination = query_parts[0] + '?' + query.join("&");
+      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 %>
+        <% else %>
+          <%= lang.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.name %>
+    <% end %>
+  </a>
+<% end %>

data/lib/tr8n/cache_adapters/rails.rb

@@ -0,0 +1,100 @@
+# encoding: UTF-8
+#--
+# 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.
+#++
+
+require 'dalli' if defined?(Dalli)
+
+class Tr8n::CacheAdapters::Rails < Tr8n::Cache
+
+  def initialize
+    Tr8n.logger.info("Initializing Rails cache...")
+    @cache = Rails.cache
+  end
+
+  def cache_name
+    @cache.class.name
+  end
+
+  def read_only?
+    false
+  end
+
+  def fetch(key, opts = {})
+    miss = false
+    data = @cache.fetch(versioned_key(key, opts)) do
+      info("Cache miss: #{key}")
+      miss = true
+      if block_given?
+        yield
+      else
+        nil
+      end
+    end
+    info("Cache hit: #{key}") unless miss
+    data
+  rescue Exception => ex
+    warn("Failed to retrieve data: #{ex.message}")
+    return nil unless block_given?
+    yield
+  end
+
+  def store(key, data, opts = {})
+    info("Cache store: #{key}")
+    @cache.write(versioned_key(key, opts), data)
+    data
+  rescue Exception => ex
+    warn("Failed to store data: #{ex.message}")
+    key
+  end
+
+  def delete(key, opts = {})
+    info("Cache delete: #{key}")
+    @cache.delete(versioned_key(key, opts))
+    key
+  rescue Exception => ex
+    warn("Failed to delete data: #{ex.message}")
+    key
+  end
+
+  def exist?(key, opts = {})
+    data = @cache.fetch(versioned_key(key, opts))
+    not data.nil?
+  rescue Exception => ex
+    warn("Failed to check if key exists: #{ex.message}")
+    false
+  end
+
+  def clear(opts = {})
+    info("Cache clear")
+  rescue Exception => ex
+    warn("Failed to clear cache: #{ex.message}")
+  end
+end

data/lib/tr8n_client_sdk.rb

@@ -32,6 +32,7 @@
 require "tr8n_client_sdk/railtie"
 require "tr8n_client_sdk/engine"
 require "tr8n_core"
+require "tr8n/cache_adapters/rails"
 
 module Tr8nClientSdk
 

data/lib/tr8n_client_sdk/extensions/action_common_methods.rb

@@ -99,20 +99,32 @@ module Tr8nClientSdk
     ## Common methods - wrappers
     ######################################################################
 
+    def tr8n_session
+      Tr8n.session
+    end
+
     def tr8n_application
-      Tr8n.session.application
+      tr8n_session.application
     end
 
     def tr8n_current_user
-      Tr8n.session.current_user
+      tr8n_session.current_user
     end
 
     def tr8n_current_translator
-      Tr8n.session.current_translator
+      tr8n_session.current_translator
+    end
+
+    def tr8n_current_locale
+      tr8n_session.current_language.locale
     end
 
     def tr8n_current_language
-      Tr8n.session.current_language
+      tr8n_session.current_language
+    end
+
+    def tr8n_language_dir
+      tr8n_current_language.dir
     end
 
   end

data/lib/tr8n_client_sdk/extensions/action_controller_extension.rb

@@ -37,6 +37,13 @@ module Tr8nClientSdk
       base.send(:include, InstanceMethods) 
       base.before_filter :tr8n_init_client_sdk
       base.after_filter :tr8n_reset_client_sdk
+      if defined? base.rescue_from
+        base.rescue_from 'Tr8n::Exception' do |e|
+          Tr8n.logger.error(e)
+          Tr8n.logger.error(e.backtrace)
+          raise e
+        end
+      end
     end
 
     module InstanceMethods
@@ -65,20 +72,55 @@ module Tr8nClientSdk
         nil
       end  
 
+      def tr8n_cookie_name
+        "tr8n_#{tr8n_application.key}"
+      end
+
+      def tr8n_cookie
+        request.cookies[tr8n_cookie_name]
+      end
+
+      def tr8n_cookie_params
+        @tr8n_cookie_params ||= begin
+          if tr8n_cookie
+            cookie_params = Tr8n::Utils.decode_and_verify_params(tr8n_cookie, tr8n_application.secret)
+            Tr8n.logger.info(cookie_params.inspect)
+            cookie_params
+          else
+            {}
+          end
+        end
+      end
+
+      def tr8n_translator_locale
+        tr8n_cookie_params["locale"]
+      end
+
       def tr8n_init_current_locale
         self.send(Tr8n.config.current_locale_method) if Tr8n.config.current_locale_method
       rescue
+        # fallback onto the cookie params from the service
+        return tr8n_translator_locale if tr8n_translator_locale
+
         # 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]
+        session[:locale] || Tr8n.config.default_locale
       end
 
       def tr8n_init_current_user
         self.send(Tr8n.config.current_user_method) if Tr8n.config.current_user_method
       rescue
-        Tr8n.config.default_locale
+        nil
+      end
+
+      def tr8n_init_current_translator
+        if tr8n_cookie_params["translator"]
+          Tr8n::Translator.new(tr8n_cookie_params["translator"].merge(:application => tr8n_application))
+        else
+          nil
+        end
       end
 
       def tr8n_init_client_sdk
@@ -88,21 +130,10 @@ module Tr8nClientSdk
 
         Tr8n.session.init
 
-        translator = nil
-
-        cookie_name = "tr8n_#{tr8n_application.key}"
-        if request.cookies[cookie_name]
-          cookie_params = Tr8n::Utils.decode_and_verify_params(request.cookies[cookie_name], tr8n_application.secret)
-          Tr8n.logger.info(cookie_params.inspect)
-          locale = cookie_params["locale"]
-          translator = Tr8n::Translator.new(cookie_params["translator"].merge(:application => tr8n_application)) unless cookie_params["translator"].nil?
-        end
-
-        locale ||= tr8n_init_current_locale || Tr8n.config.default_locale
-
         Tr8n.session.current_user = tr8n_init_current_user
-        Tr8n.session.current_translator = translator
-        Tr8n.session.current_language = tr8n_application.language(locale || tr8n_init_current_locale || Tr8n.config.default_locale)
+        Tr8n.session.current_language = tr8n_application.language(tr8n_init_current_locale)
+        Tr8n.session.current_translator = tr8n_init_current_translator
+
         Tr8n.session.current_source = tr8n_source
         Tr8n.session.current_component = tr8n_component
       end

data/lib/tr8n_client_sdk/extensions/action_view_extension.rb

@@ -128,6 +128,7 @@ module Tr8nClientSdk
       Thread.current[:block_options].pop
       ret
     end
+    alias_method :tr8n_block, :tr8n_with_options_tag
 
     def tr8n_when_string_tag(time, opts = {})
       elapsed_seconds = Time.now - time
@@ -137,12 +138,12 @@ module Tr8nClientSdk
         tr('a moment ago', 'Time reference')
       elsif elapsed_seconds < 55.minutes
         elapsed_minutes = (elapsed_seconds / 1.minute).to_i
-        tr("{minutes||minute} ago", 'Time reference', :minutes => elapsed_minutes)
+        tr('{minutes || minute} ago', 'Time reference', :minutes => elapsed_minutes)
       elsif elapsed_seconds < 1.75.hours
-        tr("about an hour ago", 'Time reference')
+        tr('about an hour ago', 'Time reference')
       elsif elapsed_seconds < 12.hours
         elapsed_hours = (elapsed_seconds / 1.hour).to_i
-        tr("{hours||hour} ago", 'Time reference', :hours => elapsed_hours)
+        tr('{hours || hour} ago', 'Time reference', :hours => elapsed_hours)
       elsif time.today_in_time_zone?
         display_time(time, :time_am_pm)
       elsif time.yesterday_in_time_zone?
@@ -150,16 +151,16 @@ module Tr8nClientSdk
       elsif elapsed_seconds < 5.days
         time.tr(:day_time).gsub('/ ', '/').sub(/^[0:]*/,"")
       elsif time.same_year_in_time_zone?
-        time.tr(:monthname_abbr_time).gsub('/ ', '/').sub(/^[0:]*/,"")
+        time.tr(:monthname_abbr_time).gsub('/ ', '/').sub(/^[0:]*/, '')
       else
-        time.tr(:monthname_abbr_year_time).gsub('/ ', '/').sub(/^[0:]*/,"")
+        time.tr(:monthname_abbr_year_time).gsub('/ ', '/').sub(/^[0:]*/, '')
       end
     end
 
     def tr8n_url_tag(path)
       tr8n_application.url_for(path)
     end
-    
+
     ######################################################################
     ## Language Direction Support
     ######################################################################
@@ -176,5 +177,9 @@ module Tr8nClientSdk
       "dir='#{lang.dir}'".html_safe
     end
 
+    def tr8n_lang_attribute_tag(lang = tr8n_current_language)
+      "lang=#{lang.locale}".html_safe
+    end
+
   end
 end

data/lib/tr8n_client_sdk/extensions/string.rb

@@ -0,0 +1,44 @@
+#--
+# 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.
+#++
+
+class String
+
+  def tr8n_translated
+    return self if frozen?
+    @tr8n_translated = true
+    self.html_safe
+  end
+
+  def tr8n_translated?
+    @tr8n_translated
+  end
+
+end

data/lib/tr8n_client_sdk/railtie.rb

@@ -37,6 +37,8 @@ require File.join(File.dirname(__FILE__), 'extensions/action_common_methods')
 require File.join(File.dirname(__FILE__), 'extensions/action_view_extension')
 require File.join(File.dirname(__FILE__), 'extensions/action_controller_extension')
 
+require File.join(File.dirname(__FILE__), 'extensions/string')
+
 module Tr8nClientSdk
   class Railtie < ::Rails::Railtie #:nodoc:
     initializer 'tr8n_client_sdk' do |app|

data/lib/tr8n_client_sdk/version.rb

@@ -30,5 +30,5 @@
 #++
 
 module Tr8nClientSdk
-  VERSION = "4.1.3"
+  VERSION = '4.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tr8n_client_sdk
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 4.1.5
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -54,11 +54,13 @@ files:
 - app/views/tr8n_client_sdk/tags/_scripts.html.erb
 - config/routes.rb
 - lib/tasks/tr8n_client_sdk.rake
+- lib/tr8n/cache_adapters/rails.rb
 - lib/tr8n_client_sdk.rb
 - lib/tr8n_client_sdk/engine.rb
 - lib/tr8n_client_sdk/extensions/action_common_methods.rb
 - lib/tr8n_client_sdk/extensions/action_controller_extension.rb
 - lib/tr8n_client_sdk/extensions/action_view_extension.rb
+- lib/tr8n_client_sdk/extensions/string.rb
 - lib/tr8n_client_sdk/railtie.rb
 - lib/tr8n_client_sdk/version.rb
 homepage: https://github.com/tr8n/tr8n_rails_clientsdk