Switch to hike 1.0 API

Author: ixti

lib/mincer.js

@@ -38,7 +38,7 @@ path.sep = path.sep || (path.resolve('.')[0] === '/' ? '/' : '\\');
 
 // 3rd-party
 var Mimoza  = require('mimoza');
-var Trail   = require('hike').Trail;
+var Hike    = require('hike');
 
 
 // internal
@@ -219,7 +219,7 @@ prop(Mincer, 'logger',  require('./mincer/logger'));
 // main internal properties.
 // each new environment clone these properties for initial states,
 // so they can be used to set 'defaults' for all environment instances.
-prop(Mincer, '__trail__',             new Trail(__dirname));
+prop(Mincer, '__trail__',             new Hike(__dirname));
 prop(Mincer, '__engines__',           {});
 prop(Mincer, '__mimeTypes__',         new Mimoza());
 prop(Mincer, '__preProcessors__',     new Hash(function () { return []; }));

lib/mincer/base.js

@@ -163,7 +163,7 @@ func_proxy_with_expire_index('clearPaths');
 //
 
 func_proxy_with_expire_index('registerMimeType', function (mimeType, ext) {
-  this.__trail__.extensions.append(ext);
+  this.__trail__.appendExtensions(ext);
 });
 
 //

lib/mincer/environment.js

@@ -15,7 +15,7 @@
 
 // 3rd-party
 var _       = require('lodash');
-var Trail   = require('hike').Trail;
+var Hike    = require('hike');
 
 
 // internal
@@ -64,7 +64,7 @@ var Environment = module.exports = function Environment(root) {
   prop(this, 'sourceRoot',            '/', { writable: true });
 
   // define internal properties
-  prop(this, '__trail__',             new Trail(root || '.'));
+  prop(this, '__trail__',             new Hike(root || '.'));
   prop(this, '__engines__',           Mincer.getEngines());
   prop(this, '__mimeTypes__',         Mincer.registeredMimeTypes);
   prop(this, '__preProcessors__',     Mincer.getPreProcessors());
@@ -85,7 +85,7 @@ var Environment = module.exports = function Environment(root) {
 
   // register default mimeType extensions
   _.forEach(this.__mimeTypes__.types, function (type, ext) {
-    this.__trail__.extensions.append(ext);
+    this.__trail__.appendExtensions(ext);
   }, this);
 
 

lib/mincer/helpers/paths.js

@@ -34,7 +34,7 @@ var getter = require('../common').getter;
  *  To be useful set this to your applications root directory.
  **/
 getter(module.exports, 'root', function () {
-  return this.__trail__.root;
+  return this.__trail__.__root__;
 });
 
 
@@ -50,7 +50,7 @@ getter(module.exports, 'root', function () {
  *  [[Paths#prependPath]], and [[Paths#clearPaths]].
  **/
 getter(module.exports, 'paths', function () {
-  return this.__trail__.paths.toArray();
+  return this.__trail__.paths;
 });
 
 
@@ -61,7 +61,7 @@ getter(module.exports, 'paths', function () {
  *  Paths at the end have the least priority.
  **/
 module.exports.prependPath = function (path) {
-  this.__trail__.paths.prepend(path);
+  this.__trail__.prependPaths(path);
 };
 
 
@@ -72,25 +72,23 @@ module.exports.prependPath = function (path) {
  *  Paths at the beginning have a higher priority.
  **/
 module.exports.appendPath = function (path) {
-  this.__trail__.paths.append(path);
+  this.__trail__.appendPaths(path);
 };
 
 
 /**
- *  Paths#clearPaths() -> Void
+ *  Paths#clearPaths() -> Array
  *
  *  Clear all paths and start fresh.
  *
  *  There is no mechanism for reordering paths, so its best to
  *  completely wipe the paths list and reappend them in the order
  *  you want.
+ *
+ *  Returns list of previously registered paths.
  **/
 module.exports.clearPaths = function () {
-  var trail = this.__trail__;
-
-  this.paths.forEach(function (path) {
-    trail.paths.remove(path);
-  });
+  return this.__trail__.removePaths();
 };
 
 
@@ -104,5 +102,5 @@ module.exports.clearPaths = function () {
  *      [".js", ".css", ".coffee", ".sass", ...]
  **/
 getter(module.exports, 'extensions', function () {
-  return this.__trail__.extensions.toArray();
+  return [].concat(this.__trail__.__extensions__);
 });

lib/mincer/helpers/processing.js

@@ -251,12 +251,12 @@ module.exports.unregisterBundleProcessor = function (mimeType, klass) {
 module.exports.addEngineToTrail = function (ext, klass) {
   var format_ext;
 
-  this.__trail__.extensions.append(ext);
+  this.__trail__.appendExtensions(ext);
 
   if (klass.defaultMimeType) {
     format_ext = this.getExtensionForMimeType(klass.defaultMimeType);
     if (format_ext) {
-      this.__trail__.aliases.append(format_ext, ext);
+      this.__trail__.aliasExtension(format_ext, ext);
     }
   }
 };

lib/mincer/index.js

@@ -43,7 +43,7 @@ var Index = module.exports = function Index(environment) {
   prop(this, 'sourceRoot',            environment.sourceRoot);
 
   // some private properties
-  prop(this, '__trail__',             environment.__trail__.index);
+  prop(this, '__trail__',             environment.__trail__.cached);
   prop(this, '__cache__',             environment.__cache__);
   prop(this, '__engines__',           environment.getEngines());
   prop(this, '__mimeTypes__',         environment.registeredMimeTypes);

package.json

@@ -18,7 +18,7 @@
   "dependencies"    : {
                         "argparse"           : "~ 0.1.15",
                         "fs-tools"           : "~ 0.2.10",
-                        "hike"               : "~ 0.1.4",
+                        "hike"               : "~ 1.0.0",
                         "lodash"             : "~ 2.4.1",
                         "mimoza"             : "~ 0.3.0",
                         "shellwords"         : "~ 0.1.0",