Merge pull request #8 from groupon/refactor

Refactor

Author: chrisjpowers

public/js/gscreen.js

@@ -16,11 +16,6 @@ angular.module("GScreen").factory "Alert", ($resource) ->
   resource = $resource "/api/alerts/:id", null,
     update:
       method: "PUT"
-    remove:
-      method: "POST"
-      url: "/api/alerts/:id/remove"
-      params:
-        id: "@id"
 
   get: (id) ->
     resource.get id: id

src/client/resources/alert.coffee

@@ -16,8 +16,6 @@ angular.module("GScreen").factory "Channel", ($resource) ->
   resource = $resource "/api/channels/:id", null,
     update:
       method: "PUT"
-    remove:
-      method: "DELETE"
 
   get: (id) ->
     resource.get id: id

src/client/resources/channel.coffee

@@ -16,8 +16,6 @@ angular.module("GScreen").factory "Chromecast", ($resource) ->
   resource = $resource "/api/receivers/:id", null,
     update:
       method: "PUT"
-    remove:
-      method: "DELETE"
 
   get: (id) ->
     resource.get id: id

src/client/resources/chromecast.coffee

@@ -16,9 +16,6 @@ angular.module("GScreen").factory "Takeover", ($resource) ->
   resource = $resource "/api/takeover", null,
     update:
       method: "PUT"
-    remove:
-      method: "POST"
-      url: "/api/takeover/remove"
 
   get: (id) ->
     resource.get()

src/client/resources/takeover.coffee

@@ -13,8 +13,8 @@ Redistribution and use in source and binary forms, with or without modification,
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.###
 
 cradle = require "cradle"
-views = require "./couch-db-views"
-validations = require "./couch-db-validations"
+views = require "./views"
+validations = require "./validations"
 
 module.exports = class CouchDB
   constructor: (config) ->

src/server/couch-db.coffee src/server/couchdb/index.coffee

@@ -12,7 +12,7 @@ Redistribution and use in source and binary forms, with or without modification,
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.###
 
-CouchDB = require "./couch-db"
+CouchDB = require "./couchdb"
 config = require "./config"
 
 module.exports = new CouchDB(config.couch)

src/server/couch-db-validations.coffee src/server/couchdb/validations.coffee

@@ -13,7 +13,7 @@ Redistribution and use in source and binary forms, with or without modification,
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.###
 
 Model = require "./model"
-db = require "./db"
+db = require "../db"
 
 module.exports = class Alert extends Model
   @type: "alert"

src/server/couch-db-views.coffee src/server/couchdb/views.coffee

@@ -12,7 +12,7 @@ Redistribution and use in source and binary forms, with or without modification,
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.###
 
-db = require "./db"
+db = require "../db"
 _ = require "underscore"
 
 module.exports = class Model

src/server/db.coffee

@@ -17,7 +17,7 @@ Alert = require "./alert"
 Channel = require "./channel"
 Model = require "./model"
 Takeover = require "./takeover"
-db = require "./db"
+db = require "../db"
 
 module.exports = class Receiver extends Model
   @type: "receiver"

src/server/alert.coffee src/server/models/alert.coffee

@@ -14,7 +14,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 _ = require "underscore"
 Model = require "./model"
-db = require "./db"
+db = require "../db"
 
 module.exports = class Takeover extends Model
   @type: "takeover"

src/server/channel.coffee src/server/models/channel.coffee

@@ -1,3 +1,4 @@
+
 ###
 Copyright (c) 2014, Groupon
 All rights reserved.
@@ -13,32 +14,36 @@ Redistribution and use in source and binary forms, with or without modification,
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.###
 
 pathLib = require "path"
-Alert = require "./alert"
-Channel = require "./channel"
-Receiver = require "./receiver"
-Takeover = require "./takeover"
+express = require "express"
+Alert = require "../models/alert"
+Channel = require "../models/channel"
+Receiver = require "../models/receiver"
+Takeover = require "../models/takeover"
 
 module.exports = (app, sockets) ->
+
+  router = express.Router()
+
   addResources = (basePath, resourceClass) ->
-    app.get "#{basePath}", (req, res) ->
+    router.get "#{basePath}", (req, res) ->
       resourceClass.all (err, resources) ->
         if err then res.send err else res.send resources
 
-    app.get "#{basePath}/:id", (req, res) ->
+    router.get "#{basePath}/:id", (req, res) ->
       resourceClass.findById req.param("id"), (err, resource) ->
         return res.status(404).send(null) if err && err.error == "not_found"
         return res.status(500).send(err) if err
         res.send resource
 
-    app.post "#{basePath}", (req, res) ->
+    router.post "#{basePath}", (req, res) ->
       data = req.body
       resource = new resourceClass(data)
       resource.save (err) ->
         return res.status(500).send(err) if err
         sockets.emit "#{resourceClass.type}-created", resource
         res.send resource
 
-    app.put "#{basePath}/:id", (req, res) ->
+    router.put "#{basePath}/:id", (req, res) ->
       resourceClass.findById req.param("id"), (err, resource) ->
         return res.status(404).send(null) if err && err.error == "not_found"
         return res.status(500).send(err) if err
@@ -47,7 +52,7 @@ module.exports = (app, sockets) ->
           sockets.emit "#{resourceClass.type}-updated", resource
           res.send resource
 
-    app.delete "#{basePath}/:id", (req, res) ->
+    router.delete "#{basePath}/:id", (req, res) ->
       resourceClass.findById req.param("id"), (err, resource) ->
         return res.status(404).send(null) if err && err.error == "not_found"
         return res.status(500).send(err) if err
@@ -57,13 +62,13 @@ module.exports = (app, sockets) ->
           res.send status: "success"
 
   addResource = (basePath, resourceClass, id) ->
-    app.get "#{basePath}", (req, res) ->
+    router.get "#{basePath}", (req, res) ->
       resourceClass.findById id, (err, resource) ->
         return res.status(404).send(null) if err && err.error == "not_found"
         return res.status(500).send(err) if err
         res.send resource
 
-    app.post "#{basePath}", (req, res) ->
+    router.post "#{basePath}", (req, res) ->
       data = req.body
       data.id = id
       resource = new resourceClass(data)
@@ -72,7 +77,7 @@ module.exports = (app, sockets) ->
         sockets.emit "#{resourceClass.type}-created", resource
         res.send resource
 
-    app.put "#{basePath}", (req, res) ->
+    router.put "#{basePath}", (req, res) ->
       resourceClass.findById id, (err, resource) ->
         return res.status(404).send(null) if err && err.error == "not_found"
         return res.status(500).send(err) if err
@@ -81,7 +86,7 @@ module.exports = (app, sockets) ->
           sockets.emit "#{resourceClass.type}-updated", resource
           res.send resource
 
-    app.post "#{basePath}/remove", (req, res) ->
+    router.delete "#{basePath}", (req, res) ->
       resourceClass.findById id, (err, resource) ->
         return res.status(404).send(null) if err && err.error == "not_found"
         return res.status(500).send(err) if err
@@ -90,23 +95,9 @@ module.exports = (app, sockets) ->
           sockets.emit "#{resourceClass.type}-deleted", resource
           res.send status: "success"
 
-  addResources "/api/alerts", Alert
-  addResources "/api/channels", Channel
-  addResources "/api/receivers", Receiver
-  addResource "/api/takeover", Takeover, "takeover-singleton"
-
-  app.get "/chromecasts/new", (req, res) ->
-    res.sendfile pathLib.resolve("#{__dirname}/../../public/index.html")
-
-  app.get "/chromecasts/:id", (req, res) ->
-    res.sendfile pathLib.resolve("#{__dirname}/../../public/setup-chromecast.html")
-
-  app.get "/channels/new", (req, res) ->
-    res.sendfile pathLib.resolve("#{__dirname}/../../public/index.html")
-
-  app.get "/channels/:id", (req, res) ->
-    res.sendfile pathLib.resolve("#{__dirname}/../../public/channel.html")
+  addResources "/alerts", Alert
+  addResources "/channels", Channel
+  addResources "/receivers", Receiver
+  addResource "/takeover", Takeover, "takeover-singleton"
 
-  # Wildcard all GET routes, send to the Angular app
-  app.get "*", (req, res) ->
-    res.sendfile pathLib.resolve("#{__dirname}/../../public/index.html")
+  app.use('/api', router)

src/server/model.coffee src/server/models/model.coffee

@@ -0,0 +1,32 @@
+###
+Copyright (c) 2014, Groupon
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.###
+
+pathLib = require "path"
+
+module.exports = (app) ->
+  app.get "/chromecasts/new", (req, res) ->
+    res.sendfile pathLib.resolve("#{__dirname}/../../../public/index.html")
+
+  app.get "/chromecasts/:id", (req, res) ->
+    res.sendfile pathLib.resolve("#{__dirname}/../../../public/setup-chromecast.html")
+
+  app.get "/channels/new", (req, res) ->
+    res.sendfile pathLib.resolve("#{__dirname}/../../../public/index.html")
+
+  app.get "/channels/:id", (req, res) ->
+    res.sendfile pathLib.resolve("#{__dirname}/../../../public/channel.html")
+
+  # Wildcard all GET routes, send to the Angular app
+  app.get "*", (req, res) ->
+    res.sendfile pathLib.resolve("#{__dirname}/../../../public/index.html")

src/server/receiver.coffee src/server/models/receiver.coffee

@@ -18,7 +18,8 @@ morgan = require "morgan"
 bodyParser = require "body-parser"
 methodOverride = require "method-override"
 config = require "./config"
-routes = require "./routes"
+api = require("./routes/api")
+routes = require "./routes/routes"
 socketIO = require "socket.io"
 
 app = express()
@@ -32,7 +33,8 @@ app.use bodyParser.json()
 app.use methodOverride()
 app.use express.static("#{__dirname}/../../public")
 
-routes(app, sockets)
+api(app, sockets)
+routes(app)
 
 port = process.env.PORT || config.server?.port || 4994
 server.listen port