Spacing adjustments of shortcode replacements

mendezcode · Oct 31, 2013 · b523732 · b523732
1 parent cf9d43c
commit b523732
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/lib/shortcode-parser.js b/lib/shortcode-parser.js
@@ -73,7 +73,7 @@ function parseShortcode(name, buf, inline) {
 
   return {
     attr: attr,
-    content: buf
+    content: inline ? buf : buf.replace(/(^\n|\n$)/g, '')
   }
 
 }

diff --git a/test/fixtures/output.txt b/test/fixtures/output.txt
@@ -8,13 +8,15 @@
 
 # Block Level > Same Line
 
-<!-- container opts: {} --> ... On the same line ... <!-- /container -->
+<!-- container opts: {} -->
+ ... On the same line, spacing is adjusted ... 
+<!-- /container -->
 
 # Block Level > Multiple Lines
 
 <!-- container opts: {"hello":"world","name":"John","age":30,"float":55.5,"slider":null,"boolean":true} -->
 
- ... On different lines ...
+ ... On different lines, spacing is preserved ... 
 
 <!-- /container -->
 
@@ -38,9 +40,7 @@ pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui offi
 [12345]
 [some_shortcode] [/some_shortcode]
 
-# Nested Block Levels Not Supported
-
-<!-- container opts: {} --> Nested Block Level Shortcodes <!-- container opts: {} --><!-- /container --> Not <!-- /container --> Supported [/container]
+#
 
 Lorem ipsum dolor sit amet, <strong style="font-size: 10px; font-family: 'Inconsolata',sans-serif;">Hello World</strong> adipisicing elit, sed do eiusmod tempor
 incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut

diff --git a/test/fixtures/shortcodes.txt b/test/fixtures/shortcodes.txt
@@ -8,13 +8,13 @@
 
 # Block Level > Same Line
 
-[container] ... On the same line ... [/container]
+[container] ... On the same line, spacing is adjusted ... [/container]
 
 # Block Level > Multiple Lines
 
 [container hello=world name=John age=30 float=55.5 slider=null boolean=true other=undefined]
 
- ... On different lines ...
+ ... On different lines, spacing is preserved ... 
 
 [/container]
 
@@ -38,9 +38,7 @@ pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui offi
 [12345]
 [some_shortcode] [/some_shortcode]
 
-# Nested Block Levels Not Supported
-
-[container] Nested Block Level Shortcodes [container] Not [/container] Supported [/container]
+#
 
 Lorem ipsum dolor sit amet, [bold size=10px font="Inconsolata"]Hello World[/bold] adipisicing elit, sed do eiusmod tempor
 incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut

diff --git a/test/unit.js b/test/unit.js
@@ -35,7 +35,7 @@ vows.describe("Shortcode Parser").addBatch({
       });
 
       shortcode.add('container', container = function(buf, opts) {
-        return util.format('<!-- container opts: %s -->%s<!-- /container -->', JSON.stringify(opts), buf);
+        return util.format('<!-- container opts: %s -->\n%s\n<!-- /container -->', JSON.stringify(opts), buf);
       });
 
       shortcode.add('params_test', params_test = function(buf, opts) {