pug-rails 1.11.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63088a476cff59fa064af8d4ca1604dc599229f0
-  data.tar.gz: beaff63ef17bf550e20b7c4e059e817beb674b6c
+  metadata.gz: c04d4c84bdfca755cf44cc37c81eb46a36f6102d
+  data.tar.gz: 3b3618108557ec5e16cc4c1d271b7ecb3d9d9599
 SHA512:
-  metadata.gz: d98ab8f6b374ce43225876e23ea00c4b3750e6f4f429f5176daba5ec19e701b96c56b9a3da0ca3110c471c026fdf25955f172aede015648c92cf474adf485ee8
-  data.tar.gz: 07c4177ac4daf1caa6706b07f0f531aa9a8ded036e88e4b1e4fd1bbff9b53e6f15db6fe38a6aa3a5364819b6e2ea73f75ba0979d19b89b19f9f75309b3a03913
+  metadata.gz: dbeea34052c2ed42dd37c3be5a3084ae06f3c9bdcce80d711b844bb7451673d68e5b8467617b60f749195ce4b180d0a6aa703fdd07e43c9571f4400780bdd273
+  data.tar.gz: b06a30e6b8d851a46332f75a483697465ed68456348690b20f77b583f89ffcce0cf5fa1f815751229dea4ebc7275bcbc02c6c31dd4ff569be50d030e23e48eb5

data/README.md

@@ -1,35 +1,65 @@
-# Ruby on Rails integration with Pug (ex. Jade)
+## Pug/Jade template engine integration with Rails asset pipeline
 
-## How it works
-This gem compiles Jade templates with [command line tool](http://jade-lang.com/command-line).
+## About
+This gem uses [pug-ruby](https://github.com/yivo/pug-ruby) to compile Pug/Jade templates. Please refer to that gem if you want to use Pug/Jade compiler directly.
 
-There are support of all basic features including advanced:
-* [Jade includes](http://jade-lang.com/reference/includes)
-* [Jade extends](http://jade-lang.com/reference/extends)
-* [Jade inheritance](http://jade-lang.com/reference/inheritance)
+## Installing gem
+Add to your Gemfile:
+```ruby
+gem 'pug-rails', '~> 2.0'
+```
 
-Jade template can be alternatively compiled using [command line](http://jade-lang.com/command-line). This method is impemented in this fork.
+## Installing Jade
+Install Jade globally via npm:
+```bash
+npm install -g jade
+```
 
-## Installing
+Require Jade runtime.js:
+```js
+//= require jade/runtime
+```
+
+Use `.jst.jade` as extension of your Jade files.
+
+## Installing Pug
 Install Pug globally via npm:
 ```bash
 npm install -g pug-cli
 ```
 
-Add to your Gemfile:
-```ruby
-gem 'pug-rails', '~> 1.0'
-```
-
 Require Pug runtime.js:
 ```js
 //= require pug/runtime
 ```
+NOTE: You don't need to do this if you are inlining Pug runtime functions in template. Please read about `inlineRuntimeFunctions` option at official website — [pugjs.org](http://pugjs.org).
 
-## Running Tests
-```bash
-bundle exec rake test
+Use `.jst.pug` as extension of your Pug files.
+
+## Configuring Pug and Jade
+Access Pug and Jade configurations directly:
+```ruby
+Jade.config.compile_debug = false
+Pug.config.compile_debug  = false
+```
+
+Access Pug and Jade configurations through `Rails.application.config`:
+```ruby
+Rails.application.config.jade.compile_debug = false
+Rails.application.config.pug.compile_debug  = false
+```
+
+## Configuring asset lookup paths
+It doesn't matter where to put Pug/Jade files but don't forget to update asset lookup paths. 
+Personally I prefer to put templates in `app/assets/templates`:
+```ruby
+# Add app/assets/templates to asset lookup paths
+# Add this to your initializers or application.rb
+Rails.application.config.assets.paths << Rails.root.join('app/assets/templates')
 ```
 
+## Running Tests
+Refer to [pug-ruby](https://github.com/yivo/pug-ruby)
+
 ## Versioning
-Gem version always reflects the version of Pug it contains.
+Prior to version 2.0 version of the gem was the same as the version of the Jade runtime that it contains.

data/lib/jade-rails/railtie.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+module Jade
+  class Railtie < Rails::Engine
+    config.jade               = Jade.config
+    config.jade.pretty        = Rails.env.development?
+    config.jade.compile_debug = Rails.env.development?
+
+    config.before_initialize do |app|
+      register_template = -> (env) { (env || app.assets).register_engine('.jade',  Jade::Template) }
+      if app.config.assets.respond_to?(:configure)
+        app.config.assets.configure { |env| register_template.call(env) }
+      else
+        register_template.call(nil)
+      end
+    end
+  end
+end

data/lib/jade-rails/template.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+require 'tilt'
+module Jade
+  class Template < Tilt::Template
+    def prepare
+    end
+
+    def evaluate(context, locals, &block)
+      Jade.compile(data, filename: file, client: true)
+    end
+  end
+end

data/lib/pug-rails.rb

@@ -1,40 +1,21 @@
 # frozen_string_literal: true
-require 'open3'
-require 'tilt'
-require 'json'
 
-module Pug
+module Jade
   class << self
-    def compile(source, options = {})
-      source = source.read if source.respond_to?(:read)
-
-      # Command line arguments take precedence over json options in Jade binary
-      # @link https://github.com/jadejs/jade/blob/master/bin/jade.js
-      # @link https://github.com/pugjs/pug-cli/blob/master/index.js
-      cmd = [ options.fetch(:executable) ]
-      cmd.push('--client')
-      cmd.push('--path', options[:filename]) if options[:filename]
-      cmd.push('--pretty')                   if options[:pretty]
-      cmd.push('--no-debug')                 unless options[:debug]
-      cmd.push('--obj', JSON.generate(options))
-
-      stdout, stderr, exit_status = Open3.capture3(*cmd, stdin_data: source)
-      raise CompileError.new(stderr) unless exit_status.success?
-      stdout
-    end
-
-    def find_executable
-      %w( pug jade ).find do |name|
-        `which #{name}`
-        $?.success?
-      end
-    end
+    attr_accessor :runtime_version
   end
+end
 
-  class CompileError < ::StandardError
+module Pug
+  class << self
+    attr_accessor :runtime_version
   end
 end
 
-require 'pug/template'
-require 'pug/railtie' if defined?(Rails)
+Jade.runtime_version = '1.11.0'
+Pug.runtime_version  = '2.0.2'
 
+require 'pug-rails/template'
+require 'pug-rails/railtie'
+require 'jade-rails/template'
+require 'jade-rails/railtie'

data/lib/pug-rails/railtie.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+module Pug
+  class Railtie < Rails::Engine
+    config.pug               = Pug.config
+    config.pug.pretty        = Rails.env.development?
+    config.pug.compile_debug = Rails.env.development?
+
+    config.before_initialize do |app|
+      register_template = -> (env) { (env || app.assets).register_engine('.pug',  Pug::Template) }
+      if app.config.assets.respond_to?(:configure)
+        app.config.assets.configure { |env| register_template.call(env) }
+      else
+        register_template.call(nil)
+      end
+    end
+  end
+end

data/lib/{pug → pug-rails}/template.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
+require 'tilt'
 module Pug
   class Template < Tilt::Template
     def prepare
     end
 
     def evaluate(context, locals, &block)
-      jade_config = Rails.application.config.pug.merge(filename: file)
-      Pug.compile(data, jade_config)
+      Pug.compile(data, filename: file, client: true)
     end
   end
 end

data/pug-rails.gemspec

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
-require File.expand_path('../lib/pug/version', __FILE__)
-
 Gem::Specification.new do |s|
   s.name            = 'pug-rails'
-  s.version         = Pug::VERSION
+  s.version         = '2.0.0'
   s.author          = 'Yaroslav Konoplov'
-  s.email           = 'yaroslav@inbox.com'
-  s.summary         = 'Jade adapter for the Rails asset pipeline.'
-  s.description     = 'Jade adapter for the Rails asset pipeline.'
+  s.email           = 'eahome00@gmail.com'
+  s.summary         = 'Pug/Jade template engine integration with Rails asset pipeline.'
+  s.description     = 'Pug/Jade template engine integration with Rails asset pipeline.'
   s.homepage        = 'https://github.com/yivo/pug-rails'
   s.license         = 'MIT'
 
@@ -16,7 +14,6 @@ Gem::Specification.new do |s|
   s.test_files      = `git ls-files -z -- {test,spec,features}/*`.split("\x0")
   s.require_paths   = ['lib']
 
-  s.add_dependency 'tilt', '~> 2.0.0'
-  s.add_development_dependency 'bundler', '~> 1.7'
-  s.add_development_dependency 'rake',    '~> 10.0'
+  s.add_dependency 'pug-ruby', '~> 1.0'
+  s.add_dependency 'tilt',     '~> 2.0'
 end

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

@@ -249,4 +249,4 @@ exports.DebugItem = function DebugItem(lineno, filename) {
 },{"fs":2}],2:[function(require,module,exports){
 
 },{}]},{},[1])(1)
-});
+});

data/vendor/assets/javascripts/pug/LICENCE

@@ -1,22 +1,19 @@
-(The MIT License)
+Copyright (c) 2014 Forbes Lindesay
 
-Copyright (c) 2009-2014 TJ Holowaychuk <tj@vision-media.ca>
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/vendor/assets/javascripts/pug/runtime.js

@@ -1,6 +1,8 @@
-(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.jade = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.pug = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 'use strict';
 
+var pug_has_own_property = Object.prototype.hasOwnProperty;
+
 /**
  * Merge two attribute objects giving precedence
  * to values in object `b`. Classes are special-cased
@@ -13,27 +15,25 @@
  * @api private
  */
 
-exports.merge = function merge(a, b) {
+exports.merge = pug_merge;
+function pug_merge(a, b) {
   if (arguments.length === 1) {
     var attrs = a[0];
     for (var i = 1; i < a.length; i++) {
-      attrs = merge(attrs, a[i]);
+      attrs = pug_merge(attrs, a[i]);
     }
     return attrs;
   }
-  var ac = a['class'];
-  var bc = b['class'];
-
-  if (ac || bc) {
-    ac = ac || [];
-    bc = bc || [];
-    if (!Array.isArray(ac)) ac = [ac];
-    if (!Array.isArray(bc)) bc = [bc];
-    a['class'] = ac.concat(bc).filter(nulls);
-  }
 
   for (var key in b) {
-    if (key != 'class') {
+    if (key === 'class') {
+      var valA = a[key] || [];
+      a[key] = (Array.isArray(valA) ? valA : [valA]).concat(b[key] || []);
+    } else if (key === 'style') {
+      var valA = pug_style(a[key]);
+      var valB = pug_style(b[key]);
+      a[key] = valA + (valA && valB && ';') + valB;
+    } else {
       a[key] = b[key];
     }
   }
@@ -42,64 +42,81 @@ exports.merge = function merge(a, b) {
 };
 
 /**
- * Filter null `val`s.
+ * Process array, object, or string as a string of classes delimited by a space.
  *
- * @param {*} val
- * @return {Boolean}
- * @api private
- */
-
-function nulls(val) {
-  return val != null && val !== '';
-}
-
-/**
- * join array as classes.
+ * If `val` is an array, all members of it and its subarrays are counted as
+ * classes. If `escaping` is an array, then whether or not the item in `val` is
+ * escaped depends on the corresponding item in `escaping`. If `escaping` is
+ * not an array, no escaping is done.
  *
- * @param {*} val
- * @return {String}
- */
-exports.joinClasses = joinClasses;
-function joinClasses(val) {
-  return (Array.isArray(val) ? val.map(joinClasses) :
-    (val && typeof val === 'object') ? Object.keys(val).filter(function (key) { return val[key]; }) :
-    [val]).filter(nulls).join(' ');
-}
-
-/**
- * Render the given classes.
+ * If `val` is an object, all the keys whose value is truthy are counted as
+ * classes. No escaping is done.
+ *
+ * If `val` is a string, it is counted as a class. No escaping is done.
  *
- * @param {Array} classes
- * @param {Array.<Boolean>} escaped
+ * @param {(Array.<string>|Object.<string, boolean>|string)} val
+ * @param {?Array.<string>} escaping
  * @return {String}
  */
-exports.cls = function cls(classes, escaped) {
-  var buf = [];
-  for (var i = 0; i < classes.length; i++) {
-    if (escaped && escaped[i]) {
-      buf.push(exports.escape(joinClasses([classes[i]])));
-    } else {
-      buf.push(joinClasses(classes[i]));
+exports.classes = pug_classes;
+function pug_classes_array(val, escaping) {
+  var classString = '', className, padding = '', escapeEnabled = Array.isArray(escaping);
+  for (var i = 0; i < val.length; i++) {
+    className = pug_classes(val[i]);
+    if (!className) continue;
+    escapeEnabled && escaping[i] && (className = pug_escape(className));
+    classString = classString + padding + className;
+    padding = ' ';
+  }
+  return classString;
+}
+function pug_classes_object(val) {
+  var classString = '', padding = '';
+  for (var key in val) {
+    if (key && val[key] && pug_has_own_property.call(val, key)) {
+      classString = classString + padding + key;
+      padding = ' ';
     }
   }
-  var text = joinClasses(buf);
-  if (text.length) {
-    return ' class="' + text + '"';
+  return classString;
+}
+function pug_classes(val, escaping) {
+  if (Array.isArray(val)) {
+    return pug_classes_array(val, escaping);
+  } else if (val && typeof val === 'object') {
+    return pug_classes_object(val);
   } else {
-    return '';
+    return val || '';
   }
-};
+}
 
+/**
+ * Convert object or string to a string of CSS styles delimited by a semicolon.
+ *
+ * @param {(Object.<string, string>|string)} val
+ * @return {String}
+ */
 
-exports.style = function (val) {
-  if (val && typeof val === 'object') {
-    return Object.keys(val).map(function (style) {
-      return style + ':' + val[style];
-    }).join(';');
+exports.style = pug_style;
+function pug_style(val) {
+  if (!val) return '';
+  if (typeof val === 'object') {
+    var out = '', delim = '';
+    for (var style in val) {
+      /* istanbul ignore else */
+      if (pug_has_own_property.call(val, style)) {
+        out = out + delim + style + ':' + val[style];
+        delim = ';';
+      }
+    }
+    return out;
   } else {
+    val = '' + val;
+    if (val[val.length - 1] === ';') return val.slice(0, -1);
     return val;
   }
 };
+
 /**
  * Render the given attribute.
  *
@@ -109,67 +126,55 @@ exports.style = function (val) {
  * @param {Boolean} terse
  * @return {String}
  */
-exports.attr = function attr(key, val, escaped, terse) {
-  if (key === 'style') {
-    val = exports.style(val);
+exports.attr = pug_attr;
+function pug_attr(key, val, escaped, terse) {
+  if (val === false || val == null || !val && (key === 'class' || key === 'style')) {
+    return '';
   }
-  if ('boolean' == typeof val || null == val) {
-    if (val) {
-      return ' ' + (terse ? key : key + '="' + key + '"');
-    } else {
-      return '';
-    }
-  } else if (0 == key.indexOf('data') && 'string' != typeof val) {
-    if (JSON.stringify(val).indexOf('&') !== -1) {
-      console.warn('Since Jade 2.0.0, ampersands (`&`) in data attributes ' +
-                   'will be escaped to `&amp;`');
-    };
-    if (val && typeof val.toISOString === 'function') {
-      console.warn('Jade will eliminate the double quotes around dates in ' +
-                   'ISO form after 2.0.0');
-    }
-    return ' ' + key + "='" + JSON.stringify(val).replace(/'/g, '&apos;') + "'";
-  } else if (escaped) {
-    if (val && typeof val.toISOString === 'function') {
-      console.warn('Jade will stringify dates in ISO form after 2.0.0');
-    }
-    return ' ' + key + '="' + exports.escape(val) + '"';
-  } else {
-    if (val && typeof val.toISOString === 'function') {
-      console.warn('Jade will stringify dates in ISO form after 2.0.0');
+  if (val === true) {
+    return ' ' + (terse ? key : key + '="' + key + '"');
+  }
+  if (typeof val.toJSON === 'function') {
+    val = val.toJSON();
+  }
+  if (typeof val !== 'string') {
+    val = JSON.stringify(val);
+    if (!escaped && val.indexOf('"') !== -1) {
+      return ' ' + key + '=\'' + val.replace(/'/g, '&#39;') + '\'';
     }
-    return ' ' + key + '="' + val + '"';
   }
+  if (escaped) val = pug_escape(val);
+  return ' ' + key + '="' + val + '"';
 };
 
 /**
  * Render the given attributes object.
  *
  * @param {Object} obj
- * @param {Object} escaped
+ * @param {Object} terse whether to use HTML5 terse boolean attributes
  * @return {String}
  */
-exports.attrs = function attrs(obj, terse){
-  var buf = [];
-
-  var keys = Object.keys(obj);
-
-  if (keys.length) {
-    for (var i = 0; i < keys.length; ++i) {
-      var key = keys[i]
-        , val = obj[key];
-
-      if ('class' == key) {
-        if (val = joinClasses(val)) {
-          buf.push(' ' + key + '="' + val + '"');
-        }
-      } else {
-        buf.push(exports.attr(key, val, false, terse));
+exports.attrs = pug_attrs;
+function pug_attrs(obj, terse){
+  var attrs = '';
+
+  for (var key in obj) {
+    if (pug_has_own_property.call(obj, key)) {
+      var val = obj[key];
+
+      if ('class' === key) {
+        val = pug_classes(val);
+        attrs = pug_attr(key, val, false, terse) + attrs;
+        continue;
       }
+      if ('style' === key) {
+        val = pug_style(val);
+      }
+      attrs += pug_attr(key, val, false, terse);
     }
   }
 
-  return buf.join('');
+  return attrs;
 };
 
 /**
@@ -180,36 +185,44 @@ exports.attrs = function attrs(obj, terse){
  * @api private
  */
 
-var jade_encode_html_rules = {
-  '&': '&amp;',
-  '<': '&lt;',
-  '>': '&gt;',
-  '"': '&quot;'
-};
-var jade_match_html = /[&<>"]/g;
-
-function jade_encode_char(c) {
-  return jade_encode_html_rules[c] || c;
-}
+var pug_match_html = /["&<>]/;
+exports.escape = pug_escape;
+function pug_escape(_html){
+  var html = '' + _html;
+  var regexResult = pug_match_html.exec(html);
+  if (!regexResult) return _html;
 
-exports.escape = jade_escape;
-function jade_escape(html){
-  var result = String(html).replace(jade_match_html, jade_encode_char);
-  if (result === '' + html) return html;
+  var result = '';
+  var i, lastIndex, escape;
+  for (i = regexResult.index, lastIndex = 0; i < html.length; i++) {
+    switch (html.charCodeAt(i)) {
+      case 34: escape = '&quot;'; break;
+      case 38: escape = '&amp;'; break;
+      case 60: escape = '&lt;'; break;
+      case 62: escape = '&gt;'; break;
+      default: continue;
+    }
+    if (lastIndex !== i) result += html.substring(lastIndex, i);
+    lastIndex = i + 1;
+    result += escape;
+  }
+  if (lastIndex !== i) return result + html.substring(lastIndex, i);
   else return result;
 };
 
 /**
  * Re-throw the given `err` in context to the
- * the jade in `filename` at the given `lineno`.
+ * the pug in `filename` at the given `lineno`.
  *
  * @param {Error} err
  * @param {String} filename
  * @param {String} lineno
+ * @param {String} str original source
  * @api private
  */
 
-exports.rethrow = function rethrow(err, filename, lineno, str){
+exports.rethrow = pug_rethrow;
+function pug_rethrow(err, filename, lineno, str){
   if (!(err instanceof Error)) throw err;
   if ((typeof window != 'undefined' || !filename) && !str) {
     err.message += ' on line ' + lineno;
@@ -218,7 +231,7 @@ exports.rethrow = function rethrow(err, filename, lineno, str){
   try {
     str = str || require('fs').readFileSync(filename, 'utf8')
   } catch (ex) {
-    rethrow(err, null, lineno)
+    pug_rethrow(err, null, lineno)
   }
   var context = 3
     , lines = str.split('\n')
@@ -236,17 +249,11 @@ exports.rethrow = function rethrow(err, filename, lineno, str){
 
   // Alter exception message
   err.path = filename;
-  err.message = (filename || 'Jade') + ':' + lineno
+  err.message = (filename || 'Pug') + ':' + lineno
     + '\n' + context + '\n\n' + err.message;
   throw err;
 };
-
-exports.DebugItem = function DebugItem(lineno, filename) {
-  this.lineno = lineno;
-  this.filename = filename;
-}
-
 },{"fs":2}],2:[function(require,module,exports){
 
 },{}]},{},[1])(1)
-});
+});

metadata

@@ -1,79 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: pug-rails
 version: !ruby/object:Gem::Version
-  version: 1.11.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Yaroslav Konoplov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2016-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: tilt
+  name: pug-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: rake
+  name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
+        version: '2.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-description: Jade adapter for the Rails asset pipeline.
-email: yaroslav@inbox.com
+        version: '2.0'
+description: Pug/Jade template engine integration with Rails asset pipeline.
+email: eahome00@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- Gemfile
 - README.md
-- Rakefile
+- lib/jade-rails/railtie.rb
+- lib/jade-rails/template.rb
 - lib/pug-rails.rb
-- lib/pug/railtie.rb
-- lib/pug/template.rb
-- lib/pug/version.rb
+- lib/pug-rails/railtie.rb
+- lib/pug-rails/template.rb
 - pug-rails.gemspec
-- test/assets/javascripts/pug/extends/index.jade
-- test/assets/javascripts/pug/extends/layout.jade
-- test/assets/javascripts/pug/includes/includes/foot.jade
-- test/assets/javascripts/pug/includes/includes/head.jade
-- test/assets/javascripts/pug/includes/index.jade
-- test/assets/javascripts/pug/sample_template.jade
-- test/test-pug-rails.rb
 - vendor/assets/javascripts/jade/LICENCE
 - vendor/assets/javascripts/jade/runtime.js
 - vendor/assets/javascripts/pug/LICENCE
@@ -101,12 +79,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Jade adapter for the Rails asset pipeline.
-test_files:
-- test/assets/javascripts/pug/extends/index.jade
-- test/assets/javascripts/pug/extends/layout.jade
-- test/assets/javascripts/pug/includes/includes/foot.jade
-- test/assets/javascripts/pug/includes/includes/head.jade
-- test/assets/javascripts/pug/includes/index.jade
-- test/assets/javascripts/pug/sample_template.jade
-- test/test-pug-rails.rb
+summary: Pug/Jade template engine integration with Rails asset pipeline.
+test_files: []

data/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-gem 'test-unit'

data/Rakefile

@@ -1,9 +0,0 @@
-require 'rake/testtask'
-require 'bundler/gem_tasks'
-
-Rake::TestTask.new do |t|
-  t.libs << 'test'
-end
-
-desc 'Run test suite'
-task default: :test

data/lib/pug/railtie.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-module Pug
-  class Railtie < Rails::Engine
-    config.pug               = ActiveSupport::OrderedOptions.new
-    config.pug.executable    = Pug.find_executable
-    config.pug.pretty        = Rails.env.development?
-    config.pug.self          = false
-    config.pug.compile_debug = Rails.env.development?
-    config.pug.globals       = []
-    config.jade              = config.pug
-
-    config.before_initialize do |app|
-      register_jade = -> (env = nil) {
-        (env || app.assets).register_engine '.jade', ::Pug::Template
-        (env || app.assets).register_engine '.pug',  ::Pug::Template
-      }
-
-      if app.config.assets.respond_to?(:configure)
-        app.config.assets.configure { |env| register_jade.call(env) }
-      else
-        register_jade.call
-      end
-    end
-  end
-end

data/lib/pug/version.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-module Pug
-  VERSION = '1.11.0.1'
-end

data/test/assets/javascripts/pug/extends/index.jade

@@ -1,8 +0,0 @@
-//- index.jade
-extends ./layout.jade
-
-block title
-  title Article Title
-
-block content
-  h1 My Article

data/test/assets/javascripts/pug/extends/layout.jade

@@ -1,8 +0,0 @@
-//- layout.jade
-doctype html
-html
-  head
-    block title
-      title Default title
-  body
-    block content

data/test/assets/javascripts/pug/includes/includes/foot.jade

@@ -1,3 +0,0 @@
-//- includes/foot.jade
-#footer
-  p Copyright (c) foobar

data/test/assets/javascripts/pug/includes/includes/head.jade

@@ -1,5 +0,0 @@
-//- includes/head.jade
-head
-  title My Site
-  script(src='/javascripts/jquery.js')
-  script(src='/javascripts/app.js')

data/test/assets/javascripts/pug/includes/index.jade

@@ -1,8 +0,0 @@
-//- index.jade
-doctype html
-html
-  include ./includes/head.jade
-  body
-    h1 My Site
-    p Welcome to my super lame site.
-    include ./includes/foot.jade

data/test/assets/javascripts/pug/sample_template.jade

@@ -1,16 +0,0 @@
-doctype html
-html(lang='en')
-  head
-    title=pageTitle
-    script(type='text/javascript').
-      if (foo) bar(1 + 5);
-  body
-    h1 Jade - node template engine
-    #container.col
-      if youAreUsingJade
-        p You are amazing
-      else
-        p Get on it!
-      p.
-        Jade is a terse and simple templating language with a
-        strong focus on performance and powerful features.

data/test/test-pug-rails.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-require 'pug-rails'
-require 'test/unit'
-
-class PugTest < Test::Unit::TestCase
-  DOCTYPE_PATTERN               = /^\s*<!DOCTYPE html>/
-  PUG_TEMPLATE_FUNCTION_PATTERN = /^function\s+template\s*\(locals\)\s*\{.*\}$/m
-
-  def test_compile
-    template = File.read(File.expand_path('../assets/javascripts/pug/sample_template.jade', __FILE__))
-    result   = Pug.compile(template)
-    assert_match(PUG_TEMPLATE_FUNCTION_PATTERN, result)
-    assert_no_match(DOCTYPE_PATTERN, result)
-  end
-
-  def test_compile_with_io
-    io = StringIO.new('lorem ipsum dolor')
-    assert_equal Pug.compile('lorem ipsum dolor'), Pug.compile(io)
-  end
-
-  def test_compilation_error
-    assert_raise Pug::CompileError do
-      Pug.compile <<-JADE
-        else
-          .foo
-      JADE
-    end
-  end
-
-  def test_includes
-    file     = File.expand_path('../assets/javascripts/pug/includes/index.jade', __FILE__)
-    template = File.read(file)
-    result   = Pug.compile(template, filename: file)
-    assert_match(PUG_TEMPLATE_FUNCTION_PATTERN, result)
-    assert_no_match(DOCTYPE_PATTERN, result)
-  end
-
-  def test_extends
-    file     = File.expand_path('../assets/javascripts/pug/extends/layout.jade', __FILE__)
-    template = File.read(file)
-    result   = Pug.compile(template, filename: file)
-    assert_match(PUG_TEMPLATE_FUNCTION_PATTERN, result)
-    assert_no_match(DOCTYPE_PATTERN, result)
-  end
-end