made class non-global

middleclass.lua

@@ -135,11 +135,6 @@ function Object:initialize() end
 
 function Object:__tostring() return "instance of " .. tostring(self.class) end
 
-function class(name, super, ...)
-  super = super or Object
-  return super:subclass(name, ...)
-end
-
 function instanceOf(aClass, obj)
   if type(aClass) ~= 'table' or type(obj) ~= 'table' or not obj.class then return false end
   if obj.class == aClass then return true end
@@ -157,4 +152,11 @@ function includes(mixin, aClass)
   return includes(mixin, aClass.super)
 end
 
+function middleclass.class(name, super, ...)
+  super = super or Object
+  return super:subclass(name, ...)
+end
+
+setmetatable(middleclass, { __call = function(_, ...) return middleclass.class(...) end })
+
 return middleclass

spec/Object_spec.lua

@@ -1,4 +1,4 @@
-require 'middleclass'
+local class = require 'middleclass'
 
 context('Object', function()
 

spec/class_spec.lua

@@ -1,4 +1,4 @@
-require 'middleclass'
+local class = require 'middleclass'
 
 context('class()', function()
 
@@ -9,31 +9,19 @@ context('class()', function()
   end)
 
   context('when given a name', function()
-    local TheClass
+    test('the resulting class has the correct name and Object as its superclass', function()
-
+      local TheClass = class('TheClass')
-    before(function()
-      TheClass = class('TheClass')
-    end)
-
-    test('the resulting class has the correct name', function()
       assert_equal(TheClass.name, 'TheClass')
-    end)
-
-    test('the resulting class has Object as its superclass', function()
       assert_equal(TheClass.super, Object)
     end)
   end)
 
   context('when given a name and a superclass', function()
-    local TheSuperClass = class('TheSuperClass')
+    test('the resulting class has the correct name and superclass', function()
-    local TheSubClass = class('TheSubClass', TheSuperClass)
+      local TheSuperClass = class('TheSuperClass')
-
+      local TheSubClass = class('TheSubClass', TheSuperClass)
-    test('the resulting class has the correct name', function()
       assert_equal(TheSubClass.name, 'TheSubClass')
-    end)
+      assert_equal(TheSubClass.super, TheSuperClass)
-
-    test('the resulting class has the correct superclass', function()
-     assert_equal(TheSubClass.super, TheSuperClass)
     end)
   end)
 

spec/classes_spec.lua

@@ -1,4 +1,4 @@
-require 'middleclass'
+local class = require 'middleclass'
 
 context('A Class', function()
 

spec/includes_spec.lua

@@ -1,4 +1,4 @@
-require 'middleclass'
+local class = require 'middleclass'
 
 context('includes', function()
 

spec/instanceOf_spec.lua

@@ -1,4 +1,4 @@
-require 'middleclass'
+local class = require 'middleclass'
 
 context('instanceOf', function()
 

spec/instances_spec.lua

@@ -1,4 +1,4 @@
-require 'middleclass'
+local class = require 'middleclass'
 
 context('An instance', function()
 

spec/metamethods_spec.lua

@@ -1,4 +1,4 @@
-require 'middleclass'
+local class = require 'middleclass'
 
 context('Metamethods', function()
 

spec/mixins_spec.lua

@@ -1,4 +1,4 @@
-require 'middleclass'
+local class = require 'middleclass'
 
 context('A Mixin', function()
 

spec/subclassOf_spec.lua

@@ -1,4 +1,4 @@
-require 'middleclass'
+local class = require 'middleclass'
 
 context('subclassOf', function()