Merging master

Author: kdinev

.gitignore

@@ -2,4 +2,5 @@ node_modules
 bower_components
 dist
 test_out
-coverage
+coverage
+instrument

.travis.yml

@@ -13,5 +13,8 @@ before_install:
 script:
   - npm run start
   - sleep 3
+  - npm run instrument
   - npm run test-single
-  - npm run protractor
+  - npm run protractor
+  - npm run cover-combined
+  - cat ./coverage/final/lcov.info | coveralls

README.md

@@ -1,6 +1,8 @@
 #Ignite UI directives for AngularJS
 
-[![Build Status](https://travis-ci.org/IgniteUI/igniteui-angular.svg?branch=master)](https://travis-ci.org/IgniteUI/igniteui-angular) [![Codacy Badge](https://api.codacy.com/project/badge/grade/f7b38e525b504be0aabc891079530521)](https://www.codacy.com/app/kdinev/igniteui-angular)
+[![Build Status](https://travis-ci.org/IgniteUI/igniteui-angular.svg?branch=master)](https://travis-ci.org/IgniteUI/igniteui-angular)
+[![Coverage Status](https://coveralls.io/repos/github/IgniteUI/igniteui-angular/badge.svg?branch=master)](https://coveralls.io/github/IgniteUI/igniteui-angular?branch=master)
+[![Codacy Badge](https://api.codacy.com/project/badge/grade/f7b38e525b504be0aabc891079530521)](https://www.codacy.com/app/kdinev/igniteui-angular)
 
 Use the directives found in `igniteui-angular.js` to use [Ignite UI](http://igniteui.com) controls in [AngularJS](http://angularjs.com) pages. [Work with the running samples here](http://igniteui.github.io/igniteui-angular).
 
@@ -150,7 +152,11 @@ Simply do:
 
 	npm install
 
-The command is preconfigured and it will also call `bower install` behind the scenes.
+The command is preconfigured and it will also call `bower install` behind the scenes. 
+
+Then you need to instrument the source file with:
+
+	npm run instrument
 
 ####Running Unit Tests
 The easiest way to run the unit tests is to use the npm script:
@@ -190,6 +196,25 @@ Running the tests is done with:
 
 **Note:** You will need to run the protractor on a separate bash
 
+###Code coverage
+After running the Karma or Protractor tests by default a coverage will be created for each of them.
+
+To combine the both reports into one single report you need to execute:
+
+	npm run cover-combined
+	
+After that the default directory where you can open the code coverage is igniteui-angular/coverage/final/lcov/src.
+
+**Running specific coverage:** 
+
+To view only the Karma coverage you can see it under *coverage/karma/**/lcov-report/src*. 
+
+To view the code coverage only for the Protractor you need to run the command:
+
+	npm run cover-protractor
+
+After that the location is the same(igniteui-angular/coverage/final/lcov/src). That is because the Protractor report is not easily readable by default.
+
 ---------------------------------------
 
 ##What is Ignite UI?

package.json

@@ -2,27 +2,33 @@
   "name": "igniteui-angular",
   "dependencies": {},
   "devDependencies": {
+    "mkdirp": "",
     "coveralls": "",
     "grunt": "",
     "grunt-contrib-jshint": "",
     "grunt-contrib-uglify": "",
     "grunt-contrib-watch": "",
     "jshint-stylish": "",
     "protractor": "",
+    "protractor-istanbul-plugin": "",
     "http-server": "",
     "bower": "",
     "shelljs": "",
+    "istanbul-coveralls": "",
     "karma": "",
     "karma-jasmine": "",
     "karma-coverage": "",
     "karma-chrome-launcher": "",
     "karma-firefox-launcher": "",
     "karma-junit-reporter": ""
-
   },
   "scripts": {
     "postinstall": "bower install",
-
+	"instrument": "istanbul instrument ./src/ -o ./instrument/",
+	
+	"cover-protractor": "rm -rf coverage/tmp && mkdirp coverage/tmp/ && cp coverage/protractor/*.json coverage/tmp/ && istanbul report --include=./coverage/tmp/*.json -dir coverage/final",
+	"cover-combined": "rm -rf coverage/tmp && mkdirp coverage/tmp/ && cp coverage/karma/**/coverage*.json coverage/tmp/ && cp coverage/protractor/*.json coverage/tmp/ && istanbul report --include=./coverage/tmp/*.json -dir coverage/final",
+	
     "prestart": "npm install",
     "start": "http-server -a localhost -p 8000 &",
 

samples/grid/master-detail/app/app.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 var app = angular.module("app", ["ngResource", "igniteui-directives"]);
 

samples/grid/master-detail/app/controllers/masterDetailController.js

@@ -1,21 +1,21 @@
-app.controller('masterDetailController',
+app.controller("masterDetailController",
 
-            ['$scope', 'dataService',
+            ["$scope", "dataService",
     function ($scope,   dataService) {
 
-        'use strict';
+        "use strict";
 
         $scope.error = null;
 
-        $scope.message = '';
+        $scope.message = "";
 
         $scope.selectedHome = null;
         $scope.selectedHomeOriginal = null;
 
         $scope.save = function(){
             dataService.save($scope.selectedHome).then(function(){
                 $scope.selectedHome = null;
-                $scope.message = 'Home saved';
+                $scope.message = "Home saved";
             }, 
             function(error){
                 $scope.error = error;
@@ -36,24 +36,24 @@ app.controller('masterDetailController',
 
         // **** Grid-related event handlers ********
         $scope.homesGridRendered = function(e){
-            $scope.message = 'Grid is rendered';
+            $scope.message = "Grid is rendered";
         };
 
         $scope.homesGridColumnSorted = function(e, u){
             $scope.$apply(function () {
-                $scope.message = 'Column sorted';
+                $scope.message = "Column sorted";
             });
         };
 
         $scope.homesGridPageSelectionChanged = function(e, u){
             $scope.$apply(function () {
-                $scope.message = 'Page index changed';
+                $scope.message = "Page index changed";
             });
         };
 
         $scope.homesGridPageSizeChanged = function(e, u){
             $scope.$apply(function () {
-                $scope.message = 'Page size changed';
+                $scope.message = "Page size changed";
             });
         };
 

samples/grid/master-detail/app/services/dataService.js

@@ -1,25 +1,25 @@
-app.factory('dataService', 
+app.factory("dataService", 
 
-            ['$http', '$q', 
+            ["$http", "$q", 
      function($http,   $q){
 
-         'use strict';
+         "use strict";
 
          var svc = {
 
             getAll: function(){
 
                 var deferred = $q.defer();
 
-                $http.get('/api/homes').success(deferred.resolve).error(deferred.reject);
+                $http.get("/api/homes").success(deferred.resolve).error(deferred.reject);
 
                 return deferred.promise;
             },
 
             save: function (home) {
                     var deferred = $q.defer();
 
-                    $http.post('/api/homes', home).success(function (result) {
+                    $http.post("/api/homes", home).success(function (result) {
                         deferred.resolve(result);
                     }).error(deferred.reject);
 

samples/js/data/tasks.js

@@ -1,4 +1,4 @@
-app.factory('tasks', [function () {
+app.factory("tasks", [function () {
     var svc = {
         data: [
 			{

samples/js/igniteui-sample.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 /*
     The factories are created to provide data and services
@@ -10,12 +10,12 @@
 	controller.
 */
 
-var app = angular.module('igniteui-sample', ['igniteui-directives']);
+var app = angular.module("igniteui-sample", ["igniteui-directives"]);
 
 // controllers
-app.controller('gridController',
+app.controller("gridController",
 
-            ['$scope', 'northwind',
+            ["$scope", "northwind",
     function ($scope,   northwind) {
         // only needed until https://github.com/angular/angular.js/issues/6683 is resolved
         for (var i = 0; i < northwind.data.length; i++) {
@@ -77,9 +77,9 @@ app.controller('gridController',
 
     }]);
 
-app.controller('comboController',
+app.controller("comboController",
 
-            ['$scope', 'northwind',
+            ["$scope", "northwind",
     function ($scope,   northwind) {
 
         $scope.northwind = northwind.data;
@@ -91,35 +91,35 @@ app.controller('comboController',
 
     }]);
 
-app.controller('dataChartController',
+app.controller("dataChartController",
 
-            ['$scope', 'populationData',
+            ["$scope", "populationData",
     function ($scope,   populationData) {
 
         $scope.dataChart = populationData.data;
 
     }]);
 
-app.controller('editorsController',
+app.controller("editorsController",
 
-            ['$scope',
+            ["$scope",
     function ($scope) {
 
         $scope.editors = {
             currency: 12.1,
             date: new Date(),
-            editor: 'Infragistics',
-            mask: '134-134-134',
+            editor: "Infragistics",
+            mask: "134-134-134",
             numeric: 123,
             percent: 0.12,
-            text: 'Ignite UI'
+            text: "Ignite UI"
         };
 
     }]);
 
-app.controller('treeController',
+app.controller("treeController",
 
-            ['$scope', 'productCategories',
+            ["$scope", "productCategories",
     function ($scope,   productCategories) {
 
         $scope.ProductCategories = productCategories.data;
@@ -159,44 +159,44 @@ app.controller('treeController',
         };
 
         $scope.removeSelectedNode = function () {
-            var selected = $('#tree1').igTree('selectedNode');
+            var selected = $("#tree1").igTree("selectedNode");
             if (selected.path !== null) {
-                $('#tree1').igTree('removeAt', selected.path);
+                $("#tree1").igTree("removeAt", selected.path);
             } else {
-                alert('Select a node from the tree first');
+                alert("Select a node from the tree first");
             }
         };
 
     }]);
 
-app.controller('hierarchicalGridController',
+app.controller("hierarchicalGridController",
 
-            ['$scope', 'northwindEmployees',
+            ["$scope", "northwindEmployees",
     function ($scope,   northwindEmployees) {
 
         $scope.northwindEmployees = northwindEmployees.data;
 
     }]);
 
-app.controller('tileManagerController',
+app.controller("tileManagerController",
 
-            ['$scope', 'candidates',
+            ["$scope", "candidates",
     function ($scope,   candidates) {
 
         $scope.candidates = candidates.data;
 
     }]);
-app.controller('treeGridController',
+app.controller("treeGridController",
 
-            ['$scope', 'tasks',
+            ["$scope", "tasks",
     function ($scope,   tasks) {
 
         $scope.tasks = tasks.data;
 
     }]);
-app.controller('pivotGridController',
+app.controller("pivotGridController",
 
-            ['$scope',
+            ["$scope",
     function ($scope) {
 
         $scope.pivotData = new $.ig.OlapFlatDataSource({
@@ -218,7 +218,7 @@ app.controller('pivotGridController',
                                 {
                                     caption: "Units Sold", name: "UnitsSold",
                                     // returns a function that will be used as sum aggregator on the 'UnitsSold property' of the data objects
-                                    aggregator: $.ig.OlapUtilities.prototype.sumAggregator('UnitsSold')
+                                    aggregator: $.ig.OlapUtilities.prototype.sumAggregator("UnitsSold")
                                 }]
                         },
                         dimensions: [ // for each dimension name and hierarchies are required
@@ -255,21 +255,21 @@ app.controller('pivotGridController',
                 measures: "[Measures].[UnitsSold]"
             });
     }]);
-app.controller('pivotGridXmlaController',
+app.controller("pivotGridXmlaController",
 
-            ['$scope',
+            ["$scope",
     function ($scope) {
 		$scope.xmlaDataSource = new $.ig.OlapXmlaDataSource({
-                serverUrl: 'http://sampledata.infragistics.com/olap/msmdpump.dll',
-                catalog: 'Adventure Works DW Standard Edition',
-                cube: 'Adventure Works',
+                serverUrl: "http://sampledata.infragistics.com/olap/msmdpump.dll",
+                catalog: "Adventure Works DW Standard Edition",
+                cube: "Adventure Works",
                 rows: "[Ship Date].[Calendar]",
                 columns: "[Delivery Date].[Calendar]",
                 measures: "[Measures].[Product Gross Profit Margin Status],[Measures].[Product Gross Profit Margin Goal]",
             });
     }]);
-app.controller('htmlEditorController',
-            ['$scope',
+app.controller("htmlEditorController",
+            ["$scope",
     function ($scope) {
        $scope.data = "<p>Ignite UI controls:</p><p><ul><li>igEditors</li><li>igHtmlEditor</li><li>igGrid</li><li>igDataChart</li><li>etc.</li></ul></p>";
     }]);

src-samples/src/grid/master-detail/app/app.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 var app = angular.module("app", ["ngResource", "igniteui-directives"]);