From 082cbf192b3fb6a3dfd02bc5dd0221a34990026c Mon Sep 17 00:00:00 2001
From: Tankred Hase <tankred@whiteout.io>
Date: Tue, 11 Nov 2014 21:50:01 +0100
Subject: [PATCH] Refactore services code style

---
 src/js/app.js                         |  4 ++--
 src/js/service/mail-config.js         | 27 +++++++++++++++++++++++++++
 src/js/services/mail-config.js        | 27 ---------------------------
 test/unit/mail-config-service-test.js |  2 +-
 test/unit/validate-phone-ctrl-test.js |  1 -
 5 files changed, 30 insertions(+), 31 deletions(-)
 create mode 100644 src/js/service/mail-config.js
 delete mode 100644 src/js/services/mail-config.js

diff --git a/src/js/app.js b/src/js/app.js
index 37ea8de..c188df3 100644
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -36,8 +36,8 @@ var DialogCtrl = require('./controller/dialog'),
     ActionBarCtrl = require('./controller/action-bar'),
     errorUtil = require('./util/error'),
     backButtonUtil = require('./util/backbutton-handler');
-require('./directives/common'),
-require('./services/mail-config');
+require('./directive/common'),
+require('./service/mail-config');
 
 // init main angular module including dependencies
 var app = angular.module('mail', [
diff --git a/src/js/service/mail-config.js b/src/js/service/mail-config.js
new file mode 100644
index 0000000..3b9eb38
--- /dev/null
+++ b/src/js/service/mail-config.js
@@ -0,0 +1,27 @@
+'use strict';
+
+var ngModule = angular.module('woServices', []);
+ngModule.service('mailConfig', MailConfig);
+
+var cfg = require('../app-config').config;
+
+function MailConfig($http, $q) {
+    this._http = $http;
+    this._q = $q;
+}
+
+/**
+ * Get the mail server IMAP and SMTP configuration for an email address
+ */
+MailConfig.prototype.get = function(emailAddress) {
+    if (emailAddress.indexOf('@') < 0) {
+        return this._q(function(resolve, reject) {
+            reject(new Error('Invalid email address!'));
+        });
+    }
+
+    var url = cfg.settingsUrl + emailAddress.split('@')[1];
+    return this._http.get(url).then(function(res) {
+        return res.data;
+    });
+};
\ No newline at end of file
diff --git a/src/js/services/mail-config.js b/src/js/services/mail-config.js
deleted file mode 100644
index fb51bc4..0000000
--- a/src/js/services/mail-config.js
+++ /dev/null
@@ -1,27 +0,0 @@
-'use strict';
-
-var cfg = require('../app-config').config;
-
-var ngModule = angular.module('woServices', []);
-
-ngModule.service('mailConfig', function($http, $q) {
-
-    /**
-     * Get the mail server IMAP and SMTP configuration for an email address
-     */
-    this.get = function(emailAddress) {
-        if (emailAddress.indexOf('@') < 0) {
-            return $q(function(resolve, reject) {
-                reject(new Error('Invalid email address!'));
-            });
-        }
-
-        var url = cfg.settingsUrl + emailAddress.split('@')[1];
-        return $http.get(url).then(function(res) {
-            return res.data;
-        });
-    };
-
-});
-
-module.exports = ngModule;
\ No newline at end of file
diff --git a/test/unit/mail-config-service-test.js b/test/unit/mail-config-service-test.js
index 9691540..893dad7 100644
--- a/test/unit/mail-config-service-test.js
+++ b/test/unit/mail-config-service-test.js
@@ -2,7 +2,7 @@
 
 var mocks = angular.mock,
     cfg = require('../../src/js/app-config').config;
-require('../../src/js/services/mail-config');
+require('../../src/js/service/mail-config');
 
 describe('Mail Config Service unit test', function() {
     var mailConfig, httpBackend;
diff --git a/test/unit/validate-phone-ctrl-test.js b/test/unit/validate-phone-ctrl-test.js
index 1f14077..b3089c8 100644
--- a/test/unit/validate-phone-ctrl-test.js
+++ b/test/unit/validate-phone-ctrl-test.js
@@ -5,7 +5,6 @@ var mocks = angular.mock,
     Auth = require('../../src/js/bo/auth'),
     AdminDao = require('../../src/js/dao/admin-dao'),
     appController = require('../../src/js/app-controller');
-require('../../src/js/services/mail-config');
 
 describe('Validate Phone Controller unit test', function() {
     var scope, location, mailConfigMock, ctrl, authStub, origAuth, adminStub;