From a9ae09bdce1f90cecb618bf92bdf3f6fb183af0d Mon Sep 17 00:00:00 2001
From: Andrew Stewart <andrew@stwrt.ca>
Date: Thu, 24 Apr 2014 16:31:47 -0600
Subject: [PATCH] Remove Basestar from global scope

---
 lib/adaptor.js              |  5 ++-
 lib/basestar.js             |  7 ++--
 lib/driver.js               |  5 ++-
 test/specs/basestar.spec.js | 80 +++++++++++++++----------------------
 4 files changed, 41 insertions(+), 56 deletions(-)

diff --git a/lib/adaptor.js b/lib/adaptor.js
index 1f90248..db2971a 100644
--- a/lib/adaptor.js
+++ b/lib/adaptor.js
@@ -8,7 +8,8 @@
 
 "use strict";
 
-require('./basestar');
+var Basestar = require('./basestar');
+
 var namespace = require('node-namespace');
 
 // The Adaptor class is a base class for Adaptor classes in external Cylon
@@ -63,5 +64,5 @@ namespace("Cylon", function() {
 
     return Adaptor;
 
-  })(Cylon.Basestar);
+  })(Basestar);
 });
diff --git a/lib/basestar.js b/lib/basestar.js
index 34bbb23..090b4f0 100644
--- a/lib/basestar.js
+++ b/lib/basestar.js
@@ -17,7 +17,9 @@ var EventEmitter = require('events').EventEmitter;
 //
 // It also extends EventEmitter, so child classes are capable of emitting events
 // for other parts of the system to handle.
-var Basestar = function Basestar(opts) {
+var Basestar;
+
+module.exports = Basestar = function Basestar(opts) {
   this.self = this;
 }
 
@@ -98,6 +100,3 @@ Basestar.prototype.defineDriverEvent = function(opts) {
 
   return this.defineEvent(opts);
 };
-
-if (!global.Cylon) { global.Cylon = {}; }
-module.exports = global.Cylon.Basestar = Basestar;
diff --git a/lib/driver.js b/lib/driver.js
index fc1ce0b..df763df 100644
--- a/lib/driver.js
+++ b/lib/driver.js
@@ -8,7 +8,8 @@
 
 'use strict';
 
-require('./basestar');
+var Basestar = require('./basestar');
+
 var namespace = require('node-namespace');
 
 // The Driver class is a base class for Driver classes in external Cylon
@@ -65,5 +66,5 @@ namespace("Cylon", function() {
 
     return Driver;
 
-  })(Cylon.Basestar);
+  })(Basestar);
 });
diff --git a/test/specs/basestar.spec.js b/test/specs/basestar.spec.js
index b9cc0f0..030890c 100644
--- a/test/specs/basestar.spec.js
+++ b/test/specs/basestar.spec.js
@@ -1,13 +1,13 @@
 "use strict";
 
-source('basestar');
+var Basestar = source('basestar');
 
 var EventEmitter = require('events').EventEmitter;
 
 describe('Basestar', function() {
   describe('constructor', function() {
     it('assigns @self to the instance of the Basestar class', function() {
-      var instance = new Cylon.Basestar();
+      var instance = new Basestar();
       expect(instance.self).to.be.eql(instance);
     });
   });
@@ -15,36 +15,26 @@ describe('Basestar', function() {
   describe('#proxyMethods', function() {
     var methods = ['asString', 'toString', 'returnString'];
 
-    var ProxyClass = (function() {
-      function ProxyClass() {}
+    var ProxyClass = function ProxyClass() {}
 
-      ProxyClass.prototype.asString = function() {
-        return "[object ProxyClass]";
-      };
+    ProxyClass.prototype.asString = function() {
+      return "[object ProxyClass]";
+    };
 
-      ProxyClass.prototype.toString = function() {
-        return "[object ProxyClass]";
-      };
+    ProxyClass.prototype.toString = function() {
+      return "[object ProxyClass]";
+    };
 
-      ProxyClass.prototype.returnString = function(string) {
-        return string;
-      };
+    ProxyClass.prototype.returnString = function(string) {
+      return string;
+    };
 
-      return ProxyClass;
+    var TestClass = function TestClass() {
+      this.testInstance = new ProxyClass;
+      this.proxyMethods(methods, this.testInstance, this, true);
+    }
 
-    })();
-
-    var TestClass = (function(_super) {
-      subclass(TestClass, _super);
-
-      function TestClass() {
-        this.testInstance = new ProxyClass;
-        this.proxyMethods(methods, this.testInstance, this, true);
-      }
-
-      return TestClass;
-
-    })(Cylon.Basestar);
+    subclass(TestClass, Basestar);
 
     it('can alias methods', function() {
       var testclass = new TestClass;
@@ -66,28 +56,22 @@ describe('Basestar', function() {
   });
 
   describe("#defineEvent", function() {
-    var ProxyClass = (function(klass) {
-      subclass(ProxyClass, klass);
-      function ProxyClass() {}
-      return ProxyClass;
-    })(Cylon.Basestar);
 
-    var EmitterClass = (function(klass) {
-      subclass(EmitterClass, klass);
+    var ProxyClass = function ProxyClass() {};
 
-      function EmitterClass(update) {
-        update || (update = false);
-        this.proxy = new ProxyClass();
-        this.defineEvent({
-          eventName: "testevent",
-          source: this,
-          target: this.proxy,
-          sendUpdate: update
-        });
-      }
+    var EmitterClass = function EmitterClass(update) {
+      update || (update = false);
+      this.proxy = new ProxyClass();
+      this.defineEvent({
+        eventName: "testevent",
+        source: this,
+        target: this.proxy,
+        sendUpdate: update
+      });
+    }
 
-      return EmitterClass;
-    })(Cylon.Basestar);
+    subclass(ProxyClass, Basestar);
+    subclass(EmitterClass, Basestar);
 
     it("proxies events from one class to another", function() {
       var eventSpy = spy(),
@@ -127,7 +111,7 @@ describe('Basestar', function() {
     var basestar;
 
     before(function() {
-      basestar = new Cylon.Basestar();
+      basestar = new Basestar();
       basestar.connector = new EventEmitter();
       basestar.connection = new EventEmitter();
     });
@@ -159,7 +143,7 @@ describe('Basestar', function() {
     var basestar;
 
     before(function() {
-      basestar = new Cylon.Basestar();
+      basestar = new Basestar();
       basestar.connection = new EventEmitter();
       basestar.device = new EventEmitter();
     });