Updates from rraval

Cakefile

@@ -60,7 +60,7 @@ task "dist", "Generate dist/eco.js", ->
       "strscan":          read "node_modules/strscan/lib/strscan.js"
       "coffee-script":    stub "CoffeeScript"
 
-    package = for name, source of modules
+    pkg = for name, source of modules
       """
         '#{name}': function(module, require, exports) {
           #{source}
@@ -89,12 +89,12 @@ task "dist", "Generate dist/eco.js", ->
           }
         };
       })({
-        #{package.join ',\n'}
+        #{pkg.join ',\n'}
       })('eco');
     """
 
     try
-      fs.mkdirSync "#{__dirname}/dist", 0755
+      fs.mkdirSync "#{__dirname}/dist", 0o755
     catch err
 
     fs.writeFileSync "#{__dirname}/dist/eco.js", "#{header}\n#{source}"

src/command.coffee

@@ -22,8 +22,8 @@ printUsage = ->
   process.exit 1
 
 printVersion = ->
-  package = JSON.parse fs.readFileSync __dirname + "/../package.json", "utf8"
-  console.error "Eco version #{package.version}"
+  pkg = JSON.parse fs.readFileSync __dirname + "/../package.json", "utf8"
+  console.error "Eco version #{pkg.version}"
   process.exit 0
 
 preprocessArgs = (args) ->

src/preprocessor.coffee

@@ -25,12 +25,16 @@ module.exports = class Preprocessor
 
   printString: (string) ->
     if string.length
+      string = string
+          .replace(/\s+</g, '<')
+          .replace(/>\s+/g, '>')
       @record "__out.push #{util.inspectString string}"
 
   beginCode: (options) ->
     @options = options
 
   recordCode: (code) ->
+    code = code.replace /\s+/g, ' '
     if code isnt "end"
       if @options.print
         if @options.safe

src/scanner.coffee

@@ -4,8 +4,8 @@
 module.exports = class Scanner
   @modePatterns:
     data:    /(.*?)(<%%|<%\s*(\#)|<%(([=-])?)|\n|$)/
-    code:    /(.*?)((((:|(->|=>))\s*))?%>|\n|$)/
-    comment: /(.*?)(%>|\n|$)/
+    code:    /([\s\S]*?)((((:|(->|=>))\s*))?%>|$)/
+    comment: /([\s\S]*?)(%>|$)/
 
   @dedentablePattern: /^(end|when|else|catch|finally)(?:\W|$)/
 
@@ -73,10 +73,7 @@ module.exports = class Scanner
         callback ["beginCode", print: @directive?, safe: @directive is "-"]
 
   scanCode: (callback) ->
-    if @tail is "\n"
-      callback ["fail", "unexpected newline in code block"]
-
-    else if @tail
+    if @tail
       @mode = "data"
       code  = trim @flush()
       code += " #{@arrow}" if @arrow
@@ -86,10 +83,7 @@ module.exports = class Scanner
       callback ["indent", @arrow] if @directive
 
   scanComment: (callback) ->
-    if @tail is "\n"
-      callback ["fail", "unexpected newline in code block"]
-
-    else if @tail
+    if @tail
       @mode   = "data"
       @buffer = ""
 

test/fixtures/newlines.coffee

@@ -0,0 +1,2 @@
+func { foo: bar }
+__out.push '\n'

test/fixtures/newlines.eco

@@ -0,0 +1,3 @@
+<% func {
+    foo: bar
+} %>