Merge pull request #61 from mikeric/utilize-adapter-read-when-subscribing

Utilize adapter.read when subscribing

@@ -47,11 +47,10 @@ Rivets.js is model interface-agnostic, meaning it can work with any event-driven
 rivets.configure({
 rivets.configure({
   adapter: {
   adapter: {
     subscribe: function(obj, keypath, callback) {
     subscribe: function(obj, keypath, callback) {
-      callback.wrapped = function(m, v) { callback(v) };
-      obj.on('change:' + keypath, callback.wrapped);
+      obj.on('change:' + keypath, callback);
     },
     },
     unsubscribe: function(obj, keypath, callback) {
     unsubscribe: function(obj, keypath, callback) {
-      obj.off('change:' + keypath, callback.wrapped);
+      obj.off('change:' + keypath, callback);
     },
     },
     read: function(obj, keypath) {
     read: function(obj, keypath) {
       return obj.get(keypath);
       return obj.get(keypath);

@@ -26,7 +26,7 @@ describe('Rivets.Binding', function() {
     it('subscribes to the model for changes via the adapter', function() {
     it('subscribes to the model for changes via the adapter', function() {
       spyOn(rivets.config.adapter, 'subscribe');
       spyOn(rivets.config.adapter, 'subscribe');
       binding.bind();
       binding.bind();
-      expect(rivets.config.adapter.subscribe).toHaveBeenCalledWith(model, 'name', binding.set);
+      expect(rivets.config.adapter.subscribe).toHaveBeenCalledWith(model, 'name', binding.sync);
     });
     });
 
 
     describe('with preloadData set to true', function() {
     describe('with preloadData set to true', function() {
@@ -64,8 +64,8 @@ describe('Rivets.Binding', function() {
       it('sets up observers on the dependant attributes', function() {
       it('sets up observers on the dependant attributes', function() {
         spyOn(rivets.config.adapter, 'subscribe');
         spyOn(rivets.config.adapter, 'subscribe');
         binding.bind();
         binding.bind();
-        expect(rivets.config.adapter.subscribe).toHaveBeenCalledWith(model, 'fname', binding.dependencyCallbacks['fname']);
-        expect(rivets.config.adapter.subscribe).toHaveBeenCalledWith(model, 'lname', binding.dependencyCallbacks['lname']);
+        expect(rivets.config.adapter.subscribe).toHaveBeenCalledWith(model, 'fname', binding.sync);
+        expect(rivets.config.adapter.subscribe).toHaveBeenCalledWith(model, 'lname', binding.sync);
       });
       });
     });
     });
   });
   });

@@ -56,29 +56,26 @@ class Rivets.Binding
     else
     else
       @routine @el, value
       @routine @el, value
 
 
+  # Syncs up the view binding with the model.
+  sync: =>
+    @set if @options.bypass
+      @model[@keypath]
+    else
+      Rivets.config.adapter.read @model, @keypath
+
   # Subscribes to the model for changes at the specified keypath. Bi-directional
   # Subscribes to the model for changes at the specified keypath. Bi-directional
   # routines will also listen for changes on the element to propagate them back
   # routines will also listen for changes on the element to propagate them back
   # to the model.
   # to the model.
   bind: =>
   bind: =>
     if @options.bypass
     if @options.bypass
-      @set @model[@keypath]
+      @sync()
     else
     else
-      Rivets.config.adapter.subscribe @model, @keypath, @set
-
-      if Rivets.config.preloadData
-        @set Rivets.config.adapter.read @model, @keypath
+      Rivets.config.adapter.subscribe @model, @keypath, @sync
+      @sync() if Rivets.config.preloadData
 
 
     if @options.dependencies?.length
     if @options.dependencies?.length
-      @dependencyCallbacks = {}
-
       for keypath in @options.dependencies
       for keypath in @options.dependencies
-        callback = @dependencyCallbacks[keypath] = (value) =>
-          @set if @options.bypass
-            @model[@keypath]
-          else
-            Rivets.config.adapter.read @model, @keypath
-
-        Rivets.config.adapter.subscribe @model, keypath, callback
+        Rivets.config.adapter.subscribe @model, keypath, @sync
 
 
     if @type in @bidirectionals
     if @type in @bidirectionals
       bindEvent @el, 'change', @publish
       bindEvent @el, 'change', @publish
@@ -91,12 +88,11 @@ class Rivets.Binding
   # Unsubscribes from the model and the element.
   # Unsubscribes from the model and the element.
   unbind: =>
   unbind: =>
     unless @options.bypass
     unless @options.bypass
-      Rivets.config.adapter.unsubscribe @model, @keypath, @set
+      Rivets.config.adapter.unsubscribe @model, @keypath, @sync
 
 
       if @options.dependencies?.length
       if @options.dependencies?.length
         for keypath in @options.dependencies
         for keypath in @options.dependencies
-          callback = @dependencyCallbacks[keypath]
-          Rivets.config.adapter.unsubscribe @model, keypath, callback
+          Rivets.config.adapter.unsubscribe @model, keypath, @sync
 
 
       if @type in @bidirectionals
       if @type in @bidirectionals
         @el.removeEventListener 'change', @publish
         @el.removeEventListener 'change', @publish