From 6893abdb75564d3540bb2d4e9a0dbfe6899072b2 Mon Sep 17 00:00:00 2001
From: Simo Kinnunen <simo@shoqolate.com>
Date: Wed, 5 Feb 2014 17:37:32 +0900
Subject: [PATCH] Switch to a more consistent naming convention for services
 and resource loading.

---
 res/app/scripts/app.js                                 |  4 ++--
 res/app/scripts/controllers/DeviceControlCtrl.js       |  6 +++---
 res/app/scripts/controllers/DeviceListCtrl.js          |  8 ++++----
 res/app/scripts/controllers/{index.js => _index.js}    |  0
 res/app/scripts/controllers/{module.js => _module.js}  |  0
 .../services/{controlService.js => ControlService.js}  |  6 +++---
 .../services/{deviceService.js => DeviceService.js}    |  6 +++---
 .../services/{groupService.js => GroupService.js}      |  8 ++++----
 res/app/scripts/services/SocketService.js              |  8 ++++++++
 .../services/{userService.js => UserService.js}        |  4 ++--
 res/app/scripts/services/_index.js                     | 10 ++++++++++
 res/app/scripts/services/{module.js => _module.js}     |  0
 res/app/scripts/services/index.js                      | 10 ----------
 res/app/scripts/services/socketService.js              |  8 --------
 14 files changed, 39 insertions(+), 39 deletions(-)
 rename res/app/scripts/controllers/{index.js => _index.js} (100%)
 rename res/app/scripts/controllers/{module.js => _module.js} (100%)
 rename res/app/scripts/services/{controlService.js => ControlService.js} (91%)
 rename res/app/scripts/services/{deviceService.js => DeviceService.js} (94%)
 rename res/app/scripts/services/{groupService.js => GroupService.js} (90%)
 create mode 100644 res/app/scripts/services/SocketService.js
 rename res/app/scripts/services/{userService.js => UserService.js} (70%)
 create mode 100644 res/app/scripts/services/_index.js
 rename res/app/scripts/services/{module.js => _module.js} (100%)
 delete mode 100644 res/app/scripts/services/index.js
 delete mode 100644 res/app/scripts/services/socketService.js

diff --git a/res/app/scripts/app.js b/res/app/scripts/app.js
index 9bb5b8cb..87e46f7f 100644
--- a/res/app/scripts/app.js
+++ b/res/app/scripts/app.js
@@ -1,7 +1,7 @@
 define([
     'angular'
-  , './controllers/index'
-  , './services/index'
+  , './controllers/_index'
+  , './services/_index'
   ]
 , function(ng) {
     return ng.module('app', [
diff --git a/res/app/scripts/controllers/DeviceControlCtrl.js b/res/app/scripts/controllers/DeviceControlCtrl.js
index ae2f6f9b..0a2ba2d9 100644
--- a/res/app/scripts/controllers/DeviceControlCtrl.js
+++ b/res/app/scripts/controllers/DeviceControlCtrl.js
@@ -1,4 +1,4 @@
-define(['./module'], function(mod) {
+define(['./_module'], function(controllers) {
   function DeviceControlCtrl($scope, $routeParams, deviceService) {
     $scope.device = null
 
@@ -8,10 +8,10 @@ define(['./module'], function(mod) {
       })
   }
 
-  mod.controller('DeviceControlCtrl'
+  controllers.controller('DeviceControlCtrl'
   , [ '$scope'
     , '$routeParams'
-    , 'deviceService'
+    , 'DeviceService'
     , DeviceControlCtrl
     ])
 })
diff --git a/res/app/scripts/controllers/DeviceListCtrl.js b/res/app/scripts/controllers/DeviceListCtrl.js
index 74bebf4d..819e0b70 100644
--- a/res/app/scripts/controllers/DeviceListCtrl.js
+++ b/res/app/scripts/controllers/DeviceListCtrl.js
@@ -1,4 +1,4 @@
-define(['./module'], function(mod) {
+define(['./_module'], function(controllers) {
   function DeviceListCtrl($scope, deviceService, groupService) {
     $scope.devices = deviceService.devices
 
@@ -21,10 +21,10 @@ define(['./module'], function(mod) {
     }
   }
 
-  mod.controller('DeviceListCtrl'
+  controllers.controller('DeviceListCtrl'
   , [ '$scope'
-    , 'deviceService'
-    , 'groupService'
+    , 'DeviceService'
+    , 'GroupService'
     , DeviceListCtrl
     ])
 })
diff --git a/res/app/scripts/controllers/index.js b/res/app/scripts/controllers/_index.js
similarity index 100%
rename from res/app/scripts/controllers/index.js
rename to res/app/scripts/controllers/_index.js
diff --git a/res/app/scripts/controllers/module.js b/res/app/scripts/controllers/_module.js
similarity index 100%
rename from res/app/scripts/controllers/module.js
rename to res/app/scripts/controllers/_module.js
diff --git a/res/app/scripts/services/controlService.js b/res/app/scripts/services/ControlService.js
similarity index 91%
rename from res/app/scripts/services/controlService.js
rename to res/app/scripts/services/ControlService.js
index 7a1c8f30..039804d4 100644
--- a/res/app/scripts/services/controlService.js
+++ b/res/app/scripts/services/ControlService.js
@@ -1,4 +1,4 @@
-define(['./module', 'lodash'], function(mod, _) {
+define(['./_module', 'lodash'], function(services, _) {
   function ControlServiceFactory($rootScope, socket) {
     var controlService = {
       members: []
@@ -51,9 +51,9 @@ define(['./module', 'lodash'], function(mod, _) {
     return controlService
   }
 
-  mod.factory('controlService'
+  services.factory('ControlService'
   , [ '$rootScope'
-    , 'socketService'
+    , 'SocketService'
     , ControlServiceFactory
     ])
 })
diff --git a/res/app/scripts/services/deviceService.js b/res/app/scripts/services/DeviceService.js
similarity index 94%
rename from res/app/scripts/services/deviceService.js
rename to res/app/scripts/services/DeviceService.js
index de6f596d..55111bb5 100644
--- a/res/app/scripts/services/deviceService.js
+++ b/res/app/scripts/services/DeviceService.js
@@ -1,4 +1,4 @@
-define(['./module', 'oboe'], function(mod, oboe) {
+define(['./_module', 'oboe'], function(services, oboe) {
   function DeviceServiceFactory($rootScope, $http, socket) {
     var deviceService = {
       devices: []
@@ -77,10 +77,10 @@ define(['./module', 'oboe'], function(mod, oboe) {
     return deviceService
   }
 
-  mod.factory('deviceService'
+  services.factory('DeviceService'
   , [ '$rootScope'
     , '$http'
-    , 'socketService'
+    , 'SocketService'
     , DeviceServiceFactory
     ])
 })
diff --git a/res/app/scripts/services/groupService.js b/res/app/scripts/services/GroupService.js
similarity index 90%
rename from res/app/scripts/services/groupService.js
rename to res/app/scripts/services/GroupService.js
index 3724db37..febd904d 100644
--- a/res/app/scripts/services/groupService.js
+++ b/res/app/scripts/services/GroupService.js
@@ -1,4 +1,4 @@
-define(['./module', 'lodash'], function(mod, _) {
+define(['./_module', 'lodash'], function(services, _) {
   function GroupServiceFactory($rootScope, socket, userService) {
     var groupService = {
       members: []
@@ -46,10 +46,10 @@ define(['./module', 'lodash'], function(mod, _) {
     return groupService
   }
 
-  mod.factory('groupService'
+  services.factory('GroupService'
   , [ '$rootScope'
-    , 'socketService'
-    , 'userService'
+    , 'SocketService'
+    , 'UserService'
     , GroupServiceFactory
     ])
 })
diff --git a/res/app/scripts/services/SocketService.js b/res/app/scripts/services/SocketService.js
new file mode 100644
index 00000000..a36ad6a5
--- /dev/null
+++ b/res/app/scripts/services/SocketService.js
@@ -0,0 +1,8 @@
+define(['./_module', 'socket.io'], function(services, io) {
+  function SocketServiceFactory() {
+    var socketService = io.connect()
+    return socketService
+  }
+
+  services.factory('SocketService', [SocketServiceFactory])
+})
diff --git a/res/app/scripts/services/userService.js b/res/app/scripts/services/UserService.js
similarity index 70%
rename from res/app/scripts/services/userService.js
rename to res/app/scripts/services/UserService.js
index dcc63fd2..6192463e 100644
--- a/res/app/scripts/services/userService.js
+++ b/res/app/scripts/services/UserService.js
@@ -1,4 +1,4 @@
-define(['./module'], function(mod) {
+define(['./_module'], function(services) {
   function UserServiceFactory($http) {
     var userService = {
     }
@@ -13,5 +13,5 @@ define(['./module'], function(mod) {
     return userService
   }
 
-  mod.factory('userService', ['$http', UserServiceFactory])
+  services.factory('UserService', ['$http', UserServiceFactory])
 })
diff --git a/res/app/scripts/services/_index.js b/res/app/scripts/services/_index.js
new file mode 100644
index 00000000..c96d8997
--- /dev/null
+++ b/res/app/scripts/services/_index.js
@@ -0,0 +1,10 @@
+define([
+    './SocketService'
+  , './DeviceService'
+  , './GroupService'
+  , './UserService'
+  , './ControlService'
+  ]
+, function() {
+  }
+)
diff --git a/res/app/scripts/services/module.js b/res/app/scripts/services/_module.js
similarity index 100%
rename from res/app/scripts/services/module.js
rename to res/app/scripts/services/_module.js
diff --git a/res/app/scripts/services/index.js b/res/app/scripts/services/index.js
deleted file mode 100644
index 5205d115..00000000
--- a/res/app/scripts/services/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-define([
-    './socketService'
-  , './deviceService'
-  , './groupService'
-  , './userService'
-  , './controlService'
-  ]
-, function() {
-  }
-)
diff --git a/res/app/scripts/services/socketService.js b/res/app/scripts/services/socketService.js
deleted file mode 100644
index a92fc7c4..00000000
--- a/res/app/scripts/services/socketService.js
+++ /dev/null
@@ -1,8 +0,0 @@
-define(['./module', 'socket.io'], function(mod, io) {
-  function SocketServiceFactory() {
-    var socketService = io.connect()
-    return socketService
-  }
-
-  mod.factory('socketService', [SocketServiceFactory])
-})