Merge branch 'master' into iteration-binding

@@ -85,6 +85,13 @@ describe('Rivets.Binding', function() {
       expect(binding.routine).toHaveBeenCalledWith(el, 'awesome sweater');
       expect(binding.routine).toHaveBeenCalledWith(el, 'awesome sweater');
     });
     });
 
 
+    it('calls methods with the object as context', function() {
+      binding.model = {foo: 'bar'};
+      spyOn(binding, 'routine');
+      binding.set(function() { return this.foo; });
+      expect(binding.routine).toHaveBeenCalledWith(el, binding.model.foo);
+    });
+
     describe('on an event binding', function() {
     describe('on an event binding', function() {
       beforeEach(function() {
       beforeEach(function() {
         binding.options.special = 'event';
         binding.options.special = 'event';

@@ -50,7 +50,7 @@ class Rivets.Binding
     else if @options.special is "iteration"
     else if @options.special is "iteration"
       @routine @el, value, @
       @routine @el, value, @
     else
     else
-      value = value() if value instanceof Function
+      value = value.call(@model) if value instanceof Function
       @routine @el, value
       @routine @el, value
 
 
   # Subscribes to the model for changes at the specified keypath. Bi-directional
   # Subscribes to the model for changes at the specified keypath. Bi-directional