allow publish to existing mixed case names

let registry apply strict case-checking
fix standard conformance
remove expectation about useful error message
just expect an error

correct option name

Author: smikes

lib/publish.js

@@ -5,7 +5,7 @@ var semver = require('semver')
 var crypto = require('crypto')
 var Stream = require('stream').Stream
 var assert = require('assert')
-var fixer = require('normalize-package-data/lib/fixer.js')
+var fixer = require('normalize-package-data').fixer
 var concat = require('concat-stream')
 
 function escaped (name) {
@@ -38,7 +38,7 @@ function publish (uri, params, cb) {
     'must pass package metadata to publish'
   )
   try {
-    fixer.fixNameField(metadata, true)
+    fixer.fixNameField(metadata, {strict: true, allowLegacyCase: true})
   } catch (er) {
     return cb(er)
   }

lib/star.js

@@ -7,7 +7,7 @@ function star (uri, params, cb) {
   assert(params && typeof params === 'object', 'must pass params to star')
   assert(typeof cb === 'function', 'must pass callback to star')
 
-  var starred = params.starred ? true : false
+  var starred = !!params.starred
 
   var auth = params.auth
   assert(auth && typeof auth === 'object', 'must pass auth to star')

test/publish-mixcase-name.js

@@ -0,0 +1,91 @@
+var tap = require('tap')
+var fs = require('fs')
+
+var server = require('./lib/server.js')
+var common = require('./lib/common.js')
+
+var auth = {
+  username: 'username',
+  password: '%1234@asdf%',
+  email: '[email protected]',
+  alwaysAuth: true
+}
+
+var client = common.freshClient()
+
+tap.test('publish mixcase name', function (t) {
+  // not really a tarball, but doesn't matter
+  var bodyPath = require.resolve('../package.json')
+  var tarball = fs.createReadStream(bodyPath)
+  var pd = fs.readFileSync(bodyPath, 'base64')
+  var pkg = require('../package.json')
+  var lastTime = null
+
+  // change to mixed case name
+  pkg.name = 'npm-Registry-Client'
+
+  server.expect('/npm-Registry-Client', function (req, res) {
+    t.equal(req.method, 'PUT')
+    var b = ''
+    req.setEncoding('utf8')
+    req.on('data', function (d) {
+      b += d
+    })
+
+    req.on('end', function () {
+      var o = lastTime = JSON.parse(b)
+      t.equal(o._id, 'npm-Registry-Client')
+      t.equal(o['dist-tags'].latest, pkg.version)
+      t.has(o.versions[pkg.version], pkg)
+      t.same(o.maintainers, [ { name: 'username', email: '[email protected]' } ])
+      var att = o._attachments[ pkg.name + '-' + pkg.version + '.tgz' ]
+      t.same(att.data, pd)
+      res.statusCode = 409
+      res.json({reason: 'must supply latest _rev to update existing package'})
+    })
+  })
+
+  server.expect('/npm-Registry-Client?write=true', function (req, res) {
+    t.equal(req.method, 'GET')
+    t.ok(lastTime)
+    for (var i in lastTime.versions) {
+      var v = lastTime.versions[i]
+      delete lastTime.versions[i]
+      lastTime.versions['0.0.2'] = v
+      lastTime['dist-tags'] = { latest: '0.0.2' }
+    }
+    lastTime._rev = 'asdf'
+    res.json(lastTime)
+  })
+
+  server.expect('/npm-Registry-Client', function (req, res) {
+    t.equal(req.method, 'PUT')
+    t.ok(lastTime)
+
+    var b = ''
+    req.setEncoding('utf8')
+    req.on('data', function (d) {
+      b += d
+    })
+
+    req.on('end', function () {
+      var o = JSON.parse(b)
+      t.equal(o._rev, 'asdf')
+      t.deepEqual(o.versions['0.0.2'], o.versions[pkg.version])
+      res.statusCode = 201
+      res.json({created: true})
+    })
+  })
+
+  var params = {
+    metadata: pkg,
+    access: 'public',
+    body: tarball,
+    auth: auth
+  }
+  client.publish('http://localhost:1337/', params, function (er, data) {
+    if (er) throw er
+    t.deepEqual(data, { created: true })
+    t.end()
+  })
+})

test/publish-new-mixcase-name.js

@@ -0,0 +1,72 @@
+var test = require('tap').test
+var crypto = require('crypto')
+var fs = require('fs')
+
+var server = require('./lib/server.js')
+var common = require('./lib/common.js')
+var client = common.freshClient()
+
+var URI = 'http://localhost:1337/'
+var USERNAME = 'username'
+var PASSWORD = '%1234@asdf%'
+var EMAIL = '[email protected]'
+var METADATA = require('../package.json')
+var ACCESS = 'public'
+// not really a tarball, but doesn't matter
+var BODY_PATH = require.resolve('../package.json')
+var BODY = fs.createReadStream(BODY_PATH)
+var AUTH = {
+  username: USERNAME,
+  password: PASSWORD,
+  email: EMAIL
+}
+var PARAMS = {
+  metadata: METADATA,
+  access: ACCESS,
+  body: BODY,
+  auth: AUTH
+}
+
+test('publish-new-mixcase-name', function (t) {
+  var pd = fs.readFileSync(BODY_PATH, 'base64')
+
+  // change to mixed-case name
+  METADATA.name = 'npm-Registry-Client'
+
+  server.expect('/npm-Registry-Client', function (req, res) {
+    t.equal(req.method, 'PUT')
+    var b = ''
+    req.setEncoding('utf8')
+    req.on('data', function (d) {
+      b += d
+    })
+
+    req.on('end', function () {
+      var o = JSON.parse(b)
+      t.equal(o._id, 'npm-Registry-Client')
+      t.equal(o['dist-tags'].latest, METADATA.version)
+      t.equal(o.access, ACCESS)
+      t.has(o.versions[METADATA.version], METADATA)
+      t.same(o.maintainers, [{ name: 'username', email: '[email protected]' }])
+      t.same(o.maintainers, o.versions[METADATA.version].maintainers)
+
+      var att = o._attachments[METADATA.name + '-' + METADATA.version + '.tgz']
+      t.same(att.data, pd)
+
+      var hash = crypto.createHash('sha1').update(pd, 'base64').digest('hex')
+      t.equal(o.versions[METADATA.version].dist.shasum, hash)
+
+      res.statusCode = 403
+      res.json({error: 'Name must be lower-case'})
+    })
+  })
+
+  client.publish(URI, PARAMS, function (er, data, json, res) {
+    t.assert(er instanceof Error) // expect error
+
+    // TODO: need a test that ensures useful error message
+    // t.similar(data.error, /must be lower-case/)
+
+    t.end()
+  })
+})

test/request.js

@@ -81,7 +81,7 @@ test('request call contract', function (t) {
 })
 
 test('run request through its paces', function (t) {
-  t.plan(28)
+  t.plan(29)
 
   server.expect('/request-defaults', function (req, res) {
     t.equal(req.method, 'GET', 'uses GET by default')