Merge branch 'master' of github.com:Urigo/angular-meteor

Author: Urigo

.docs/angular-meteor/client/views/angular-2.html

@@ -165,7 +165,7 @@ <h4 class="sample-code">
           <div class="angular-2-option">
             <h2>Angular 2.0.0-alpha</h2>
             <p>
-              An angualr2-meteor package with all the dependencies (TypeScript, System.js, etc...) so you can start writing Angular 2.0 code right away. written by - <a href="https://github.com/netanelgilad"><i class="fa fa-github"></i> @netanelgilad</a>.
+              An angular2-meteor package with all the dependencies (TypeScript, System.js, etc...) so you can start writing Angular 2.0 code right away. written by - <a href="https://github.com/netanelgilad"><i class="fa fa-github"></i> @netanelgilad</a>.
             </p>
           </div>
           <div class="ctas">

.docs/angular-meteor/client/views/steps/tutorial.intro.html

@@ -20,7 +20,7 @@
 
 No previous knowledge in Angular or Meteor is necessary.
 
-We will walk you through building an Angular-Meteor app. Can't wait to see it? Here's the final version - [http://socially-step18.meteor.com/](http://socially-step18.meteor.com/). Don't forget to come back an go through this tutorial!
+We will walk you through building an Angular-Meteor app. Can't wait to see it? Here's the final version - [http://socially-step18.meteor.com/](http://socially-step18.meteor.com/). Don't forget to come back and go through this tutorial!
 
 You can also participate in our free angular-meteor university and do the step by step exercises together with community members.
 Read more about the angular-meteor university [here](https://github.com/Urigo/meteor-angular-socially#angular-meteor-university-).

.docs/angular-meteor/client/views/steps/tutorial.step_00.html

@@ -55,7 +55,7 @@ <h1>Step 0 - Bootstrapping</h1>
 
 So, as you can see, we have a full running app! which includes a server and a client.
 
-But let's start from the beginning, please delete the following files:
+The default Meteor app starts life with three files, one 'js', one 'html' and one 'css' file. Each named with the application name you used in the 'create' command above, in our case this is 'socially'. We're going to add our own files for this tutorial. So let's start by deleting the following files:
 
     socially.css	socially.html	socially.js
 
@@ -72,7 +72,7 @@ <h1>Step 0 - Bootstrapping</h1>
 As you can see, there is no html tag, no head tag, very simple.
 
 
-The reason is the way Meteor structures and serves files to the client.
+The reason for this is the way Meteor structures and serves files to the client.
 
 Meteor scans all the HTML files in your application and concatenates them together.
 
@@ -120,53 +120,52 @@ <h1>Step 0 - Bootstrapping</h1>
       <div ng-include="'index.ng.html'"></div>
     </body>
 
-But if you load this in your browser, you'll see nothing. That's because we still need to create the actual Angular app, which we'll do next.
+But if you load this in your browser, you won't see anything. That's because we still need to create the actual Angular app, which we'll do next.
 
-* It's very important to note - all the paths are always absolute, not relative!  so if 'index.ng.html' was inside a client folder, you would have to place the whole path from the route app, doesn't matter where you are
-calling the file from, like that:
+* It's very important to note - the paths are always absolute, not relative!  so if 'index.ng.html' was inside a client folder, you would have to place the whole path from the route app, doesn't matter where you're calling the file from. 
+
+like this (e.g. if index.ng.html was in the 'client' folder):
 
     <div ng-include="'client/index.ng.html'"></div>
 
 # AngularJS app
 
-AngularJS apps are actually individual modules so now we are going to create our app module.
+AngularJS apps are actually individual modules. So to start with lets create our app module.
 
-Create a new app.js file.  now you can see another example of Meteor's power and simplicity - no need to include this file anywhere. Meteor will take care of it by going through all the files in the folder and including them automatically.
+Create a new app.js file.  Now you can see another example of Meteor's power and simplicity - no need to include this file anywhere. Meteor will take care of it by going through all the files in the folder and including them automatically.
 
-But Meteor's goal is to break down the barrier between client and server, and the code you write runs everywhere! (more on that later).
+One of Meteor's goals is to break down the barrier between client and server, so the code you write can run everywhere! (more on that later).
 But we need Angular's power only in the client side, so how can we do that?
 
-There are a few ways to tell Meteor to run a code only on the client/server/phone side, let's start with the simplest way - Meteor.isClient variable.
+There are a few ways to tell Meteor to run code only on the client/server/phone side, let's start with the simplest way - Meteor.isClient variable.
 
 __`app.js`:__
 
     if (Meteor.isClient) {
 
     }
 
-Now anything that will happen inside this if statement will run only on the client side.
+Now everything inside this 'if' statement will only run on the client side.
 
-So let's continue with starting our AngularJS application, we will call it "socially":
+Let's continue defining our AngularJS application module, and give it the name "socially":
 
 __`app.js`:__
 
     if (Meteor.isClient) {
       angular.module('socially',['angular-meteor']);
     }
 
-And name our application in the ng-app directive in index.html:
+And use the same application name in the ng-app directive in index.html:
 
     <body ng-app="socially">
       <div ng-include="'index.ng.html'"></div>
     </body>
 
-What we did here is to declare a new angular module named 'socially' and making it dependant on the 'angular-meteor' module (that we included in the first step).
+What we did here is to declare a new angular module named 'socially' and make it dependant on the 'angular-meteor' module (that we included in the first step).
 
 Now run the app.
 
-everything is the same.
-
-and now inside our index.ng.html let's use Angular:
+Everything is the same, but now inside our index.ng.html let's use Angular:
 
     <p>Nothing here {{dstache}} 'yet' + '!' }}</p>
 
@@ -180,16 +179,16 @@ <h1>Step 0 - Bootstrapping</h1>
 * A binding, denoted by double curly braces {{dstache}} }}
 * a simple expression 'yet' + '!' used in this binding.
 
-AngularJS finds those double curly braces, evaluates the expression and inserts the result into the DOM in place of the binding.
+AngularJS finds the double curly braces, evaluates the expression and inserts the result into the DOM in place of the binding.
 Rather than a one-time insert, as we'll see in the next steps, a binding will result in efficient continuous updates whenever the result of the expression evaluation changes.
-Inside in the client side, like a future smart browser would do.
+Inside in the client side code, like a future smart browser would do.
 
 
-> Why did use a new file extension file.ng.html ?
+> Why did we use the new file extension file.ng.html ?
 >
-> That is because Meteor templating system uses double-curlies. If we use them in our AngularJS view HTML, Meteor will override Angular.
+> That's because the Meteor templating system uses double-curlies. If we use them in our AngularJS view HTML, Meteor will override Angular.
 >
-> Fortunately, we created a new file extension to make Meteor not override our Angular expression.
+> Fortunately, we created a new file extension to stop Meteor overriding our Angular expression.
 >
 > If you still want to use HTML files without changing their extension, Angular (unlike Meteor...) gives us the [option to change the double-curlies to Double-square-brackets](http://stackoverflow.com/a/12923955/1426570)
 

.docs/angular-meteor/client/views/steps/tutorial.step_05.html

@@ -203,7 +203,7 @@ <h1>
 
 #### Common Mistakes
 
-In case you won't enter the right absolute path (maybe by accident add a relative one), then you might be getting the folowwing error:
+In case you won't enter the right absolute path (maybe by accident add a relative one), then you might be getting the following error:
 
 WARNING: Tried to load angular more than once.
 

.docs/angular-meteor/client/views/steps/tutorial.step_08.html

@@ -97,16 +97,10 @@ <h1>
         return userId && party.owner === userId;
       },
       update: function (userId, party, fields, modifier) {
-        if (userId !== party.owner)
-          return false;
-
-        return true;
+        return userId && party.owner === userId;
       },
       remove: function (userId, party) {
-        if (userId !== party.owner)
-          return false;
-
-        return true;
+        return userId && party.owner === userId;
       }
     });
 

LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Uri Goldshtein
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

lib/diff-array.js

@@ -94,7 +94,8 @@ var diffArray = function (lastSeqArray, seqArray, callbacks) {
       var newItem = seqArray[pos];
       var oldItem = lastSeqArray[posOld[idString]];
       var setDiff = diffObjectChanges(oldItem, newItem);
-      var unsetDiff = diffObjectRemovals(oldItem, newItem);
+      if (newItem)
+        var unsetDiff = diffObjectRemovals(oldItem, newItem);
 
       if (setDiff)
         setDiff._id = newItem._id;
@@ -139,6 +140,9 @@ var diffObjectChanges = function (oldItem, newItem) {
     if (oldItem && angular.equals(value, oldItem[key]))
       return;
 
+    if (key == '$$hashKey')
+      return;
+
     if (isActualObject(value)) {
       var diff = diffObjectChanges(oldItem[key], value);
       if (diff) result[key] = diff;
@@ -171,11 +175,15 @@ var diffObjectRemovals = function (oldItem, newItem) {
 
   angular.forEach(oldItemKeys, function (key) {
     if (!_.contains(newItemKeys, key) ||
-      angular.isUndefined(newItem[key]))
-      result[key] = true;
+      angular.isUndefined(newItem[key])){
+      if (key != '$$hashKey')
+        result[key] = true;
+    }
     else if (isActualObject(oldItem[key])) {
-      var diff = diffObjectRemovals(oldItem[key], newItem[key]);
-      if (diff) result[key] = diff;
+      if (key != '$$hashKey') {
+        var diff = diffObjectRemovals(oldItem[key], newItem[key]);
+        if (diff) result[key] = diff;
+      }
     }
   });
 

modules/angular-meteor-meteorCollection.js

@@ -30,8 +30,7 @@ angularMeteorCollections.factory('AngularMeteorCollection', ['$q', '$meteorSubsc
         var deferred = $q.defer();
 
         // delete $$hashkey
-        if (!(item instanceof File))
-          item = $meteorUtils.stripDollarPrefixedKeys(item);
+        item = $meteorUtils.stripDollarPrefixedKeys(item);
 
         if (item._id) { // Performs an update if the _id property is set.
           var item_id = item._id; // Store the _id in temporary variable

modules/angular-meteor-utils.js

@@ -25,15 +25,15 @@ angularMeteorUtils.service('$meteorUtils', [ '$timeout',
     };
     // Borrowed from angularFire - https://github.com/firebase/angularfire/blob/master/src/utils.js#L445-L454
     this.stripDollarPrefixedKeys = function (data) {
-      if( !angular.isObject(data) || data instanceof File || data instanceof Date) { return data; }
+      if( !angular.isObject(data) || data instanceof File || (typeof FS === 'object' && data instanceof FS.File) || data instanceof Date) { return data; }
       var out = angular.isArray(data)? [] : {};
       angular.forEach(data, function(v,k) {
         if(typeof k !== 'string' || k.charAt(0) !== '$') {
           out[k] = self.stripDollarPrefixedKeys(v);
         }
       });
       return out;
-    }
+    };
   }]);
 
 angularMeteorUtils.run(['$rootScope', '$meteorUtils',

tests/integration/angular-meteor-diff-array-spec.js

@@ -50,7 +50,7 @@ describe('diffArray module', function() {
         }];
         var changedAtSpy = jasmine.createSpy('changedAt');
 
-        diffArray(oldCollection, newCollection, { changedAt: changedAtSpy });
+        expect(function(){diffArray(oldCollection, newCollection, { changedAt: changedAtSpy })}).not.toThrow();
 
         expect(changedAtSpy).toHaveBeenCalledWith(
           'a',
@@ -61,6 +61,39 @@ describe('diffArray module', function() {
       });
     });
 
+    describe('no exception on first compare and ignore $$hashkeys', function() {
+      it('should notify callback with changedAt', function() {
+        var oldCollection = [{
+          _id: "a", date: new Date(1111, 1, 1), checked: true, $$hashKey: "object:4"
+        },
+        {
+          _id: "b", date: new Date(2222, 2, 2), checked: true, $$hashKey: "object:6"
+        },
+        {
+          _id: "c", date: new Date(2222, 2, 2), checked: true, $$hashKey: "object:8"
+        }];
+        var newCollection = [{
+          _id: "a", date: new Date(1111, 1, 1), checked: true
+        },
+        {
+          _id: "b", date: new Date(2222, 2, 2), checked: false
+        },
+        {
+          _id: "c", date: new Date(2222, 2, 2), checked: true
+        }];
+        var changedAtSpy = jasmine.createSpy('changedAt');
+
+        expect(function(){diffArray(oldCollection, newCollection, { changedAt: changedAtSpy })}).not.toThrow();
+
+        expect(changedAtSpy).toHaveBeenCalledWith(
+          'b',
+          {checked: false, _id: "b"},
+          undefined,
+          1,
+          jasmine.any(Object));
+      });
+    });
+
     describe('deepCopyRemovals', function() {
       it('should handle fields that are false-y correctly', function() {
         var oldItem = {_id: 1, field : 0, another : 3};