tml 4.3.3 → 4.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cb97be993ac6b62a23169eed2b85c4bada498fd
-  data.tar.gz: 4c26fe9e93653f846bef308a83072fdf24860c4f
+  metadata.gz: 4c93181c73e8d51d0547614c850cd4f1902397a5
+  data.tar.gz: 8388206c002b497ee3210f6cc07860374c0aaeee
 SHA512:
-  metadata.gz: 6dab4c995a187be0e6ae96ad1a8e841908b757db025e0637075aac2083988e4391c5e5bba87aeea8ceee6bb7f843f4ed2c64583b97ae3a0cf660b3638f9d412a
-  data.tar.gz: cb35f547b74edd78f2a6052b5a9667cd6dc61c2a95e685fb164c3ac636e29ecdceea4aa660af55c66bf808a0130e1b4a19ef2eabfb6a04c06a8cb819832b1779
+  metadata.gz: e6f3cb0e93280f4fba083a262f54996e464712ca57caf597a22a46b361315768b0f6f32e20d2a827c64a832e1170de167738985dece40d88317b9aecb150c02a
+  data.tar.gz: 977bfea69f9e79248688fab4b9b48d62d803c8931cac356a32e6471c0bf55cf46b7e8a39ac3780066bb688255e39eec1f20fbb5e4501d0b60e8f6f21330d02d1

data/lib/tml/session.rb

@@ -134,18 +134,18 @@ module Tml
     end
 
     def source_language
-      arr = @block_options || []
-      arr.reverse.each do |opts|
-        return application.language(opts[:locale]) unless opts[:locale].blank?
+      (@block_options || []).reverse.each do |opts|
+        return application.language(opts[:locale]) unless opts[:locale].nil?
       end
+
       application.language
     end
 
     def target_language
-      arr = @block_options || []
-      arr.reverse.each do |opts|
+      (@block_options || []).reverse.each do |opts|
         return application.language(opts[:target_locale]) unless opts[:target_locale].nil?
       end
+
       current_language
     end
 
@@ -170,6 +170,10 @@ module Tml
       (@block_options ||= []).last || {}
     end
 
+    def block_options_queue
+      @block_options
+    end
+
     def with_block_options(opts)
       push_block_options(opts)
       if block_given?

data/lib/tml/tokens/data.rb

@@ -381,11 +381,7 @@ module Tml
           return error("Missing value for #{full_name} in #{label}", false)
         end
 
-        if object.nil? and not Tml::Config.allow_nil_token_values?
-          return error("Token value is nil for #{full_name} in #{label}", false)
-        end
-
-        return label.gsub(full_name, "") if object.nil?
+        return label.gsub(full_name, '') if object.nil?
 
         value = token_value(object, language, options)
         label.gsub(full_name, value)

data/lib/tml/version.rb

@@ -30,5 +30,5 @@
 #++
 
 module Tml
-  VERSION = '4.3.3'
+  VERSION = '4.3.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tml
 version: !ruby/object:Gem::Version
-  version: 4.3.3
+  version: 4.3.4
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday