Merge pull request #9 from strange-studios/make-html-selectors-configurable

Make html selectors configurable

Author: Aaron Chambers

index.js

@@ -27,7 +27,25 @@ module.exports = {
           return context.project.root;
         },
         distDir: function(context) {
-          return context.distDir;
+          return context.distDir || 'tmp/deploy-dist';
+        },
+        jsonBlueprint: {
+          base: {
+            selector: 'base',
+            attributes: ['href']
+          },
+          meta: {
+            selector: 'meta[name*="/config/environment"]',
+            attributes: ['name', 'content']
+          },
+          link: {
+            selector: 'link',
+            attributes: ['rel', 'href']
+          },
+          script: {
+            selector: 'script',
+            attributes: ['src']
+          }
         }
       },
 

lib/utilities/extract-index-config.js

@@ -23,12 +23,16 @@ function _get($, selector, attributes) {
 
 module.exports = function(data) {
   var $ = cheerio.load(data.toString());
-  var json = {
-    base: _get($, 'base', ['href']),
-    meta: _get($, 'meta[name*="/config/environment"]', ['name', 'content']),
-    link: _get($, 'link', ['rel', 'href']),
-    script: _get($, 'script', ['src'])
-  };
+  var blueprint = this.readConfig('jsonBlueprint');
+  var json = {};
+
+  for(var prop in blueprint) {
+    var value = blueprint[prop];
+
+    if (value.selector && value.attributes) {
+      json[prop] = _get($, value.selector, value.attributes);
+    }
+  }
 
   return RSVP.resolve(JSON.stringify(json));
 };

tests/unit/index-nodetest.js

@@ -53,6 +53,7 @@ describe('the deploy plugin object', function() {
   });
 
   it('implements the correct hooks', function() {
+    assert.equal(typeof plugin.configure, 'function');
     assert.equal(typeof plugin.didBuild, 'function');
   });
 

tests/unit/lib/utilities/extract-index-config-nodetest.js

@@ -12,16 +12,28 @@ describe('extract-index-config', function() {
   it('extracts the correct config', function() {
     var contents = fs.readFileSync(process.cwd() + '/tests/fixtures/dist/index.html');
 
-    return assert.isFulfilled(subject(contents))
+    var plugin = {
+      readConfig: function(key) {
+        return {
+          base: {
+            selector: 'base',
+            attributes: ['href']
+          },
+          script: {
+            selector: 'script',
+            attributes: ['src']
+          }
+        };
+      }
+    };
+
+    return assert.isFulfilled(subject.call(plugin, contents))
       .then(function(config) {
         var json = JSON.parse(config);
 
-        assert.equal(Object.keys(json).length, 4);
+        assert.equal(Object.keys(json).length, 2);
 
         assert.deepEqual(json.base[0], { href: '/' });
-        assert.deepEqual(json.meta[0], { name: 'my-app/config/environment', content: 'some-config-values' });
-        assert.deepEqual(json.link[0], { rel: 'stylesheet', href: 'assets/vendor.css' });
-        assert.deepEqual(json.link[1], { rel: 'stylesheet', href: 'assets/app.css' });
         assert.deepEqual(json.script[0], { src: 'assets/vendor.js' });
         assert.deepEqual(json.script[1], { src: 'assets/app.js' });
       });