templateString evaluates attributes with a dot in their name

Author: antoinerg

src/lib/index.js

@@ -1005,11 +1005,12 @@ lib.templateString = function(string) {
         var obj, value, i;
         for(i = 1; i < args.length; i++) {
             obj = args[i];
-            if(SIMPLE_PROPERTY_REGEX.test(key)) {
-                if(obj.hasOwnProperty(key)) {
-                    value = obj[key];
-                }
-            } else {
+            if(obj.hasOwnProperty(key)) {
+                value = obj[key];
+                break;
+            }
+
+            if(!SIMPLE_PROPERTY_REGEX.test(key)) {
                 // getterCache[key] = getterCache[key] || lib.nestedProperty(obj, key).get;
                 // value = getterCache[key]();
                 value = getterCache[key] || lib.nestedProperty(obj, key).get();

test/jasmine/tests/lib_test.js

@@ -2124,6 +2124,10 @@ describe('Test lib.js:', function() {
             expect(Lib.templateString('foo %{bar}', {bar: 'baz'})).toEqual('foo baz');
         });
 
+        it('evaluates attributes with a dot in their name', function() {
+            expect(Lib.templateString('%{marker.size}', {'marker.size': 12}, {marker: {size: 14}})).toEqual('12');
+        });
+
         it('evaluates nested properties', function() {
             expect(Lib.templateString('foo %{bar.baz}', {bar: {baz: 'asdf'}})).toEqual('foo asdf');
         });
@@ -2144,7 +2148,7 @@ describe('Test lib.js:', function() {
             expect(Lib.templateString('foo %{} %{}', {})).toEqual('foo  ');
         });
 
-        it('find the first object with a given key', function() {
+        it('uses the value from the first object with the specified key', function() {
             var obj1 = {a: 'first'}, obj2 = {a: 'second', foo: {bar: 'bar'}};
 
             // Simple key