In defaultExpressionParser, remove the direct access to the model on the

first tokenized part of the key; use adapter.read instead.  This broke
all functional test cases, due to the adapter used therein having to
deal with both a normal object, and a Data object.

@@ -15,13 +15,19 @@ describe('Functional', function() {
           obj.on(keypath, callback);
           obj.on(keypath, callback);
         },
         },
         read: function(obj, keypath) {
         read: function(obj, keypath) {
+          if (obj instanceof Data) {
             return obj.get(keypath);
             return obj.get(keypath);
+	  }
+          return obj[keypath];
         },
         },
         publish: function(obj, keypath, value) {
         publish: function(obj, keypath, value) {
+          if (obj instanceof Data) {
             attributes = {};
             attributes = {};
             attributes[keypath] = value;
             attributes[keypath] = value;
             obj.set(attributes);
             obj.set(attributes);
           }
           }
+          obj[keypath] = value;
+        }
       }
       }
     });
     });
   });
   });

@@ -182,7 +182,7 @@ defaultExpressionParser = (view, node, type, models, value) ->
     bindContext: models
     bindContext: models
   firstPart = splitPath.shift()
   firstPart = splitPath.shift()
   model = if firstPart
   model = if firstPart
-    models[firstPart]
+    Rivets.config.adapter.read models, firstPart
   else
   else
     models
     models
   keypath = splitPath.join '.'
   keypath = splitPath.join '.'