Merge branch 'master' of https://github.com/flitbit/diff

Author: flitbit

Readme.md

@@ -14,6 +14,12 @@
 npm install deep-diff
 ```
 
+For the browser, you can install with [bower](http://bower.io/):
+
+```
+bower install deep-diff
+```
+
 ## Tests
 
 Tests use [mocha](http://visionmedia.github.io/mocha/) and [expect.js](https://github.com/LearnBoost/expect.js/), so if you clone the [github repository](https://github.com/flitbit/json-ptr) you'll need to run:

bower.json

@@ -0,0 +1,25 @@
+{
+  "name": "deep-diff",
+  "main": "index.js",
+  "version": "0.1.4",
+  "homepage": "https://github.com/flitbit/diff",
+  "authors": [
+    "Phillip Clark <[email protected]>"
+  ],
+  "description": "Javascript utility for calculating deep difference, capturing changes, and applying changes across objects; for nodejs and the browser.",
+  "keywords": [
+    "diff",
+    "difference",
+    "compare",
+    "change-tracking"
+  ],
+  "license": "MIT",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "app/bower_components",
+    "test",
+    "tests"
+  ]
+}

index.js

@@ -88,7 +88,9 @@
   		changes(new DiffDeleted(currentPath, lhs));
   	} else if (ltype !== rtype) {
   		changes(new DiffEdit(currentPath, lhs, rhs));
-  	} else if (ltype === 'object' && lhs != null) {
+  	} else if (lhs instanceof Date && rhs instanceof Date && ((lhs-rhs) != 0) ) {
+  		changes(new DiffEdit(currentPath, lhs, rhs));
+  	} else if (ltype === 'object' && lhs != null && rhs != null) {
   		stack = stack || [];
   		if (stack.indexOf(lhs) < 0) {
   			stack.push(lhs);

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "deep-diff",
 	"description": "Javascript utility for calculating deep difference, capturing changes, and applying changes across objects; for nodejs and the browser.",
-	"version": "0.1.3",
+	"version": "0.1.4",
 	"keywords": [
 		"diff",
 		"difference",
@@ -10,7 +10,8 @@
 		],
 	"author": "Phillip Clark <[email protected]>",
 	"contributors": [
-		"SocalNick"
+		"SocalNick",
+		"sonstone"
 	],
 	"repository": { "type": "git", "url": "git://github.com/flitbit/diff.git" },
 	"main": "./index.js",

releases/deep-diff-0.1.4.min.js

@@ -17,7 +17,7 @@
     DeepDiff = { Conflict: "here" };
     DeepDiffConflict = DeepDiff;
   </script>
-  <script src="../releases/deep-diff-0.1.3.min.js"></script>
+  <script src="../releases/deep-diff-0.1.4.min.js"></script>
   <!--script src="../index.js"></script-->
   <script>mocha.setup('bdd')</script>
   <script src="tests.js"></script>

test/tests.html

@@ -94,8 +94,32 @@ describe('deep-diff', function() {
 			expect(diff[0].kind).to.be('E');
 		});
 
+		it('shows that an object property is changed when it is set to null', function() {
+			lhs.key = {nested: 'value'};
+			var diff = deep.diff(lhs, { key: null });
+			expect(diff).to.be.ok();
+			expect(diff.length).to.be(1);
+			expect(diff[0]).to.have.property('kind');
+			expect(diff[0].kind).to.be('E');
+		});
+
 	});
 
+
+	describe('A target that has a date value', function() {
+		var lhs = { key: new Date(555555555555) };
+
+		it('shows the property is changed with a new date value', function() {
+			var diff = deep.diff(lhs, { key: new Date(777777777777) });
+			expect(diff).to.be.ok();
+			expect(diff.length).to.be(1);
+			expect(diff[0]).to.have.property('kind');
+			expect(diff[0].kind).to.be('E');
+		});
+
+	});
+
+
 	describe('When executing in a browser (otherwise these tests are benign)', function() {
 
 		it('#isConflict reports conflict in the global namespace for `DeepDiff`', function() {