0&&n(r,0)})},oc.load=function(e,r,n){oc.ready(function(){if("function"!=typeof n&&(n=b),o(e)){o(e).html("<"+l+' href="'+r+'" />');var t=o(l,e);oc.renderNestedComponent(t,function(){n(t)})}})},oc.ready(oc.renderUnloadedComponents)}(head,document,window);
\ No newline at end of file
+'use strict';
+
+var oc = oc || {};
+
+(function(head, $document, $window){
+
+ oc.conf = oc.conf || {};
+ oc.cmd = oc.cmd || [];
+
+ // Constants
+ var CDNJS_BASEURL = 'https://cdnjs.cloudflare.com/ajax/libs/',
+ IE89_AJAX_POLYFILL_URL = CDNJS_BASEURL + 'jquery-ajaxtransport-xdomainrequest/1.0.3/jquery.xdomainrequest.min.js',
+ HANDLEBARS_URL = CDNJS_BASEURL + 'handlebars.js/3.0.1/handlebars.runtime.js',
+ JADE_URL = CDNJS_BASEURL + 'jade/1.9.2/runtime.min.js',
+ JQUERY_URL = CDNJS_BASEURL + 'jquery/1.11.2/jquery.min.js',
+ RETRY_INTERVAL = oc.conf.retryInterval || 5000,
+ POLLING_INTERVAL = oc.conf.pollingInterval || 500,
+ OC_TAG = oc.conf.tag || 'oc-component',
+ MESSAGES_ERRORS_HREF_MISSING = 'Href parameter missing',
+ MESSAGES_ERRORS_LOADING_COMPILED_VIEW = 'Error getting compiled view: {0}',
+ MESSAGES_ERRORS_RENDERING = 'Error rendering component: {0}, error: {1}',
+ MESSAGES_ERRORS_RETRIEVING = 'Failed to retrieve the component. Retrying in {0} seconds...'.replace('{0}', RETRY_INTERVAL/1000),
+ MESSAGES_ERRORS_VIEW_ENGINE_NOT_SUPPORTED = 'Error loading component: view engine "{0}" not supported',
+ MESSAGES_LOADING_COMPONENT = 'Loading...',
+ MESSAGES_RENDERED = 'Component \'{0}\' correctly rendered',
+ MESSAGES_RETRIEVING = 'Unrendered component found. Trying to retrieve it...';
+
+ // The code
+ var debug = oc.conf.debug || false,
+ headScripts = [],
+ $,
+ noop = function(){},
+ nav = $window.navigator.userAgent,
+ is8 = !!(nav.match(/MSIE 8/)),
+ is9 = !!(nav.match(/MSIE 9/)),
+ initialised = false,
+ initialising = false;
+
+ var logger = {
+ error: function(msg){
+ return console.log(msg);
+ },
+ info: function(msg){
+ return !!debug ? console.log(msg) : false;
+ }
+ };
+
+ // A minimal require.js-ish that uses head.js
+ oc.require = function(nameSpace, url, callback){
+ if(typeof(url) === 'function'){
+ callback = url;
+ url = nameSpace;
+ nameSpace = undefined;
+ }
+
+ if(typeof(nameSpace) === 'string'){
+ nameSpace = [nameSpace];
+ }
+
+ var needsToBeLoaded = function(){
+ var base = $window;
+
+ if(typeof(nameSpace) === 'undefined'){
+ return true;
+ }
+
+ for(var i = 0; i < nameSpace.length; i++){
+ base = base[nameSpace[i]];
+ if(!base){
+ return true;
+ }
+ }
+
+ return false;
+ };
+
+ var getObj = function(){
+ var base = $window;
+
+ if(typeof(nameSpace) === 'undefined'){
+ return undefined;
+ }
+
+ for(var i = 0; i < nameSpace.length; i++){
+ base = base[nameSpace[i]];
+ if(!base){
+ return undefined;
+ }
+ }
+
+ return base;
+ };
+
+ if(needsToBeLoaded()){
+ head.load(url, function(){
+ callback(getObj());
+ });
+ } else {
+ callback(getObj());
+ }
+ };
+
+
+ var processHtml = function($component, data, callback){
+
+ var newId = Math.floor(Math.random()*9999999999);
+
+ $component.html(data.html);
+ $component.attr('id', newId);
+ $component.attr('data-rendered', true);
+ $component.attr('data-rendering', false);
+ $component.attr('data-version', data.version);
+
+ if(!!data.key){
+ $component.attr('data-hash', data.key);
+ }
+
+ callback();
+ };
+
+ oc.build = function(options){
+
+ if(!options.baseUrl){
+ throw 'baseUrl parameter is required';
+ }
+
+ if(!options.name){
+ throw 'name parameter is required';
+ }
+
+ var withFinalSlash = function(s){
+ s = s || '';
+
+ if(s.slice(-1) !== '/'){
+ s += '/';
+ }
+
+ return s;
+ };
+
+ var href = withFinalSlash(options.baseUrl) + withFinalSlash(options.name);
+
+ if(!!options.version){
+ href += withFinalSlash(options.version);
+ }
+
+ if(!!options.parameters){
+ href += '?';
+ for(var parameter in options.parameters){
+ if(options.parameters.hasOwnProperty(parameter)){
+ href += parameter + '=' + options.parameters[parameter] + '&';
+ }
+ }
+ href = href.slice(0, -1);
+ }
+
+ return '<' + OC_TAG + ' href="' + href + '">';
+
+ };
+
+ oc.ready = function(callback){
+
+ if(initialised){
+ return callback();
+ } else if(initialising) {
+ oc.cmd.push(callback);
+ } else {
+
+ initialising = true;
+
+ var requirePolyfills = function(cb){
+ if((is8 || is9) && !$.IE_POLYFILL_LOADED){
+ oc.require(IE89_AJAX_POLYFILL_URL, cb);
+ } else {
+ cb();
+ }
+ };
+
+ var done = function(){
+ initialised = true;
+ initialising = false;
+ callback();
+ for(var i = 0; i < oc.cmd.length; i++){
+ oc.cmd[i](oc);
+ }
+ };
+
+ oc.require('jQuery', JQUERY_URL, function(jQuery){
+ $ = jQuery;
+ requirePolyfills(done);
+ });
+ }
+ };
+
+ oc.render = function(compiledViewInfo, model, callback){
+ oc.ready(function(){
+ if(!!compiledViewInfo.type.match(/jade|handlebars/g)){
+ oc.require(['oc', 'components', compiledViewInfo.key], compiledViewInfo.src, function(compiledView){
+ if(!compiledView){
+ callback(MESSAGES_ERRORS_LOADING_COMPILED_VIEW.replace('{0}', compiledViewInfo.src));
+ } else {
+ if(compiledViewInfo.type === 'handlebars'){
+ oc.require('Handlebars', HANDLEBARS_URL, function(Handlebars){
+ var linkedComponent = Handlebars.template(compiledView, []);
+ callback(null, linkedComponent(model));
+ });
+ } else if(compiledViewInfo.type === 'jade'){
+ oc.require('jade', JADE_URL, function(jade){
+ callback(null, compiledView(model));
+ });
+ }
+ }
+ });
+ } else {
+ callback(MESSAGES_ERRORS_VIEW_ENGINE_NOT_SUPPORTED.replace('{0}', compiledViewInfo.type));
+ }
+ });
+ };
+
+ oc.renderNestedComponent = function($component, callback){
+ oc.ready(function(){
+ var dataRendering = $component.attr('data-rendering'),
+ dataRendered = $component.attr('data-rendered'),
+ isRendering = typeof(dataRendering) === 'boolean' ? dataRendering : (dataRendering === 'true'),
+ isRendered = typeof(dataRendered) === 'boolean' ? dataRendered : (dataRendered === 'true');
+
+ if(!isRendering && !isRendered){
+ logger.info(MESSAGES_RETRIEVING);
+ $component.attr('data-rendering', true);
+ $component.html('' + MESSAGES_LOADING_COMPONENT + '
');
+
+ oc.renderByHref($component.attr('href'), function(err, data){
+ if(err || !data || !data.html){
+ return logger.error(err);
+ }
+
+ processHtml($component, data, callback);
+ });
+ } else {
+ setTimeout(callback, POLLING_INTERVAL);
+ }
+ });
+ };
+
+ oc.renderByHref = function(href, callback){
+ oc.ready(function(){
+ if(href !== ''){
+ $.ajax({
+ url: href,
+ headers: { 'Accept': 'application/vnd.oc.prerendered+json' },
+ contentType: 'text/plain',
+ crossDomain: true,
+ async: true,
+ success: function(apiResponse){
+ if(apiResponse.renderMode === 'pre-rendered'){
+ oc.render(apiResponse.template, apiResponse.data, function(err, html){
+ if(err){
+ return callback(MESSAGES_ERRORS_RENDERING.replace('{0}', apiResponse.href).replace('{1}', err));
+ }
+ logger.info(MESSAGES_RENDERED.replace('{0}', apiResponse.template.src));
+ callback(null, {
+ html: html,
+ key: apiResponse.template.key,
+ version: apiResponse.version
+ });
+ });
+ } else if(apiResponse.renderMode === 'rendered'){
+ logger.info(MESSAGES_RENDERED.replace('{0}', apiResponse.href));
+
+ if(apiResponse.html.indexOf('<' + OC_TAG) === 0){
+
+ var innerHtmlPlusEnding = apiResponse.html.slice(apiResponse.html.indexOf('>') + 1),
+ innerHtml = innerHtmlPlusEnding.slice(0, innerHtmlPlusEnding.lastIndexOf('<'));
+ apiResponse.html = innerHtml;
+ }
+
+ callback(null, {
+ html: apiResponse.html,
+ version: apiResponse.version
+ });
+ }
+ },
+ error: function(){
+ logger.error(MESSAGES_ERRORS_RETRIEVING);
+ setTimeout(function() {
+ oc.renderByHref(href, callback);
+ }, RETRY_INTERVAL);
+ }
+ });
+ } else {
+ return callback(MESSAGES_ERRORS_RENDERING.replace('{1}', MESSAGES_ERRORS_HREF_MISSING));
+ }
+ });
+ };
+
+ oc.renderUnloadedComponents = function(){
+ oc.ready(function(){
+ var selector = (is8 ? 'div[data-oc-component=true]' : OC_TAG),
+ $unloadedComponents = $(selector + '[data-rendered!=true]');
+
+ var renderUnloadedComponent = function($unloadedComponents, i){
+ oc.renderNestedComponent($($unloadedComponents[i]), function(){
+ i++;
+ if(i < $unloadedComponents.length){
+ renderUnloadedComponent($unloadedComponents, i);
+ } else {
+ oc.renderUnloadedComponents();
+ }
+ });
+ };
+
+ if($unloadedComponents.length > 0){
+ renderUnloadedComponent($unloadedComponents, 0);
+ }
+ });
+ };
+
+ oc.load = function(placeholder, href, callback){
+ oc.ready(function(){
+ if(typeof(callback) !== 'function'){
+ callback = noop;
+ }
+
+ if($(placeholder)){
+ $(placeholder).html('<' + OC_TAG + ' href="' + href + '" />');
+ var newComponent = $(OC_TAG, placeholder);
+ oc.renderNestedComponent(newComponent, function(){
+ callback(newComponent);
+ });
+ }
+ });
+ };
+
+ oc.ready(oc.renderUnloadedComponents);
+
+})(head, document, window); // jshint ignore:line
\ No newline at end of file
diff --git a/registry/domain/repository.js b/registry/domain/repository.js
index 1cd29d61b..c08a404d3 100644
--- a/registry/domain/repository.js
+++ b/registry/domain/repository.js
@@ -8,7 +8,7 @@ var path = require('path');
var S3 = require('./s3');
var settings = require('../../resources/settings');
var strings = require('../../resources');
-var validator = require('./validator');
+var validator = require('./validators');
var versionHandler = require('./version-handler');
var _ = require('underscore');
diff --git a/registry/domain/validator.js b/registry/domain/validator.js
deleted file mode 100644
index 81bbb997b..000000000
--- a/registry/domain/validator.js
+++ /dev/null
@@ -1,197 +0,0 @@
-'use strict';
-
-var format = require('stringformat');
-var semver = require('semver');
-var strings = require('../../resources');
-var _ = require('underscore');
-
-var validate = {
- booleanParameter: function(booleanParameter){
- return _.isBoolean(booleanParameter);
- },
-
- numberParameter: function(numberParameter){
- return !!numberParameter && _.isNumber(numberParameter);
- },
-
- parameter: function(parameter, expectedType){
- var expected = expectedType.toLowerCase();
-
- if(_.contains(['string', 'boolean', 'number'], expected)){
- return validate[expected + 'Parameter'](parameter);
- }
-
- return false;
- },
-
- stringParameter: function(stringParameter){
- return !!stringParameter && _.isString(stringParameter) && stringParameter !== '';
- }
-};
-
-module.exports = {
- validateComponentName: function(componentName){
- return !/[^a-zA-Z0-9\-\_]/.test(componentName);
- },
- validateTemplateType: function(templateType){
- return _.contains(['handlebars', 'jade'], templateType);
- },
- validateComponentParameters: function(requestParameters, expectedParameters){
-
- var result = { isValid: true, errors: {} },
- mandatoryParameters = [];
-
- _.forEach(expectedParameters, function(expectedParameter, expectedParameterName){
- if(expectedParameter.mandatory){
- mandatoryParameters.push(expectedParameterName);
- }
- }, this);
-
- _.forEach(mandatoryParameters, function(mandatoryParameterName){
- if(!_.has(requestParameters, mandatoryParameterName)){
- if(!result.errors.mandatory){
- result.errors.mandatory = {};
- result.isValid = false;
- }
-
- result.errors.mandatory[mandatoryParameterName] = strings.errors.registry.MANDATORY_PARAMETER_MISSING_CODE;
- }
- }, this);
-
- _.forEach(requestParameters, function(requestParameter, requestParameterName){
- if(_.has(expectedParameters, requestParameterName)){
-
- var expectedType = expectedParameters[requestParameterName].type;
-
- if(!validate.parameter(requestParameter, expectedType)){
- if(!result.errors.types){
- result.errors.types = {};
- result.isValid = false;
- }
-
- result.errors.types[requestParameterName] = strings.errors.registry.PARAMETER_WRONG_FORMAT_CODE;
- }
- }
- }, this);
-
- result.errors.message = (function(){
- var errorString = '';
-
- if(_.keys(result.errors.mandatory).length > 0){
-
- var missingParams = _.map(result.errors.mandatory, function(mandatoryParameter, mandatoryParameterName){
- return mandatoryParameterName + ', ';
- }).join('').slice(0, -2);
-
- errorString += format(strings.errors.registry.MANDATORY_PARAMETER_MISSING, missingParams);
- }
-
- if(_.keys(result.errors.types).length > 0){
- if(errorString.length > 0){
- errorString += '; ';
- }
-
- var badParams = _.map(result.errors.types, function(parameter, parameterName){
- return parameterName + ', ';
- }).join('').slice(0, -2);
-
- errorString += format(strings.errors.registry.PARAMETER_WRONG_FORMAT, badParams);
- }
- return errorString;
- }());
-
- return result;
- },
- registryConfiguration: function(conf){
-
- var response = { isValid: true };
-
- var returnError = function(message){
- response.isValid = false;
- response.message = message || 'registry configuration is not valid';
- return response;
- };
-
- if(!conf || !_.isObject(conf) || _.keys(conf).length === 0){
- return returnError(strings.errors.registry.CONFIGURATION_EMPTY);
- }
-
- var prefix = conf.prefix;
-
- if(!!prefix){
- if(prefix.substr(0, 1) !== '/'){
- return returnError(strings.errors.registry.CONFIGURATION_PREFIX_DOES_NOT_START_WITH_SLASH);
- }
-
- if(prefix.substr(prefix.length - 1) !== '/'){
- return returnError(strings.errors.registry.CONFIGURATION_PREFIX_DOES_NOT_END_WITH_SLASH);
- }
- }
-
- var publishAuth = conf.publishAuth;
-
- if(!!publishAuth){
- if(publishAuth.type !== 'basic'){
- return returnError(strings.errors.registry.CONFIGURATION_PUBLISH_AUTH_NOT_SUPPORTED);
- } else {
- if(!publishAuth.username || !publishAuth.password){
- return returnError(strings.errors.registry.CONFIGURATION_PUBLISH_AUTH_CREDENTIALS_MISSING);
- }
- }
- }
-
- var dependencies = conf.dependencies;
-
- if(!!dependencies && (!_.isObject(dependencies)) || _.isArray(dependencies)){
- return returnError(strings.errors.registry.CONFIGURATION_DEPENDENCIES_MUST_BE_OBJECT);
- }
-
- var routes = conf.routes;
-
- if(!!routes && !_.isArray(routes)){
- return returnError(strings.errors.registry.CONFIGURATION_ROUTES_MUST_BE_ARRAY);
- } else {
- _.forEach(routes, function(route){
- if(!route.route || !route.handler || !route.method){
- return returnError(strings.errors.registry.CONFIGURATION_ROUTES_NOT_VALID);
- }
-
- if(!_.isFunction(route.handler)){
- return returnError(strings.errors.registry.CONFIGURATION_ROUTES_HANDLER_MUST_BE_FUNCTION);
- }
- });
- }
-
- return response;
- },
- validatePackage: function(input){
- var response = {
- isValid: true
- };
-
- var returnError = function(message){
- response.isValid = false;
- response.message = message || 'uploaded package is not valid';
- return response;
- };
-
- if(!input || !_.isObject(input) || _.keys(input).length === 0){
- return returnError('empty');
- }
-
- if(_.keys(input).length !== 1){
- return returnError('not_valid');
- }
-
- var file = input[_.keys(input)[0]];
-
- if(file.mimetype !== 'application/octet-stream' || !!file.truncated || file.extension !== 'gz' || file.path.indexOf('.tar.gz') < 0){
- return returnError('not_valid');
- }
-
- return response;
- },
- validateVersion: function(version){
- return !!semver.valid(version);
- }
-};
diff --git a/registry/domain/validators/component-parameters.js b/registry/domain/validators/component-parameters.js
new file mode 100644
index 000000000..fd76f3394
--- /dev/null
+++ b/registry/domain/validators/component-parameters.js
@@ -0,0 +1,96 @@
+'use strict';
+
+var format = require('stringformat');
+var strings = require('../../../resources');
+var _ = require('underscore');
+
+var validate = {
+ booleanParameter: function(booleanParameter){
+ return _.isBoolean(booleanParameter);
+ },
+
+ numberParameter: function(numberParameter){
+ return !!numberParameter && _.isNumber(numberParameter);
+ },
+
+ parameter: function(parameter, expectedType){
+ var expected = expectedType.toLowerCase();
+
+ if(_.contains(['string', 'boolean', 'number'], expected)){
+ return validate[expected + 'Parameter'](parameter);
+ }
+
+ return false;
+ },
+
+ stringParameter: function(stringParameter){
+ return !!stringParameter && _.isString(stringParameter) && stringParameter !== '';
+ }
+};
+
+module.exports = function(requestParameters, expectedParameters){
+
+ var result = { isValid: true, errors: {} },
+ mandatoryParameters = [];
+
+ _.forEach(expectedParameters, function(expectedParameter, expectedParameterName){
+ if(expectedParameter.mandatory){
+ mandatoryParameters.push(expectedParameterName);
+ }
+ }, this);
+
+ _.forEach(mandatoryParameters, function(mandatoryParameterName){
+ if(!_.has(requestParameters, mandatoryParameterName)){
+ if(!result.errors.mandatory){
+ result.errors.mandatory = {};
+ result.isValid = false;
+ }
+
+ result.errors.mandatory[mandatoryParameterName] = strings.errors.registry.MANDATORY_PARAMETER_MISSING_CODE;
+ }
+ }, this);
+
+ _.forEach(requestParameters, function(requestParameter, requestParameterName){
+ if(_.has(expectedParameters, requestParameterName)){
+
+ var expectedType = expectedParameters[requestParameterName].type;
+
+ if(!validate.parameter(requestParameter, expectedType)){
+ if(!result.errors.types){
+ result.errors.types = {};
+ result.isValid = false;
+ }
+
+ result.errors.types[requestParameterName] = strings.errors.registry.PARAMETER_WRONG_FORMAT_CODE;
+ }
+ }
+ }, this);
+
+ result.errors.message = (function(){
+ var errorString = '';
+
+ if(_.keys(result.errors.mandatory).length > 0){
+
+ var missingParams = _.map(result.errors.mandatory, function(mandatoryParameter, mandatoryParameterName){
+ return mandatoryParameterName + ', ';
+ }).join('').slice(0, -2);
+
+ errorString += format(strings.errors.registry.MANDATORY_PARAMETER_MISSING, missingParams);
+ }
+
+ if(_.keys(result.errors.types).length > 0){
+ if(errorString.length > 0){
+ errorString += '; ';
+ }
+
+ var badParams = _.map(result.errors.types, function(parameter, parameterName){
+ return parameterName + ', ';
+ }).join('').slice(0, -2);
+
+ errorString += format(strings.errors.registry.PARAMETER_WRONG_FORMAT, badParams);
+ }
+ return errorString;
+ }());
+
+ return result;
+};
\ No newline at end of file
diff --git a/registry/domain/validators/index.js b/registry/domain/validators/index.js
new file mode 100644
index 000000000..2f5eba185
--- /dev/null
+++ b/registry/domain/validators/index.js
@@ -0,0 +1,23 @@
+'use strict';
+
+var componentParametersValidator = require('./component-parameters');
+var registryConfigurationValidator = require('./registry-configuration');
+var uploadedPackageValidator = require('./uploaded-package');
+
+var semver = require('semver');
+var _ = require('underscore');
+
+module.exports = {
+ validateComponentName: function(componentName){
+ return !/[^a-zA-Z0-9\-\_]/.test(componentName) && componentName !== '_package';
+ },
+ validateTemplateType: function(templateType){
+ return _.contains(['handlebars', 'jade'], templateType);
+ },
+ validateComponentParameters: componentParametersValidator,
+ registryConfiguration: registryConfigurationValidator,
+ validatePackage: uploadedPackageValidator,
+ validateVersion: function(version){
+ return !!semver.valid(version);
+ }
+};
diff --git a/registry/domain/validators/registry-configuration.js b/registry/domain/validators/registry-configuration.js
new file mode 100644
index 000000000..2ed5cd02c
--- /dev/null
+++ b/registry/domain/validators/registry-configuration.js
@@ -0,0 +1,67 @@
+'use strict';
+
+var strings = require('../../../resources');
+var _ = require('underscore');
+
+module.exports = function(conf){
+
+ var response = { isValid: true };
+
+ var returnError = function(message){
+ response.isValid = false;
+ response.message = message || 'registry configuration is not valid';
+ return response;
+ };
+
+ if(!conf || !_.isObject(conf) || _.keys(conf).length === 0){
+ return returnError(strings.errors.registry.CONFIGURATION_EMPTY);
+ }
+
+ var prefix = conf.prefix;
+
+ if(!!prefix){
+ if(prefix.substr(0, 1) !== '/'){
+ return returnError(strings.errors.registry.CONFIGURATION_PREFIX_DOES_NOT_START_WITH_SLASH);
+ }
+
+ if(prefix.substr(prefix.length - 1) !== '/'){
+ return returnError(strings.errors.registry.CONFIGURATION_PREFIX_DOES_NOT_END_WITH_SLASH);
+ }
+ }
+
+ var publishAuth = conf.publishAuth;
+
+ if(!!publishAuth){
+ if(publishAuth.type !== 'basic'){
+ return returnError(strings.errors.registry.CONFIGURATION_PUBLISH_AUTH_NOT_SUPPORTED);
+ } else {
+ if(!publishAuth.username || !publishAuth.password){
+ return returnError(strings.errors.registry.CONFIGURATION_PUBLISH_AUTH_CREDENTIALS_MISSING);
+ }
+ }
+ }
+
+ var dependencies = conf.dependencies;
+
+ if(!!dependencies && (!_.isObject(dependencies)) || _.isArray(dependencies)){
+ return returnError(strings.errors.registry.CONFIGURATION_DEPENDENCIES_MUST_BE_OBJECT);
+ }
+
+ var routes = conf.routes;
+
+ if(!!routes && !_.isArray(routes)){
+ return returnError(strings.errors.registry.CONFIGURATION_ROUTES_MUST_BE_ARRAY);
+ } else {
+ _.forEach(routes, function(route){
+ if(!route.route || !route.handler || !route.method){
+ return returnError(strings.errors.registry.CONFIGURATION_ROUTES_NOT_VALID);
+ }
+
+ if(!_.isFunction(route.handler)){
+ return returnError(strings.errors.registry.CONFIGURATION_ROUTES_HANDLER_MUST_BE_FUNCTION);
+ }
+ });
+ }
+
+ return response;
+};
\ No newline at end of file
diff --git a/registry/domain/validators/uploaded-package.js b/registry/domain/validators/uploaded-package.js
new file mode 100644
index 000000000..684c56117
--- /dev/null
+++ b/registry/domain/validators/uploaded-package.js
@@ -0,0 +1,31 @@
+'use strict';
+
+var _ = require('underscore');
+
+module.exports = function(input){
+ var response = {
+ isValid: true
+ };
+
+ var returnError = function(message){
+ response.isValid = false;
+ response.message = message || 'uploaded package is not valid';
+ return response;
+ };
+
+ if(!input || !_.isObject(input) || _.keys(input).length === 0){
+ return returnError('empty');
+ }
+
+ if(_.keys(input).length !== 1){
+ return returnError('not_valid');
+ }
+
+ var file = input[_.keys(input)[0]];
+
+ if(file.mimetype !== 'application/octet-stream' || !!file.truncated || file.extension !== 'gz' || file.path.indexOf('.tar.gz') < 0){
+ return returnError('not_valid');
+ }
+
+ return response;
+};
\ No newline at end of file
diff --git a/registry/index.js b/registry/index.js
index 629e1e8d9..85459b28d 100644
--- a/registry/index.js
+++ b/registry/index.js
@@ -14,7 +14,7 @@ var Repository = require('./domain/repository');
var requestHandler = require('./middleware/request-handler');
var Router = require('./router');
var settings = require('../resources/settings');
-var validator = require('./domain/validator');
+var validator = require('./domain/validators');
var _ = require('underscore');
module.exports = function(options){
diff --git a/registry/routes/component.js b/registry/routes/component.js
index 2c434bddb..f65bd127d 100644
--- a/registry/routes/component.js
+++ b/registry/routes/component.js
@@ -7,7 +7,7 @@ var format = require('stringformat');
var RequireWrapper = require('../domain/require-wrapper');
var sanitiser = require('../domain/sanitiser');
var urlBuilder = require('../domain/url-builder');
-var validator = require('../domain/validator');
+var validator = require('../domain/validators');
var vm = require('vm');
var _ = require('underscore');
diff --git a/registry/routes/publish.js b/registry/routes/publish.js
index 6f2809899..d75053e0a 100644
--- a/registry/routes/publish.js
+++ b/registry/routes/publish.js
@@ -4,7 +4,7 @@ var format = require('stringformat');
var path = require('path');
var RequireWrapper = require('../domain/require-wrapper');
var Targz = require('tar.gz');
-var validator = require('../domain/validator');
+var validator = require('../domain/validators');
var _ = require('underscore');
module.exports = function(repository){
diff --git a/test/mocks/console.js b/test/mocks/console.js
index 3ba9837f7..2ce04fc8a 100644
--- a/test/mocks/console.js
+++ b/test/mocks/console.js
@@ -10,6 +10,10 @@ module.exports = {
logs.push(message);
return message;
},
+ logNoNewLine: function(message){
+ logs.push(message);
+ return message;
+ },
reset: function(){
logs = [];
}
diff --git a/test/unit/cli-domain-local.js b/test/unit/cli-domain-local.js
index a2a98168d..597b86828 100644
--- a/test/unit/cli-domain-local.js
+++ b/test/unit/cli-domain-local.js
@@ -2,16 +2,19 @@
var expect = require('chai').expect;
var injectr = require('injectr');
+var path = require('path');
var sinon = require('sinon');
+var _ = require('underscore');
var initialise = function(){
var fsMock = {
- readdirSync: sinon.spy(),
+ existsSync: sinon.stub(),
+ lstatSync: sinon.stub(),
mkdirSync: sinon.spy(),
- readJsonSync: sinon.stub(),
+ readdirSync: sinon.stub(),
readFileSync: sinon.stub(),
- existsSync: sinon.stub(),
+ readJsonSync: sinon.stub(),
writeFileSync: sinon.spy(),
writeJsonSync: sinon.spy()
};
@@ -24,6 +27,13 @@ var initialise = function(){
code: code
};
}
+ },
+ path: {
+ extname: path.extname,
+ join: path.join,
+ resolve: function(){
+ return _.toArray(arguments).join('/');
+ }
}
}, { __dirname: '' });
@@ -36,11 +46,15 @@ var executePackaging = function(local, callback){
return local.package('.', callback);
};
+var executeComponentsListingByDir = function(local, callback){
+ return local.getComponentsByDir('.', callback);
+};
+
describe('cli : domain : local', function(){
describe('when packaging', function(){
- describe('when component is logic-less', function(){
+ describe('when component is valid', function(){
var component;
beforeEach(function(done){
@@ -71,6 +85,10 @@ describe('cli : domain : local', function(){
it('should add version to package.json file', function(){
expect(component.oc.version).to.eql('1.2.3');
});
+
+ it('should mark the package.json as a packaged', function(){
+ expect(component.oc.packaged).to.eql(true);
+ });
});
describe('when component has a server.js logic', function(){
@@ -234,4 +252,43 @@ describe('cli : domain : local', function(){
});
});
});
+
+ describe('when getting components from dir', function(){
+
+ var error, result;
+ beforeEach(function(done){
+
+ var data = initialise();
+
+ data.fs.readdirSync.onCall(0).returns([
+ 'a-component',
+ 'a-not-component-dir',
+ 'a-file.json',
+ '_package'
+ ]);
+
+ data.fs.lstatSync.onCall(0).returns({ isDirectory: function(){ return true; }});
+ data.fs.existsSync.onCall(0).returns(true);
+ data.fs.readJsonSync.onCall(0).returns({ oc: {}});
+
+ data.fs.lstatSync.onCall(1).returns({ isDirectory: function(){ return true; }});
+ data.fs.existsSync.onCall(1).returns(false);
+
+ data.fs.lstatSync.onCall(2).returns({ isDirectory: function(){ return false; }});
+
+ data.fs.lstatSync.onCall(3).returns({ isDirectory: function(){ return true; }});
+ data.fs.existsSync.onCall(2).returns(true);
+ data.fs.readJsonSync.onCall(1).returns({ oc: { packaged: true }});
+
+ executeComponentsListingByDir(data.local, function(err, res){
+ error = err;
+ result = res;
+ done();
+ });
+ });
+
+ it('should add version to package.json file', function(){
+ expect(result).to.eql(['./a-component']);
+ });
+ });
});
diff --git a/test/unit/registry-domain-validator.js b/test/unit/registry-domain-validator.js
index ffa66bee5..7c0e183e2 100644
--- a/test/unit/registry-domain-validator.js
+++ b/test/unit/registry-domain-validator.js
@@ -4,7 +4,7 @@ var expect = require('chai').expect;
describe('registry : domain : validator', function(){
- var validator = require('../../registry/domain/validator');
+ var validator = require('../../registry/domain/validators');
describe('when validating registry configuration', function(){
@@ -486,6 +486,14 @@ describe('registry : domain : validator', function(){
});
});
+ describe('when name is reserved', function(){
+
+ var name = '_package';
+ it('should not be valid', function(){
+ expect(validate(name)).to.be.false;
+ });
+ });
+
});
describe('when validating template type for new candidate', function(){