Added task to combine js files

.gitignore

@@ -4,5 +4,6 @@
 node_modules/
 lib/
 public/lib
+public/dist
 *.log
 public/css/common.css
\ No newline at end of file

bower.json

@@ -2,7 +2,7 @@
     "name": "dgc-metadata",
     "description": "DGC Metadata",
     "version": "1.0.0-SNAPSHOT",
-    "dependencies": {
+    "devDependencies": {
         "angular": "~1.2.15",
         "angular-resource": "~1.2.15",
         "angular-cookies": "~1.2.15",
@@ -13,6 +13,8 @@
         "angular-ui-router": "~0.2.13",
         "lodash": "~3.0.0",
         "angular-ui-utils": "~0.1.1",
-        "font-awesome": "~4.2.0"
+        "font-awesome": "~4.2.0",
+        "closure-compiler": "https://dl.google.com/closure-compiler/compiler-20140814.zip",
+        "ng-closure-runner": "https://raw.github.com/angular/ng-closure-runner/v0.2.3/assets/ng-closure-runner.zip"
     }
 }

gruntfile.js

@@ -2,6 +2,7 @@
 
 module.exports = function(grunt) {
     // Project Configuration
+    var classPathSep = (process.platform === "win32") ? ';' : ':';
     grunt.initConfig({
         pkg: grunt.file.readJSON('package.json'),
         watch: {
@@ -9,8 +10,8 @@ module.exports = function(grunt) {
                 livereload: 35730
             },
             js: {
-                files: ['public/**/*.js', '!public/lib/**'],
-                tasks: ['jshint']
+                files: ['public/**/*.js', '!public/lib/**', '!public/dist/**'],
+                tasks: ['jshint', 'shell']
             },
             html: {
                 files: ['public/**/*.html']
@@ -21,7 +22,7 @@ module.exports = function(grunt) {
         },
         jshint: {
             all: {
-                src: ['gruntfile.js', 'package.json', 'server.js', 'server/**/*.js', 'public/**/*.js', '!public/lib/**'],
+                src: ['gruntfile.js', 'package.json', 'server.js', 'server/**/*.js', 'public/**/*.js', '!public/lib/**', '!public/dist/**'],
                 options: {
                     jshintrc: true
                 }
@@ -76,6 +77,37 @@ module.exports = function(grunt) {
                     verbose: true
                 }
             }
+        },
+        // app
+        dist: 'public/dist/app.min.js',
+        modules: grunt.file.expand(
+            'public/js/app.js',
+            'public/js/routes.js',
+            'public/modules/**/*Module.js',
+            'public/modules/**/*.js',
+            'public/js/init.js'
+        ).join(' '),
+        shell: {
+            min: {
+                command: 'java ' +
+                    '-cp public/lib/closure-compiler/compiler.jar' + classPathSep +
+                    'public/lib/ng-closure-runner/ngcompiler.jar ' +
+                    'org.angularjs.closurerunner.NgClosureRunner ' +
+                    '--compilation_level SIMPLE_OPTIMIZATIONS ' +
+                    //'--formatting PRETTY_PRINT ' +
+                    '--language_in ECMASCRIPT5_STRICT ' +
+                    '--angular_pass ' +
+                    '--manage_closure_dependencies ' +
+                    '--js <%= modules %> ' +
+                    '--js_output_file <%= dist %>'
+            }
+        },
+        devUpdate: {
+            main: {
+                options: {
+                    updateType: 'force'
+                }
+            }
         }
     });
 
@@ -83,7 +115,7 @@ module.exports = function(grunt) {
     require('load-grunt-tasks')(grunt);
 
     //Default task(s).
-    grunt.registerTask('default', ['bower', 'jshint', 'jsbeautifier:default']);
+    grunt.registerTask('default', ['devUpdate', 'bower', 'jshint', 'jsbeautifier:default', 'shell:min']);
 
     // Server task
     grunt.registerTask('server', ['bower', 'jshint', 'concurrent']);

package.json

@@ -49,8 +49,10 @@
         "grunt-concurrent": "0.4.3",
         "grunt-contrib-jshint": "0.9.2",
         "grunt-contrib-watch": "0.6.0",
+        "grunt-dev-update": "^1.0.2",
         "grunt-jsbeautifier": "~0.2.6",
         "grunt-nodemon": "0.2.0",
-        "load-grunt-tasks": "^2.0.0"
+        "grunt-shell": "^1.1.1",
+        "load-grunt-tasks": "^3.1.0"
     }
 }

public/js/app.js

@@ -23,7 +23,7 @@ angular.module('dgc').factory('lodash', ['$window',
             renderErrors: $window.renderErrors
         };
     }
-]).run(function(Global, NotificationService, lodash) {
+]).run(['Global', 'NotificationService', 'lodash', function(Global, NotificationService, lodash) {
     var errors = Global.renderErrors;
     if (angular.isArray(errors) || angular.isObject(errors)) {
         lodash.forEach(errors, function(err) {
@@ -37,4 +37,4 @@ angular.module('dgc').factory('lodash', ['$window',
         errors.timeout = false;
         NotificationService.error(errors);
     }
-});
+}]);

public/js/init.js

@@ -5,5 +5,7 @@ angular.element(document).ready(function() {
     if (window.location.hash === '#_=_') window.location.hash = '#!';
 
     //Then init the app
-    angular.bootstrap(document, ['dgc']);
+    angular.bootstrap(document, ['dgc'], {
+        strictDi: true
+    });
 });

public/modules/notification/notificationModule.js

@@ -3,10 +3,10 @@
 angular.module('dgc.system.notification', ['ui.router']).constant('ColorCoding', {
     info: 'success',
     error: 'danger'
-}).run(function($rootScope, NotificationService) {
+}).run(['$rootScope', 'NotificationService', function($rootScope, NotificationService) {
     $rootScope.$on('$locationChangeSuccess', function(evt, from, to) {
         if (from !== to) {
             NotificationService.reset();
         }
     });
-});
+}]);

public/modules/search/searchController.js

@@ -8,7 +8,7 @@ angular.module('dgc.search').controller('SearchController', ['$scope', '$locatio
         $scope.search = function(query) {
             $scope.results = [];
             NotificationService.reset();
-            SearchResource.search($location.search(query).$$search, function(response) {
+            SearchResource.search($location.search(query).search(), function(response) {
                 $scope.results = response;
                 if ($scope.results.length < 1) {
                     NotificationService.error("No Result found", false);
@@ -19,7 +19,7 @@ angular.module('dgc.search').controller('SearchController', ['$scope', '$locatio
             });
         };
 
-        var urlParts = $location.$$url.split('?');
+        var urlParts = $location.url().split('?');
         $scope.query = urlParts.length > 1 ? urlParts[1] : null;
         if ($scope.query) {
             $scope.search($scope.query);

public/modules/search/views/search.html

@@ -12,7 +12,9 @@
         </div>
         <div class="row">
             <div class="col-sm-offset-1 col-lg-6">
-                <small class="small-txt">Search : hive_table, hive_database</small>
+                <small class="small-txt">Examples : property=HiveLineage.executionEngine&text=tez</small><br/>
+                <small class="small-txt">property=type&text=HiveLineage</small><br/>
+                <small class="small-txt">property=type&text=hive_table</small>
             </div>
         </div>
         <div class="row">

public/views/includes/foot.html

@@ -9,36 +9,7 @@
 <script type="text/javascript" src="/lib/angular-bootstrap/ui-bootstrap.js"></script>
 <script type="text/javascript" src="/lib/angular-bootstrap/ui-bootstrap-tpls.js"></script>
 
-
-<!-- Application Depedencies -->
-<!-- Application Init -->
-<script type="text/javascript" src="js/app.js"></script>
-<script type="text/javascript" src="js/routes.js"></script>
-
-<!-- Notification module -->
-<script type="text/javascript" src="/modules/notification/notificationModule.js"></script>
-<script type="text/javascript" src="/modules/notification/notificationService.js"></script>
-<script type="text/javascript" src="/modules/notification/notificationController.js"></script>
-
-<!-- Home Module -->
-<script type="text/javascript" src="/modules/home/homeModule.js"></script>
-<script type="text/javascript" src="/modules/home/homeRoutes.js"></script>
-<script type="text/javascript" src="/modules/home/headerController.js"></script>
-
-<!-- Search Module -->
-<script type="text/javascript" src="/modules/search/searchModule.js"></script>
-<script type="text/javascript" src="/modules/search/searchRoutes.js"></script>
-<script type="text/javascript" src="/modules/search/searchResource.js"></script>
-<script type="text/javascript" src="/modules/search/searchController.js"></script>
-
-<!-- Details Module -->
-<script type="text/javascript" src="/modules/details/detailsModule.js"></script>
-<script type="text/javascript" src="/modules/details/detailsRoutes.js"></script>
-<script type="text/javascript" src="/modules/details/detailsResource.js"></script>
-<script type="text/javascript" src="/modules/details/detailsController.js"></script>
-
-<!-- Initialize the application -->
-<script type="text/javascript" src="js/init.js"></script>
+<script type="text/javascript" src="dist/app.min.js"></script>
 
 {% if (process.env.NODE_ENV == 'local') %}
 <!-- Livereload script rendered -->