tml-rails 4.4.1 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c160510b6789f81b1b1851264330c2940c4a5d40
-  data.tar.gz: 4ca5ca0a5a41ff31480bb230dbfd90bc595ba402
+  metadata.gz: 2e992a68bd9ca23d3a6c095d44db4d4cf4e0bb77
+  data.tar.gz: 1a7847dfb32417c88636343cb4570fcd18842067
 SHA512:
-  metadata.gz: 0b0b11adeeee73c5ffd57ba1bda1e01a90cd22303dd6066c82fdfc60a2b0df00d73b3f86dc9309365a27788101a40ec7584534347aeb30413fa7073e187f30fc
-  data.tar.gz: d92eaf0a10c479498fceba9432b05e7cc7eed772311c42de7648ee28192fad8f53d476d0e88225556d7cf7afffa21ef492d630dcab6cf2f08fb3b13575d18635
+  metadata.gz: f1c837e64efcdf9136754b9b0d4ad25576bfac7c9c215cf02c2adbf95ec020fe24868438a3081802428293e8f700bb156cc741379f7ab9771123d72ea51e62b6
+  data.tar.gz: e57f7967637af87ffa84a1292892c696e517cafdc47e32db0d6f89c4e859ad709f226d598aa6257e7b98fc3dab239835de8794737baaf06a4142835302178aae

data/README.md

@@ -43,8 +43,8 @@ Tml.configure do |config|
     :token => YOUR_APPLICATION_TOKEN,
   }
   config.cache = {
-    :adapter    => 'rails',
-    :version    => 1
+    :enablec => true,
+    :adapter => 'rails'
   }
 end
 ```
@@ -82,8 +82,7 @@ config.cache_store = :redis_store, {
   :host => 'localhost',
   :port => 6379,
   :db => 0,
-  :namespace => 'my_cache',
-  :expires_in => 90.minutes
+  :namespace => 'my_cache'
 }
 ```
 
@@ -100,8 +99,7 @@ config/initializers/tml.rb
 ```ruby
 config.cache = {
   :enabled    => true,
-  :adapter    => 'rails',
-  :version    => 1
+  :adapter    => 'rails'
 }
 ```
 
@@ -112,9 +110,7 @@ config.cache = {
     :enabled    => true,
     :adapter    => 'memcache',
     :host       => 'localhost:11211',
-    :namespace  => 'translations',
-    :version    => 1,
-    :timeout    => 3600
+    :namespace  => 'translations'
 }
 ```
 
@@ -127,9 +123,7 @@ config.cache = {
     :host       => 'localhost',
     :port       => 6379,
     :password   => 'password',
-    :namespace  => 'translations',
-    :version    => 1,
-    :timeout    => 3600
+    :namespace  => 'translations'
 }
 ```
 
@@ -160,26 +154,16 @@ config.cache = {
   :enabled    => true,
   :adapter    => 'file',
   :path       => 'config/tml',
-  :version    => 'current',
-  :segmented  => false
+  :version    => 'current'
 }
 ```
 
-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:
+The file based cache can be generated from your current release using the following command:
 
 ```sh
 $ bundle exec rake tml:cache:generate
 ```
 
-You can also rollback to the previous file cache using:
-
-```sh
-$ bundle exec rake tml:cache:rollback
-```
-
-
 Integration
 ===================================
 
@@ -241,7 +225,7 @@ you can simply use:
 "Hello World".translate
 ```
 
-Learn more about TML at: http://TranslationExchange.com/docs
+Learn more about TML at: http://translationexchange.com/docs
 
 
 I18n fallback

data/app/controllers/tml_rails/tools_controller.rb

@@ -33,9 +33,16 @@ module TmlRails
   class ToolsController < ApplicationController
 
     def upgrade
-      if params[:access_token] == Tml.config.access_token
+      if Tml.config.invalidator[:auth].is_a?(Proc)
+        authorized = Tml.config.invalidator[:auth].call(request)
+      else
+        authorized = params[:access_token] == Tml.config.access_token
+      end
+
+      if authorized
         Tml.cache.upgrade_version
       end
+
       redirect_back
     end
 

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

@@ -3,16 +3,18 @@
    opts[:class] ||= 'dropdown'
 %>
 
-
 <style>
   .trex-dropdown {
     text-align:<%= tml_current_language.align("left") %>;
   }
-
   .trex-dropdown .trex-dropdown-menu {
     min-width:200px;
   }
-
+  .trex-native-name {
+    padding: 0px 5px;
+    color: #ccc;
+    font-size: 10px;
+  }
   .trex-dropdown .trex-dropdown-footer {
     font-size:10px;
     color:#ccc;
@@ -24,11 +26,13 @@
     border-bottom-left-radius: 5px; 
     border-bottom-right-radius: 5px;
   }
-
 </style>
 
 
-<<%= opts[:element] %> class="trex-dropdown <%= opts[:class] %>" style="<%= opts[:style] %>">
+<% if opts[:element] %>
+  <<%= opts[:element] %> class="trex-language-selector trex-dropdown <%= opts[:class] %>" style="<%= opts[:style] %>">
+<% end %>
+
   <a href="#" role="button" class="<%= opts[:class] || 'dropdown' %>-toggle" data-toggle="dropdown" dir="<%= tml_current_language.dir %>">
     <%= tml_language_name_tag(tml_current_language, opts) %>
   </a>
@@ -38,8 +42,14 @@
     <% tml_application.languages.each do |lang| %>
 
       <li dir="<%= tml_current_language.dir %>">
-        <%=link_to({:locale => lang.locale}) do %>
-          <%= tml_language_name_tag(lang, opts) %>
+        <% if Tml.config.locale[:subdomain] %>
+          <%=link_to(tml_subdomain_locale_url(lang.locale)) do %>
+            <%= tml_language_name_tag(lang, opts) %>
+          <% end %>
+        <% else %>
+          <%=link_to({:locale => lang.locale}) do %>
+            <%= tml_language_name_tag(lang, opts) %>
+          <% end %>
         <% end %>
       </li>
 
@@ -62,5 +72,8 @@
       </a>
     </div>
   </ul>
-</<%= opts[:element] %>>
+
+<% if opts[:element] %>
+  </<%= opts[:element] %>>
+<% end %>
 

data/app/views/tml_rails/tags/{_language_selector_select.html.erb → _language_selector_dropdown.html.erb}

@@ -1,11 +1,15 @@
 <%= render(:partial => '/tml_rails/tags/language_selector_js') %>
 
+<% if opts[:element] %>
+  <<%= opts[:element] %> class="trex-language-selector <%= opts[:class] %>" style="<%= opts[:style] %>">
+<% end %>
+
 <select id="tml_language_selector" onchange="tml_change_locale(this.options[this.selectedIndex].value)" style="<%=opts[:style]%>" class="<%=opts[:class]%>">
   <% tml_application.languages.each do |lang| %>
     <option dir='ltr' value="<%=lang.locale%>" <%="selected" if lang.locale == tml_current_locale %>>
-      <% if opts[:language] == :native %>
+      <% if opts[:language].to_sym == :native %>
         <%= lang.native_name %>
-      <% elsif opts[:language] == :english %>
+      <% elsif opts[:language].to_sym == :english %>
         <%= lang.english_name %>
       <% else %>
         <%= lang.english_name %>
@@ -13,3 +17,8 @@
     </option>
   <% end %>
 </select>
+
+<% if opts[:element] %>
+  </<%= opts[:element] %>>
+<% end %>
+

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

@@ -0,0 +1,19 @@
+<% if opts[:element] %>
+  <<%= opts[:element] %> class="trex-language-selector <%= opts[:class] %>" style="<%= opts[:style] %>">
+<% end %>
+
+<div style="<%=opts[:style]%>" class="trex-language-selector <%=opts[:class]%>">
+
+  <% tml_application.languages.each_with_index do |lang, index| %>
+
+    <%= link_to(params.merge(:locale => lang.locale), :style => (opts[:style] || 'padding-right:5px;text-decoration:none'), :class => opts[:class]) do %>
+        <%= image_tag(lang.flag_url) %>
+    <% end %>
+
+  <% end %>
+
+</div>
+
+<% if opts[:element] %>
+  </<%= opts[:element] %>>
+<% end %>

data/config/routes.rb

@@ -30,5 +30,9 @@
 #++
 
 Rails.application.routes.draw do
-  get '/tml/upgrade' => 'tml_rails/tools#upgrade'
+
+  if Tml.config.invalidator and Tml.config.invalidator[:enabled]
+    get Tml.config.invalidator[:path] => 'tml_rails/tools#upgrade'
+  end
+
 end

data/lib/tml_rails/core/string.rb

@@ -31,12 +31,14 @@
 
 class String
 
+  # marks the string as translated and safe at the same time
   def tml_translated
     return self if frozen?
     @tml_translated = true
     self.html_safe
   end
 
+  # indicates whether the string has been translated or not
   def tml_translated?
     @tml_translated
   end

data/lib/tml_rails/extensions/action_common_methods.rb

@@ -127,5 +127,17 @@ module TmlRails
       tml_current_language.dir
     end
 
+    def tml_subdomain_locale_url(locale = tml_current_locale)
+      uri = URI::parse(request.url)
+      host = uri.host.split('.')
+      if host.count == 2
+        host.unshift(locale)
+      else
+        host[0] = locale
+      end
+      uri.host = host.join('.')
+      uri.to_s
+    end
+
   end
 end

data/lib/tml_rails/extensions/action_controller_extension.rb

@@ -35,8 +35,8 @@ module TmlRails
     def self.included(base)
       base.send(:include, TmlRails::ActionCommonMethods)
       base.send(:include, InstanceMethods) 
-      base.before_filter :tml_init_client_sdk
-      base.after_filter :tml_reset_client_sdk
+      base.before_filter :tml_init
+      base.after_filter :tml_reset
       if defined? base.rescue_from
         base.rescue_from 'Tml::Exception' do |e|
           Tml.logger.error(e)
@@ -68,7 +68,7 @@ module TmlRails
         self.class.name
       end
 
-      def tml_init_client_sdk
+      def tml_init
         return if Tml.config.disabled?
 
         @tml_started_at = Time.now
@@ -95,6 +95,7 @@ module TmlRails
 
         unless tml_session_params[:locale]
           tml_session_params.merge!(:cookies => cookies)
+          params[:locale] = request.subdomain if Tml.config.locale[:subdomain]
           tml_session_params.merge!(:change_locale => true) if params[:locale]
           tml_session_params.merge!(:locale => params[:locale] || tml_user_preferred_locale)
         end
@@ -114,7 +115,7 @@ module TmlRails
         end
       end
 
-      def tml_reset_client_sdk
+      def tml_reset
         return if Tml.config.disabled?
         @tml_finished_at = Time.now
         tml_application.submit_missing_keys

data/lib/tml_rails/extensions/action_view_extension.rb

@@ -46,15 +46,6 @@ module TmlRails
       options_for_select(options.tro(description), selected)
     end
 
-    def tml_phrases_link_tag(search = "", phrase_type = :without, phrase_status = :any)
-      return unless Tml.config.enabled?
-      return if tml_current_language.default?
-      return unless tml_current_translator.inline?
-
-      link_to(image_tag(tml_application.url_for("/assets/tml/translate_icn.gif"), :style => "vertical-align:middle; border: 0px;", :title => search),
-              tml_application.url_for("/tml/app/phrases/index?search=#{search}")).html_safe
-    end
-
     def tml_language_flag_tag(lang = tml_current_language, opts = {})
       return '' unless tml_application.feature_enabled?(:language_flags)
       html = image_tag(lang.flag_url, :style => (opts[:style] || 'vertical-align:middle;'), :title => lang.native_name)
@@ -64,7 +55,7 @@ module TmlRails
 
     def tml_language_name_tag(lang = tml_current_language, opts = {})
       show_flag = opts[:flag].nil? ? true : opts[:flag]
-      name_type = opts[:language].nil? ? :english : opts[:language] # :full, :native, :english, :locale, :both
+      name_type = opts[:language].nil? ? :english : opts[:language].to_sym # :full, :native, :english, :locale, :both
 
       html = []
       html << "<span style='white-space: nowrap'>"
@@ -87,14 +78,16 @@ module TmlRails
       end
 
       html << '</span></span>'
-      html.join().html_safe
+      html.join.html_safe
     end
 
     def tml_language_selector_tag(type = nil, opts = {})
       return unless Tml.config.enabled?
 
       type ||= :default
-      unless [:bootstrap, :default, :inline, :select, :popup].include?(type.to_sym)
+      type = :dropdown if type == :select
+
+      unless [:bootstrap, :default, :inline, :dropdown, :popup, :flags].include?(type.to_sym)
         return "Unsupported language selector #{type}"
       end
 
@@ -142,6 +135,10 @@ module TmlRails
     end
     alias_method :tml_block, :tml_with_options_tag
 
+    def tml_source(source, &block)
+      tml_with_options_tag({source: source}, &block)
+    end
+
     def tml_when_string_tag(time, opts = {})
       elapsed_seconds = Time.now - time
       if elapsed_seconds < 0
@@ -177,21 +174,33 @@ module TmlRails
     ## Language Direction Support
     ######################################################################
 
+    # switches CSS positions based on the language direction
+    # <%= tml_style_attribute_tag('float', 'right') %> => "float: right" : "float: left"
+    # <%= tml_style_attribute_tag('align', 'right') %> => "align: right" : "align: left"
     def tml_style_attribute_tag(attr_name = 'float', default = 'right', lang = tml_current_language)
       return "#{attr_name}:#{default}".html_safe if Tml.config.disabled?
       "#{attr_name}:#{lang.align(default)}".html_safe
     end
 
+    # supports directional CSS attributes
+    # <%= tml_style_directional_attribute_tag('padding', 'right', '5px') %> => "padding-right: 5px" : "padding-left: 5px"
     def tml_style_directional_attribute_tag(attr_name = 'padding', default = 'right', value = '5px', lang = tml_current_language)
       return "#{attr_name}-#{default}:#{value}".html_safe if Tml.config.disabled?
       "#{attr_name}-#{lang.align(default)}:#{value}".html_safe
     end
 
+    # provides the locale and direction of the language
+    def tml_html_attributes_tag(lang = tml_current_language)
+      "#{tml_lang_attribute_tag(lang)} #{tml_dir_attribute_tag(lang)}"
+    end
+
+    # providers the direction of the language
     def tml_dir_attribute_tag(lang = tml_current_language)
       return "dir='ltr'" if Tml.config.disabled?
       "dir='#{lang.dir}'".html_safe
     end
 
+    # provides the locale of the language
     def tml_lang_attribute_tag(lang = tml_current_language)
       return "lang='en-US'" if Tml.config.disabled?
       "lang='#{lang.locale}'".html_safe

data/lib/tml_rails/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tml-rails
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.4.2
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,7 +38,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.4'
-description: Client SDK for Translation Exchange.
+description: Translation Markup Language from Translation Exchange.
 email:
 - michael@translationexchange.com
 executables: []
@@ -51,10 +51,11 @@ files:
 - app/controllers/tml_rails/tools_controller.rb
 - app/views/tml_rails/tags/_language_selector_bootstrap.html.erb
 - app/views/tml_rails/tags/_language_selector_default.html.erb
+- app/views/tml_rails/tags/_language_selector_dropdown.html.erb
+- app/views/tml_rails/tags/_language_selector_flags.html.erb
 - app/views/tml_rails/tags/_language_selector_inline.html.erb
 - app/views/tml_rails/tags/_language_selector_js.html.erb
 - app/views/tml_rails/tags/_language_selector_popup.html.erb
-- app/views/tml_rails/tags/_language_selector_select.html.erb
 - app/views/tml_rails/tags/_language_strip.html.erb
 - app/views/tml_rails/tags/_powered_by_trex.html.erb
 - app/views/tml_rails/tags/_scripts.html.erb