tml 4.4.2 → 4.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5b559306971c39fdd4df874f01174dd53af720f
-  data.tar.gz: 64df8e8b2fabc6b1bdab21461b72f0ae0f373687
+  metadata.gz: 44adb9e80172d8023dcf8e7b3919a3be0ff499af
+  data.tar.gz: 08a06206541073c22a546ed0315cd4b4a54d0bc0
 SHA512:
-  metadata.gz: 43033def0b0187721cb8c0020c5ca60958c62228c992ad11e23092c2872f5ad9118a6a8d159854475e5c3636183043b0f9181d021076423ed60a3859e973ae43
-  data.tar.gz: acbcb86d03f2abf4c5d16a6af803228af8df3dfdb671f0453ca84a9d085d3ad7526c15d2e4d1b1b043b2d949cbc0aaa3ddbf31f05c79ba3297dd2465e66919b0
+  metadata.gz: 5208fe912e0d3b62291ae86b544f6048a096d8a681b3dc3ce33ae3dd074ba7bfd3dc9a3fcd5c02bb2cea4485a7864f26c3dc652bac00aef06ba64696d6e5df1f
+  data.tar.gz: d0f6454db79e4efa6bfa929698bdf93ceaa1ef5a80f65f67ac0b481380cc18c6718d36ed6346679ff4319ca3e916e98acc8aaf94f40a33b56d869f42470131b8

data/lib/tml/config.rb

@@ -75,19 +75,27 @@ module Tml
   # The class can be extended with a different implementation, as long as the interface is supported
   class Config
     # Configuration Attributes
-    attr_accessor :enabled, :default_locale, :default_level, :format, :application, :context_rules, :logger, :cache, :default_tokens, :localization
+    attr_accessor :enabled, :locale, :default_level, :format, :application, :context_rules, :logger, :cache, :default_tokens, :localization
 
     # Used by Rails and Sinatra extensions
     attr_accessor :current_locale_method, :current_user_method, :translator_options, :i18n_backend
+    attr_accessor :invalidator
 
     # Used for IRB only
     attr_accessor :submit_missing_keys_realtime
 
     def initialize
       @enabled = true
-      @default_locale = 'en'
       @default_level  = 0
       @format = :html
+      @subdomains = false
+
+      @locale = {
+        default:    'en',
+        method:     'current_locale',
+        subdomain:  false,
+        extension:  false
+      }
 
       # if running from IRB, make it default to TRUE
       @submit_missing_keys_realtime = (%w(irb pry).include?($0 || ''))
@@ -172,82 +180,90 @@ module Tml
       @default_tokens = {
         :html => {
           :data => {
-            :ndash  =>  "–",       # –
-            :mdash  =>  "—",       # —
-            :iexcl  =>  "¡",       # ¡
-            :iquest =>  "¿",      # ¿
-            :quot   =>  """,        # "
-            :ldquo  =>  "“",       # “
-            :rdquo  =>  "”",       # ”
-            :lsquo  =>  "‘",       # ‘
-            :rsquo  =>  "’",       # ’
-            :laquo  =>  "«",       # «
-            :raquo  =>  "»",       # »
-            :nbsp   =>  " ",        # space
-            :lsaquo =>  "‹",      # ‹
-            :rsaquo =>  "›",      # ›
-            :br     =>  "<br/>",         # line break
-            :lbrace =>  "{",
-            :rbrace =>  "}",
-            :trade  =>  "&trade;",       # TM
+            :ndash  =>  '&ndash;',       # –
+            :mdash  =>  '&mdash;',       # —
+            :iexcl  =>  '&iexcl;',       # ¡
+            :iquest =>  '&iquest;',      # ¿
+            :quot   =>  '&quot;',        # '
+            :ldquo  =>  '&ldquo;',       # “
+            :rdquo  =>  '&rdquo;',       # ”
+            :lsquo  =>  '&lsquo;',       # ‘
+            :rsquo  =>  '&rsquo;',       # ’
+            :laquo  =>  '&laquo;',       # «
+            :raquo  =>  '&raquo;',       # »
+            :nbsp   =>  '&nbsp;',        # space
+            :lsaquo =>  '&lsaquo;',      # ‹
+            :rsaquo =>  '&rsaquo;',      # ›
+            :br     =>  '<br/>',         # line break
+            :lbrace =>  '{',
+            :rbrace =>  '}',
+            :trade  =>  '&trade;',       # TM
           },
           :decoration => {
-            :strong =>  "<strong>{$0}</strong>",
-            :bold   =>  "<strong>{$0}</strong>",
-            :b      =>  "<strong>{$0}</strong>",
-            :em     =>  "<em>{$0}</em>",
-            :italic =>  "<i>{$0}</i>",
-            :i      =>  "<i>{$0}</i>",
+            :strong =>  '<strong>{$0}</strong>',
+            :bold   =>  '<strong>{$0}</strong>',
+            :b      =>  '<strong>{$0}</strong>',
+            :em     =>  '<em>{$0}</em>',
+            :italic =>  '<i>{$0}</i>',
+            :i      =>  '<i>{$0}</i>',
             :link   =>  "<a href='{$href}'>{$0}</a>",
-            :br     =>  "<br>{$0}",
-            :strike =>  "<strike>{$0}</strike>",
+            :br     =>  '<br>{$0}',
+            :strike =>  '<strike>{$0}</strike>',
             :div    =>  "<div id='{$id}' class='{$class}' style='{$style}'>{$0}</div>",
             :span   =>  "<span id='{$id}' class='{$class}' style='{$style}'>{$0}</span>",
-            :h1     =>  "<h1>{$0}</h1>",
-            :h2     =>  "<h2>{$0}</h2>",
-            :h3     =>  "<h3>{$0}</h3>",
+            :h1     =>  '<h1>{$0}</h1>',
+            :h2     =>  '<h2>{$0}</h2>',
+            :h3     =>  '<h3>{$0}</h3>',
           }
         },
         :text => {
           :data => {
-            :ndash  =>  "–",
-            :mdash  =>  "-",
-            :iexcl  =>  "¡",
-            :iquest =>  "¿",
-            :quot   =>  '"',
-            :ldquo  =>  "“",
-            :rdquo  =>  "”",
-            :lsquo  =>  "‘",
-            :rsquo  =>  "’",
-            :laquo  =>  "«",
-            :raquo  =>  "»",
-            :nbsp   =>  " ",
-            :lsaquo =>  "‹",
-            :rsaquo =>  "›",
-            :br     =>  "\n",
-            :lbrace =>  "{",
-            :rbrace =>  "}",
-            :trade  =>  "™",
+            :ndash  =>  '–',
+            :mdash  =>  '-',
+            :iexcl  =>  '¡',
+            :iquest =>  '¿',
+            :quot   =>  "'",
+            :ldquo  =>  '“',
+            :rdquo  =>  '”',
+            :lsquo  =>  '‘',
+            :rsquo  =>  '’',
+            :laquo  =>  '«',
+            :raquo  =>  '»',
+            :nbsp   =>  ' ',
+            :lsaquo =>  '‹',
+            :rsaquo =>  '›',
+            :br     =>  '\n',
+            :lbrace =>  '{',
+            :rbrace =>  '}',
+            :trade  =>  '™',
           },
           :decoration => {
-            :strong =>  "{$0}",
-            :bold   =>  "{$0}",
-            :b      =>  "{$0}",
-            :em     =>  "{$0}",
-            :italic =>  "{$0}",
-            :i      =>  "{$0}",
-            :link   =>  "{$0}:{$1}",
-            :br     =>  "\n{$0}",
-            :strike =>  "{$0}",
-            :div    =>  "{$0}",
-            :span   =>  "{$0}",
-            :h1     =>  "{$0}",
-            :h2     =>  "{$0}",
-            :h3     =>  "{$0}",
+            :strong =>  '{$0}',
+            :bold   =>  '{$0}',
+            :b      =>  '{$0}',
+            :em     =>  '{$0}',
+            :italic =>  '{$0}',
+            :i      =>  '{$0}',
+            :link   =>  '{$0}:{$1}',
+            :br     =>  '\n{$0}',
+            :strike =>  '{$0}',
+            :div    =>  '{$0}',
+            :span   =>  '{$0}',
+            :h1     =>  '{$0}',
+            :h2     =>  '{$0}',
+            :h3     =>  '{$0}',
           }
         }
       }
 
+      @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"],
@@ -266,25 +282,25 @@ module Tml
           :date_time              => '%m/%d/%Y at %H:%M',   # 01/03/1010 at 5:30
         },
         :token_mapping => {
-          "%a" => "{short_week_day_name}",
-          "%A" => "{week_day_name}",
-          "%b" => "{short_month_name}",
-          "%B" => "{month_name}",
-          "%p" => "{am_pm}",
-          "%d" => "{days}",
-          "%e" => "{day_of_month}",
-          "%j" => "{year_days}",
-          "%m" => "{months}",
-          "%W" => "{week_num}",
-          "%w" => "{week_days}",
-          "%y" => "{short_years}",
-          "%Y" => "{years}",
-          "%l" => "{trimed_hour}",
-          "%H" => "{full_hours}",
-          "%I" => "{short_hours}",
-          "%M" => "{minutes}",
-          "%S" => "{seconds}",
-          "%s" => "{since_epoch}"
+          '%a' => '{short_week_day_name}',
+          '%A' => '{week_day_name}',
+          '%b' => '{short_month_name}',
+          '%B' => '{month_name}',
+          '%p' => '{am_pm}',
+          '%d' => '{days}',
+          '%e' => '{day_of_month}',
+          '%j' => '{year_days}',
+          '%m' => '{months}',
+          '%W' => '{week_num}',
+          '%w' => '{week_days}',
+          '%y' => '{short_years}',
+          '%Y' => '{years}',
+          '%l' => '{trimed_hour}',
+          '%H' => '{full_hours}',
+          '%I' => '{short_hours}',
+          '%M' => '{minutes}',
+          '%S' => '{seconds}',
+          '%s' => '{since_epoch}'
         }
       }
     end
@@ -318,16 +334,16 @@ module Tml
     ## Application
     #########################################################
 
-    #def default_locale
-    #  return Tml.session.application.default_locale if Tml.session.application
-    #  @default_locale
-    #end
     #
     #def default_level
     #  return Tml.session.application.default_level if Tml.session.application
     #  @default_level
     #end
 
+    def default_locale
+      @locale[:default]
+    end
+
     def default_language
       @default_language ||= begin
         file = File.expand_path(File.join(File.dirname(__FILE__), '..', 'tml', 'languages', "#{Tml.config.default_locale}.json"))

data/lib/tml/version.rb

@@ -30,5 +30,5 @@
 #++
 
 module Tml
-  VERSION = '4.4.2'
+  VERSION = '4.4.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tml
 version: !ruby/object:Gem::Version
-  version: 4.4.2
+  version: 4.4.3
 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: faraday