jade-rails 1.9.1.0 → 1.9.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1efd81616df034adfbadab46e346124e47159786
-  data.tar.gz: acce583b683b4289a1bb60f0f61e2ada7c6e0f9c
+  metadata.gz: 696efa36a4f79013cd5a7f3ad58e06fafc8d3030
+  data.tar.gz: 123431b4eefafe0970a39518040a132df4ce9a91
 SHA512:
-  metadata.gz: 387672ce7b135d2612f01b869fcc751a0472546054313140316112b4d6eab7e090e99e8b23f33584357741bec04faa668ff2025285fb3935910b7fcfdb8b217a
-  data.tar.gz: 4ae350b05f81d48925a0a40c359a44e94fa85a957f1da1cac83513d62a39143048b1f62ede13bde841da82e6dde517b89c54a1bd36cae0a77f6ce374e0c8afb3
+  metadata.gz: b3bce3121c8d27d34a90a5a5b2f51d3c3c82df5a0dbb0362491c862cf8bf7b01fdc6d63d8b058974ba7ba5b2eeade611297029ed1b643a57c1129608e98f8f80
+  data.tar.gz: 7cc4e08918c0b70cbec3cfc1be01fe23c409c6075dbfd825deb2e680209784db544f35b3cd34a8fbe6a53d4c3a95e728c4e396a695e1d259f6c410570fb23860

data/README.md

@@ -11,7 +11,7 @@ to render Jade templates anywhere on the front end of your Rails app.
 Add to your Gemfile:
 
 ```ruby
-gem 'jade-rails', '~> 1.9.1.0'
+gem 'jade-rails', '~> 1.9.2.0'
 ```
 
 In your `application.js`, require the Jade runtime before any files that include

data/lib/jade/version.rb

@@ -1,3 +1,3 @@
 module Jade
-  VERSION = '1.9.1.0'
+  VERSION = '1.9.2.0'
 end

data/vendor/assets/javascripts/jade/jade.js

@@ -344,7 +344,7 @@ Compiler.prototype = {
     var args = mixin.args || '';
     var block = mixin.block;
     var attrs = mixin.attrs;
-    var attrsBlocks = mixin.attributeBlocks;
+    var attrsBlocks = mixin.attributeBlocks.slice();
     var pp = this.pp;
     var dynamic = mixin.name[0]==='#';
     var key = mixin.name;
@@ -454,10 +454,10 @@ Compiler.prototype = {
     if (pp && !tag.isInline())
       this.prettyIndent(0, true);
 
-    if (tag.selfClosing || (!this.xml && selfClosing.indexOf(tag.name) !== -1)) {
+    if (tag.selfClosing || (!this.xml && selfClosing[tag.name])) {
       this.buffer('<');
       bufferName();
-      this.visitAttributes(tag.attrs, tag.attributeBlocks);
+      this.visitAttributes(tag.attrs, tag.attributeBlocks.slice());
       this.terse
         ? this.buffer('>')
         : this.buffer('/>');
@@ -473,7 +473,7 @@ Compiler.prototype = {
       // Optimize attributes buffering
       this.buffer('<');
       bufferName();
-      this.visitAttributes(tag.attrs, tag.attributeBlocks);
+      this.visitAttributes(tag.attrs, tag.attributeBlocks.slice());
       this.buffer('>');
       if (tag.code) this.visitCode(tag.code);
       this.visit(tag.block);
@@ -771,7 +771,9 @@ var Parser = require('./parser')
  * Expose self closing tags.
  */
 
-exports.selfClosing = require('void-elements');
+// FIXME: either stop exporting selfClosing in v2 or export the new object
+// form
+exports.selfClosing = Object.keys(require('void-elements'));
 
 /**
  * Default supported doctypes.
@@ -988,34 +990,52 @@ exports.compile = function(str, options){
  *
  * @param {String} str
  * @param {Options} options
- * @return {String}
+ * @return {Object}
  * @api public
  */
 
-exports.compileClient = function(str, options){
+exports.compileClientWithDependenciesTracked = function(str, options){
   var options = options || {};
   var name = options.name || 'template';
   var filename = options.filename ? utils.stringify(options.filename) : 'undefined';
   var fn;
 
   str = String(str);
-
+  options.compileDebug = options.compileDebug ? true : false;
+  var parsed = parse(str, options);
   if (options.compileDebug) {
-    options.compileDebug = true;
     fn = [
         'var jade_debug = [{ lineno: 1, filename: ' + filename + ' }];'
       , 'try {'
-      , parse(str, options).body
+      , parsed.body
       , '} catch (err) {'
       , '  jade.rethrow(err, jade_debug[0].filename, jade_debug[0].lineno, ' + utils.stringify(str) + ');'
       , '}'
     ].join('\n');
   } else {
-    options.compileDebug = false;
-    fn = parse(str, options).body;
+    fn = parsed.body;
   }
 
-  return 'function ' + name + '(locals) {\n' + fn + '\n}';
+  return {body: 'function ' + name + '(locals) {\n' + fn + '\n}', dependencies: parsed.dependencies};
+};
+
+/**
+ * Compile a JavaScript source representation of the given jade `str`.
+ *
+ * Options:
+ *
+ *   - `compileDebug` When it is `true`, the source code is included in
+ *     the compiled template for better error messages.
+ *   - `filename` used to improve errors when `compileDebug` is not `true` and to resolve imports/extends
+ *   - `name` the name of the resulting function (defaults to "template")
+ *
+ * @param {String} str
+ * @param {Options} options
+ * @return {String}
+ * @api public
+ */
+exports.compileClient = function (str, options) {
+  return exports.compileClientWithDependenciesTracked(str, options).body;
 };
 
 /**
@@ -1366,12 +1386,7 @@ Lexer.prototype = {
 
   interpolation: function() {
     if (/^#\{/.test(this.input)) {
-      var match;
-      try {
-        match = this.bracketExpression(1);
-      } catch (ex) {
-        return;//not an interpolation expression, just an unmatched open interpolation
-      }
+      var match = this.bracketExpression(1);
 
       this.consume(match.end + 1);
       return this.tok('interpolation', match.src);
@@ -1391,6 +1406,10 @@ Lexer.prototype = {
         name = name.slice(0, -1);
         tok = this.tok('tag', name);
         this.defer(this.tok(':'));
+        if (this.input[0] !== ' ') {
+          console.warn('Warning: space required after `:` on line ' + this.lineno +
+              ' of jade file "' + this.filename + '"');
+        }
         while (' ' == this.input[0]) this.input = this.input.substr(1);
       } else {
         tok = this.tok('tag', name);
@@ -1624,12 +1643,7 @@ Lexer.prototype = {
         tok = this.tok('call', captures[3]);
       } else {
         // interpolated call
-        var match;
-        try {
-          match = this.bracketExpression(2 + captures[1].length);
-        } catch (ex) {
-          return;//not an interpolation expression, just an unmatched open interpolation
-        }
+        var match = this.bracketExpression(2 + captures[1].length);
         this.consume(match.end + 1);
         assertExpression(match.src);
         tok = this.tok('call', '#{'+match.src+'}');
@@ -1637,14 +1651,10 @@ Lexer.prototype = {
 
       // Check for args (not attributes)
       if (captures = /^ *\(/.exec(this.input)) {
-        try {
-          var range = this.bracketExpression(captures[0].length - 1);
-          if (!/^\s*[-\w]+ *=/.test(range.src)) { // not attributes
-            this.consume(range.end + 1);
-            tok.args = range.src;
-          }
-        } catch (ex) {
-          //not a bracket expcetion, just unmatched open parens
+        var range = this.bracketExpression(captures[0].length - 1);
+        if (!/^\s*[-\w]+ *=/.test(range.src)) { // not attributes
+          this.consume(range.end + 1);
+          tok.args = range.src;
         }
         if (tok.args) {
           assertExpression('[' + tok.args + ']');
@@ -2036,7 +2046,13 @@ Lexer.prototype = {
    */
 
   colon: function() {
-    return this.scan(/^: */, ':');
+    var good = /^: +/.test(this.input);
+    var res = this.scan(/^: */, ':');
+    if (res && !good) {
+      console.warn('Warning: space required after `:` on line ' + this.lineno +
+          ' of jade file "' + this.filename + '"');
+    }
+    return res;
   },
 
   fail: function () {
@@ -2753,7 +2769,7 @@ var Parser = exports = module.exports = function Parser(str, filename, options){
   this.mixins = {};
   this.options = options;
   this.contexts = [this];
-  this.inMixin = false;
+  this.inMixin = 0;
   this.dependencies = [];
   this.inBlock = 0;
 };
@@ -3023,6 +3039,7 @@ Parser.prototype = {
     this.expect('indent');
     while ('outdent' != this.peek().type) {
       switch (this.peek().type) {
+        case 'comment':
         case 'newline':
           this.advance();
           break;
@@ -3359,10 +3376,10 @@ Parser.prototype = {
 
     // definition
     if ('indent' == this.peek().type) {
-      this.inMixin = true;
+      this.inMixin++;
       mixin = new nodes.Mixin(name, args, this.block(), false);
       this.mixins[name] = mixin;
-      this.inMixin = false;
+      this.inMixin--;
       return mixin;
     // call
     } else {
@@ -7449,28 +7466,28 @@ function findGlobals(source) {
 
 },{}],34:[function(require,module,exports){
 /**
- * This file automatically generated from `build.js`.
+ * This file automatically generated from `pre-publish.js`.
  * Do not manually edit.
  */
 
-module.exports = [
-  "area",
-  "base",
-  "br",
-  "col",
-  "embed",
-  "hr",
-  "img",
-  "input",
-  "keygen",
-  "link",
-  "menuitem",
-  "meta",
-  "param",
-  "source",
-  "track",
-  "wbr"
-];
+module.exports = {
+  "area": true,
+  "base": true,
+  "br": true,
+  "col": true,
+  "embed": true,
+  "hr": true,
+  "img": true,
+  "input": true,
+  "keygen": true,
+  "link": true,
+  "menuitem": true,
+  "meta": true,
+  "param": true,
+  "source": true,
+  "track": true,
+  "wbr": true
+};
 
 },{}],35:[function(require,module,exports){
 'use strict';

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jade-rails
 version: !ruby/object:Gem::Version
-  version: 1.9.1.0
+  version: 1.9.2.0
 platform: ruby
 authors:
 - Paul Raythattha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs