Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for sentences. #37

Merged
merged 1 commit into from
Nov 29, 2014
Merged

Add support for sentences. #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions diff.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,13 +196,19 @@
return retLines;
};

return {
Diff: Diff,
var SentenceDiff = new Diff();
SentenceDiff.tokenize = function (value) {
return removeEmpty(value.split(/(\S.+?[.!?])(?=\s+|$)/));
};

return {
Diff: Diff,

diffChars: function(oldStr, newStr) { return CharDiff.diff(oldStr, newStr); },
diffWords: function(oldStr, newStr) { return WordDiff.diff(oldStr, newStr); },
diffWordsWithSpace: function(oldStr, newStr) { return WordWithSpaceDiff.diff(oldStr, newStr); },
diffLines: function(oldStr, newStr) { return LineDiff.diff(oldStr, newStr); },
diffSentences: function(oldStr, newStr) { return SentenceDiff.diff(oldStr, newStr); },

diffCss: function(oldStr, newStr) { return CssDiff.diff(oldStr, newStr); },

Expand Down
13 changes: 13 additions & 0 deletions test/diffTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,19 @@ describe('#diffWordsWithSpace', function() {
});
});

describe('#diffSentences', function() {

it('Should diff Sentences', function() {
var diffResult = diff.diffSentences('New Value.', 'New ValueMoreData.');
diff.convertChangesToXML(diffResult).should.equal('<ins>New ValueMoreData.</ins><del>New Value.</del>');
});

it('should diff only the last sentence', function() {
var diffResult = diff.diffSentences('Here im. Rock you like old man.', 'Here im. Rock you like hurricane.');
diff.convertChangesToXML(diffResult).should.equal('Here im. <ins>Rock you like hurricane.</ins><del>Rock you like old man.</del>');
});
});

// CSS Diff
describe('#diffCss', function() {
it('should diff css', function() {
Expand Down