tml 5.5.3 → 5.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4de2f5184318d3d0719cfe5de0495ab6e91e9f1
-  data.tar.gz: bf574f2c89a6a5d7b4da3c5e2e54eaa4fe0af6b1
+  metadata.gz: 01627bae72095f4b9e7ce0e7075321bf8c6354fa
+  data.tar.gz: a2a539378307191e667ce9624a9c4708c3904412
 SHA512:
-  metadata.gz: c81dca25c0ca6304bf7f3a21eca7fba9c27715e47426d21e66bb4a06b5b8794825fe1d931ff29e0763f132374870675af24569702639244381fbe4bac2afe34f
-  data.tar.gz: 3f6dfccc814f762f526759a5291090e02bef34a86d8f47401d5ffbbcedfc7963d7f23d847d6731992c158798894c67559facf5d1dc25d113d161b98e963e70ba
+  metadata.gz: 40bb60e7df1e3a58d41c5fd8eec56848c7290e553646701d1895c69b73c37f51481fbb3be1aa96973b869804f16838458e565a135e2578ee0fab08f4be140372
+  data.tar.gz: f469500ca7422f2f43e58f11b8184ebd832c2aeb6a501482d83c89bb0b1dd443132204676e70525f4bbca1180ce2161cd62a544a3a722b859a8859141c42da94

data/lib/tml/config.rb

@@ -367,7 +367,7 @@ module Tml
     #end
 
     def default_locale
-      @locale[:default]
+      @locale[:default] || 'en'
     end
 
     def default_language

data/lib/tml/tokens/data.rb

@@ -290,9 +290,11 @@ module Tml
 
       ##############################################################################
       #
+      # Hashes are often used with JSON structures. We can be smart about how to pull default values.
+      #
       # examples:
       #
-      # tr("Hello {user}", {:user => {:value => "Michael", :gender => :male}}}
+      # tr("Hello {user}", {:user => {:name => "Michael", :gender => :male}}}
       #
       # tr("Hello {user}", {:user => {:object => {:gender => :male}, :value => "Michael"}}}
       # tr("Hello {user}", {:user => {:object => {:name => "Michael", :gender => :male}, :property => :name}}}
@@ -306,6 +308,13 @@ module Tml
 
       def token_value_from_hash_param(hash, language, options)
         value = Tml::Utils.hash_value(hash, :value)
+        [:name, :first_name, :display_name, :full_name, :username].each do |attr|
+          value ||= Tml::Utils.hash_value(hash, attr)
+        end
+
+        attr  = Tml::Utils.hash_value(hash, :attribute) || Tml::Utils.hash_value(hash, :property)
+        value ||= Tml::Utils.hash_value(hash, attr)
+
         object = Tml::Utils.hash_value(hash, :object)
 
         unless value.nil?
@@ -316,8 +325,6 @@ module Tml
           return error("Missing value for hash token #{full_name} in #{label}")
         end
 
-        attr  = Tml::Utils.hash_value(hash, :attribute) || Tml::Utils.hash_value(hash, :property)
-
         if object.is_a?(Hash)
           unless attr.nil?
             return sanitize(Tml::Utils.hash_value(object, attr), object, language, options.merge(:safe => false))

data/lib/tml/version.rb

@@ -31,7 +31,7 @@
 #++
 
 module Tml
-  VERSION = '5.5.3'
+  VERSION = '5.5.4'
 
   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.5.3
+  version: 5.5.4
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-03 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday