Merge pull request #4 from shaunwarman/simplify-logic

chore: simplify code

Author: shaunwarman

index.js

@@ -24,14 +24,9 @@ module.exports = function(opts) {
   return (str, prop = 'path') => {
     let output = opts.prepend + str;
     try {
-      if (!PROD) manifest = require(opts.manifest);
-      if (typeof manifest[str] === 'string') {
-        output = opts.prepend + String(manifest[str] || str);
-      } else if (typeof manifest[str] === 'object') {
-        const val = String((manifest[str] && manifest[str][prop]) || str);
-        if (prop === 'path') return opts.prepend + val;
-        output = PROD ? val : false;
-      }
+      const val = String((manifest[str] && manifest[str][prop]) || str);
+      if (prop === 'path') return opts.prepend + val;
+      output = PROD ? val : false;
     } catch (err) {}
 
     return output;

test/test.js

@@ -13,17 +13,6 @@ test('throws error without opts.manifest string', t => {
   t.is(error.message, '`manifest` property is required');
 });
 
-test('throws error with opts.prepend non-string with old format', t => {
-  const manifest = path.join(__dirname, 'fixtures', 'old-rev-manifest.json');
-  const error = t.throws(() =>
-    manifestRev({
-      manifest,
-      prepend: true
-    })
-  );
-  t.is(error.message, '`prepend` property defined, but it was not a string');
-});
-
 test('throws error with opts.prepend non-string with new format', t => {
   const manifest = path.join(__dirname, 'fixtures', 'rev-manifest.json');
   const error = t.throws(() =>
@@ -35,59 +24,26 @@ test('throws error with opts.prepend non-string with new format', t => {
   t.is(error.message, '`prepend` property defined, but it was not a string');
 });
 
-test('exposes manifest function with old format', t => {
-  const manifest = path.join(__dirname, 'fixtures', 'old-rev-manifest.json');
-  t.true(typeof manifestRev({ manifest }) === 'function');
-});
-
 test('exposes manifest function with new format', t => {
   const manifest = path.join(__dirname, 'fixtures', 'rev-manifest.json');
   t.true(typeof manifestRev({ manifest }) === 'function');
 });
 
-test('returns output when manifest invoked with old format', t => {
-  const manifest = path.join(__dirname, 'fixtures', 'old-rev-manifest.json');
-  t.is(manifestRev({ manifest })('script.js'), '/script-d80c4dea53.js');
-});
-
 test('returns output when manifest invoked with new format', t => {
   const manifest = path.join(__dirname, 'fixtures', 'rev-manifest.json');
   t.is(manifestRev({ manifest })('script.js'), '/script-d80c4dea53.js');
 });
 
-test('returns output of path when manifest invoked with old format', t => {
-  const manifest = path.join(__dirname, 'fixtures', 'old-rev-manifest.json');
-  t.is(manifestRev({ manifest })('script.js', 'path'), '/script-d80c4dea53.js');
-});
-
 test('returns output of path when manifest invoked with new format', t => {
   const manifest = path.join(__dirname, 'fixtures', 'rev-manifest.json');
   t.is(manifestRev({ manifest })('script.js', 'path'), '/script-d80c4dea53.js');
 });
 
-test('returns output of integrity when manifest invoked with old format', t => {
-  const manifest = path.join(__dirname, 'fixtures', 'old-rev-manifest.json');
-  t.is(
-    manifestRev({ manifest })('script.js', 'integrity'),
-    '/script-d80c4dea53.js'
-  );
-});
-
 test('returns output of integrity when manifest invoked with new format', t => {
   const manifest = path.join(__dirname, 'fixtures', 'rev-manifest.json');
   t.is(manifestRev({ manifest })('script.js', 'integrity'), false);
 });
 
-test('returns output of integrity when manifest invoked in PROD with old format', t => {
-  const manifest = path.join(__dirname, 'fixtures', 'old-rev-manifest.json');
-  process.env.NODE_ENV = 'production';
-  t.is(
-    manifestRev({ manifest })('script.js', 'integrity'),
-    '/script-d80c4dea53.js'
-  );
-  delete process.env.NODE_ENV;
-});
-
 test('returns output of integrity when manifest invoked in PROD with new format', t => {
   const manifest = path.join(__dirname, 'fixtures', 'rev-manifest.json');
   process.env.NODE_ENV = 'production';