major refactoring of scope

3 files changed, 102 insertions, 107 deletions

diff --git a/test/directivesSpec.js b/test/directivesSpec.js
index 83a270c1..4ef57dce 100644
--- a/test/directivesSpec.js
+++ b/test/directivesSpec.js
@@ -1,49 +1,49 @@
 describe("directives", function(){
 
-  var compile, element;
+  var compile, model, element;
 
   beforeEach(function() {
     var compiler = new Compiler(angularTextMarkup, angularAttrMarkup, angularDirective, angularWidget);
     compile = function(html) {
       element = jqLite(html);
-      var view = compiler.compile(element)(element);
-      view.init();
-      return view.scope;
+      model = compiler.compile(element)(element);
+      model.$init();
+      return model;
     };
   });
 
   afterEach(function() {
-    element.remove();
+    model.$element.remove();
     expect(_(jqCache).size()).toEqual(0);
   });
 
   it("should ng-init", function() {
     var scope = compile('<div ng-init="a=123"></div>');
-    expect(scope.get('a')).toEqual(123);
+    expect(scope.a).toEqual(123);
   });
 
   it("should ng-eval", function() {
     var scope = compile('<div ng-init="a=0" ng-eval="a = a + 1"></div>');
-    expect(scope.get('a')).toEqual(0);
-    scope.updateView();
-    expect(scope.get('a')).toEqual(1);
-    scope.updateView();
-    expect(scope.get('a')).toEqual(2);
+    expect(scope.a).toEqual(0);
+    scope.$eval();
+    expect(scope.a).toEqual(1);
+    scope.$eval();
+    expect(scope.a).toEqual(2);
   });
 
   it('should ng-bind', function() {
     var scope = compile('<div ng-bind="a"></div>');
     expect(element.text()).toEqual('');
-    scope.set('a', 'misko');
-    scope.updateView();
+    scope.a = 'misko';
+    scope.$eval();
     expect(element.text()).toEqual('misko');
   });
 
   it('should ng-bind-template', function() {
     var scope = compile('<div ng-bind-template="Hello {{name}}!"></div>');
     expect(element.text()).toEqual('');
-    scope.set('name', 'Misko');
-    scope.updateView();
+    scope.$set('name', 'Misko');
+    scope.$eval();
     expect(element.text()).toEqual('Hello Misko!');
   });
 
@@ -51,75 +51,73 @@ describe("directives", function(){
     var scope = compile('<img ng-bind-attr="{src:\'mysrc\', alt:\'myalt\'}"/>');
     expect(element.attr('src')).toEqual(null);
     expect(element.attr('alt')).toEqual(null);
-    scope.updateView();
+    scope.$eval();
     expect(element.attr('src')).toEqual('mysrc');
     expect(element.attr('alt')).toEqual('myalt');
   });
 
   it('should ng-non-bindable', function(){
     var scope = compile('<div ng-non-bindable><span ng-bind="name"></span></div>');
-    scope.set('name', 'misko');
-    scope.updateView();
+    scope.$set('name', 'misko');
+    scope.$eval();
     expect(element.text()).toEqual('');
   });
 
   it('should ng-repeat over array', function(){
     var scope = compile('<ul><li ng-repeat="item in items" ng-init="suffix = \';\'" ng-bind="item + suffix"></li></ul>');
 
-    scope.set('items', ['misko', 'shyam']);
-    scope.updateView();
+    scope.$set('items', ['misko', 'shyam']);
+    scope.$eval();
     expect(element.text()).toEqual('misko;shyam;');
 
-    scope.set('items', ['adam', 'kai', 'brad']);
-    scope.updateView();
+    scope.$set('items', ['adam', 'kai', 'brad']);
+    scope.$eval();
     expect(element.text()).toEqual('adam;kai;brad;');
 
-    scope.set('items', ['brad']);
-    scope.updateView();
+    scope.$set('items', ['brad']);
+    scope.$eval();
     expect(element.text()).toEqual('brad;');
   });
 
   it('should ng-repeat over object', function(){
     var scope = compile('<ul><li ng-repeat="(key, value) in items" ng-bind="key + \':\' + value + \';\' "></li></ul>');
-    scope.set('items', {misko:'swe', shyam:'set'});
-    scope.updateView();
+    scope.$set('items', {misko:'swe', shyam:'set'});
+    scope.$eval();
     expect(element.text()).toEqual('misko:swe;shyam:set;');
   });
 
   it('should error on wrong parsing of ng-repeat', function(){
     var scope = compile('<ul><li ng-repeat="i dont parse"></li></ul>');
     var log = "";
-    eachNode(element, function(li){
-      log += li.attr('ng-error') + ';';
-      log += li.hasClass('ng-exception') + ';';
-    });
+    log += element.attr('ng-error') + ';';
+    log += element.hasClass('ng-exception') + ';';
     expect(log).toEqual("\"Expected ng-repeat in form of 'item in collection' but got 'i dont parse'.\";true;");
   });
 
   it('should ng-watch', function(){
     var scope = compile('<div ng-watch="i: count = count + 1" ng-init="count = 0">');
-    scope.updateView();
-    scope.updateView();
-    expect(scope.get('count')).toEqual(0);
+    scope.$eval();
+    scope.$eval();
+    expect(scope.$get('count')).toEqual(0);
 
-    scope.set('i', 0);
-    scope.updateView();
-    scope.updateView();
-    expect(scope.get('count')).toEqual(1);
+    scope.$set('i', 0);
+    scope.$eval();
+    scope.$eval();
+    expect(scope.$get('count')).toEqual(1);
   });
 
   it('should ng-action', function(){
     var scope = compile('<div ng-action="clicked = true"></div>');
-    scope.updateView();
-    expect(scope.get('clicked')).toBeFalsy();
+    scope.$eval();
+    expect(scope.$get('clicked')).toBeFalsy();
 
     element.click();
-    expect(scope.get('clicked')).toEqual(true);
+    expect(scope.$get('clicked')).toEqual(true);
   });
 
   it('should ng-class', function(){
     var scope = compile('<div class="existing" ng-class="[\'A\', \'B\']"></div>');
-    scope.updateView();
+    scope.$eval();
     expect(element.hasClass('existing')).toBeTruthy();
     expect(element.hasClass('A')).toBeTruthy();
     expect(element.hasClass('B')).toBeTruthy();
@@ -127,7 +125,7 @@ describe("directives", function(){
 
   it('should ng-class odd/even', function(){
     var scope = compile('<ul><li ng-repeat="i in [0,1]" class="existing" ng-class-odd="\'odd\'" ng-class-even="\'even\'"></li><ul>');
-    scope.updateView();
+    scope.$eval();
     var e1 = jQuery(element.parent()[0]).find('li:first');
     var e2 = jQuery(element.parent()[0]).find('li:last');
     expect(e1.hasClass('existing')).toBeTruthy();
@@ -138,25 +136,25 @@ describe("directives", function(){
 
   it('should ng-style', function(){
     var scope = compile('<div ng-style="{color:\'red\'}"></div>');
-    scope.updateView();
+    scope.$eval();
     expect(element.css('color')).toEqual('red');
   });
 
   it('should ng-show', function(){
     var scope = compile('<div ng-hide="hide"></div>');
-    scope.updateView();
+    scope.$eval();
     expect(element.css('display')).toEqual('');
-    scope.set('hide', true);
-    scope.updateView();
+    scope.$set('hide', true);
+    scope.$eval();
     expect(element.css('display')).toEqual('none');
   });
 
   it('should ng-hide', function(){
     var scope = compile('<div ng-show="show"></div>');
-    scope.updateView();
+    scope.$eval();
     expect(element.css('display')).toEqual('none');
-    scope.set('show', true);
-    scope.updateView();
+    scope.$set('show', true);
+    scope.$eval();
     expect(element.css('display')).toEqual('');
   });
 });
diff --git a/test/markupSpec.js b/test/markupSpec.js
index 8ea88f08..c83f27ff 100644
--- a/test/markupSpec.js
+++ b/test/markupSpec.js
@@ -8,9 +8,8 @@ describe("markups", function(){
     var compiler = new Compiler(angularTextMarkup, angularAttrMarkup, angularDirective, angularWidget);
     compile = function(html) {
       element = jqLite(html);
-      var view = compiler.compile(element)(element);
-      view.init();
-      scope = view.scope;
+      scope = compiler.compile(element)(element);
+      scope.$init();
     };
   });
 
@@ -24,16 +23,16 @@ describe("markups", function(){
   it('should translate {{}} in text', function(){
     compile('<div>hello {{name}}!</div>');
     expect(element.html()).toEqual('hello <span ng-bind="name"></span>!');
-    scope.set('name', 'Misko');
-    scope.updateView();
+    scope.$set('name', 'Misko');
+    scope.$eval();
     expect(element.html()).toEqual('hello <span ng-bind="name">Misko</span>!');
   });
 
   it('should translate {{}} in terminal nodes', function(){
     compile('<select name="x"><option value="">Greet {{name}}!</option></select>');
     expect(element.html()).toEqual('<option ng-bind-template="Greet {{name}}!" value=""></option>');
-    scope.set('name', 'Misko');
-    scope.updateView();
+    scope.$set('name', 'Misko');
+    scope.$eval();
     expect(element.html()).toEqual('<option ng-bind-template="Greet {{name}}!" value="">Greet Misko!</option>');
   });
 
@@ -41,8 +40,8 @@ describe("markups", function(){
     compile('<img src="http://server/{{path}}.png"/>');
     expect(element.attr('src')).toEqual();
     expect(element.attr('ng-bind-attr')).toEqual('{"src":"http://server/{{path}}.png"}');
-    scope.set('path', 'a/b');
-    scope.updateView();
+    scope.$set('path', 'a/b');
+    scope.$eval();
     expect(element.attr('src')).toEqual("http://server/a/b.png");
   });
 
diff --git a/test/widgetsSpec.js b/test/widgetsSpec.js
index 0f416278..7c9ea04a 100644
--- a/test/widgetsSpec.js
+++ b/test/widgetsSpec.js
@@ -1,6 +1,6 @@
 describe("input widget", function(){
 
-  var compile, element, scope, model;
+  var compile, element, scope;
 
   beforeEach(function() {
     scope = null;
@@ -8,10 +8,8 @@ describe("input widget", function(){
     var compiler = new Compiler(angularTextMarkup, angularAttrMarkup, angularDirective, angularWidget);
     compile = function(html) {
       element = jqLite(html);
-      var view = compiler.compile(element)(element);
-      view.init();
-      scope = view.scope;
-      model = scope.state;
+      scope = compiler.compile(element)(element);
+      scope.$init();
     };
   });
 
@@ -22,35 +20,35 @@ describe("input widget", function(){
 
   it('should input-text auto init and handle keyup/change events', function(){
     compile('<input type="Text" name="name" value="Misko" ng-action="count = count + 1" ng-init="count=0"/>');
-    expect(scope.get('name')).toEqual("Misko");
-    expect(scope.get('count')).toEqual(0);
+    expect(scope.$get('name')).toEqual("Misko");
+    expect(scope.$get('count')).toEqual(0);
 
-    scope.set('name', 'Adam');
-    scope.updateView();
+    scope.$set('name', 'Adam');
+    scope.$eval();
     expect(element.val()).toEqual("Adam");
 
     element.val('Shyam');
     element.trigger('keyup');
-    expect(scope.get('name')).toEqual('Shyam');
-    expect(scope.get('count')).toEqual(1);
+    expect(scope.$get('name')).toEqual('Shyam');
+    expect(scope.$get('count')).toEqual(1);
 
     element.val('Kai');
     element.trigger('change');
-    expect(scope.get('name')).toEqual('Kai');
-    expect(scope.get('count')).toEqual(2);
+    expect(scope.$get('name')).toEqual('Kai');
+    expect(scope.$get('count')).toEqual(2);
   });
 
   it("should process ng-format", function(){
     compile('<input type="Text" name="list" value="a,b,c" ng-format="list"/>');
-    expect(scope.get('list')).toEqual(['a', 'b', 'c']);
+    expect(scope.$get('list')).toEqual(['a', 'b', 'c']);
 
-    scope.set('list', ['x', 'y', 'z']);
-    scope.updateView();
+    scope.$set('list', ['x', 'y', 'z']);
+    scope.$eval();
     expect(element.val()).toEqual("x, y, z");
 
     element.val('1, 2, 3');
     element.trigger('keyup');
-    expect(scope.get('list')).toEqual(['1', '2', '3']);
+    expect(scope.$get('list')).toEqual(['1', '2', '3']);
   });
 
   it("should process ng-validation", function(){
@@ -58,8 +56,8 @@ describe("input widget", function(){
     expect(element.hasClass('ng-validation-error')).toBeTruthy();
     expect(element.attr('ng-error')).toEqual('Not a number');
 
-    scope.set('price', '123');
-    scope.updateView();
+    scope.$set('price', '123');
+    scope.$eval();
     expect(element.hasClass('ng-validation-error')).toBeFalsy();
     expect(element.attr('ng-error')).toBeFalsy();
 
@@ -74,8 +72,8 @@ describe("input widget", function(){
     expect(element.hasClass('ng-validation-error')).toBeTruthy();
     expect(element.attr('ng-error')).toEqual('Required');
 
-    scope.set('price', 'xxx');
-    scope.updateView();
+    scope.$set('price', 'xxx');
+    scope.$eval();
     expect(element.hasClass('ng-validation-error')).toBeFalsy();
     expect(element.attr('ng-error')).toBeFalsy();
 
@@ -87,41 +85,41 @@ describe("input widget", function(){
 
   it("should process ng-required", function() {
     compile('<textarea name="name">Misko</textarea>');
-    expect(scope.get('name')).toEqual("Misko");
+    expect(scope.$get('name')).toEqual("Misko");
 
-    scope.set('name', 'Adam');
-    scope.updateView();
+    scope.$set('name', 'Adam');
+    scope.$eval();
     expect(element.val()).toEqual("Adam");
 
     element.val('Shyam');
     element.trigger('keyup');
-    expect(scope.get('name')).toEqual('Shyam');
+    expect(scope.$get('name')).toEqual('Shyam');
 
     element.val('Kai');
     element.trigger('change');
-    expect(scope.get('name')).toEqual('Kai');
+    expect(scope.$get('name')).toEqual('Kai');
   });
 
   it('should call ng-action on button click', function(){
     compile('<input type="button" value="Click Me" ng-action="clicked = true"/>');
     element.click();
-    expect(scope.get('clicked')).toEqual(true);
+    expect(scope.$get('clicked')).toEqual(true);
   });
 
   it('should support button alias', function(){
     compile('<button ng-action="clicked = true">Click Me</button>');
     element.click();
-    expect(scope.get('clicked')).toEqual(true);
+    expect(scope.$get('clicked')).toEqual(true);
   });
 
   it('should type="checkbox"', function(){
     compile('<input type="checkbox" name="checkbox" checked ng-action="action = true"/>');
-    expect(scope.get('checkbox')).toEqual(true);
+    expect(scope.$get('checkbox')).toEqual(true);
     element.click();
-    expect(scope.get('checkbox')).toEqual(false);
-    expect(scope.get('action')).toEqual(true);
+    expect(scope.$get('checkbox')).toEqual(false);
+    expect(scope.$get('action')).toEqual(true);
     element.click();
-    expect(scope.get('checkbox')).toEqual(true);
+    expect(scope.$get('checkbox')).toEqual(true);
   });
 
   it('should type="radio"', function(){
@@ -131,21 +129,21 @@ describe("input widget", function(){
       '</div>');
     var a = element[0].childNodes[0];
     var b = element[0].childNodes[1];
-    expect(model.chose).toEqual('B');
-    expect(model.clicked).not.toBeDefined();
-    model.chose = 'A';
-    model.$updateView();
+    expect(scope.chose).toEqual('B');
+    expect(scope.clicked).not.toBeDefined();
+    scope.chose = 'A';
+    scope.$eval();
     expect(a.checked).toEqual(true);
 
-    model.chose = 'B';
-    model.$updateView();
+    scope.chose = 'B';
+    scope.$eval();
     expect(a.checked).toEqual(false);
     expect(b.checked).toEqual(true);
-    expect(model.clicked).not.toBeDefined();
+    expect(scope.clicked).not.toBeDefined();
 
     jqLite(a).click();
-    expect(model.chose).toEqual('A');
-    expect(model.clicked).toEqual(1);
+    expect(scope.chose).toEqual('A');
+    expect(scope.clicked).toEqual(1);
   });
 
   it('should type="select-one"', function(){
@@ -154,10 +152,10 @@ describe("input widget", function(){
         '<option>A</option>' +
         '<option selected>B</option>' +
       '</select>');
-    expect(model.selection).toEqual('B');
-    model.selection = 'A';
-    model.$updateView();
-    expect(model.selection).toEqual('A');
+    expect(scope.selection).toEqual('B');
+    scope.selection = 'A';
+    scope.$eval();
+    expect(scope.selection).toEqual('A');
     expect(element[0].childNodes[0].selected).toEqual(true);
   });
 
@@ -167,14 +165,14 @@ describe("input widget", function(){
         '<option>A</option>' +
         '<option selected>B</option>' +
       '</select>');
-    expect(model.selection).toEqual(['B']);
-    model.selection = ['A'];
-    model.$updateView();
+    expect(scope.selection).toEqual(['B']);
+    scope.selection = ['A'];
+    scope.$eval();
     expect(element[0].childNodes[0].selected).toEqual(true);
   });
 
   it('should report error on missing field', function(){
-
+    //compile('<input type="text"/>');
   });
 
   it('should report error on assignment error', function(){