Merge pull request #10 from jamesramsay/para-breaks

Para breaks

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hercule",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Markdown transcluder",
   "main": "./lib/main",
   "scripts": {
@@ -33,7 +33,7 @@
   "dependencies": {
     "async": "^0.9.0",
     "dashdash": "^1.7.0",
-    "lodash": "^2.4.1"
+    "lodash": "^3.0.0"
   },
   "devDependencies": {
     "coffee-script": "^1.7.0",

src/transclude.coffee

@@ -45,9 +45,6 @@ scan = (document, file, verbose, cb) ->
     if match[WHITESPACE_GROUP]?
       ref.whitespace = match[WHITESPACE_GROUP]
 
-    if document[match.index + match[0].length] is "\n"
-      ref.endOfLine = true
-
     references.push ref
 
   if verbose and references.length > 0
@@ -111,13 +108,13 @@ transclude = (file, parents = [], placeholderOverrides = [], verbose, cb) ->
 
           if output?
             if reference.whitespace
-              # Allows indentation to be preserved
+              # Preserve indentation if transclude is not preceded by content
               output = output.replace /\n/g, "\n#{reference.whitespace}"
 
-            if not reference.endOfLine
-              # Allows inline replacement by removing new line at EOF
-              output = output.replace /\n $/, ""
+            # Remove new lines at EOF which cause unexpected paragraphs and breaks
+            output = output.replace /\n $/, ""
 
+            if verbose then console.error "    Output:#{JSON.stringify output}"
             refRegExp = new RegExp("{{#{reference.placeholder}}}", "g")
             document = document.replace refRegExp, output
 

test/index.coffee

@@ -16,7 +16,6 @@ describe 'hercule', ->
 
       hercule.scan document, "", null, (err, references) ->
         assert.equal references.length, 1
-        assert.equal references[0].endOfLine, null
 
       done()
 
@@ -25,8 +24,6 @@ describe 'hercule', ->
 
       hercule.scan document, "", null, (err, references) ->
         assert.equal references.length, 2
-        assert.equal references[0].endOfLine, true
-        assert.equal references[1].endOfLine, null
 
       done()
 
@@ -163,6 +160,6 @@ describe 'hercule', ->
 
       hercule.transclude inputFile, null, null, false, (err, document) ->
         if err then return cb err
-        assert.equal document, "The quick brown fox jumps over the lazy dog\n  .\n"
+        assert.equal document, "The quick brown fox jumps over the lazy dog.\n"
 
         done()