github/bower
1
1
Fork 0
mirror of https://github.com/bower/bower.git synced 2026-04-24 03:00:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix reading versions from cache directory.

Browse Source 
When we write into directory we use encodeURIComponent, but when we read, we did nothing. Now we use decodeURIComponent to read the correct version and match the correct cache directory.
This commit is contained in:
Greg Bergé
2014-01-27 22:49:58 +01:00
parent 703ac13185
commit 3dbddfba41
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/core/ResolveCache.js
View File

@@ -76,7 +76,7 @@ ResolveCache.prototype.retrieve = function (source, target) {
}
// Resolve with canonical dir and package meta
canonicalDir = path.join(dir, version);
canonicalDir = path.join(dir, encodeURIComponent(version));
return that._readPkgMeta(canonicalDir)
.then(function (pkgMeta) {
return [canonicalDir, pkgMeta];
@@ -346,6 +346,7 @@ ResolveCache.prototype._getVersions = function (sourceId) {
.then(function (versions) {
// Sort and cache in memory
that._sortVersions(versions);
versions = versions.map(decodeURIComponent);
that._cache.set(sourceId, versions);
return [versions, false];
}, function (err) {

18
test/core/resolveCache.js
View File

@@ -529,6 +529,7 @@ describe('ResolveCache', function () {
var sourceId = md5(source);
var sourceDir = path.join(cacheDir, sourceId);
var json = { name: 'foo' };
var encoded;
// Create some versions
fs.mkdirSync(sourceDir);
@@ -538,22 +539,25 @@ describe('ResolveCache', function () {
fs.writeFileSync(path.join(sourceDir, '0.1.0', '.bower.json'), JSON.stringify(json, null, ' '));
json.version = '0.1.0+build.4';
fs.mkdirSync(path.join(sourceDir, '0.1.0+build.4'));
fs.writeFileSync(path.join(sourceDir, '0.1.0+build.4', '.bower.json'), JSON.stringify(json, null, ' '));
encoded = encodeURIComponent('0.1.0+build.4');
fs.mkdirSync(path.join(sourceDir, encoded));
fs.writeFileSync(path.join(sourceDir, encoded, '.bower.json'), JSON.stringify(json, null, ' '));
json.version = '0.1.0+build.5';
fs.mkdirSync(path.join(sourceDir, '0.1.0+build.5'));
fs.writeFileSync(path.join(sourceDir, '0.1.0+build.5', '.bower.json'), JSON.stringify(json, null, ' '));
encoded = encodeURIComponent('0.1.0+build.5');
fs.mkdirSync(path.join(sourceDir, encoded));
fs.writeFileSync(path.join(sourceDir, encoded, '.bower.json'), JSON.stringify(json, null, ' '));
json.version = '0.1.0+build.6';
fs.mkdirSync(path.join(sourceDir, '0.1.0+build.6'));
fs.writeFileSync(path.join(sourceDir, '0.1.0+build.6', '.bower.json'), JSON.stringify(json, null, ' '));
encoded = encodeURIComponent('0.1.0+build.6');
fs.mkdirSync(path.join(sourceDir, encoded));
fs.writeFileSync(path.join(sourceDir, encoded, '.bower.json'), JSON.stringify(json, null, ' '));
resolveCache.retrieve(source, '0.1.0+build.5')
.spread(function (canonicalDir, pkgMeta) {
expect(pkgMeta).to.be.an('object');
expect(pkgMeta.version).to.equal('0.1.0+build.5');
expect(canonicalDir).to.equal(path.join(sourceDir, '0.1.0+build.5'));
expect(canonicalDir).to.equal(path.join(sourceDir, encodeURIComponent('0.1.0+build.5')));
next();
})