pug-rails 2.0.3 → 3.0.0.rc1

data/test/fixtures/javascripts/application-1.js.expected

@@ -0,0 +1,10 @@
+(function() { this.JST || (this.JST = {}); this.JST["templates/jade"] = (function(jade) { function template(locals) {
+  var buf = [];
+  var jade_mixins = {};
+  var jade_interp;
+
+  buf.push("<div>Hello, Jade!</div>");;return buf.join("");
+  }; return template; }).call(this, jade);;
+}).call(this);
+(function() { this.JST || (this.JST = {}); this.JST["templates/pug"] = (function() { function template(locals) {var pug_html = "", pug_mixins = {}, pug_interp;pug_html = pug_html + "\u003Cdiv\u003EHello, Pug!\u003C\u002Fdiv\u003E";;return pug_html;}; return template; }).call(this);;
+}).call(this);

data/test/fixtures/javascripts/application-2.js

@@ -0,0 +1,2 @@
+//= require jade-runtime-1.11.0
+//= require pug-runtime-2.0.2

data/test/test-helper.rb

@@ -0,0 +1,62 @@
+Bundler.require :default, :development
+
+require "sprockets/railtie"
+require "fileutils"
+
+module TestHelper
+  def self.included(base)
+    base.setup do
+      clear_tmp
+      clear_logs
+    end
+
+    base.teardown do
+      clear_tmp
+      if defined?(Rails) && Rails.respond_to?(:application=)
+        Rails.application = nil
+      end
+    end
+  end
+
+  def create_rails_application
+    Class.new(Rails::Application) do
+      config.eager_load                 = false
+      config.assets.enabled             = true
+      config.assets.gzip                = false
+      config.assets.paths               = [Rails.root.join("test/fixtures/javascripts").to_s]
+      config.assets.precompile          = []
+      config.paths["public"]            = [Rails.root.join("tmp").to_s]
+      config.active_support.deprecation = :stderr
+      config.pug.compile_debug          = false
+      config.jade.compile_debug         = false
+      config.pug.pretty                 = false
+      config.jade.pretty                = false
+    end
+  end
+
+  def create_sprockets_task(app)
+    require "sprockets/version" # Fix for sprockets 2.x
+
+    if Sprockets::VERSION.start_with?("2")
+      require "rake/sprocketstask"
+      Rake::SprocketsTask.new do |t|
+        t.environment = app.assets
+        t.output      = "#{app.config.paths["public"].to_a[0]}#{app.config.assets.prefix}"
+        t.assets      = app.config.assets.precompile
+      end
+    else
+      require "sprockets/rails/task"
+      Sprockets::Rails::Task.new(app)
+    end
+  end
+
+  def clear_tmp
+    FileUtils.rm_rf(File.expand_path("../../tmp", __FILE__))
+  end
+
+  def clear_logs
+    FileUtils.rm_rf(File.expand_path("../../log", __FILE__))
+  end
+end
+
+Test::Unit::TestCase.send :include, TestHelper

data/test/test-pug-rails.rb

@@ -1,11 +1,7 @@
-# encoding: utf-8
+# encoding: UTF-8
 # frozen_string_literal: true
 
-require 'rails'
-require 'sprockets/railtie'
-require 'pug-rails'
-require 'test/unit'
-require 'fileutils'
+require_relative "test-helper"
 
 class PugRailsTest < Test::Unit::TestCase
   def test_registration
@@ -13,93 +9,42 @@ class PugRailsTest < Test::Unit::TestCase
     app.initialize!
 
     if app.assets.respond_to?(:transformers)
-      assert app.assets.transformers.fetch('text/x-pug').fetch('application/javascript+function') == Pug::Sprockets::Transformer
-      assert app.assets.transformers.fetch('text/x-jade').fetch('application/javascript+function') == Jade::Sprockets::Transformer
+      assert app.assets.transformers.fetch("text/x-pug").fetch("application/javascript+function") \
+             == Pug::Sprockets::Transformer
+      assert app.assets.transformers.fetch("text/x-jade").fetch("application/javascript+function") \
+             == Jade::Sprockets::Transformer
     end
 
     if app.assets.respond_to?(:engines)
-      assert app.assets.engines.fetch('.pug') == Pug::Sprockets::Transformer
-      assert app.assets.engines.fetch('.jade') == Jade::Sprockets::Transformer
+      assert app.assets.engines.fetch(".pug")  == Pug::Sprockets::Transformer
+      assert app.assets.engines.fetch(".jade") == Jade::Sprockets::Transformer
     end
 
-    assert app.assets.paths.include?(File.expand_path('../../vendor/assets/javascripts', __FILE__))
-    assert_includes app.config.assets.precompile, 'pug/runtime.js'
-    assert_includes app.config.assets.precompile, 'jade/runtime.js'
+    File.join(Gem::Specification.find_by_name("pug-ruby").gem_dir, "vendor").tap do |path|
+      assert app.assets.paths.include?(path)
+    end
   end
 
   def test_compilation
     app = create_rails_application
     app.initialize!
+
     task = create_sprockets_task(app)
     task.instance_exec { manifest.compile(assets) }
 
-    expected = <<-JAVASCRIPT.squish
-      (function() { this.JST || (this.JST = {}); this.JST["templates/jade"] = (function(jade) { function template(locals) {
-        var buf = [];
-        var jade_mixins = {};
-        var jade_interp;
-      
-        buf.push("<div>Hello, Jade!</div>");;return buf.join("");
-        }; return template; }).call(this, jade);;
-      }).call(this);
-      (function() { this.JST || (this.JST = {}); this.JST["templates/pug"] = (function() { function template(locals) {var pug_html = "", pug_mixins = {}, pug_interp;pug_html = pug_html + "\\u003Cdiv\\u003EHello, Pug!\\u003C\\u002Fdiv\\u003E";;return pug_html;}; return template; }).call(this);;
-      }).call(this);
-    JAVASCRIPT
-    assert_equal expected, app.assets['application.js'].to_s.squish
-  end
-
-  def setup
-    super
-    clear_tmp
-    clear_logs
-  end
-
-  def teardown
-    super
-    clear_tmp
-    if defined?(Rails) && Rails.respond_to?(:application=)
-      Rails.application = nil
-    end
-  end
-
-private
-  def create_rails_application
-    Class.new(Rails::Application) do
-      config.eager_load                 = false
-      config.assets.enabled             = true
-      config.assets.gzip                = false
-      config.assets.paths               = [Rails.root.join('test/fixtures/javascripts').to_s]
-      config.assets.precompile          = %w( application.js )
-      config.paths['public']            = [Rails.root.join('tmp').to_s]
-      config.active_support.deprecation = :stderr
-      config.pug.compile_debug          = false
-      config.jade.compile_debug         = false
-      config.pug.pretty                 = false
-      config.jade.pretty                = false
+    File.expand_path("../fixtures/javascripts/application-1.js.expected", __FILE__).tap do |path|
+      assert_equal File.read(path).squish, app.assets["application-1.js"].to_s.squish
     end
   end
 
-  def create_sprockets_task(app)
-    require 'sprockets/version' # Fix for sprockets 2.x
-
-    if Sprockets::VERSION.start_with?('2')
-      require 'rake/sprocketstask'
-      Rake::SprocketsTask.new do |t|
-        t.environment = app.assets
-        t.output      = "#{app.config.paths['public'][0]}#{app.config.assets.prefix}"
-        t.assets      = app.config.assets.precompile
-      end
-    else
-      require 'sprockets/rails/task'
-      Sprockets::Rails::Task.new(app)
-    end
-  end
+  def test_runtime
+    app = create_rails_application
+    app.initialize!
 
-  def clear_tmp
-    FileUtils.rm_rf(File.expand_path('../../tmp', __FILE__))
-  end
+    task = create_sprockets_task(app)
+    task.instance_exec { manifest.compile(assets) }
 
-  def clear_logs
-    FileUtils.rm_rf(File.expand_path('../../log', __FILE__))
+    assert_match /pug_escape/,  app.assets["application-2.js"].to_s
+    assert_match /jade_escape/, app.assets["application-2.js"].to_s
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pug-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 3.0.0.rc1
 platform: ruby
 authors:
 - Yaroslav Konoplov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pug-ruby
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -111,30 +111,39 @@ files:
 - Appraisals
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
-- gemfiles/rails_3.gemfile
-- gemfiles/rails_3.gemfile.lock
-- gemfiles/rails_4_with_sprockets_2.gemfile
-- gemfiles/rails_4_with_sprockets_2.gemfile.lock
-- gemfiles/rails_4_with_sprockets_3.gemfile
-- gemfiles/rails_4_with_sprockets_3.gemfile.lock
-- gemfiles/rails_5.gemfile
-- gemfiles/rails_5.gemfile.lock
+- gemfiles/rails_3.1.gemfile
+- gemfiles/rails_3.1.gemfile.lock
+- gemfiles/rails_3.2.gemfile
+- gemfiles/rails_3.2.gemfile.lock
+- gemfiles/rails_4.1_with_sprockets_2.gemfile
+- gemfiles/rails_4.1_with_sprockets_2.gemfile.lock
+- gemfiles/rails_4.1_with_sprockets_3.gemfile
+- gemfiles/rails_4.1_with_sprockets_3.gemfile.lock
+- gemfiles/rails_4.2_with_sprockets_2.gemfile
+- gemfiles/rails_4.2_with_sprockets_2.gemfile.lock
+- gemfiles/rails_4.2_with_sprockets_3.gemfile
+- gemfiles/rails_4.2_with_sprockets_3.gemfile.lock
+- gemfiles/rails_5.0.gemfile
+- gemfiles/rails_5.0.gemfile.lock
+- gemfiles/rails_5.1.gemfile
+- gemfiles/rails_5.1.gemfile.lock
 - lib/jade-rails/railtie.rb
 - lib/jade-rails/sprockets/transformer.rb
 - lib/pug-rails.rb
 - lib/pug-rails/railtie.rb
 - lib/pug-rails/sprockets/transformer.rb
+- lib/pug-rails/version.rb
 - pug-rails.gemspec
-- test/fixtures/javascripts/application.js
+- test/fixtures/javascripts/application-1.js
+- test/fixtures/javascripts/application-1.js.expected
+- test/fixtures/javascripts/application-2.js
 - test/fixtures/javascripts/templates/jade.jst.jade
 - test/fixtures/javascripts/templates/pug.jst.pug
+- test/test-helper.rb
 - test/test-pug-rails.rb
-- vendor/assets/javascripts/jade/LICENCE
-- vendor/assets/javascripts/jade/runtime.js
-- vendor/assets/javascripts/pug/LICENCE
-- vendor/assets/javascripts/pug/runtime.js
 homepage: https://github.com/yivo/pug-rails
 licenses:
 - MIT
@@ -150,17 +159,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Pug/Jade template engine integration with Rails asset pipeline.
 test_files:
-- test/fixtures/javascripts/application.js
+- test/fixtures/javascripts/application-1.js
+- test/fixtures/javascripts/application-1.js.expected
+- test/fixtures/javascripts/application-2.js
 - test/fixtures/javascripts/templates/jade.jst.jade
 - test/fixtures/javascripts/templates/pug.jst.pug
+- test/test-helper.rb
 - test/test-pug-rails.rb

data/vendor/assets/javascripts/jade/LICENCE

@@ -1,22 +0,0 @@
-(The MIT License)
-
-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:
-
-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.

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

@@ -1,252 +0,0 @@
-(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){
-'use strict';
-
-/**
- * Merge two attribute objects giving precedence
- * to values in object `b`. Classes are special-cased
- * allowing for arrays and merging/joining appropriately
- * resulting in a string.
- *
- * @param {Object} a
- * @param {Object} b
- * @return {Object} a
- * @api private
- */
-
-exports.merge = function merge(a, b) {
-  if (arguments.length === 1) {
-    var attrs = a[0];
-    for (var i = 1; i < a.length; i++) {
-      attrs = 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') {
-      a[key] = b[key];
-    }
-  }
-
-  return a;
-};
-
-/**
- * Filter null `val`s.
- *
- * @param {*} val
- * @return {Boolean}
- * @api private
- */
-
-function nulls(val) {
-  return val != null && val !== '';
-}
-
-/**
- * join array as classes.
- *
- * @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.
- *
- * @param {Array} classes
- * @param {Array.<Boolean>} escaped
- * @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]));
-    }
-  }
-  var text = joinClasses(buf);
-  if (text.length) {
-    return ' class="' + text + '"';
-  } else {
-    return '';
-  }
-};
-
-
-exports.style = function (val) {
-  if (val && typeof val === 'object') {
-    return Object.keys(val).map(function (style) {
-      return style + ':' + val[style];
-    }).join(';');
-  } else {
-    return val;
-  }
-};
-/**
- * Render the given attribute.
- *
- * @param {String} key
- * @param {String} val
- * @param {Boolean} escaped
- * @param {Boolean} terse
- * @return {String}
- */
-exports.attr = function attr(key, val, escaped, terse) {
-  if (key === 'style') {
-    val = exports.style(val);
-  }
-  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');
-    }
-    return ' ' + key + '="' + val + '"';
-  }
-};
-
-/**
- * Render the given attributes object.
- *
- * @param {Object} obj
- * @param {Object} escaped
- * @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));
-      }
-    }
-  }
-
-  return buf.join('');
-};
-
-/**
- * Escape the given string of `html`.
- *
- * @param {String} html
- * @return {String}
- * @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;
-}
-
-exports.escape = jade_escape;
-function jade_escape(html){
-  var result = String(html).replace(jade_match_html, jade_encode_char);
-  if (result === '' + html) return html;
-  else return result;
-};
-
-/**
- * Re-throw the given `err` in context to the
- * the jade in `filename` at the given `lineno`.
- *
- * @param {Error} err
- * @param {String} filename
- * @param {String} lineno
- * @api private
- */
-
-exports.rethrow = function rethrow(err, filename, lineno, str){
-  if (!(err instanceof Error)) throw err;
-  if ((typeof window != 'undefined' || !filename) && !str) {
-    err.message += ' on line ' + lineno;
-    throw err;
-  }
-  try {
-    str = str || require('fs').readFileSync(filename, 'utf8')
-  } catch (ex) {
-    rethrow(err, null, lineno)
-  }
-  var context = 3
-    , lines = str.split('\n')
-    , start = Math.max(lineno - context, 0)
-    , end = Math.min(lines.length, lineno + context);
-
-  // Error context
-  var context = lines.slice(start, end).map(function(line, i){
-    var curr = i + start + 1;
-    return (curr == lineno ? '  > ' : '    ')
-      + curr
-      + '| '
-      + line;
-  }).join('\n');
-
-  // Alter exception message
-  err.path = filename;
-  err.message = (filename || 'Jade') + ':' + 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)
-});