jade-rails 1.8.2.0 → 1.9.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e27fa225be920aaecbc6698c5dfec924dc5b16a
-  data.tar.gz: 028e65cd5fd383e30674ae86bbe1f6d257dfa62d
+  metadata.gz: 1efd81616df034adfbadab46e346124e47159786
+  data.tar.gz: acce583b683b4289a1bb60f0f61e2ada7c6e0f9c
 SHA512:
-  metadata.gz: 799fa1826b46a99d8f422d66a16dfe512563669b86f30899a3e1b200ed347301a0819bd3e51aa3636702fe03cbdf3763057d5b2fc6f35a435e81f7f31e4acf61
-  data.tar.gz: fa141437b2e9160c847daad70361231dea3ce3e4af23d8688a19a7b7bf6258fd7ac7a138126a04ef81235cc1f2fb3fe7718e07a0099acd10a6a3c16a275e9a9a
+  metadata.gz: 387672ce7b135d2612f01b869fcc751a0472546054313140316112b4d6eab7e090e99e8b23f33584357741bec04faa668ff2025285fb3935910b7fcfdb8b217a
+  data.tar.gz: 4ae350b05f81d48925a0a40c359a44e94fa85a957f1da1cac83513d62a39143048b1f62ede13bde841da82e6dde517b89c54a1bd36cae0a77f6ce374e0c8afb3

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.8.2.0'
+gem 'jade-rails', '~> 1.9.1.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.8.2.0'
+  VERSION = '1.9.1.0'
 end

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

@@ -789,7 +789,7 @@ exports.filters = require('./filters');
  * Utilities.
  */
 
-exports.utils = require('./utils');
+exports.utils = utils;
 
 /**
  * Expose `Compiler`.
@@ -898,6 +898,32 @@ function parse(str, options){
   return {body: body, dependencies: parser.dependencies};
 }
 
+/**
+ * Get the template from a string or a file, either compiled on-the-fly or
+ * read from cache (if enabled), and cache the template if needed.
+ *
+ * If `str` is not set, the file specified in `options.filename` will be read.
+ *
+ * If `options.cache` is true, this function reads the file from
+ * `options.filename` so it must be set prior to calling this function.
+ *
+ * @param {Object} options
+ * @param {String=} str
+ * @return {Function}
+ * @api private
+ */
+function handleTemplateCache (options, str) {
+  var key = options.filename;
+  if (options.cache && exports.cache[key]) {
+    return exports.cache[key];
+  } else {
+    if (str === undefined) str = fs.readFileSync(options.filename, 'utf8');
+    var templ = exports.compile(str, options);
+    if (options.cache) exports.cache[key] = templ;
+    return templ;
+  }
+}
+
 /**
  * Compile a `Function` representation of the given jade `str`.
  *
@@ -942,7 +968,7 @@ exports.compile = function(str, options){
     res.toString = function () {
       var err = new Error('The `client` option is deprecated, use the `jade.compileClient` method instead');
       err.name = 'Warning';
-      console.error(err.stack || err.message);
+      console.error(err.stack || /* istanbul ignore next */ err.message);
       return exports.compileClient(str, options);
     };
   }
@@ -1008,17 +1034,8 @@ exports.compileClient = function(str, options){
  */
 exports.compileFile = function (path, options) {
   options = options || {};
-
-  var key = path + ':string';
-
   options.filename = path;
-  var str = options.cache
-    ? exports.cache[key] || (exports.cache[key] = fs.readFileSync(path, 'utf8'))
-    : fs.readFileSync(path, 'utf8');
-
-  return options.cache
-    ? exports.cache[path] || (exports.cache[path] = exports.compile(str, options))
-    : exports.compile(str, options);
+  return handleTemplateCache(options);
 };
 
 /**
@@ -1058,11 +1075,7 @@ exports.render = function(str, options, fn){
     throw new Error('the "filename" option is required for caching');
   }
 
-  var path = options.filename;
-  var tmpl = options.cache
-    ? exports.cache[path] || (exports.cache[path] = exports.compile(str, options))
-    : exports.compile(str, options);
-  return tmpl(options);
+  return handleTemplateCache(options, str)(options);
 };
 
 /**
@@ -1092,13 +1105,8 @@ exports.renderFile = function(path, options, fn){
 
   options = options || {};
 
-  var key = path + ':string';
-
   options.filename = path;
-  var str = options.cache
-    ? exports.cache[key] || (exports.cache[key] = fs.readFileSync(path, 'utf8'))
-    : fs.readFileSync(path, 'utf8');
-  return exports.render(str, options);
+  return handleTemplateCache(options)(options);
 };
 
 
@@ -1112,16 +1120,19 @@ exports.renderFile = function(path, options, fn){
  */
 
 exports.compileFileClient = function(path, options){
+  var key = path + ':client';
   options = options || {};
 
-  var key = path + ':string';
-
   options.filename = path;
-  var str = options.cache
-    ? exports.cache[key] || (exports.cache[key] = fs.readFileSync(path, 'utf8'))
-    : fs.readFileSync(path, 'utf8');
 
-  return exports.compileClient(str, options);
+  if (options.cache && exports.cache[key]) {
+      return exports.cache[key];
+  }
+
+  var str = fs.readFileSync(options.filename, 'utf8');
+  var out = exports.compileClient(str, options);
+  if (options.cache) exports.cache[key] = out;
+  return out;
 };
 
 /**

metadata

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