Remove Route class from global namespace - #170

kahmali · Feb 24, 2016 · 44aac00 · 44aac00
1 parent a3c07ec
commit 44aac00
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## Unreleased
+
+#### Fixed
+- Remove Route class from global namespace ([#170][])
+
+
 ## [v0.8.4] - 2015-08-18
 
 #### Fixed

diff --git a/lib/restivus.coffee b/lib/restivus.coffee
@@ -76,7 +76,7 @@ class @Restivus
   ###
   addRoute: (path, options, endpoints) ->
     # Create a new route and add it to our list of existing routes
-    route = new Route(this, path, options, endpoints)
+    route = new share.Route(this, path, options, endpoints)
     @_routes.push(route)
 
     route.addToApi()

diff --git a/lib/route.coffee b/lib/route.coffee
@@ -1,4 +1,4 @@
-class @Route
+class share.Route
 
   constructor: (@api, @path, @options, @endpoints) ->
     # Check if options were provided

diff --git a/package.js b/package.js
@@ -17,6 +17,7 @@ Package.onUse(function (api) {
   api.use('accounts-base@1.2.0');
   api.use('simple:json-routes@1.0.4');
 
+  api.addFiles('lib/package-scope-variables.js', 'server');
   api.addFiles('lib/auth.coffee', 'server');
   api.addFiles('lib/iron-router-error-to-response.js', 'server');
   api.addFiles('lib/route.coffee', 'server');
@@ -37,8 +38,9 @@ Package.onTest(function (api) {
   api.use('underscore');
   api.use('accounts-base');
   api.use('accounts-password');
-  api.use('mongo')
+  api.use('mongo');
 
+  api.addFiles('lib/route.coffee', 'server');
   api.addFiles('test/api_tests.coffee', 'server');
   api.addFiles('test/route_unit_tests.coffee', 'server');
   api.addFiles('test/authentication_tests.coffee', 'server');

diff --git a/test/route_unit_tests.coffee b/test/route_unit_tests.coffee
@@ -2,7 +2,7 @@ describe 'A route', =>
   Api = new Restivus
 
   it 'can be constructed with options', (test) =>
-    route = new @Route Api, 'test-route-1', {authRequired: true, roleRequired: ['admin', 'dev']},
+    route = new share.Route Api, 'test-route-1', {authRequired: true, roleRequired: ['admin', 'dev']},
       get: -> 'GET test-route-1'
 
     test.equal route.path, 'test-route-1'
@@ -12,14 +12,14 @@ describe 'A route', =>
     test.equal route.endpoints.get(), 'GET test-route-1'
 
   it 'can be constructed without options', (test) =>
-    route = new @Route Api, 'test-route-2',
+    route = new share.Route Api, 'test-route-2',
       get: -> 'GET test-route-2'
 
     test.equal route.path, 'test-route-2'
     test.equal route.endpoints.get(), 'GET test-route-2'
 
   it 'should support endpoints for all HTTP methods', (test) =>
-    route = new @Route Api, 'test-route-3',
+    route = new share.Route Api, 'test-route-3',
       get: -> 'GET test-route-2'
       post: -> 'POST test-route-2'
       put: -> 'PUT test-route-2'