Merge pull request #4 from pugjs/pug

Rename to pug-loader

README.md

@@ -1,14 +1,14 @@
-# jade-load
+# pug-loader
 
-The jade loader is responsible for loading the depenendencies of a given jade file.  It adds `fullPath` and `str` properties to every `Include` and `Extends` node.  It also adds an `ast` property to any `Include` nodes that are loading jade and any `Extends` nodes.  It then recursively loads the dependencies of any of those included files.
+The pug loader is responsible for loading the depenendencies of a given pug file.  It adds `fullPath` and `str` properties to every `Include` and `Extends` node.  It also adds an `ast` property to any `Include` nodes that are loading pug and any `Extends` nodes.  It then recursively loads the dependencies of any of those included files.
 
-[![Build Status](https://img.shields.io/travis/jadejs/jade-load/master.svg)](https://travis-ci.org/jadejs/jade-load)
-[![Dependency Status](https://img.shields.io/gemnasium/jadejs/jade-load.svg)](https://gemnasium.com/jadejs/jade-load)
-[![NPM version](https://img.shields.io/npm/v/jade-load.svg)](https://www.npmjs.org/package/jade-load)
+[![Build Status](https://img.shields.io/travis/pugjs/pug-loader/master.svg)](https://travis-ci.org/pugjs/pug-loader)
+[![Dependency Status](https://img.shields.io/gemnasium/pugjs/pug-loader.svg)](https://gemnasium.com/pugjs/pug-loader)
+[![NPM version](https://img.shields.io/npm/v/pug-loader.svg)](https://www.npmjs.org/package/pug-loader)
 
 ## Installation
 
-    npm install jade-load
+    npm install pug-loader
 
 ## Usage
 
@@ -58,14 +58,14 @@ This function is not meant to be called from outside of `jade-load`, but rather
 
 ```js
 var fs = require('fs');
-var lex = require('jade-lexer');
-var parse = require('jade-parser');
-var load = require('jade-load');
+var lex = require('pug-lexer');
+var parse = require('pug-parser');
+var load = require('pug-loader');
 
 // you can do everything very manually
 
-var str = fs.readFileSync('bar.jade', 'utf8');
-var ast = load(parse(lex(str, 'bar.jade'), 'bar.jade'), {
+var str = fs.readFileSync('bar.pug', 'utf8');
+var ast = load(parse(lex(str, 'bar.pug'), 'bar.pug'), {
   lex: lex,
   parse: parse,
   resolve: function (filename, source, options) {
@@ -76,8 +76,8 @@ var ast = load(parse(lex(str, 'bar.jade'), 'bar.jade'), {
 
 // or you can do all that in just two steps
 
-var str = fs.readFileSync('bar.jade', 'utf8');
-var ast = load.string(str, 'bar.jade', {
+var str = fs.readFileSync('bar.pug', 'utf8');
+var ast = load.string(str, 'bar.pug', {
   lex: lex,
   parse: parse,
   resolve: function (filename, source, options) {
@@ -88,7 +88,7 @@ var ast = load.string(str, 'bar.jade', {
 
 // or you can do all that in only one step
 
-var ast = load.file('bar.jade', {
+var ast = load.file('bar.pug', {
   lex: lex,
   parse: parse,
   resolve: function (filename, source, options) {

index.js

@@ -2,7 +2,7 @@
 
 var fs = require('fs');
 var path = require('path');
-var walk = require('jade-walk');
+var walk = require('pug-walk');
 
 module.exports = load;
 function load(ast, options) {

package.json

@@ -1,23 +1,23 @@
 {
-  "name": "jade-load",
+  "name": "pug-loader",
   "version": "0.0.4",
-  "description": "The jade loader is responsible for loading the depenendencies of a given jade file.",
+  "description": "The pug loader is responsible for loading the depenendencies of a given pug file.",
   "keywords": [
-    "jade"
+    "pug"
   ],
   "dependencies": {
-    "jade-walk": "0.0.3"
+    "pug-walk": "0.0.3"
   },
   "devDependencies": {
-    "jade-lexer": "0.0.9",
-    "jade-parser": "0.0.9"
+    "pug-lexer": "^1.0.0",
+    "pug-parser": "^1.0.0"
   },
   "scripts": {
     "test": "node test"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/jadejs/jade-load.git"
+    "url": "https://github.com/pugjs/pug-loader.git"
   },
   "author": "ForbesLindesay",
   "license": "MIT"

test/expected.json

@@ -5,10 +5,10 @@
       "type": "Extends",
       "file": {
         "type": "FileReference",
-        "path": "bar.jade",
+        "path": "bar.pug",
         "line": 1,
-        "filename": "<dirname>/foo.jade",
-        "fullPath": "<dirname>/bar.jade",
+        "filename": "<dirname>/foo.pug",
+        "fullPath": "<dirname>/bar.pug",
         "str": "block bing\n",
         "ast": {
           "type": "Block",
@@ -17,17 +17,17 @@
               "type": "NamedBlock",
               "nodes": [],
               "line": 1,
-              "filename": "<dirname>/bar.jade",
+              "filename": "<dirname>/bar.pug",
               "name": "bing",
               "mode": "replace"
             }
           ],
           "line": 0,
-          "filename": "<dirname>/bar.jade"
+          "filename": "<dirname>/bar.pug"
         }
       },
       "line": 1,
-      "filename": "<dirname>/foo.jade"
+      "filename": "<dirname>/foo.pug"
     },
     {
       "type": "NamedBlock",
@@ -37,9 +37,9 @@
           "file": {
             "type": "FileReference",
             "line": 4,
-            "filename": "<dirname>/foo.jade",
-            "path": "bing.jade",
-            "fullPath": "<dirname>/bing.jade",
+            "filename": "<dirname>/foo.pug",
+            "path": "bing.pug",
+            "fullPath": "<dirname>/bing.pug",
             "str": ".bing bong\n",
             "ast": {
               "type": "Block",
@@ -55,11 +55,11 @@
                         "type": "Text",
                         "val": "bong",
                         "line": 1,
-                        "filename": "<dirname>/bing.jade"
+                        "filename": "<dirname>/bing.pug"
                       }
                     ],
                     "line": 1,
-                    "filename": "<dirname>/bing.jade"
+                    "filename": "<dirname>/bing.pug"
                   },
                   "attrs": [
                     {
@@ -71,29 +71,29 @@
                   "attributeBlocks": [],
                   "isInline": false,
                   "line": 1,
-                  "filename": "<dirname>/bing.jade"
+                  "filename": "<dirname>/bing.pug"
                 }
               ],
               "line": 0,
-              "filename": "<dirname>/bing.jade"
+              "filename": "<dirname>/bing.pug"
             }
           },
           "line": 4,
-          "filename": "<dirname>/foo.jade",
+          "filename": "<dirname>/foo.pug",
           "block": {
             "type": "Block",
             "nodes": [],
             "line": 4,
-            "filename": "<dirname>/foo.jade"
+            "filename": "<dirname>/foo.pug"
           }
         }
       ],
       "line": 3,
-      "filename": "<dirname>/foo.jade",
+      "filename": "<dirname>/foo.pug",
       "name": "bing",
       "mode": "replace"
     }
   ],
   "line": 0,
-  "filename": "<dirname>/foo.jade"
+  "filename": "<dirname>/foo.pug"
 }

test/foo.pug

@@ -0,0 +1,4 @@
+extends bar.pug
+
+block bing
+  include bing.pug

test/index.js

@@ -3,12 +3,12 @@
 var fs = require('fs');
 var path = require('path');
 var assert = require('assert');
-var walk = require('jade-walk');
-var lex = require('jade-lexer');
-var parse = require('jade-parser');
+var walk = require('pug-walk');
+var lex = require('pug-lexer');
+var parse = require('pug-parser');
 var load = require('../');
 
-var filename = __dirname + '/foo.jade';
+var filename = __dirname + '/foo.pug';
 var ast = load.file(filename, {
   lex: lex,
   parse: parse