Feature/bumping deps (#2)

* Bumping versions.

* Upgrading to the new Angular.JS API for promises

* Removing bower componenets

Author: alexflav23

.gitignore

@@ -2,3 +2,4 @@
 .idea/
 .idea-modules/
 *.iml
+bower_components/

bower.json

@@ -1,17 +1,20 @@
 {
   "name": "dali",
-  "version": "1.3.2",
+  "version": "1.4.0",
   "authors": [
-    "Flavian Alexandru <alexandruflavian23@gmail.com>"
+    "Flavian Alexandru <flavian@outworkers.com>"
   ],
   "description": "JavaScript mini-framework with re-usable components",
   "main": "dali.js",
   "license": "MIT",
-  "homepage": "https://github.com/websudos/dali",
+  "homepage": "https://github.com/outworkers/dali",
   "dependencies": {
     "jsSHA": "2.0.2",
-    "angular": "1.4.8",
-    "angular-bootstrap": "1.1.0"
+    "angular": "1.6.4",
+    "angular-ui-bootstrap": "2.5.0"
+  },
+  "devDevepencies": {
+    "mocha": "3.4.2"
   },
   "ignore": [
     "**/.*",

conf.js

@@ -0,0 +1,13 @@
+exports.config = {
+  
+  framework: 'jasmine',
+  specs: [
+      'spec/**/*.js'
+  ],
+  capabilities: {
+      browserName: 'chrome'
+  },
+  jasmineNodeOpts: {
+    showColors: true // Use colors in the command line report.
+  }
+};

lib/services/Service.js

@@ -120,22 +120,39 @@ dali.services.Service.prototype.jsonp = function(route, config) {
     return this.request(this.getHttp().jsonp(route, config));
 };
 
-
 dali.services.Service.prototype.request = function(request) {
     var deferred = this.q_.defer();
 
-    request.success(function(data, status, headers, config) {
-        deferred.resolve(new dali.http.HttpResponse(data, status, headers, config));
+    request.then(function(response)) {
+        deferred.resolve(
+          new dali.http.HttpResponse(
+            response.data,
+            response.statusText,
+            response.headers,
+            response.config
+          )
+        );
 
         if (this.autoalert_) {
-            dali.services.AlertService.getInstance().success(status + ":" + data);
+            dali.services.AlertService
+              .getInstance()
+              .success(response.statusText + ":" + response.data);
         }
 
-    }).error(function(data, status, headers, config) {
-        deferred.reject(new dali.http.HttpError(data, status, headers, config));
+    }, function onError(response) {
+        deferred.reject(
+          new dali.http.HttpError(
+            response.data,
+            response.statusText,
+            response.headers,
+            response.config
+          )
+        );
 
         if (this.autoalert_) {
-            dali.services.AlertService.getInstance().error(status + ":" + data);
+            dali.services.AlertService
+              .getInstance()
+              .error(status + ":" + data);
         }
     });
 

package.json

@@ -0,0 +1,26 @@
+{
+  "name": "dali",
+  "version": "1.4.0",
+  "authors": [
+    "Flavian Alexandru <flavian@outworkers.com>"
+  ],
+  "description": "JavaScript mini-framework with re-usable components",
+  "main": "dali.js",
+  "license": "MIT",
+  "homepage": "https://github.com/outworkers/dali",
+  "dependencies": {
+    "jsSHA": "2.0.2",
+    "angular": "1.6.4",
+    "angular-ui-bootstrap": "2.5.0"
+  },
+  "devDevepencies": {
+    "mocha": "3.4.2"
+  },
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ]
+}

spec/lib/services/services-test.js

@@ -0,0 +1,23 @@
+describe("the Service.js HTTP proxy for Angular should", function() {
+
+  it('convert successful HTTP resonses to dali lib equivalent', inject(function($q, $http, $rootScope) {
+    var service = new dali.services.Service();
+    service.setServices($q, $http, dali.services.AlertService.getInstance());
+
+    // your test assertion goes here
+    var $scope = {};
+
+    /* Code Under Test */
+    service.get('http://localhost/foo');
+
+    $httpBackend
+     .when('GET', 'http://localhost/foo')
+     .respond(200, { foo: 'bar' });
+
+    $httpBackend.flush();
+
+    expect($scope.valid).toBe(true);
+    expect($scope.response).toEqual({ foo: 'bar' });
+ }));
+
+});

spec/util/util-spec.js

@@ -0,0 +1,3 @@
+it('should demonstrate using when (200 status)', inject(function($http) {
+  console.log("test should suceed");
+}));