Merge branch 'Icydillic-patch-2'

Author: asafdav

src/ng-csv/services/csv-service.js

@@ -5,7 +5,7 @@ angular.module('ngCsv.services').
   service('CSV', ['$q', function ($q) {
 
     var EOL = '\r\n';
-    var BOM = "%ef%bb%bf";
+    var BOM = "\ufeff";
 
     /**
      * Stringify one field
@@ -58,12 +58,12 @@ angular.module('ngCsv.services').
           csvContent += headerString + EOL;
         }
 
-        var arrData;
+        var arrData = [];
 
         if (angular.isArray(responseData)) {
           arrData = responseData;
         }
-        else {
+        else if (angular.isFunction(responseData)) {
           arrData = responseData();
         }
 

test/unit/ngCsv/directives/ngCsv.js

@@ -180,7 +180,7 @@ describe('ngCsv directive', function () {
 
     // Check that the compiled element contains the templated content
     scope.buildCSV(scope.data).then(function() {
-      expect(scope.csv).toBe('%ef%bb%bf1,2,3\r\n4,5,6\r\n');
+      expect(scope.csv).toBe('\ufeff1,2,3\r\n4,5,6\r\n');
       done();
     });
     scope.$apply();
@@ -323,4 +323,24 @@ describe('ngCsv directive', function () {
     $timeout.flush();
     scope.$apply();
   });
+
+  it('Handles undefined variables without raising any exception', function (done) {
+    var element = $compile(
+      '<div ng-csv="undefinedVariable" field-separator="{{sep}}"' +
+      ' filename="custom.csv">' +
+      '</div>')($rootScope);
+    $rootScope.$digest();
+    $rootScope.sep = ';';
+    $rootScope.$digest();
+
+    var scope = element.isolateScope();
+    // Check that the compiled element has indeed undefined variable
+    expect(scope.$eval(scope.data)).toEqual(undefined);
+
+    scope.buildCSV(scope.data).then(function() {
+      expect(scope.csv).toBe('');
+      done();
+    });
+    scope.$apply();
+  });
 });