diff - npm Package Compare versions

Comparing version 1.0.7 to 1.0.8

diff.js

@@ -168,3 +168,18 @@ /* See LICENSE file for terms of use */
   LineDiff.tokenize = function(value) {
-    return value.split(/^/m);
+    var retLines = [],
+        lines = value.split(/^/m);
+
+    for(var i = 0; i < lines.length; i++) {
+      var line = lines[i],
+          lastLine = lines[i - 1];
+
+      // Merge lines that may contain windows new lines
+      if (line == '\n' && lastLine && lastLine[lastLine.length - 1] === '\r') {
+        retLines[retLines.length - 1] += '\n';
+      } else if (line) {
+        retLines.push(line);
+      }
+    }
+
+    return retLines;
   };
@@ -171,0 +186,0 @@

package.json

 {
   "name": "diff",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "A javascript text diff implementation.",
@@ -36,3 +36,4 @@ "keywords": [
     "mocha": "~1.6",
-    "should": "~1.2"
+    "should": "~1.2",
+    "colors": "~0.6.2"
   },
@@ -39,0 +40,0 @@ "optionalDependencies": {},

README.md

@@ -20,39 +20,32 @@ # jsdiff
 
-* JsDiff.diffChars(oldStr, newStr)
-    Diffs two blocks of text, comparing character by character.
+* `JsDiff.diffChars(oldStr, newStr)` - diffs two blocks of text, comparing character by character.
 
     Returns a list of change objects (See below).
 
-* JsDiff.diffWords(oldStr, newStr)
-    Diffs two blocks of text, comparing word by word.
+* `JsDiff.diffWords(oldStr, newStr)` - diffs two blocks of text, comparing word by word.
 
     Returns a list of change objects (See below).
 
-* JsDiff.diffLines(oldStr, newStr)
-    Diffs two blocks of text, comparing line by line.
+* `JsDiff.diffLines(oldStr, newStr)` - diffs two blocks of text, comparing line by line.
 
     Returns a list of change objects (See below).
 
-* JsDiff.diffCss(oldStr, newStr)
-    Diffs two blocks of text, comparing CSS tokens.
+* `JsDiff.diffCss(oldStr, newStr)` - diffs two blocks of text, comparing CSS tokens.
 
     Returns a list of change objects (See below).
 
-* JsDiff.createPatch(fileName, oldStr, newStr, oldHeader, newHeader)
-    Creates a unified diff patch.
+* `JsDiff.createPatch(fileName, oldStr, newStr, oldHeader, newHeader)` - creates a unified diff patch.
 
     Parameters:
-    * fileName : String to be output in the filename sections of the patch
-    * oldStr : Original string value
-    * newStr : New string value
-    * oldHeader : Additional information to include in the old file header
-    * newHeader : Additional information to include in thew new file header
+    * `fileName` : String to be output in the filename sections of the patch
+    * `oldStr` : Original string value
+    * `newStr` : New string value
+    * `oldHeader` : Additional information to include in the old file header
+    * `newHeader` : Additional information to include in thew new file header
 
-* JsDiff.applyPatch(oldStr, diffStr)
-    Applies a unified diff patch.
+* `JsDiff.applyPatch(oldStr, diffStr)` - applies a unified diff patch.
 
     Return a string containing new version of provided data.
 
-* convertChangesToXML(changes)
-    Converts a list of changes to a serialized XML format
+* `convertChangesToXML(changes)` - converts a list of changes to a serialized XML format
 
@@ -62,10 +55,66 @@ ### Change Objects
 
-* value: Text content
-* added: True if the value was inserted into the new string
-* removed: True of the value was removed from the old string
+* `value`: Text content
+* `added`: True if the value was inserted into the new string
+* `removed`: True of the value was removed from the old string
 
 Note that some cases may omit a particular flag field. Comparison on the flag fields should always be done in a truthy or falsy manner.
 
-## [Example](http://kpdecker.github.com/jsdiff)
+## Examples
 
+Basic example in Node
+
+```js
+require('colors')
+var jsdiff = require('diff');
+
+var one = 'beep boop';
+var other = 'beep boob blah';
+
+var diff = jsdiff.diffChars(one, other);
+
+diff.forEach(function(part){
+  // green for additions, red for deletions
+  // grey for common parts
+  var color = part.added ? 'green' :
+    part.removed ? 'red' : 'grey';
+  process.stderr.write(part.value[color]);
+});
+
+console.log()
+```
+Running the above program should yield
+
+<img src="images/node_example.png" alt="Node Example">
+
+Basic example in a web page
+
+```html
+<pre id="display"></pre>
+<script src="diff.js"></script>
+<script>
+var one = 'beep boop';
+var other = 'beep boob blah';
+
+var diff = JsDiff.diffChars(one, other);
+
+diff.forEach(function(part){
+  // green for additions, red for deletions
+  // grey for common parts
+  var color = part.added ? 'green' :
+    part.removed ? 'red' : 'grey';
+  var span = document.createElement('span');
+  span.style.color = color;
+  span.appendChild(document
+    .createTextNode(part.value));
+  display.appendChild(span);
+});
+</script>
+```
+
+Open the above .html file in a browser and you should see
+
+<img src="images/web_example.png" alt="Node Example">
+
+**[Full online demo](http://kpdecker.github.com/jsdiff)**
+
 ## License
@@ -104,1 +153,5 @@
 OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/kpdecker/jsdiff/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

18451

increased by10.66%

Lines of code

325

increased by3.83%

Number of lines in readme file

155

increased by51.96%

Worsened metrics

Dev dependency count

3

increased by50%

No dependency changes