Handle fallbackRegistryUrl for ~info and ~preview

src/registry/domain/url-builder.js

@@ -4,6 +4,22 @@ var querystring = require('querystring');
 var url = require('url');
 var _ = require('underscore');
 
+function componentForType(component, baseUrl, type) {
+  if (_.isString(component)) {
+    component = {name: component};
+  }
+
+  var href = url.resolve(baseUrl, component.name) + '/';
+
+  if (!!component.version) {
+    href += component.version + '/';
+  }
+
+  href += '~' + type;
+
+  return href;
+}
+
 var build = {
   component: function (component, baseUrl) {
     if (_.isString(component)) {
@@ -20,17 +36,15 @@ var build = {
 
     return componentUrl;
   },
+  componentInfo: function (component, baseUrl) {
+    return componentForType(component, baseUrl, 'info');
+  },
   componentPreview: function (component, baseUrl) {
-    var href = baseUrl + component.name + '/';
-
-    if(!!component.version){
-      href += component.version + '/';
-    }
-
-    href += '~preview/';
-
+    var href = componentForType(component, baseUrl, 'preview');
     if (!!component.parameters && !_.isEmpty(component.parameters)) {
-      href += '?' + querystring.stringify(component.parameters);
+      href += '/?' + querystring.stringify(component.parameters);
+    } else {
+      href += '/';
     }
 
     return href;

src/registry/router.js

@@ -16,8 +16,8 @@ module.exports.create = function(app, conf, repository){
   var routes = {
     component: new ComponentRoute(conf, repository),
     components: new ComponentsRoute(conf, repository),
-    componentInfo: new ComponentInfoRoute(repository),
-    componentPreview: new ComponentPreviewRoute(repository),
+    componentInfo: new ComponentInfoRoute(conf, repository),
+    componentPreview: new ComponentPreviewRoute(conf, repository),
     listComponents: new ListComponentsRoute(repository),
     publish: new PublishRoute(repository),
     staticRedirector: new StaticRedirectorRoute(repository)

src/registry/routes/component-info.js

@@ -4,25 +4,10 @@ var parseAuthor = require('parse-author');
 var _ = require('underscore');
 
 var urlBuilder = require('../domain/url-builder');
+var getComponentFallback = require('./helpers/get-component-fallback');
 
-module.exports = function(repository){
-  return function(req, res){
-
-    repository.getComponent(req.params.componentName, req.params.componentVersion, function(err, component){
-
-      if(err){
-        res.errorDetails = err;
-        return res.status(404).json({ err: err });
-      }
-
-      var isHtmlRequest = !!req.headers.accept && req.headers.accept.indexOf('text/html') >= 0;
-
-      if(isHtmlRequest && !!res.conf.discovery){
-
-        var params = {},
-            author = component.author || {},
-            parsedAuthor = _.isString(author) ? parseAuthor(author) : author;
-
+function getParams(component) {
+  var params = {};
   if(!!component.oc.parameters){
     var mandatoryParams = _.filter(_.keys(component.oc.parameters), function(paramName){
       var param = component.oc.parameters[paramName];
@@ -34,6 +19,15 @@ module.exports = function(repository){
     });
   }
 
+  return params;
+}
+
+function getParsedAuthor(component) {
+  var author = component.author || {};
+  return _.isString(author) ? parseAuthor(author) : author;
+}
+
+function addGetRepositoryUrlFunction(component) {
   component.getRepositoryUrl = function() {
     if (_.isObject(this.repository)) {
       if (this.repository.url) {
@@ -45,6 +39,21 @@ module.exports = function(repository){
     }
     return null;
   };
+}
+
+function componentInfo(err, req, res, component) {
+  if(err) {
+    res.errorDetails = err.registryError || err;
+    return res.status(404).json(err);
+  }
+
+  var isHtmlRequest = !!req.headers.accept && req.headers.accept.indexOf('text/html') >= 0;
+
+  if(isHtmlRequest && !!res.conf.discovery){
+
+    var params = getParams(component);
+    var parsedAuthor = getParsedAuthor(component);
+    addGetRepositoryUrlFunction(component);
 
     return res.render('component-info', {
       component: component,
@@ -59,6 +68,18 @@ module.exports = function(repository){
       requestVersion: req.params.componentVersion || ''
     }));
   }
+}
+
+module.exports = function(conf, repository){
+  return function(req, res){
+    repository.getComponent(req.params.componentName, req.params.componentVersion, function(registryError, component){
+      if(registryError && conf.fallbackRegistryUrl) {
+        return getComponentFallback.getComponentInfo(conf, req, res, registryError, function(fallbackError, fallbackComponent){
+          componentInfo(fallbackError, req, res, fallbackComponent);
+        });
+      }
+
+      componentInfo(registryError, req, res, component);
     });
   };
 };

src/registry/routes/component-preview.js

@@ -3,16 +3,13 @@
 var _ = require('underscore');
 
 var urlBuilder = require('../domain/url-builder');
+var getComponentFallback = require('./helpers/get-component-fallback');
 
-module.exports = function(repository){
-  return function(req, res){
-
-    repository.getComponent(req.params.componentName, req.params.componentVersion, function(err, component){
-
+function componentPreview(err, req, res, component) {
     if(err) {
-        res.errorDetails = err;
+        res.errorDetails = err.registryError || err;
         res.errorCode = 'NOT_FOUND';
-        return res.status(404).json({ err: err });
+        return res.status(404).json(err);
     }
 
     var isHtmlRequest = !!req.headers.accept && req.headers.accept.indexOf('text/html') >= 0;
@@ -31,6 +28,21 @@ module.exports = function(repository){
             requestVersion: req.params.componentVersion || ''
         }));
     }
+}
+
+module.exports = function(conf, repository){
+  return function(req, res){
+
+    repository.getComponent(req.params.componentName, req.params.componentVersion, function(registryError, component){
+
+      if(registryError && conf.fallbackRegistryUrl) {
+        return getComponentFallback.getComponentPreview(conf, req, res, registryError, function(fallbackError, fallbackComponent){
+            componentPreview(fallbackError, req, res, fallbackComponent);
+        });
+      }
+
+      componentPreview(registryError, req, res, component);
+
     });
   };
 };

src/registry/routes/helpers/get-component-fallback.js

@@ -2,9 +2,41 @@
 
 var request = require('minimal-request');
 var url = require('url');
+var urlBuilder = require('../../domain/url-builder');
 var _ = require('underscore');
 
-module.exports = function(fallbackRegistryUrl, headers, component, callback) {
+function getComponentFallbackForViewType(buildUrl, conf, req, res, registryError, callback) {
+  var path = buildUrl({
+    name: req.params.componentName,
+    version: req.params.componentVersion
+  }, conf.fallbackRegistryUrl);
+
+  return request({
+    method: 'get',
+    url: path,
+    headers: _.extend({}, req.headers, {
+      'host': url.parse(conf.fallbackRegistryUrl).host,
+      'accept': 'application/json'
+    })
+  }, function (fallbackErr, fallbackResponse) {
+    if (fallbackErr === 304) {
+      return res.status(304).send('');
+    }
+
+    if (fallbackErr) {
+      return callback({registryError: registryError, fallbackError: fallbackErr});
+    }
+
+    try {
+      return callback(null, JSON.parse(fallbackResponse));
+    } catch (parseError) {
+      return callback({registryError: registryError, fallbackError: 'Could not parse fallback response: ' + fallbackResponse});
+    }
+  });
+}
+
+module.exports = {
+  getComponent: function (fallbackRegistryUrl, headers, component, callback) {
     return request({
       method: 'post',
       url: fallbackRegistryUrl,
@@ -28,4 +60,11 @@ module.exports = function(fallbackRegistryUrl, headers, component, callback) {
 
       return callback(res[0]);
     });
+  },
+  getComponentPreview: function (conf, req, res, registryError, callback) {
+    getComponentFallbackForViewType(urlBuilder.componentPreview, conf, req, res, registryError, callback);
+  },
+  getComponentInfo: function (conf, req, res, registryError, callback) {
+    getComponentFallbackForViewType(urlBuilder.componentInfo, conf, req, res, registryError, callback);
+  }
 };

src/registry/routes/helpers/get-component.js

@@ -76,7 +76,7 @@ module.exports = function(conf, repository){
       // check route exist for component and version
       if(err){
         if(conf.fallbackRegistryUrl) {
-          return getComponentFallback(conf.fallbackRegistryUrl, options.headers, requestedComponent, callback);
+          return getComponentFallback.getComponent(conf.fallbackRegistryUrl, options.headers, requestedComponent, callback);
         }
 
         return callback({

test/acceptance/registry/registry-with-fallback.js

@@ -83,5 +83,41 @@ describe('registry', function(){
         expect(result.html).to.equal('Hello world!');
       });
     });
+
+    describe('GET /fallback-hello-world/~info', function(){
+
+      before(function(done){
+        request({
+          url: 'http://localhost:3030/fallback-welcome-with-optional-parameters/~info',
+          json: true
+        }, next(done));
+      });
+
+      it('should respond with requested component', function(){
+        expect(result.name).to.eql('fallback-welcome-with-optional-parameters');
+      });
+
+      it('should respond with components parameters', function(){
+        expect(Object.keys(result.oc.parameters).length).to.equal(3);
+      });
+    });
+
+    describe('GET /fallback-hello-world/~preview', function(){
+
+      before(function(done){
+        request({
+          url: 'http://localhost:3030/fallback-welcome-with-optional-parameters/~preview',
+          json: true
+        }, next(done));
+      });
+
+      it('should respond with requested component', function(){
+        expect(result.name).to.eql('fallback-welcome-with-optional-parameters');
+      });
+
+      it('should respond with components parameters', function(){
+        expect(Object.keys(result.oc.parameters).length).to.equal(3);
+      });
+    });
   });
 });

test/fixtures/fallback-registry-components/fallback-welcome-with-optional-parameters/.npmignore

@@ -0,0 +1,3 @@
+_package
+package.tar.gz
+node_modules

test/fixtures/fallback-registry-components/fallback-welcome-with-optional-parameters/_package/package.json

@@ -0,0 +1,44 @@
+{
+  "name": "fallback-welcome-with-optional-parameters",
+  "description": "",
+  "version": "1.0.0",
+  "repository": "",
+  "oc": {
+    "container": false,
+    "files": {
+      "template": {
+        "type": "jade",
+        "hashKey": "ab16fc5f93c027e4ce2f30db29b9f93586bd1af9",
+        "src": "template.js"
+      },
+      "dataProvider": {
+        "type": "node.js",
+        "hashKey": "c10781cef3d4df94e5198d719f446c04a9798ebf",
+        "src": "server.js"
+      },
+      "static": []
+    },
+    "parameters": {
+      "firstName": {
+        "type": "string",
+        "mandatory": true,
+        "example": "John"
+      },
+      "lastName": {
+        "type": "string",
+        "mandatory": false,
+        "example": "Smith"
+      },
+      "nick": {
+        "type": "string",
+        "mandatory": false,
+        "example": "Smith",
+        "default": "Johnny"
+      }
+    },
+    "renderInfo": false,
+    "version": "0.33.12",
+    "packaged": true,
+    "date": 1476562431977
+  }
+}

test/fixtures/fallback-registry-components/fallback-welcome-with-optional-parameters/package.json

@@ -0,0 +1,35 @@
+{
+  "name": "fallback-welcome-with-optional-parameters",
+  "description": "",
+  "version": "1.0.0",
+  "repository": "",
+  "oc": {
+    "container": false,
+    "files": {
+      "data": "server.js",
+      "template": {
+        "src": "template.jade",
+        "type": "jade"
+      }
+    },
+    "parameters": {
+      "firstName": {
+        "type": "string",
+        "mandatory": true,
+        "example": "John"
+      },
+      "lastName": {
+        "type": "string",
+        "mandatory": false,
+        "example": "Smith"
+      },
+      "nick": {
+        "type": "string",
+        "mandatory": false,
+        "example": "Smith",
+        "default": "Johnny"
+      }
+    },
+    "renderInfo": false
+  }
+}

test/fixtures/fallback-registry-components/fallback-welcome-with-optional-parameters/server.js

@@ -0,0 +1,9 @@
+'use strict';
+
+module.exports.data = function(context, callback){
+  callback(null, {
+    firstName: context.params.firstName,
+    lastName: context.params.lastName,
+    nick: context.params.nick
+  });
+};