tml 5.4.5 → 5.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55a593dd10fe515d4bc86495de5df5bfc0174e74
-  data.tar.gz: 3630a827b871144f534d4eb0e3f96b511fc0ca44
+  metadata.gz: cabb1d4b4e4a202fda309b2d0f140a1f4c91c58f
+  data.tar.gz: c332c1f7653cecbc6ac7b619fa3d9e00a4a1483d
 SHA512:
-  metadata.gz: 487911fa7073003f1e73f95e74c134a801f742795dc2e7783e2c26c975a6a035d718826cfa6614a6f397cb23e899508aa140a0ceffe8466c152471b856393b5e
-  data.tar.gz: 324205be9a2ae9d5d4a9ede6d178ffe0418333b39b1f60cad0de00d0d7f1d889579ec2a5ac8a77aaea2ad387ee553407bfe8545011cd23f9965176278fe0336b
+  metadata.gz: d64b807628e15e3d18cb7cacba69d1e4fd5407dd62fb35e27d37f04b48df82e50c12feec2e845c46ac0d97ee5796028b53b02eda76b3be2e763963ac83d82ccc
+  data.tar.gz: 1deca44da3cb162a4355aa4b4e17438f750852f1567c2c515682f3d913e37f4d9edbe460212175bd626c9a1da3fa6d245ad5d3e84378de7b75e694dcc6e73bc1

data/lib/tml/cache_version.rb

@@ -68,12 +68,12 @@ module Tml
       expires_at = version['t'] + version_check_interval
       if expires_at < Time.now.to_i
         Tml.logger.debug('Cache version is outdated, needs refresh')
-        'undefined'
-      else
-        delta = expires_at - Time.now.to_i
-        Tml.logger.debug("Cache version is up to date, expires in #{delta}s")
-        version['version']
+        return 'undefined'
       end
+
+      delta = expires_at - Time.now.to_i
+      Tml.logger.debug("Cache version is up to date, expires in #{delta}s")
+      version['version']
     end
 
     # fetches the version from the cache

data/lib/tml/config.rb

@@ -289,19 +289,11 @@ module Tml
         }
       }
 
-      @invalidator ||= {
-          enabled: true,
-          path: '/tml/upgrade',
-          auth: lambda do |request|
-            request.params[:access_token] == application[:token]
-          end
-      }
-
       @localization = {
-        :default_day_names        =>  ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
-        :default_abbr_day_names   =>  ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
-        :default_month_names      =>  ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
-        :default_abbr_month_names =>  ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
+        :default_day_names        => %w(Sunday Monday Tuesday Wednesday Thursday Friday Saturday),
+        :default_abbr_day_names   => %w(Sun Mon Tue Wed Thu Fri Sat),
+        :default_month_names      => %w(January February March April May June July August September October November December),
+        :default_abbr_month_names => %w(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec),
         :custom_date_formats      =>  {
           :default                => '%m/%d/%Y',            # 07/4/2008
           :short_numeric          => '%m/%d',               # 07/4

data/lib/tml/ext/array.rb

@@ -32,7 +32,7 @@
 class Array
 
   # translates an array of options for a select tag
-  def tro(description = '', options = {})
+  def translate_options(description = '', options = {})
     return [] if empty?
 
     options = options.merge(:skip_decorations => true)
@@ -47,6 +47,7 @@ class Array
       end
     end
   end
+  alias_method :tro, :translate_options
 
   # translates and joins all elements
   def translate_and_join(separator = ', ', description = '', options = {})

data/lib/tml/session.rb

@@ -46,7 +46,7 @@ module Tml
       key       = opts[:key]          || Tml.config.application[:key]
       host      = opts[:host]         || Tml.config.application[:host]
       cdn_host  = opts[:cdn_host]     || Tml.config.application[:cdn_host]
-      token     = opts[:access_token] || Tml.config.application[:token]
+      token     = opts[:access_token] || opts[:token] || Tml.config.application[:token]
 
       Tml.cache.reset_version
 
@@ -102,7 +102,8 @@ module Tml
 
     def target_language
       target_locale = block_option(:target_locale)
-      target_locale ? application.language(target_locale) : current_language
+      language = (target_locale ? application.language(target_locale) : current_language)
+      language || Tml.config.default_language
     end
 
     def inline_mode?

data/lib/tml/tokens/data.rb

@@ -136,6 +136,7 @@ module Tml
       #   :separator => ', ',
       #   :joiner => 'and',
       #   :remainder => lambda{|elements| tr("#{count||other}", :count => elements.size)},
+      #   :translate => false,
       #   :expandable => true,
       #   :collapsable => true
       # })
@@ -254,7 +255,7 @@ module Tml
       def token_value_from_array_param(array, language, options)
         # if you provided an array, it better have some values
         if array.size < 2
-          return error("Invalid value for array token #{full_name} in #{label}")
+          return sanitize(array[0], array[0], language, options.merge(:safe => false))
         end
 
         # if the first value of an array is an array handle it here
@@ -279,6 +280,11 @@ module Tml
           return sanitize(array[0].send(array[1]), array[0], language, options.merge(:safe => false))
         end
 
+        # if second param is a lambda
+        if array[1].is_a?(Proc)
+          return sanitize(array[1].call(array[0]), array[0], language, options.merge(:safe => false))
+        end
+
         error("Invalid value for array token #{full_name} in #{label}")
       end
 

data/lib/tml/tokens/transform.rb

@@ -103,7 +103,7 @@ class Tml::Tokens::Transform < Tml::Tokens::Data
   # transform:  ["unsupported", {"male": "{$0}", "female": "{$1}", "other": "{$0}/{$1}"}]
   # results in: {"male": "Dorogoi", "female": "Dorogaya", "other": "Dorogoi/Dorogaya"}
   #
-  # token:      {actors:|| likes, like}
+  # token:      {actors || likes, like}
   # transform:  ["unsupported", {"one": "{$0}", "other": "{$1}"}]
   # results in: {"one": "likes", "other": "like"}
   def generate_value_map(params, context)

data/lib/tml/version.rb

@@ -31,7 +31,7 @@
 #++
 
 module Tml
-  VERSION = '5.4.5'
+  VERSION = '5.4.6'
 
   def self.full_version
     "tml-ruby v#{Tml::VERSION} (Faraday v#{Faraday::VERSION})"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tml
 version: !ruby/object:Gem::Version
-  version: 5.4.5
+  version: 5.4.6
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday