jade-js-source 0.27.6 → 0.28.0

data/{lib/jade_js/jade.js → jade.js}

@@ -483,8 +483,9 @@ Compiler.prototype = {
    */
 
   visitText: function(text){
-    text = utils.text(text.val.replace(/\\/g, '\\\\'));
+    text = utils.text(text.val.replace(/\\/g, '_SLASH_'));
     if (this.escape) text = escape(text);
+    text = text.replace(/_SLASH_/g, '\\\\');
     this.buffer(text);
   },
 
@@ -587,7 +588,9 @@ Compiler.prototype = {
 
     this.buf.push(''
       + '  } else {\n'
+      + '    var $$l = 0;\n'
       + '    for (var ' + each.key + ' in ' + each.obj + ') {\n'
+      + '      $$l++;'
        + '      if (' + each.obj + '.hasOwnProperty(' + each.key + ')){'
       + '      var ' + each.val + ' = ' + each.obj + '[' + each.key + '];\n');
 
@@ -595,7 +598,13 @@ Compiler.prototype = {
 
      this.buf.push('      }\n');
 
-    this.buf.push('   }\n  }\n}).call(this);\n');
+    this.buf.push('    }\n');
+    if (each.alternative) {
+      this.buf.push('    if ($$l === 0) {');
+      this.visit(each.alternative);
+      this.buf.push('    }');
+    }
+    this.buf.push('  }\n}).call(this);\n');
   },
 
   /**
@@ -813,7 +822,6 @@ module.exports = {
    */
 
   coffeescript: function(str){
-    str = str.replace(/\\n/g, '\n');
     var js = require('coffee-script').compile(str).replace(/\\/g, '\\\\').replace(/\n/g, '\\n');
     return '<script type="text/javascript">\\n' + js + '</script>';
   }
@@ -1283,6 +1291,8 @@ Lexer.prototype = {
     var captures;
     if (captures = /^\n *\n/.exec(this.input)) {
       this.consume(captures[0].length - 1);
+
+      ++this.lineno;
       if (this.pipeless) return this.tok('text', '');
       return this.next();
     }
@@ -3585,12 +3595,16 @@ require.register("utils.js", function(module, exports, require){
  */
 
 var interpolate = exports.interpolate = function(str){
-  return str.replace(/(\\)?([#!]){(.*?)}/g, function(str, escape, flag, code){
+  return str.replace(/(_SLASH_)?([#!]){(.*?)}/g, function(str, escape, flag, code){
+    code = code
+      .replace(/\\'/g, "'")
+      .replace(/_SLASH_/g, '\\');
+
     return escape
-      ? str.slice(1)
+      ? str.slice(7)
       : "' + "
         + ('!' == flag ? '' : 'escape')
-        + "((interp = " + code.replace(/\\'/g, "'")
+        + "((interp = " + code
         + ") == null ? '' : interp) + '";
   });
 };

data/support/ruby/jade_js/source.rb

@@ -0,0 +1,13 @@
+module JadeJs
+  module Source
+
+    def self.bundled_path
+      File.expand_path("../../../../jade.js", __FILE__)
+    end
+
+    def self.bundled_runtime_path
+      File.expand_path("../../../../runtime.js", __FILE__)
+    end
+
+  end
+end

metadata

@@ -1,33 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: jade-js-source
 version: !ruby/object:Gem::Version
-  version: 0.27.6
+  version: 0.28.0
   prerelease: 
 platform: ruby
 authors:
-- TJ Holowaychuk
-- David Haslem
+- TJ Holowaychuk <tj@vision-media.ca>
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies: []
-description: ! "      Jade is a high performance template engine heavily influenced
-  by Haml \n      and implemented with JavaScript for node.\n"
-email: therabidbanana@gmail.com
+description: 
+email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/jade_js/jade.js
-- lib/jade_js/runtime.js
-- lib/jade_js/source.rb
-homepage: https://github.com/visionmedia/jade
+- jade.js
+- runtime.js
+- !binary |-
+  c3VwcG9ydC9ydWJ5L2phZGVfanMvc291cmNlLnJi
+homepage: http://jade-lang.com/
 licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:
-- lib
+- !binary |-
+  c3VwcG9ydC9ydWJ5
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -41,9 +41,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: jade-js-source
+rubyforge_project: 
 rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: Jade - template engine
+summary: Jade template engine
 test_files: []
+has_rdoc: 

data/lib/jade_js/source.rb

@@ -1,10 +0,0 @@
-module JadeJs
-  module Source
-    def self.bundled_path
-      File.expand_path("../jade.js", __FILE__)
-    end
-    def self.bundled_runtime_path
-      File.expand_path("../runtime.js", __FILE__)
-    end
-  end
-end