From ab52782d2bc01b73ab72f559b20e5f728b964361 Mon Sep 17 00:00:00 2001
From: Harris Tzovanakis <me@drjova.com>
Date: Wed, 3 Aug 2016 15:49:36 +0200
Subject: [PATCH] global: improvement of project structure

* Improves project structure by splitting the components.

* Improves test feedback by adding test coverage report when you run
  ``npm test``.

Signed-off-by: Harris Tzovanakis <me@drjova.com>
---
 examples/simple/index.html                    |   2 +-
 examples/simple/static/app.js                 |   2 +-
 gulpfile.js                                   |  28 +-
 karma-src.conf.js                             |   9 +-
 package.json                                  |   2 +-
 .../controllers/InvenioRecordsCtrl.js         | 422 +++++++++
 .../directives/invenioRecords.js              | 105 ++
 .../directives/invenioRecordsActions.js       |  65 ++
 .../directives/invenioRecordsAlert.js         |  65 ++
 .../directives/invenioRecordsForms.js         | 206 ++++
 .../directives/invenioRecordsLoading.js       |  65 ++
 src/invenio-records-js/invenioRecords.js      |  34 +
 .../invenioRecords.module.js                  | 894 ------------------
 .../services/InvenioRecordsAPI.js             |  76 ++
 .../invenioRecordsActionsSpec.js              |   2 +-
 .../invenio-records-js/controllersSpec.js     |  10 +-
 16 files changed, 1072 insertions(+), 915 deletions(-)
 create mode 100644 src/invenio-records-js/controllers/InvenioRecordsCtrl.js
 create mode 100644 src/invenio-records-js/directives/invenioRecords.js
 create mode 100644 src/invenio-records-js/directives/invenioRecordsActions.js
 create mode 100644 src/invenio-records-js/directives/invenioRecordsAlert.js
 create mode 100644 src/invenio-records-js/directives/invenioRecordsForms.js
 create mode 100644 src/invenio-records-js/directives/invenioRecordsLoading.js
 create mode 100644 src/invenio-records-js/invenioRecords.js
 delete mode 100644 src/invenio-records-js/invenioRecords.module.js
 create mode 100644 src/invenio-records-js/services/InvenioRecordsAPI.js

diff --git a/examples/simple/index.html b/examples/simple/index.html
index a3475a1..cad5508 100644
--- a/examples/simple/index.html
+++ b/examples/simple/index.html
@@ -28,7 +28,7 @@
     <script src='./node_modules/tv4/tv4.js'></script>
     <script src='./node_modules/angular-schema-form/dist/schema-form.js'></script>
     <script src='./node_modules/angular-schema-form/dist/bootstrap-decorator.js'></script>
-    <script src="/src/invenio-records-js/invenioRecords.module.js"></script>
+    <script src="/dist/invenio-records-js.js"></script>
     <script src="./static/app.js"></script>
     <style>
       body {
diff --git a/examples/simple/static/app.js b/examples/simple/static/app.js
index f36c856..cca8202 100644
--- a/examples/simple/static/app.js
+++ b/examples/simple/static/app.js
@@ -23,6 +23,6 @@
 
 (function (angular) {
   angular.module('invenioRecordsDemo', [
-    'invenioRecords', 'schemaForm'
+    'invenioRecords'
   ]);
 })(angular);
diff --git a/gulpfile.js b/gulpfile.js
index 8ff56c8..7998e76 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -41,8 +41,8 @@ var sourceDirectory = path.join(rootDirectory, './src');
 
 var sourceFiles = [
 
-  // Make sure module files are handled first
-  path.join(sourceDirectory, '/**/*.module.js'),
+  // Then add all JavaScript files
+  path.join(sourceDirectory, '/*.js'),
 
   // Then add all JavaScript files
   path.join(sourceDirectory, '/**/*.js'),
@@ -69,7 +69,7 @@ var lintFiles = [
  */
 
 // run all the build tasks
-gulp.task('build', ['clean.build'], function (done) {
+gulp.task('build', ['clean.build'], function(done) {
   runSequence(
     'build.src', 'build.templates', done
   );
@@ -80,6 +80,8 @@ gulp.task('build.src', function() {
   gulp.src(sourceFiles)
     .pipe(plugins.plumber())
     .pipe(plugins.concat('invenio-records-js.js'))
+    .pipe(plugins.stripComments())
+    .pipe(plugins.header(licences.javascript))
     .pipe(gulp.dest('./dist/'))
     .pipe(plugins.uglify())
     .pipe(plugins.rename('invenio-records-js.min.js'))
@@ -99,12 +101,12 @@ gulp.task('build.templates', function() {
  */
 
 // Run test once and exit
-gulp.task('test', function (done) {
+gulp.task('test', function(done) {
   runSequence('test.jshint', 'test.src', done);
 });
 
 // check jshint
-gulp.task('test.jshint', function () {
+gulp.task('test.jshint', function() {
   return gulp.src(lintFiles)
     .pipe(plugins.plumber())
     .pipe(plugins.jshint())
@@ -113,7 +115,7 @@ gulp.task('test.jshint', function () {
 });
 
 // test sources
-gulp.task('test.src', function (done) {
+gulp.task('test.src', function(done) {
   karma.start({
     configFile: __dirname + '/karma-src.conf.js',
     singleRun: true
@@ -121,7 +123,7 @@ gulp.task('test.src', function (done) {
 });
 
 // coveralls
-gulp.task('coveralls', function () {
+gulp.task('coveralls', function() {
   return gulp.src('coverage/**/lcov.info')
     .pipe(plugins.coveralls());
 });
@@ -131,7 +133,8 @@ gulp.task('coveralls', function () {
  * Demo
  */
 
-gulp.task('demo', function() {
+// run the demo
+gulp.task('demo.run', function() {
   gulp.src(rootDirectory)
     .pipe(plugins.webserver({
       livereload: true,
@@ -139,6 +142,11 @@ gulp.task('demo', function() {
   }));
 });
 
+// run build and then the demo
+gulp.task('demo', function(done) {
+  runSequence('build', 'demo.run', done);
+});
+
 /**
  * Clean tasks
  */
@@ -152,7 +160,7 @@ gulp.task('clean.build', function() {
  * Watch
  */
 
-gulp.task('watch', function () {
+gulp.task('watch', function() {
   // Watch JavaScript files
   gulp.watch(sourceFiles, ['test']);
 });
@@ -161,6 +169,6 @@ gulp.task('watch', function () {
  * Default taks
  */
 
-gulp.task('default', function () {
+gulp.task('default', function() {
   runSequence('test', 'watch');
 });
diff --git a/karma-src.conf.js b/karma-src.conf.js
index 0ddb818..fe399d3 100644
--- a/karma-src.conf.js
+++ b/karma-src.conf.js
@@ -67,6 +67,7 @@ module.exports = function(config) {
       'node_modules/angular-schema-form/dist/schema-form.js',
       'node_modules/angular-schema-form/dist/bootstrap-decorator.js',
       'node_modules/angular-schema-form-dynamic-select/angular-schema-form-dynamic-select.js',
+      'src/*/*.js',
       'src/**/*.js',
       'src/**/*.html',
       'test/unit/**/*.js',
@@ -89,8 +90,12 @@ module.exports = function(config) {
 
     // Coverage reporter
     coverageReporter: {
-      type: 'lcov',
-      dir: 'coverage/'
+      dir: 'coverage/',
+      reporters: [
+        {type: 'text'},
+        {type: 'html', subdir: 'report-html'},
+        {type: 'lcov', subdir: 'report-lcov'}
+      ]
     },
 
 
diff --git a/package.json b/package.json
index 7ca1f8a..1c7eae4 100644
--- a/package.json
+++ b/package.json
@@ -40,9 +40,9 @@
     "gulp-load-plugins": "^1.1.0",
     "gulp-plumber": "^0.6.6",
     "gulp-rename": "^1.2.0",
+    "gulp-strip-comments": "^2.4.3",
     "gulp-uglify": "^0.3.1",
     "gulp-webserver": "^0.9.1",
-    "istanbul": "^0.4.1",
     "jquery": "^2.1.4",
     "jsdoc": "^3.4.0",
     "jshint-stylish": "^0.4.0",
diff --git a/src/invenio-records-js/controllers/InvenioRecordsCtrl.js b/src/invenio-records-js/controllers/InvenioRecordsCtrl.js
new file mode 100644
index 0000000..97a9cb0
--- /dev/null
+++ b/src/invenio-records-js/controllers/InvenioRecordsCtrl.js
@@ -0,0 +1,422 @@
+/*
+ * This file is part of Invenio.
+ * Copyright (C) 2016 CERN.
+ *
+ * Invenio is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * Invenio is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Invenio; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * In applying this license, CERN does not
+ * waive the privileges and immunities granted to it by virtue of its status
+ * as an Intergovernmental Organization or submit itself to any jurisdiction.
+ */
+
+/**
+  * @ngdoc controller
+  * @name InvenioRecordsCtrl
+  * @namespace InvenioRecordsCtrl
+  * @description
+  *    Invenio records controller.
+  */
+function InvenioRecordsCtrl($scope, $rootScope, $q, $timeout,
+    InvenioRecordsAPI) {
+
+  // Parameters
+
+  // Assign the controller to `vm`
+  var vm = this;
+
+  // The request args
+  vm.invenioRecordsArgs = {
+    url: '/',
+    method: 'GET',
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  };
+
+  // The form model
+  vm.invenioRecordsModel = null;
+  // Set endpoints
+  vm.invenioRecordsEndpoints = null;
+
+  // Record Loading - If the invenioRecords has the state loading
+  vm.invenioRecordsLoading = true;
+
+  // Record Alerts - if the invenioRecords has any alert
+  vm.invenioRecordsAlert = null;
+
+  ////////////
+
+  // Functions
+
+  /**
+    * Set record schema.
+    * @memberof InvenioRecordsCtrl
+    * @functioninvenioRecordsSetSchema
+    */
+  function invenioRecordsSetSchema(response) {
+    vm.invenioRecordsSchema = response.data;
+  }
+
+  /**
+    * Set form schema.
+    * @memberof InvenioRecordsCtrl
+    * @function invenioRecordsSetForm
+    */
+  function invenioRecordsSetForm(response) {
+    vm.invenioRecordsForm = response.data;
+  }
+
+  /**
+    * Initialize the controller
+    * @memberof InvenioRecordsCtrl
+    * @function invenioRecordsInit
+    * @param {Object} evt - The event object.
+    * @param {Object} args - The invenio records arguments.
+    * @param {Object} endpoints - The invenio endpoints for actions.
+    * @param {Object} record - The record object.
+    */
+  function invenioRecordsInit(evt, args, endpoints, record) {
+    // Start loading
+    $rootScope.$broadcast('invenio.records.loading.start');
+    // Assign the model
+    vm.invenioRecordsModel = angular.copy(record);
+    // Assign the args
+    vm.invenioRecordsArgs = angular.merge(
+      {},
+      vm.invenioRecordsArgs,
+      args
+    );
+    // Assign endpoints
+    vm.invenioRecordsEndpoints = angular.merge(
+      {},
+      endpoints
+    );
+
+    // Get the schema and the form
+    $q.all([
+      InvenioRecordsAPI.get(vm.invenioRecordsEndpoints.schema)
+        .then(invenioRecordsSetSchema),
+      InvenioRecordsAPI.get(vm.invenioRecordsEndpoints.form)
+        .then(invenioRecordsSetForm)
+    ]).then(function() {
+      // Remove loading state
+      $rootScope.$broadcast('invenio.records.loading.stop');
+    });
+  }
+
+  /**
+    * Records actions
+    * @memberof InvenioRecordsCtrl
+    * @function invenioRecordsActions
+    * @param {Object} evt - The event object.
+    * @param {String} type - The invenio action type.
+    * @param {Object} successCallback - Call function after success.
+    * @param {Object} errorCallback - Call function after error..
+    */
+  function invenioRecordsActions(evt, type, successCallback, errorCallback) {
+
+    function getEndpoints(){
+      var deferred = $q.defer();
+      if(vm.invenioRecordsEndpoints.self === undefined || type === 'publish') {
+        // If the action url doesnt exists request it
+        InvenioRecordsAPI.request({
+          method: vm.invenioRecordsModel.recid ? 'GET' : 'POST',
+          url: vm.invenioRecordsEndpoints.initialization,
+          data: {},
+          headers: vm.invenioRecordsArgs.headers || {}
+        }).then(function success(response) {
+          // Upadate the endpoints
+          $rootScope.$broadcast(
+            'invenio.records.endpoints.updated', response.data.links
+          );
+          deferred.resolve({});
+        }, function error(response) {
+          // Error
+          deferred.reject(response);
+        });
+      } else {
+        // We already have it resolve it asap
+        deferred.resolve({});
+      }
+      return deferred.promise;
+    }
+
+    // Get the endpoints and do the request
+    getEndpoints().then(
+      function success() {
+        var _data = angular.merge({}, vm.invenioRecordsModel);
+
+        var unwatend = [[null], [{}], '', [undefined]];
+        angular.forEach(_data, function(value, key) {
+          angular.forEach(unwatend, function(_value) {
+            if (angular.equals(_value, value))  {
+              delete _data[key];
+            }
+          });
+        });
+
+        if (vm.invenioRecordsEndpoints[type] !== undefined) {
+          var method = (type === 'delete') ? 'DELETE': 'PUT';
+          if (type === 'publish') {
+            method = 'POST';
+          }
+          $timeout(function() {
+            InvenioRecordsAPI.request({
+              url: vm.invenioRecordsEndpoints[type],
+              method: method,
+              data: {
+                metadata: _data
+              },
+              headers: vm.invenioRecordsArgs.headers || {}
+            }).then(
+              successCallback,
+              errorCallback
+            );
+          }, 2000);
+        } else {
+          errorCallback({
+            type: 'danger',
+            data: {
+              message: 'The action type is not supported.'
+            }
+          });
+        }
+      },
+      errorCallback);
+  }
+
+  /**
+    * Action handler
+    * @memberof InvenioRecordsCtrl
+    * @function invenioRecordsHandler
+    */
+  function invenioRecordsHandler(type) {
+
+    /**
+      * After a successful request
+      * @memberof invenioRecordsHandler
+      * @function actionSuccessful
+      * @param {Object} response - The action request response.
+      */
+    function actionSuccessful(response) {
+      $rootScope.$broadcast('invenio.records.alert', {
+        type: 'success',
+        data: response.data,
+        action: type
+      });
+
+      // Trigger successful event for action
+      $rootScope.$broadcast('invenio.records.action.success', type);
+
+      // Stop loadig idicator
+      $rootScope.$broadcast('invenio.records.loading.stop');
+    }
+    /**
+      * After an errored request
+      * @memberof invenioRecordsHandler
+      * @function actionErrored
+      * @param {Object} response - The action request response.
+      */
+    function actionErrored(response) {
+      $rootScope.$broadcast('invenio.records.alert', {
+        type: 'danger',
+        data: response.data,
+        action: type
+      });
+
+      if (response.data.status === 400 && response.data.errors) {
+        var deferred = $q.defer();
+        var promise = deferred.promise;
+        promise.then(function displayValidationErrors() {
+          angular.forEach(response.data.errors, function(value) {
+            try {
+              $scope.$broadcast(
+                'schemaForm.error.' + value.field.replace('metadata.', ''),
+                'backendValidationError',
+                value.message
+              );
+            } catch(error) {
+              $scope.$broadcast(
+                'schemaForm.error.' + value.field,
+                'backendValidationError',
+                value.message
+              );
+            }
+          });
+        }).then(function stopLoading() {
+          $rootScope.$broadcast('invenio.records.loading.stop');
+        });
+        deferred.resolve();
+      } else {
+        $rootScope.$broadcast('invenio.records.loading.stop');
+      }
+      // Trigger successful event for action
+      $rootScope.$broadcast('invenio.records.action.error', response.data);
+    }
+
+    // Start loading
+    $rootScope.$broadcast('invenio.records.loading.start');
+
+    // Request submission
+    $scope.$broadcast(
+      'invenio.records.action',
+      type,
+      actionSuccessful,
+      actionErrored
+    );
+  }
+
+  /**
+    * Remove validation error
+    * @memberof InvenioRecordsCtrl
+    * @function invenioRecordsRemoveValidation
+    * @param {Object} fieldValue - The filed value.
+    * @param {Object} form - The form object.
+    */
+  function invenioRecordsRemoveValidation(fieldValue, form) {
+    // Reset validation only if the filed has been changed
+    if (form.validationMessage) {
+      // If the field has changed remove the error
+      $scope.$broadcast(
+        'schemaForm.error.' + form.key.join('.'),
+        'backendValidationError',
+        true
+      );
+    }
+  }
+
+  /**
+    * Change the state to loading
+    * @memberof InvenioRecordsCtrl
+    * @function invenioRecordsLoadingStart
+    * @param {Object} evt - The event object.
+    */
+  function invenioRecordsLoadingStart(evt) {
+    // Set the state to loading
+    vm.invenioRecordsLoading = true;
+  }
+
+  /**
+    * Change the state to normal
+    * @memberof InvenioRecordsCtrl
+    * @function invenioRecordsLoadingStop
+    * @param {Object} evt - The event object.
+    */
+  function invenioRecordsLoadingStop(evt) {
+    // Set the state to normal
+    vm.invenioRecordsLoading = false;
+  }
+
+  /**
+    * Show alert messages
+    * @memberof InvenioRecordsCtrl
+    * @function invenioRecordsAlert
+    * @param {Object} evt - The event object.
+    * @param {Object} data - The object with the alert data.
+    */
+  function invenioRecordsAlert(evt, data) {
+    // Reset the error
+    vm.invenioRecordsAlert = null;
+    // Attach the error to the scope
+    vm.invenioRecordsAlert = data;
+  }
+
+  /**
+    * Prepare the form after the action
+    * @memberof InvenioRecordsCtrl
+    * @function invenioRecordsActionFinished
+    * @param {Object} evt - The event object.
+    * @param {Object} type - The action type
+    */
+  function invenioRecordsActionSuccess(evt, type) {
+    // Set the form to pristine if it's self or publish
+    if (['publish', 'self'].indexOf(type) > -1) {
+      $scope.depositionForm.$setPristine();
+      // Set the form to submitted if it's published
+      if (type === 'publish') {
+        $scope.depositionForm.$setSubmitted();
+      }
+    }
+    // Set the form to $invalid if it's deleted/discarded
+  }
+
+  /**
+    * Updating the endpoints
+    * @memberof InvenioRecordsCtrl
+    * @function invenioRecordsEndpointsUpdated
+    * @param {Object} evt - The event object.
+    * @param {Object} endpoints - The object with the endpoints.
+    */
+  function invenioRecordsEndpointsUpdated(evt, endpoints) {
+    vm.invenioRecordsEndpoints = angular.merge(
+      {
+        'delete': endpoints.self,
+      },
+      vm.invenioRecordsEndpoints,
+      endpoints
+    );
+  }
+
+  // Attach fuctions to the scope
+
+  // Action handler
+  vm.actionHandler = invenioRecordsHandler;
+  // Remove validation
+  vm.removeValidationMessage = invenioRecordsRemoveValidation;
+
+  ////////////
+
+  // Listener
+
+  // Local
+
+  // When invenio.records action requested
+  $scope.$on('invenio.records.action', invenioRecordsActions);
+
+  // When the module initialized
+  $scope.$on('invenio.records.init', invenioRecordsInit);
+
+  // Global - Until a unified invenio angular module
+
+  // When there is an error
+  $rootScope.$on('invenio.records.alert', invenioRecordsAlert);
+
+  // When loading requested to start
+  $rootScope.$on('invenio.records.loading.start', invenioRecordsLoadingStart);
+  // When loading requested to stop
+  $rootScope.$on('invenio.records.loading.stop', invenioRecordsLoadingStop);
+
+  // When the ``public`` action finishes without errors
+  $rootScope.$on(
+    'invenio.records.action.success', invenioRecordsActionSuccess
+  );
+
+  // Update endpoints
+  $rootScope.$on(
+    'invenio.records.endpoints.updated', invenioRecordsEndpointsUpdated
+  );
+}
+
+// Inject depedencies
+InvenioRecordsCtrl.$inject = [
+  '$scope',
+  '$rootScope',
+  '$q',
+  '$timeout',
+  'InvenioRecordsAPI',
+];
+
+angular.module('invenioRecords.controllers')
+  .controller('InvenioRecordsCtrl', InvenioRecordsCtrl);
diff --git a/src/invenio-records-js/directives/invenioRecords.js b/src/invenio-records-js/directives/invenioRecords.js
new file mode 100644
index 0000000..5ac53db
--- /dev/null
+++ b/src/invenio-records-js/directives/invenioRecords.js
@@ -0,0 +1,105 @@
+/*
+ * This file is part of Invenio.
+ * Copyright (C) 2016 CERN.
+ *
+ * Invenio is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * Invenio is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Invenio; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * In applying this license, CERN does not
+ * waive the privileges and immunities granted to it by virtue of its status
+ * as an Intergovernmental Organization or submit itself to any jurisdiction.
+ */
+
+/**
+  * @ngdoc directive
+  * @name invenioRecords
+  * @description
+  *    The invenioRecords directive handler
+  * @namespace invenioRecords
+  * @example
+  *    Usage:
+  *     <invenio-records
+  *      action="http://"
+  *      extra-params='{}'
+  *      form="http://"
+  *      initialization="http://"
+  *      record='record'
+  *      schema="http://">
+  *     </invenio-records>
+  *
+  */
+function invenioRecords() {
+
+  // Functions
+
+  /**
+    * Initialize directive
+    * @memberof invenioRecords
+    * @param {service} scope -  The scope of this element.
+    * @param {service} element - Element that this directive is assigned to.
+    * @param {service} attrs - Attribute of this element.
+    * @param {InvenioRecordsCtrl} vm - Invenio records controller.
+    */
+  function link(scope, element, attrs, vm) {
+
+    // Upadate parameters
+    var collectedArgs = {
+      method: attrs.actionMethod || 'GET'
+    };
+
+    // Get alert messages
+    var responseParams = {
+      responseParams: JSON.parse(attrs.responseParams || '{}')
+    };
+
+    // Get any extras
+    var extraParams = JSON.parse(attrs.extraParams || '{}');
+
+    // Merge together
+    var args = angular.merge(
+      {},
+      collectedArgs,
+      responseParams,
+      extraParams
+    );
+
+    // Get the endpoints for schemas
+    var endpoints = {
+      form: attrs.form || null,
+      initialization: attrs.initialization || null,
+      schema: attrs.schema || null
+    };
+
+    // Get the record object
+    var record = JSON.parse(attrs.record || '{}');
+
+    // Spread the love of initialization
+    scope.$broadcast(
+      'invenio.records.init', args, endpoints, record
+    );
+  }
+
+  ////////////
+
+  return {
+    restrict: 'AE',
+    scope: false,
+    controller: 'InvenioRecordsCtrl',
+    controllerAs: 'recordsVM',
+    link: link,
+  };
+}
+
+angular.module('invenioRecords.directives')
+  .directive('invenioRecords', invenioRecords);
diff --git a/src/invenio-records-js/directives/invenioRecordsActions.js b/src/invenio-records-js/directives/invenioRecordsActions.js
new file mode 100644
index 0000000..96c2e96
--- /dev/null
+++ b/src/invenio-records-js/directives/invenioRecordsActions.js
@@ -0,0 +1,65 @@
+/*
+ * This file is part of Invenio.
+ * Copyright (C) 2016 CERN.
+ *
+ * Invenio is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * Invenio is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Invenio; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * In applying this license, CERN does not
+ * waive the privileges and immunities granted to it by virtue of its status
+ * as an Intergovernmental Organization or submit itself to any jurisdiction.
+ */
+
+/**
+  * @ngdoc directive
+  * @name invenioRecordsActions
+  * @description
+  *    The invenio records action directive handler
+  * @namespace invenioRecordsActions
+  * @example
+  *    Usage:
+  *     <invenio-records-actions
+  *      template="">
+  *     </invenio-records-actions>
+  *
+  */
+function invenioRecordsActions() {
+
+  // Functions
+
+  /**
+    * Choose template for record actions
+    * @memberof invenioRecordsActions
+    * @param {service} element - Element that this directive is assigned to.
+    * @param {service} attrs - Attribute of this element.
+    * @example
+    *    Minimal template `template.html` usage
+    *      <a href="#" ng-click="vm.actionSave()">Save</a>
+    */
+  function templateUrl(element, attrs) {
+    return attrs.template;
+  }
+
+  ////////////
+
+  return {
+    restrict: 'AE',
+    scope: false,
+    require: '^invenioRecords',
+    templateUrl: templateUrl,
+  };
+}
+
+angular.module('invenioRecords.directives')
+  .directive('invenioRecordsActions', invenioRecordsActions);
diff --git a/src/invenio-records-js/directives/invenioRecordsAlert.js b/src/invenio-records-js/directives/invenioRecordsAlert.js
new file mode 100644
index 0000000..8305ee0
--- /dev/null
+++ b/src/invenio-records-js/directives/invenioRecordsAlert.js
@@ -0,0 +1,65 @@
+/*
+ * This file is part of Invenio.
+ * Copyright (C) 2016 CERN.
+ *
+ * Invenio is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * Invenio is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Invenio; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * In applying this license, CERN does not
+ * waive the privileges and immunities granted to it by virtue of its status
+ * as an Intergovernmental Organization or submit itself to any jurisdiction.
+ */
+
+/**
+  * @ngdoc directive
+  * @name invenioRecordsAlert
+  * @description
+  *    The invenio records alert directive handler
+  * @namespace invenioRecordsAlert
+  * @example
+  *    Usage:
+  *     <invenio-records-alert
+  *      template="http://alert.html">
+  *     </invenio-records-alert>
+  *
+  */
+function invenioRecordsAlert() {
+
+  // Functions
+
+  /**
+    * Choose template for record alert
+    * @memberof invenioRecordsAlert
+    * @param {service} element - Element that this directive is assigned to.
+    * @param {service} attrs - Attribute of this element.
+    * @example
+    *    Minimal template `template.html` usage
+    *    {{ vm.invenioRecordsAlert }}
+    */
+  function templateUrl(element, attrs) {
+    return attrs.template;
+  }
+
+  ////////////
+
+  return {
+    restrict: 'AE',
+    scope: false,
+    require: '^invenioRecords',
+    templateUrl: templateUrl,
+  };
+}
+
+angular.module('invenioRecords.directives')
+  .directive('invenioRecordsAlert', invenioRecordsAlert);
diff --git a/src/invenio-records-js/directives/invenioRecordsForms.js b/src/invenio-records-js/directives/invenioRecordsForms.js
new file mode 100644
index 0000000..a62a80e
--- /dev/null
+++ b/src/invenio-records-js/directives/invenioRecordsForms.js
@@ -0,0 +1,206 @@
+/*
+ * This file is part of Invenio.
+ * Copyright (C) 2016 CERN.
+ *
+ * Invenio is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * Invenio is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Invenio; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * In applying this license, CERN does not
+ * waive the privileges and immunities granted to it by virtue of its status
+ * as an Intergovernmental Organization or submit itself to any jurisdiction.
+ */
+
+/**
+  * @ngdoc directive
+  * @name invenioRecordsForm
+  * @description
+  *    The invenio records form directive handler
+  * @namespace invenioRecordsForm
+  * @example
+  *    Usage:
+  *     <invenio-records-form
+  *      form-templates='{"textarea": "textarea.html"}'
+  *      form-templates-base="/src/node_modules"
+  *      template="">
+  *     </invenio-records-form>
+  */
+function invenioRecordsForm($q, schemaFormDecorators, InvenioRecordsAPI,
+  $httpParamSerializerJQLike) {
+
+  // Functions
+
+  /**
+    * Initialize directive
+    * @memberof invenioRecords
+    * @param {service} scope -  The scope of this element.
+    * @param {service} element - Element that this directive is assigned to.
+    * @param {service} attrs - Attribute of this element.
+    * @param {InvenioRecordsCtrl} vm - Invenio records controller.
+    */
+  function link(scope, element, attrs, vm) {
+
+    // Add custom templates
+    if (attrs.formTemplates && attrs.formTemplatesBase) {
+      var formTemplates = JSON.parse(attrs.formTemplates);
+      var formTemplatesBase = attrs.formTemplatesBase;
+
+      if (formTemplatesBase.substr(formTemplatesBase.length -1) !== '/') {
+        formTemplatesBase = formTemplatesBase + '/';
+      }
+
+      angular.forEach(formTemplates, function(value, key) {
+        schemaFormDecorators
+          .decorator()[key.replace('_', '-')]
+          .template = formTemplatesBase + value;
+      });
+    }
+
+    /**
+      * Get property from object
+      * @memberof invenioRecordsFrom
+      * @function getProp
+      * @param {Object} obj - The object.
+      * @param {String} prop - The property path to retrieve.
+      */
+    var getProp = function (obj, prop) {
+      return prop.split('.').reduce(function(data, item) {
+        return data[item];
+      }, obj);
+    };
+
+    /**
+      * Empty promise for the autocompletion
+      * @memberof invenioRecordsFrom
+      * @function _errorOrEmpty
+      */
+    function _errorOrEmppty(){
+      var defer = $q.defer();
+      defer.resolve({data: []});
+      return defer.promise;
+    }
+
+    /**
+      * Handle the autocomplete request
+      * @memberof invenioRecordsFrom
+      * @function _suggestEngine
+      * @param {Object} args - The arguments for the request.
+      * @param {Object} keyProperty - The results key.
+      */
+    function _suggestEngine(args, keyProperty) {
+      if (args.url !== undefined) {
+        return InvenioRecordsAPI.request(args)
+          .then(
+            function success(response) {
+              return {
+                data: getProp(response.data, keyProperty)
+              };
+            },
+            _errorOrEmppty
+          );
+      }
+      return _errorOrEmppty();
+    }
+
+    /**
+      * Add url parameters
+      * @memberof invenioRecordsFrom
+      * @function _urlParser
+      * @param {String} url - The url.
+      * @param {Object} urlParameters - The parameters for the url.
+      * @param {String} query - The query.
+      */
+    function _urlParser(url, urlParameters, query){
+      if (urlParameters !== undefined) {
+        var urlArgs = {};
+        angular.forEach(urlParameters, function(value, key) {
+          try {
+            if (key === 'text' && value === 'value'){
+              urlArgs[key] = query;
+            } else {
+              urlArgs[key] = scope.$eval(value) || value;
+            }
+          } catch(error) {
+            urlArgs[key] = value;
+          }
+        });
+        url = url + '?' + $httpParamSerializerJQLike(
+          angular.merge({}, urlArgs)
+        );
+      }
+      return url;
+    }
+
+    /**
+      * Trigger it on autocomplete field
+      * @memberof invenioRecordsFrom
+      * @function autocompleteSuggest
+      * @param {Object} options - The options from the form schema.
+      * @param {String} query - The query.
+      */
+    function autocompleteSuggest(options, query) {
+      var args = {};
+      if (query && options.url !== undefined) {
+        // Parse the url parameters
+        args = angular.extend({},
+          {
+            url: _urlParser(options.url, options.urlParameters, query),
+            method: 'GET',
+            data: options.data || {},
+            headers: options.headers || vm.invenioRecordsArgs.headers
+          }
+        );
+      }
+      return _suggestEngine(args, options.map.resultsProperty);
+    }
+    // Attach to the scope
+    scope.autocompleteSuggest = autocompleteSuggest;
+  }
+
+  /**
+    * Choose template for record form
+    * @memberof invenioRecordsForm
+    * @param {service} element - Element that this directive is assigned to.
+    * @param {service} attrs - Attribute of this element.
+    * @example
+    *    Minimal template `template.html` usage
+    *      <form
+    *       sf-schema="vm.invenioRecordsSchema"
+    *       sf-form="vm.invenioRecordsForm"
+    *       sf-model="vm.invenioRecordsModel">
+    *      </form>
+    */
+  function templateUrl(element, attrs) {
+    return attrs.template;
+  }
+
+  ////////////
+
+  return {
+    restrict: 'AE',
+    link: link,
+    scope: false,
+    require: '^invenioRecords',
+    templateUrl: templateUrl,
+  };
+}
+
+invenioRecordsForm.$inject = [
+  '$q',
+  'schemaFormDecorators',
+  'InvenioRecordsAPI',
+  '$httpParamSerializerJQLike'
+];
+
+angular.module('invenioRecords.directives')
+  .directive('invenioRecordsForm', invenioRecordsForm);
diff --git a/src/invenio-records-js/directives/invenioRecordsLoading.js b/src/invenio-records-js/directives/invenioRecordsLoading.js
new file mode 100644
index 0000000..8522d83
--- /dev/null
+++ b/src/invenio-records-js/directives/invenioRecordsLoading.js
@@ -0,0 +1,65 @@
+/*
+ * This file is part of Invenio.
+ * Copyright (C) 2016 CERN.
+ *
+ * Invenio is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * Invenio is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Invenio; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * In applying this license, CERN does not
+ * waive the privileges and immunities granted to it by virtue of its status
+ * as an Intergovernmental Organization or submit itself to any jurisdiction.
+ */
+
+/**
+  * @ngdoc directive
+  * @name invenioRecordsLoading
+  * @description
+  *    The invenio records loading directive handler
+  * @namespace invenioRecordsLoading
+  * @example
+  *    Usage:
+  *     <invenio-records-loading
+  *      template="http://loading.html">
+  *     </invenio-records-loading>
+  *
+  */
+function invenioRecordsLoading() {
+
+  // Functions
+
+  /**
+    * Choose template for record loading
+    * @memberof invenioRecordsLoading
+    * @param {service} element - Element that this directive is assigned to.
+    * @param {service} attrs - Attribute of this element.
+    * @example
+    *    Minimal template `template.html` usage
+    *    {{ vm.invenioRecordsLoading }}
+    */
+  function templateUrl(element, attrs) {
+    return attrs.template;
+  }
+
+  ////////////
+
+  return {
+    restrict: 'AE',
+    scope: false,
+    require: '^invenioRecords',
+    templateUrl: templateUrl,
+  };
+}
+
+angular.module('invenioRecords.directives')
+  .directive('invenioRecordsLoading', invenioRecordsLoading);
diff --git a/src/invenio-records-js/invenioRecords.js b/src/invenio-records-js/invenioRecords.js
new file mode 100644
index 0000000..8c06f7b
--- /dev/null
+++ b/src/invenio-records-js/invenioRecords.js
@@ -0,0 +1,34 @@
+/*
+ * This file is part of Invenio.
+ * Copyright (C) 2016 CERN.
+ *
+ * Invenio is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * Invenio is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Invenio; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * In applying this license, CERN does not
+ * waive the privileges and immunities granted to it by virtue of its status
+ * as an Intergovernmental Organization or submit itself to any jurisdiction.
+ */
+
+angular.module('invenioRecords.controllers', []);
+angular.module('invenioRecords.directives', []);
+angular.module('invenioRecords.services', []);
+
+// Setup everyhting
+angular.module('invenioRecords', [
+  'schemaForm',
+  'invenioRecords.services',
+  'invenioRecords.controllers',
+  'invenioRecords.directives',
+]);
diff --git a/src/invenio-records-js/invenioRecords.module.js b/src/invenio-records-js/invenioRecords.module.js
deleted file mode 100644
index 28f04c0..0000000
--- a/src/invenio-records-js/invenioRecords.module.js
+++ /dev/null
@@ -1,894 +0,0 @@
-/*
- * This file is part of Invenio.
- * Copyright (C) 2016 CERN.
- *
- * Invenio is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * Invenio is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Invenio; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- * In applying this license, CERN does not
- * waive the privileges and immunities granted to it by virtue of its status
- * as an Intergovernmental Organization or submit itself to any jurisdiction.
- */
-
-(function (angular) {
-
-  // Controllers
-
-  /**
-   * @ngdoc controller
-   * @name invenioRecordsController
-   * @namespace invenioRecordsController
-   * @description
-   *    Invenio records controller.
-   */
-  function invenioRecordsController($scope, $rootScope, $q, $timeout,
-      invenioRecordsAPI) {
-
-    // Parameters
-
-    // Assign the controller to `vm`
-    var vm = this;
-
-    // The request args
-    vm.invenioRecordsArgs = {
-      url: '/',
-      method: 'GET',
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    };
-
-    // The form model
-    vm.invenioRecordsModel = null;
-    // Set endpoints
-    vm.invenioRecordsEndpoints = null;
-
-    // Record Loading - If the invenioRecords has the state loading
-    vm.invenioRecordsLoading = true;
-
-    // Record Alerts - if the invenioRecords has any alert
-    vm.invenioRecordsAlert = null;
-
-    ////////////
-
-    // Functions
-
-    /**
-     * Set record schema.
-     * @memberof invenioRecordsController
-     * @functioninvenioRecordsSetSchema
-     */
-    function invenioRecordsSetSchema(response) {
-      vm.invenioRecordsSchema = response.data;
-    }
-
-    /**
-     * Set form schema.
-     * @memberof invenioRecordsController
-     * @function invenioRecordsSetForm
-     */
-    function invenioRecordsSetForm(response) {
-      vm.invenioRecordsForm = response.data;
-    }
-
-    /**
-     * Initialize the controller
-     * @memberof invenioRecordsController
-     * @function invenioRecordsInit
-     * @param {Object} evt - The event object.
-     * @param {Object} args - The invenio records arguments.
-     * @param {Object} endpoints - The invenio endpoints for actions.
-     * @param {Object} record - The record object.
-     */
-    function invenioRecordsInit(evt, args, endpoints, record) {
-      // Start loading
-      $rootScope.$broadcast('invenio.records.loading.start');
-      // Assign the model
-      vm.invenioRecordsModel = angular.copy(record);
-      // Assign the args
-      vm.invenioRecordsArgs = angular.merge(
-        {},
-        vm.invenioRecordsArgs,
-        args
-      );
-      // Assign endpoints
-      vm.invenioRecordsEndpoints = angular.merge(
-        {},
-        endpoints
-      );
-
-      // Get the schema and the form
-      $q.all([
-        invenioRecordsAPI.get(vm.invenioRecordsEndpoints.schema)
-          .then(invenioRecordsSetSchema),
-        invenioRecordsAPI.get(vm.invenioRecordsEndpoints.form)
-          .then(invenioRecordsSetForm)
-      ]).then(function() {
-        // Remove loading state
-        $rootScope.$broadcast('invenio.records.loading.stop');
-      });
-    }
-
-    /**
-     * Records actions
-     * @memberof invenioRecordsController
-     * @function invenioRecordsActions
-     * @param {Object} evt - The event object.
-     * @param {String} type - The invenio action type.
-     * @param {Object} successCallback - Call function after success.
-     * @param {Object} errorCallback - Call function after error..
-     */
-    function invenioRecordsActions(evt, type, successCallback, errorCallback) {
-
-      function getEndpoints(){
-        var deferred = $q.defer();
-        if(vm.invenioRecordsEndpoints.self === undefined || type === 'publish') {
-          // If the action url doesnt exists request it
-          invenioRecordsAPI.request({
-            method: vm.invenioRecordsModel.recid ? 'GET' : 'POST',
-            url: vm.invenioRecordsEndpoints.initialization,
-            data: {},
-            headers: vm.invenioRecordsArgs.headers || {}
-          }).then(function success(response) {
-            // Upadate the endpoints
-            $rootScope.$broadcast(
-              'invenio.records.endpoints.updated', response.data.links
-            );
-            deferred.resolve({});
-          }, function error(response) {
-            // Error
-            deferred.reject(response);
-          });
-        } else {
-          // We already have it resolve it asap
-          deferred.resolve({});
-        }
-        return deferred.promise;
-      }
-
-      // Get the endpoints and do the request
-      getEndpoints().then(
-        function success() {
-          var _data = angular.merge({}, vm.invenioRecordsModel);
-
-          var unwatend = [[null], [{}], '', [undefined]];
-          angular.forEach(_data, function(value, key) {
-            angular.forEach(unwatend, function(_value) {
-              if (angular.equals(_value, value))  {
-                delete _data[key];
-              }
-            });
-          });
-
-          if (vm.invenioRecordsEndpoints[type] !== undefined) {
-            var method = (type === 'delete') ? 'DELETE': 'PUT';
-            if (type === 'publish') {
-              method = 'POST';
-            }
-            $timeout(function() {
-              invenioRecordsAPI.request({
-                url: vm.invenioRecordsEndpoints[type],
-                method: method,
-                data: {
-                  metadata: _data
-                },
-                headers: vm.invenioRecordsArgs.headers || {}
-              }).then(
-                successCallback,
-                errorCallback
-              );
-            }, 2000);
-          } else {
-            errorCallback({
-              type: 'danger',
-              data: {
-                message: 'The action type is not supported'
-              }
-            });
-          }
-        },
-        errorCallback);
-    }
-
-    /**
-     * Action handler
-     * @memberof invenioRecordsController
-     * @function invenioRecordsHandler
-     */
-    function invenioRecordsHandler(type) {
-
-      /**
-       * After a successful request
-       * @memberof invenioRecordsHandler
-       * @function actionSuccessful
-       * @param {Object} response - The action request response.
-       */
-      function actionSuccessful(response) {
-        $rootScope.$broadcast('invenio.records.alert', {
-          type: 'success',
-          data: response.data,
-          action: type
-        });
-
-        // Trigger successful event for action
-        $rootScope.$broadcast('invenio.records.action.success', type);
-
-        // Stop loadig idicator
-        $rootScope.$broadcast('invenio.records.loading.stop');
-      }
-      /**
-       * After an errored request
-       * @memberof invenioRecordsHandler
-       * @function actionErrored
-       * @param {Object} response - The action request response.
-       */
-      function actionErrored(response) {
-        $rootScope.$broadcast('invenio.records.alert', {
-          type: 'danger',
-          data: response.data,
-          action: type
-        });
-
-        if (response.data.status === 400 && response.data.errors) {
-          var deferred = $q.defer();
-          var promise = deferred.promise;
-          promise.then(function displayValidationErrors() {
-            angular.forEach(response.data.errors, function(value) {
-              try {
-                $scope.$broadcast(
-                  'schemaForm.error.' + value.field.replace('metadata.', ''),
-                  'backendValidationError',
-                  value.message
-                );
-              } catch(error) {
-                $scope.$broadcast(
-                  'schemaForm.error.' + value.field,
-                  'backendValidationError',
-                  value.message
-                );
-              }
-            });
-          }).then(function stopLoading() {
-            $rootScope.$broadcast('invenio.records.loading.stop');
-          });
-          deferred.resolve();
-        } else {
-          $rootScope.$broadcast('invenio.records.loading.stop');
-        }
-        // Trigger successful event for action
-        $rootScope.$broadcast('invenio.records.action.error', response.data);
-      }
-
-      // Start loading
-      $rootScope.$broadcast('invenio.records.loading.start');
-
-      // Request submission
-      $scope.$broadcast(
-        'invenio.records.action',
-        type,
-        actionSuccessful,
-        actionErrored
-      );
-    }
-
-    /**
-      * Remove validation error
-      * @memberof invenioRecordsController
-      * @function invenioRecordsRemoveValidation
-      * @param {Object} fieldValue - The filed value.
-      * @param {Object} form - The form object.
-      */
-    function invenioRecordsRemoveValidation(fieldValue, form) {
-      // Reset validation only if the filed has been changed
-      if (form.validationMessage) {
-        // If the field has changed remove the error
-        $scope.$broadcast(
-          'schemaForm.error.' + form.key.join('.'),
-          'backendValidationError',
-          true
-        );
-      }
-    }
-
-    /**
-      * Change the state to loading
-      * @memberof invenioRecordsController
-      * @function invenioRecordsLoadingStart
-      * @param {Object} evt - The event object.
-      */
-    function invenioRecordsLoadingStart(evt) {
-      // Set the state to loading
-      vm.invenioRecordsLoading = true;
-    }
-
-    /**
-      * Change the state to normal
-      * @memberof invenioRecordsController
-      * @function invenioRecordsLoadingStop
-      * @param {Object} evt - The event object.
-      */
-    function invenioRecordsLoadingStop(evt) {
-      // Set the state to normal
-      vm.invenioRecordsLoading = false;
-    }
-
-    /**
-      * Show alert messages
-      * @memberof invenioRecordsController
-      * @function invenioRecordsAlert
-      * @param {Object} evt - The event object.
-      * @param {Object} data - The object with the alert data.
-      */
-    function invenioRecordsAlert(evt, data) {
-      // Reset the error
-      vm.invenioRecordsAlert = null;
-      // Attach the error to the scope
-      vm.invenioRecordsAlert = data;
-    }
-
-    /**
-      * Prepare the form after the action
-      * @memberof invenioRecordsController
-      * @function invenioRecordsActionFinished
-      * @param {Object} evt - The event object.
-      * @param {Object} type - The action type
-      */
-    function invenioRecordsActionSuccess(evt, type) {
-      // Set the form to pristine if it's self or publish
-      if (['publish', 'self'].indexOf(type) > -1) {
-        $scope.depositionForm.$setPristine();
-        // Set the form to submitted if it's published
-        if (type === 'publish') {
-          $scope.depositionForm.$setSubmitted();
-        }
-      }
-      // Set the form to $invalid if it's deleted/discarded
-    }
-
-    /**
-      * Updating the endpoints
-      * @memberof invenioRecordsController
-      * @function invenioRecordsEndpointsUpdated
-      * @param {Object} evt - The event object.
-      * @param {Object} endpoints - The object with the endpoints.
-      */
-    function invenioRecordsEndpointsUpdated(evt, endpoints) {
-      vm.invenioRecordsEndpoints = angular.merge(
-        {
-          'delete': endpoints.self,
-        },
-        vm.invenioRecordsEndpoints,
-        endpoints
-      );
-    }
-
-    // Attach fuctions to the scope
-
-    // Action handler
-    vm.actionHandler = invenioRecordsHandler;
-    // Remove validation
-    vm.removeValidationMessage = invenioRecordsRemoveValidation;
-
-    ////////////
-
-    // Listener
-
-    // Local
-
-    // When invenio.records action requested
-    $scope.$on('invenio.records.action', invenioRecordsActions);
-
-    // When the module initialized
-    $scope.$on('invenio.records.init', invenioRecordsInit);
-
-    // Global - Until a unified invenio angular module
-
-    // When there is an error
-    $rootScope.$on('invenio.records.alert', invenioRecordsAlert);
-
-    // When loading requested to start
-    $rootScope.$on('invenio.records.loading.start', invenioRecordsLoadingStart);
-    // When loading requested to stop
-    $rootScope.$on('invenio.records.loading.stop', invenioRecordsLoadingStop);
-
-    // When the ``public`` action finishes without errors
-    $rootScope.$on(
-      'invenio.records.action.success', invenioRecordsActionSuccess
-    );
-
-    // Update endpoints
-    $rootScope.$on(
-      'invenio.records.endpoints.updated', invenioRecordsEndpointsUpdated
-    );
-  }
-
-  // Inject depedencies
-  invenioRecordsController.$inject = [
-    '$scope',
-    '$rootScope',
-    '$q',
-    '$timeout',
-    'invenioRecordsAPI',
-  ];
-
-  ////////////
-
-  // Services
-
-  /**
-   * @ngdoc service
-   * @name invenioRecordsAPI
-   * @namespace invenioRecordsAPI
-   * @param {service} $http - Angular http requests service.
-   * @param {service} $q - Angular promise service.
-   * @description
-   *     Call the records API
-   */
-  function invenioRecordsAPI($http, $q) {
-
-    /**
-     * Make a request to the API
-     * @memberof invenioRecordsAPI
-     * @param {Object} args - The request parameters.
-     * @returns {service} promise
-     */
-    function request(args) {
-      // Make the request
-      return $http(args);
-    }
-
-    /**
-     * Make a GET request to the API
-     * @memberof invenioRecordsAPI
-     * @param {Object} args - The request parameters.
-     * @returns {service} promise
-     */
-    function get(url) {
-      // If the url is empty just return a resolved promise
-      if (url === null) {
-        var deferred = $q.defer();
-        deferred.resolve();
-        return deferred.promise;
-      }
-      // Sugar goodies, just make a GET request
-      var args = {
-        url: url,
-        method: 'GET'
-      };
-      return request(args);
-    }
-
-    return {
-      get: get,
-      request: request,
-    };
-  }
-
-  invenioRecordsAPI.$inject = ['$http', '$q'];
-
-  ////////////
-
-  // Directives
-
-  /**
-   * @ngdoc directive
-   * @name invenioRecords
-   * @description
-   *    The invenioRecords directive handler
-   * @namespace invenioRecords
-   * @example
-   *    Usage:
-   *     <invenio-records
-   *      action="http://"
-   *      extra-params='{}'
-   *      form="http://"
-   *      initialization="http://"
-   *      record='record'
-   *      schema="http://">
-   *     </invenio-records>
-   *
-   */
-  function invenioRecords() {
-
-    // Functions
-
-    /**
-     * Initialize directive
-     * @memberof invenioRecords
-     * @param {service} scope -  The scope of this element.
-     * @param {service} element - Element that this directive is assigned to.
-     * @param {service} attrs - Attribute of this element.
-     * @param {invenioRecordsController} vm - Invenio records controller.
-     */
-    function link(scope, element, attrs, vm) {
-
-      // Upadate parameters
-      var collectedArgs = {
-        method: attrs.actionMethod || 'GET'
-      };
-
-      // Get alert messages
-      var responseParams = {
-        responseParams: JSON.parse(attrs.responseParams || '{}')
-      };
-
-      // Get any extras
-      var extraParams = JSON.parse(attrs.extraParams || '{}');
-
-      // Merge together
-      var args = angular.merge(
-        {},
-        collectedArgs,
-        responseParams,
-        extraParams
-      );
-
-      // Get the endpoints for schemas
-      var endpoints = {
-        form: attrs.form || null,
-        initialization: attrs.initialization || null,
-        schema: attrs.schema || null
-      };
-
-      // Get the record object
-      var record = JSON.parse(attrs.record || '{}');
-
-      // Spread the love of initialization
-      scope.$broadcast(
-        'invenio.records.init', args, endpoints, record
-      );
-    }
-
-    ////////////
-
-    return {
-      restrict: 'AE',
-      scope: false,
-      controller: 'invenioRecordsController',
-      controllerAs: 'recordsVM',
-      link: link,
-    };
-  }
-
-  /**
-   * @ngdoc directive
-   * @name invenioRecordsLoading
-   * @description
-   *    The invenio records loading directive handler
-   * @namespace invenioRecordsLoading
-   * @example
-   *    Usage:
-   *     <invenio-records-loading
-   *      template="http://loading.html">
-   *     </invenio-records-loading>
-   *
-   */
-  function invenioRecordsLoading() {
-
-    // Functions
-
-    /**
-     * Choose template for record loading
-     * @memberof invenioRecordsLoading
-     * @param {service} element - Element that this directive is assigned to.
-     * @param {service} attrs - Attribute of this element.
-     * @example
-     *    Minimal template `template.html` usage
-     *    {{ vm.invenioRecordsLoading }}
-     */
-    function templateUrl(element, attrs) {
-      return attrs.template;
-    }
-
-    ////////////
-
-    return {
-      restrict: 'AE',
-      scope: false,
-      require: '^invenioRecords',
-      templateUrl: templateUrl,
-    };
-  }
-
-  /**
-   * @ngdoc directive
-   * @name invenioRecordsAlert
-   * @description
-   *    The invenio records alert directive handler
-   * @namespace invenioRecordsAlert
-   * @example
-   *    Usage:
-   *     <invenio-records-alert
-   *      template="http://alert.html">
-   *     </invenio-records-alert>
-   *
-   */
-  function invenioRecordsAlert() {
-
-    // Functions
-
-    /**
-     * Choose template for record alert
-     * @memberof invenioRecordsAlert
-     * @param {service} element - Element that this directive is assigned to.
-     * @param {service} attrs - Attribute of this element.
-     * @example
-     *    Minimal template `template.html` usage
-     *    {{ vm.invenioRecordsAlert }}
-     */
-    function templateUrl(element, attrs) {
-      return attrs.template;
-    }
-
-    ////////////
-
-    return {
-      restrict: 'AE',
-      scope: false,
-      require: '^invenioRecords',
-      templateUrl: templateUrl,
-    };
-  }
-
-  /**
-   * @ngdoc directive
-   * @name invenioRecordsActions
-   * @description
-   *    The invenio records action directive handler
-   * @namespace invenioRecordsActions
-   * @example
-   *    Usage:
-   *     <invenio-records-actions
-   *      template="">
-   *     </invenio-records-actions>
-   *
-   */
-  function invenioRecordsActions() {
-
-    // Functions
-
-    /**
-     * Choose template for record actions
-     * @memberof invenioRecordsActions
-     * @param {service} element - Element that this directive is assigned to.
-     * @param {service} attrs - Attribute of this element.
-     * @example
-     *    Minimal template `template.html` usage
-     *      <a href="#" ng-click="vm.actionSave()">Save</a>
-     */
-    function templateUrl(element, attrs) {
-      return attrs.template;
-    }
-
-    ////////////
-
-    return {
-      restrict: 'AE',
-      scope: false,
-      require: '^invenioRecords',
-      templateUrl: templateUrl,
-    };
-  }
-
-  /**
-   * @ngdoc directive
-   * @name invenioRecordsForm
-   * @description
-   *    The invenio records form directive handler
-   * @namespace invenioRecordsForm
-   * @example
-   *    Usage:
-   *     <invenio-records-form
-   *      form-templates='{"textarea": "textarea.html"}'
-   *      form-templates-base="/src/node_modules"
-   *      template="">
-   *     </invenio-records-form>
-   */
-  function invenioRecordsForm($q, schemaFormDecorators, invenioRecordsAPI,
-    $httpParamSerializerJQLike) {
-
-    // Functions
-
-    /**
-     * Initialize directive
-     * @memberof invenioRecords
-     * @param {service} scope -  The scope of this element.
-     * @param {service} element - Element that this directive is assigned to.
-     * @param {service} attrs - Attribute of this element.
-     * @param {invenioRecordsController} vm - Invenio records controller.
-     */
-    function link(scope, element, attrs, vm) {
-
-      // Add custom templates
-      if (attrs.formTemplates && attrs.formTemplatesBase) {
-        var formTemplates = JSON.parse(attrs.formTemplates);
-        var formTemplatesBase = attrs.formTemplatesBase;
-
-        if (formTemplatesBase.substr(formTemplatesBase.length -1) !== '/') {
-          formTemplatesBase = formTemplatesBase + '/';
-        }
-
-        angular.forEach(formTemplates, function(value, key) {
-          schemaFormDecorators
-            .decorator()[key.replace('_', '-')]
-            .template = formTemplatesBase + value;
-        });
-      }
-
-      /**
-       * Get property from object
-       * @memberof invenioRecordsFrom
-       * @function getProp
-       * @param {Object} obj - The object.
-       * @param {String} prop - The property path to retrieve.
-       */
-      var getProp = function (obj, prop) {
-        return prop.split('.').reduce(function(data, item) {
-          return data[item];
-        }, obj);
-      };
-
-      /**
-       * Empty promise for the autocompletion
-       * @memberof invenioRecordsFrom
-       * @function _errorOrEmpty
-       */
-      function _errorOrEmppty(){
-        var defer = $q.defer();
-        defer.resolve({data: []});
-        return defer.promise;
-      }
-
-      /**
-       * Handle the autocomplete request
-       * @memberof invenioRecordsFrom
-       * @function _suggestEngine
-       * @param {Object} args - The arguments for the request.
-       * @param {Object} keyProperty - The results key.
-       */
-      function _suggestEngine(args, keyProperty) {
-        if (args.url !== undefined) {
-          return invenioRecordsAPI.request(args)
-            .then(
-              function success(response) {
-                return {
-                  data: getProp(response.data, keyProperty)
-                };
-              },
-              _errorOrEmppty
-            );
-        }
-        return _errorOrEmppty();
-      }
-
-      /**
-       * Add url parameters
-       * @memberof invenioRecordsFrom
-       * @function _urlParser
-       * @param {String} url - The url.
-       * @param {Object} urlParameters - The parameters for the url.
-       * @param {String} query - The query.
-       */
-      function _urlParser(url, urlParameters, query){
-        if (urlParameters !== undefined) {
-          var urlArgs = {};
-          angular.forEach(urlParameters, function(value, key) {
-            try {
-              if (key === 'text' && value === 'value'){
-                urlArgs[key] = query;
-              } else {
-                urlArgs[key] = scope.$eval(value) || value;
-              }
-            } catch(error) {
-              urlArgs[key] = value;
-            }
-          });
-          url = url + '?' + $httpParamSerializerJQLike(
-            angular.merge({}, urlArgs)
-          );
-        }
-        return url;
-      }
-
-      /**
-       * Trigger it on autocomplete field
-       * @memberof invenioRecordsFrom
-       * @function autocompleteSuggest
-       * @param {Object} options - The options from the form schema.
-       * @param {String} query - The query.
-       */
-      function autocompleteSuggest(options, query) {
-        var args = {};
-        if (query && options.url !== undefined) {
-          // Parse the url parameters
-          args = angular.extend({},
-            {
-              url: _urlParser(options.url, options.urlParameters, query),
-              method: 'GET',
-              data: options.data || {},
-              headers: options.headers || vm.invenioRecordsArgs.headers
-            }
-          );
-        }
-        return _suggestEngine(args, options.map.resultsProperty);
-      }
-      // Attach to the scope
-      scope.autocompleteSuggest = autocompleteSuggest;
-    }
-
-    /**
-     * Choose template for record form
-     * @memberof invenioRecordsForm
-     * @param {service} element - Element that this directive is assigned to.
-     * @param {service} attrs - Attribute of this element.
-     * @example
-     *    Minimal template `template.html` usage
-     *      <form
-     *       sf-schema="vm.invenioRecordsSchema"
-     *       sf-form="vm.invenioRecordsForm"
-     *       sf-model="vm.invenioRecordsModel">
-     *      </form>
-     */
-    function templateUrl(element, attrs) {
-      return attrs.template;
-    }
-
-    ////////////
-
-    return {
-      restrict: 'AE',
-      link: link,
-      scope: false,
-      require: '^invenioRecords',
-      templateUrl: templateUrl,
-    };
-  }
-
-  invenioRecordsForm.$inject = [
-    '$q',
-    'schemaFormDecorators',
-    'invenioRecordsAPI',
-    '$httpParamSerializerJQLike'
-  ];
-
-  ///////////////
-
-  // Put everything together
-
-  // Controllers
-  angular.module('invenioRecords.controllers', [])
-    .controller('invenioRecordsController', invenioRecordsController);
-
-  // Services
-  angular.module('invenioRecords.services', [])
-    .service('invenioRecordsAPI', invenioRecordsAPI);
-
-  // Directives
-  angular.module('invenioRecords.directives', ['schemaForm'])
-    .directive('invenioRecords', invenioRecords)
-    .directive('invenioRecordsAlert', invenioRecordsAlert)
-    .directive('invenioRecordsLoading', invenioRecordsLoading)
-    .directive('invenioRecordsActions', invenioRecordsActions)
-    .directive('invenioRecordsForm', invenioRecordsForm);
-
-  // Setup everyhting
-  angular.module('invenioRecords' , [
-    'invenioRecords.services',
-    'invenioRecords.controllers',
-    'invenioRecords.directives',
-  ]);
-
-  //////////// HAPPY EDITING :)
-
-})(angular);
diff --git a/src/invenio-records-js/services/InvenioRecordsAPI.js b/src/invenio-records-js/services/InvenioRecordsAPI.js
new file mode 100644
index 0000000..d9a4f75
--- /dev/null
+++ b/src/invenio-records-js/services/InvenioRecordsAPI.js
@@ -0,0 +1,76 @@
+/*
+ * This file is part of Invenio.
+ * Copyright (C) 2016 CERN.
+ *
+ * Invenio is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * Invenio is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Invenio; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * In applying this license, CERN does not
+ * waive the privileges and immunities granted to it by virtue of its status
+ * as an Intergovernmental Organization or submit itself to any jurisdiction.
+ */
+
+/**
+  * @ngdoc service
+  * @name InvenioRecordsAPI
+  * @namespace InvenioRecordsAPI
+  * @param {service} $http - Angular http requests service.
+  * @param {service} $q - Angular promise service.
+  * @description
+  *     Call the records API
+  */
+function InvenioRecordsAPI($http, $q) {
+
+  /**
+    * Make a request to the API
+    * @memberof InvenioRecordsAPI
+    * @param {Object} args - The request parameters.
+    * @returns {service} promise
+    */
+  function request(args) {
+    // Make the request
+    return $http(args);
+  }
+
+  /**
+    * Make a GET request to the API
+    * @memberof InvenioRecordsAPI
+    * @param {Object} args - The request parameters.
+    * @returns {service} promise
+    */
+  function get(url) {
+    // If the url is empty just return a resolved promise
+    if (url === null) {
+      var deferred = $q.defer();
+      deferred.resolve();
+      return deferred.promise;
+    }
+    // Sugar goodies, just make a GET request
+    var args = {
+      url: url,
+      method: 'GET'
+    };
+    return request(args);
+  }
+
+  return {
+    get: get,
+    request: request,
+  };
+}
+
+InvenioRecordsAPI.$inject = ['$http', '$q'];
+
+angular.module('invenioRecords.services')
+  .service('InvenioRecordsAPI', InvenioRecordsAPI);
diff --git a/test/e2e/invenio-records-js/invenioRecordsActionsSpec.js b/test/e2e/invenio-records-js/invenioRecordsActionsSpec.js
index 96cdcc3..63b4654 100644
--- a/test/e2e/invenio-records-js/invenioRecordsActionsSpec.js
+++ b/test/e2e/invenio-records-js/invenioRecordsActionsSpec.js
@@ -222,7 +222,7 @@ describe('Unit: testing directive invenio-records-actions', function() {
     scope.$digest();
 
     // Expect error
-    var error = 'The action type is not supported';
+    var error = 'The action type is not supported.';
 
     // Expect the message to be
     expect(scope.recordsVM.invenioRecordsAlert.data.message).to.be.equal(error);
diff --git a/test/unit/invenio-records-js/controllersSpec.js b/test/unit/invenio-records-js/controllersSpec.js
index 1fce6cd..194b7bb 100644
--- a/test/unit/invenio-records-js/controllersSpec.js
+++ b/test/unit/invenio-records-js/controllersSpec.js
@@ -28,13 +28,13 @@ describe('Unit: testing controllers', function() {
   var $controller;
   var $rootScope;
   var ctrl;
-  var invenioRecordsAPI;
+  var InvenioRecordsAPI;
   var scope;
 
   // Inject the angular module
   beforeEach(angular.mock.module('invenioRecords'));
 
-  beforeEach(inject(function(_$controller_, _$rootScope_, _invenioRecordsAPI_) {
+  beforeEach(inject(function(_$controller_, _$rootScope_, _InvenioRecordsAPI_) {
     // Controller
     $controller = _$controller_;
     // The Scope
@@ -42,9 +42,9 @@ describe('Unit: testing controllers', function() {
     // Set the scope
     scope = $rootScope;
     // Set the service
-    invenioRecordsAPI = _invenioRecordsAPI_;
+    InvenioRecordsAPI = _InvenioRecordsAPI_;
     // The controller
-    ctrl = $controller('invenioRecordsController', {
+    ctrl = $controller('InvenioRecordsCtrl', {
       $scope: scope,
     });
   }));
@@ -72,7 +72,7 @@ describe('Unit: testing controllers', function() {
   });
 
   it('should return undefined on empty url', function() {
-    var api = invenioRecordsAPI.get(null);
+    var api = InvenioRecordsAPI.get(null);
     expect(api.$$state.value).to.be.undefined;
   });