Remove deprecated hidden option

Author: dougwilson

HISTORY.md

@@ -2,6 +2,7 @@
 ===
 
   * Drop support for Node.js 0.8
+  * Remove `hidden` option -- use `dotfiles` option
   * Remove `from` alias to `root` -- use `root` directly
   * Remove `send.etag()` -- use `etag` in `options`
   * Remove `send.index()` -- use `index` in `options`

index.js

@@ -14,7 +14,6 @@
 
 var createError = require('http-errors')
 var debug = require('debug')('send')
-var deprecate = require('depd')('send')
 var destroy = require('destroy')
 var encodeUrl = require('encodeurl')
 var escapeHtml = require('escape-html')
@@ -121,17 +120,6 @@ function SendStream (req, path, options) {
     throw new TypeError('dotfiles option must be "allow", "deny", or "ignore"')
   }
 
-  this._hidden = Boolean(opts.hidden)
-
-  if (opts.hidden !== undefined) {
-    deprecate('hidden: use dotfiles: \'' + (this._hidden ? 'allow' : 'ignore') + '\' instead')
-  }
-
-  // legacy support
-  if (opts.dotfiles === undefined) {
-    this._dotfiles = undefined
-  }
-
   this._extensions = opts.extensions !== undefined
     ? normalizeList(opts.extensions, 'extensions option')
     : []
@@ -167,21 +155,6 @@ function SendStream (req, path, options) {
 
 util.inherits(SendStream, Stream)
 
-/**
- * Enable or disable "hidden" (dot) files.
- *
- * @param {Boolean} path
- * @return {SendStream}
- * @api public
- */
-
-SendStream.prototype.hidden = deprecate.function(function hidden (val) {
-  this._hidden = Boolean(val)
-  this._dotfiles = undefined
-  debug('hidden %s', this._hidden)
-  return this
-}, 'send.hidden: use dotfiles option')
-
 /**
  * Emit error with `status`.
  *
@@ -489,17 +462,8 @@ SendStream.prototype.pipe = function pipe (res) {
 
   // dotfile handling
   if (containsDotFile(parts)) {
-    var access = this._dotfiles
-
-    // legacy support
-    if (access === undefined) {
-      access = parts[parts.length - 1][0] === '.'
-        ? (this._hidden ? 'allow' : 'ignore')
-        : 'allow'
-    }
-
-    debug('%s dotfile "%s"', access, path)
-    switch (access) {
+    debug('%s dotfile "%s"', this._dotfiles, path)
+    switch (this._dotfiles) {
       case 'allow':
         break
       case 'deny':

package.json

@@ -17,7 +17,6 @@
   ],
   "dependencies": {
     "debug": "2.6.9",
-    "depd": "~1.1.2",
     "destroy": "~1.0.4",
     "encodeurl": "~1.0.2",
     "escape-html": "~1.0.3",

test/send.js

@@ -778,20 +778,6 @@ describe('send(file).pipe(res)', function () {
         .expect(416, done)
     })
   })
-
-  describe('.hidden()', function () {
-    it('should default support sending hidden files', function (done) {
-      var app = http.createServer(function (req, res) {
-        send(req, req.url, { root: fixtures })
-          .hidden(true)
-          .pipe(res)
-      })
-
-      request(app)
-        .get('/.hidden.txt')
-        .expect(200, 'secret', done)
-    })
-  })
 })
 
 describe('send(file, options)', function () {
@@ -910,10 +896,10 @@ describe('send(file, options)', function () {
         .expect(404, done)
     })
 
-    it('should allow file within dotfile directory for back-compat', function (done) {
+    it('should ignore file within dotfile directory', function (done) {
       request(createServer({ root: fixtures }))
         .get('/.mine/name.txt')
-        .expect(200, /tobi/, done)
+        .expect(404, done)
     })
 
     it('should reject bad value', function (done) {
@@ -1063,20 +1049,6 @@ describe('send(file, options)', function () {
     })
   })
 
-  describe('hidden', function () {
-    it('should default to false', function (done) {
-      request(app)
-        .get('/.hidden.txt')
-        .expect(404, 'Not Found', done)
-    })
-
-    it('should default support sending hidden files', function (done) {
-      request(createServer({ hidden: true, root: fixtures }))
-        .get('/.hidden.txt')
-        .expect(200, 'secret', done)
-    })
-  })
-
   describe('immutable', function () {
     it('should default to false', function (done) {
       request(createServer({ root: fixtures }))