Refactor HALAPIResource service

frontend/app/api/hal-api-resource.js

@@ -1,75 +0,0 @@
-//-- copyright
-// OpenProject is a project management system.
-// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License version 3.
-//
-// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-// Copyright (C) 2006-2013 Jean-Philippe Lang
-// Copyright (C) 2010-2013 the ChiliProject Team
-//
-// This program 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.
-//
-// This program 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 this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-//
-// See doc/COPYRIGHT.rdoc for more details.
-//++
-
-/* globals Hyperagent */
-require('hyperagent');
-
-module.exports = function HALAPIResource($timeout, $q) {
-  'use strict';
-  var configure = function() {
-    Hyperagent.configure('ajax', function(settings) {
-      var deferred = $q.defer(),
-          resolve = settings.success,
-          reject = settings.error;
-
-      settings.success = deferred.resolve;
-      settings.reject = deferred.reject;
-
-      deferred.promise.then(function(response) {
-        $timeout(function() { resolve(response); });
-      }, function(reason) {
-        $timeout(function() { reject(reason); });
-      });
-
-      return jQuery.ajax(settings);
-    });
-    Hyperagent.configure('defer', $q.defer);
-    // keep this if you want null values to not be overwritten by
-    // Hyperagent.js miniscore
-    // this weird line replaces HA miniscore with normal underscore
-    // Freud would be happy with what ('_', _) reminds me of
-    Hyperagent.configure('_', _);
-  };
-  return {
-    setup: function(uri, params) {
-      if (!params) {
-        params = {};
-      }
-      configure();
-
-      var link = new Hyperagent.Resource(_.extend({
-        url: uri
-      }, params));
-      if (params.method) {
-        link.props.href = uri;
-        link.props.method = params.method;
-      }
-      return link;
-    }
-  };
-};

frontend/app/components/common/services/hal-api-resource.service.js

@@ -1,4 +1,4 @@
-//-- copyright
+// -- copyright
 // OpenProject is a project management system.
 // Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
 //
@@ -24,10 +24,42 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // See doc/COPYRIGHT.rdoc for more details.
-//++
+// ++
+
+/* globals Hyperagent */
+require('hyperagent');
 
 angular.module('openproject.api')
-  .factory('HALAPIResource', ['$timeout',
-      '$q',
-      require('./hal-api-resource')
-  ]);
+  .run(run)
+  .factory('HALAPIResource', HALAPIResource);
+
+run.$inject = ['$http', '$q'];
+
+function run($http, $q) {
+  Hyperagent.configure('ajax', function(settings) {
+    settings.transformResponse = function (data) { return data; };
+
+    return $http(settings).then(
+      function (response) { settings.success(response.data); },
+      settings.error
+    );
+  });
+  Hyperagent.configure('defer', $q.defer);
+  Hyperagent.configure('_', _);
+}
+
+function HALAPIResource () {
+  return {
+    setup: function(uri, params) {
+      params = params || {};
+      var link = new Hyperagent.Resource(_.extend({ url: uri }, params));
+
+      if (params.method) {
+        link.props.href = uri;
+        link.props.method = params.method;
+      }
+
+      return link;
+    }
+  };
+}

frontend/app/openproject-app.js

@@ -257,8 +257,6 @@ openprojectApp
     }
   ]);
 
-require('./api');
-
 angular.module('openproject.config')
   .service('ConfigurationService', [
     'PathHelper',

frontend/tests/unit/tests/components/common/services/hal-api-resource-test.js

@@ -30,23 +30,12 @@
 
 describe('HALAPIResource', function() {
 
-  var HALAPIResource, testPathHelper;
+  var HALAPIResource;
   beforeEach(module('openproject.api'));
 
-  beforeEach(function() {
-    testPathHelper = {
-      apiV3: '/api/v3',
-      appBasePath: ''
-    };
-
-    module(function($provide) {
-      $provide.value('PathHelper', testPathHelper);
-    });
-
-    inject(function(_HALAPIResource_) {
-      HALAPIResource = _HALAPIResource_;
-    });
-  });
+  beforeEach(inject(function(_HALAPIResource_) {
+    HALAPIResource = _HALAPIResource_;
+  }));
 
   describe('setup', function() {
     var apiResource, resourceFunction;