Merge branch 'master' of https://github.com/adamarthurryan/dubdiff

Gruntfile.js

@@ -1,6 +1,7 @@
 // Generated on 2015-02-05 using generator-angular-fullstack 2.0.13
 'use strict';
 
+
 module.exports = function (grunt) {
   var localConfig;
   try {
@@ -9,6 +10,7 @@ module.exports = function (grunt) {
     localConfig = {};
   }
 
+
   // Load grunt tasks automatically, when needed
   require('jit-grunt')(grunt, {
     express: 'grunt-express-server',

client/app/app.scss

@@ -2,6 +2,7 @@ $icon-font-path: "/bower_components/bootstrap-sass-official/vendor/assets/fonts/
 $fa-font-path: "/bower_components/font-awesome/fonts";
 
 @import 'bootstrap-sass-official/vendor/assets/stylesheets/bootstrap';
+
 @import 'font-awesome/scss/font-awesome';
 
 /**

client/app/compare/compare.js

@@ -10,5 +10,9 @@ angular.module('markdownFormatWdiffApp')
       .when('/:id', {
         templateUrl: 'app/compare/show/show.html',
         controller: 'CompareShowCtrl'
+      })
+      .when('/:id/:format', {
+        templateUrl: 'app/compare/show/show.html',
+        controller: 'CompareShowCtrl'
       });
   });

client/app/compare/compare.scss

@@ -1,7 +1,27 @@
-.wdiff-container .ins {
+.wdiff ins {
+  background-color: #dbffdb;
 }
 
-.wdiff-container .del {
+.wdiff del {
+  background-color: #f8cbcb;
+}
+
+.content-pre {
+  font-family: Consolas,Menlo,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New,monospace,serif;
+  margin-bottom: 10px;
+  padding: 5px;
+  width: auto;
+  white-space: pre-wrap;
+}
+
+.content-well {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  //background-color: #f5f5f5;
+  border: 1px solid #e3e3e3;
+  border-radius: 4px;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
 }
 
 #docA, #docB {

client/app/compare/create/create.controller.js

@@ -6,17 +6,27 @@ angular.module('markdownFormatWdiffApp')
     $scope.docB = "";
     $scope.wdiff = "";
     $scope.wdiffMarkdown = "";
-    $scope.displayAsMarkdown = true;
+    $scope.isMarkdownFormat = true;
 
     $scope.compare = function() {
       $http.post('/api/compare',
-        { a: $scope.docA, b: $scope.docB },
+        { a: _.escape($scope.docA), b: _.escape($scope.docB) },
         {headers:{"Content-Type":"application/json"}})
       .success(function (comparison) {
-        $location.path('/'+comparison._id)
+        $location.path('/'+comparison._id);
+        $location.hash($scope.isMarkdownFormat?'markdown':'plaintext');
       });
     };
 
+    $scope.toggleMarkdownFormat = function() {
+      if ($scope.isMarkdownFormat) {
+        $scope.isMarkdownFormat = false;
+      }
+      else {
+        $scope.isMarkdownFormat = true;
+      }
+    }
+
 
 
   })

client/app/compare/create/create.jade

@@ -7,9 +7,15 @@ nav(ng-include='"components/elements/header.html"', onload='title = "dubdiff"; '
   form.row
 
     .col-md-2.col-sm-12.form-group
-      .controls.well
+      .controls.well.col-lg-12
         a.btn.btn-block.btn-primary(type='button', ng-click='compare()') compare
 
+      .controls.well.btn-group.col-lg-12
+        a.btn.btn-block.btn-primary(ng-class='{"active": isMarkdownFormat}', type='submit',  ng-click='toggleMarkdownFormat()')
+          span.glyphicon(ng-class='{"glyphicon-ok": isMarkdownFormat}')
+          |   As Markdown
+
+
     .col-lg-5.col-sm-12.form-group
       label(for='docA')
         | Original

client/app/compare/show/show.controller.js

@@ -1,17 +1,26 @@
 'use strict';
 
-angular.module('markdownFormatWdiffApp')
+var MARKDOWN = "markdown";
-  .controller('CompareShowCtrl', function ($scope, $routeParams, $http) {
+var PLAINTEXT = "plaintext";
-    $scope.wdiff = {};
-    $scope.before = {};
-    $scope.after = {};
-    $scope.isShowWdiff = true;
 
+angular.module('markdownFormatWdiffApp')
+  .controller('CompareShowCtrl', function ($scope, $routeParams, $http, $location) {
+    $scope.wdiff = '';
+    $scope.before = '';
+    $scope.after = '';
+    $scope.isShowWdiff = true;
+    $scope.isMarkdownFormat = true;
+
+
+    var paramFormat = $location.hash();
+    if (paramFormat == "plain" || paramFormat == "plaintext")
+      $scope.isMarkdownFormat = false;
 
     // if routeParams specifies a user, restrict the query to that user
     var path = '/api/compare/wdiff/' + $routeParams.id;
     $http.get(path).success(function(comparison) {
       $scope.wdiff = comparison.wdiff;
+
       $scope.before = comparison.a;
       $scope.after = comparison.b;
     });
@@ -32,4 +41,17 @@ angular.module('markdownFormatWdiffApp')
       $scope.isShowWdiff = true;
     }
 
+    $scope.toggleMarkdownFormat = function() {
+      if ($scope.isMarkdownFormat) {
+        $scope.isMarkdownFormat = false;
+        $location.hash('plaintext');
+        $location.replace();
+      }
+      else {
+        $scope.isMarkdownFormat = true;
+        $location.hash('markdown');
+        $location.replace();
+      }
+    }
+
   })

client/app/compare/show/show.jade

@@ -5,7 +5,7 @@ nav(ng-include='"components/elements/header.html"', onload='title = "dubdiff";
 .container
   .row
     .col-md-2.col-sm-12
-      .controls.well.btn-group
+      .controls.well.btn-group.col-lg-12
         a.btn.btn-block.btn-primary(ng-class='{"active": isShowBefore}', type='submit', ng-click='showBefore()')
           | Original
         a.btn.btn-block.btn-primary(ng-class='{"active": isShowAfter}', type='submit', ng-click='showAfter()')
@@ -13,16 +13,34 @@ nav(ng-include='"components/elements/header.html"', onload='title = "dubdiff";
         a.btn.btn-block.btn-primary(ng-class='{"active": isShowWdiff}', type='submit', ng-click='showWdiff()')
           | Difference
 
-    .col-md-10.col-sm-12.well(ng-show='isShowBefore')
+      .controls.well.btn-group.col-lg-12
-      div(btf-markdown='before')
+        a.btn.btn-block.btn-primary(ng-class='{"active": isMarkdownFormat}', type='submit',  ng-click='toggleMarkdownFormat()')
+          span.glyphicon(ng-class='{"glyphicon-ok": isMarkdownFormat}')
+          |   As Markdown
 
 
-    .col-md-10.col-sm-12.well(ng-show='isShowWdiff')
-      div(btf-markdown='wdiff')
 
-    .col-md-10.col-sm-12.well(ng-show='isShowAfter')
+    div(ng-if='isMarkdownFormat')
-      div(btf-markdown='after')
+
-      //pre
+      .col-md-10.col-sm-12.content-well(ng-show='isShowBefore')
-        {{json(result)}}
+        div.before(btf-markdown='before')
+
+      .col-md-10.col-sm-12.content-well(ng-show='isShowWdiff')
+        div.wdiff(btf-markdown='wdiff')
+
+      .col-md-10.col-sm-12.content-well(ng-show='isShowAfter')
+        div.after(btf-markdown='after')
+
+
+    div(ng-if='!isMarkdownFormat')
+
+      .col-md-10.col-sm-12.content-well(ng-show='isShowBefore')
+        .content-pre.before(ng-bind-html='before')
+
+      .col-md-10.col-sm-12.content-well(ng-show='isShowWdiff')
+        .content-pre.wdiff(ng-bind-html='wdiff')
+
+      .col-md-10.col-sm-12.content-well(ng-show='isShowAfter')
+        .content-pre.after(ng-bind-html='after')
 
 footer(ng-include='"components/elements/footer.html"')

package.json

@@ -25,9 +25,12 @@
     "temp": "^0.8.1"
   },
   "devDependencies": {
+    "connect-livereload": "~0.4.0",
     "grunt": "~0.4.4",
+    "grunt-angular-templates": "^0.5.4",
+    "grunt-asset-injector": "^0.1.0",
     "grunt-autoprefixer": "~0.7.2",
-    "grunt-wiredep": "~1.8.0",
+    "grunt-build-control": "DaftMonk/grunt-build-control",
     "grunt-concurrent": "~0.5.0",
     "grunt-contrib-clean": "~0.5.0",
     "grunt-contrib-concat": "~0.4.0",
@@ -35,50 +38,47 @@
     "grunt-contrib-cssmin": "~0.9.0",
     "grunt-contrib-htmlmin": "~0.2.0",
     "grunt-contrib-imagemin": "~0.7.1",
+    "grunt-contrib-jade": "^0.11.0",
     "grunt-contrib-jshint": "~0.10.0",
+    "grunt-contrib-sass": "^0.9.2",
     "grunt-contrib-uglify": "~0.4.0",
     "grunt-contrib-watch": "~0.6.1",
-    "grunt-contrib-jade": "^0.11.0",
+    "grunt-dom-munger": "^3.4.0",
+    "grunt-env": "~0.4.1",
+    "grunt-express-server": "~0.4.17",
     "grunt-google-cdn": "~0.4.0",
+    "grunt-karma": "~0.8.2",
+    "grunt-mocha-test": "~0.10.2",
     "grunt-newer": "~0.7.0",
     "grunt-ng-annotate": "^0.2.3",
+    "grunt-node-inspector": "~0.1.5",
+    "grunt-nodemon": "~0.2.0",
+    "grunt-open": "~0.2.3",
+    "grunt-protractor-runner": "^1.1.0",
     "grunt-rev": "~0.1.0",
     "grunt-svgmin": "~0.4.0",
     "grunt-usemin": "~2.1.1",
-    "grunt-env": "~0.4.1",
+    "grunt-wiredep": "~1.8.0",
-    "grunt-node-inspector": "~0.1.5",
-    "grunt-nodemon": "~0.2.0",
-    "grunt-angular-templates": "^0.5.4",
-    "grunt-dom-munger": "^3.4.0",
-    "grunt-protractor-runner": "^1.1.0",
-    "grunt-asset-injector": "^0.1.0",
-    "grunt-karma": "~0.8.2",
-    "grunt-build-control": "DaftMonk/grunt-build-control",
-    "grunt-mocha-test": "~0.10.2",
-    "grunt-contrib-sass": "^0.7.3",
     "jit-grunt": "^0.5.0",
-    "time-grunt": "~0.3.1",
-    "grunt-express-server": "~0.4.17",
-    "grunt-open": "~0.2.3",
-    "open": "~0.0.4",
     "jshint-stylish": "~0.1.5",
-    "connect-livereload": "~0.4.0",
-    "karma-ng-scenario": "~0.1.0",
-    "karma-firefox-launcher": "~0.1.3",
-    "karma-script-launcher": "~0.1.0",
-    "karma-html2js-preprocessor": "~0.1.0",
-    "karma-ng-jade2js-preprocessor": "^0.1.2",
-    "karma-jasmine": "~0.1.5",
-    "karma-chrome-launcher": "~0.1.3",
-    "requirejs": "~2.1.11",
-    "karma-requirejs": "~0.2.1",
-    "karma-coffee-preprocessor": "~0.2.1",
-    "karma-jade-preprocessor": "0.0.11",
-    "karma-phantomjs-launcher": "~0.1.4",
     "karma": "~0.12.9",
+    "karma-chrome-launcher": "~0.1.3",
+    "karma-coffee-preprocessor": "~0.2.1",
+    "karma-firefox-launcher": "~0.1.3",
+    "karma-html2js-preprocessor": "~0.1.0",
+    "karma-jade-preprocessor": "0.0.11",
+    "karma-jasmine": "~0.1.5",
     "karma-ng-html2js-preprocessor": "~0.1.0",
+    "karma-ng-jade2js-preprocessor": "^0.1.2",
+    "karma-ng-scenario": "~0.1.0",
+    "karma-phantomjs-launcher": "~0.1.4",
+    "karma-requirejs": "~0.2.1",
+    "karma-script-launcher": "~0.1.0",
+    "open": "~0.0.4",
+    "requirejs": "~2.1.11",
+    "should": "~3.3.1",
     "supertest": "~0.11.0",
-    "should": "~3.3.1"
+    "time-grunt": "~0.3.1"
   },
   "engines": {
     "node": ">=0.10.0"

server/api/comparison/comparison.controller.js

@@ -29,6 +29,26 @@ exports.showComparison = function showComparison(req, res) {
   });
 }
 
+//return the a or b doc for a comparison given an id, if it exsits
+exports.showComparison = function showComparison(req, res) {
+  //generate a filename
+  var filename = fnComparison(req.params.id);
+
+  //check if that file exists
+  fs.exists(filename, function (exists) {
+    //if the file does not exist, return a 404
+    if (!exists)  return res.send(404);
+
+    //otherwise, read the file as JSON
+    jf.readFile(filename, function(err, comparison) {
+      if(err) { return handleError(res, err); }
+
+      //and return
+      return res.json(comparison);
+    });
+  });
+}
+
 //return a markdown wdiff for the comparison given an id, if it exsits
 exports.wdiffMarkdownComparison = function wdiffMarkdownComparison(req, res) {
   //generate a filename

server/api/comparison/index.js

@@ -8,7 +8,9 @@ var router = express.Router();
 //router.get('/', controller.index);
 
 router.get('/:id', controller.showComparison);
+//router.get('/:id/:doc', controller.showComparisonDoc);
 router.get('/wdiff/:id', controller.wdiffMarkdownComparison);
+//router.get('/wdiff/:id/nomarkdown', controller.wdiffNoMarkdownComparison);
 
 router.post('/', controller.create);
 

server/components/wdiff/index.js

@@ -43,11 +43,9 @@ module.exports = function(a, b, asMarkdown, callback) {
           if (err)
             return callback(err);
 
-          var cmd = "./bin/wdiff " + filea.path + " " +fileb.path;
+          var cmd = "wdiff " + filea.path + " " +fileb.path;
           exec(cmd, function(err, stdout) {
-//console.log(cmd);
+
-//console.log(err);
-//console.log(stdout);
             if (err && err.code!=1 && err.code!=0) {
               return callback(err);
             }
@@ -56,7 +54,7 @@ module.exports = function(a, b, asMarkdown, callback) {
             wdiffSame = (err && err.code == 0) ? true:false;
 
 
-            var resData = {wdiff:stdout, same: wdiffSame};
+            var resData = {wdiffNoMarkdown:stdout, same: wdiffSame};
             if (asMarkdown) {
 
               //!!! this needs more sophisticated parsing