API cleanup, Gremlin inheritance for coffee and js

package.json

@@ -1,6 +1,6 @@
 {
   "name": "GremlinJS",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "main": "./src/scripts/GremlinJS.coffee",
   "license": "MIT",
   "repository": {

release-notes.md

@@ -1,5 +1,19 @@
 # Release notes
 
+## v0.6.0 *2013-11-10*
+
+### New
+
+- `G.Gizmo.extend` to inherit from gremlin classes
+- `G.Package.require` to reference packages
+
+### Removed
+
+- `G.define`, use `G.Gizmo.extend`
+- `G.require`, use `G.Package.require`
+- `G.namespace`, `G.ns`, use `G.Package.require`
+- `G.Gizmo#klass`, use `G.Gizmo#constructor` 
+
 ## v0.5.1 *2013-11-6*
 
 ### New

src/scripts/Gremlin.coffee

@@ -6,7 +6,6 @@ goog.require 'EventDispatcher'
 goog.require 'conf.Configuration'
 goog.require 'util.Helper'
 goog.require 'util.Debug'
-goog.require 'namespace'
 goog.require 'packages.Package'
 goog.require 'modules.Module'
 goog.require 'Application'
@@ -31,20 +30,11 @@ Gremlin = do ->
       app?.refresh()
       GremlinClass
 
-    define: (name, constructor, instanceMembers, staticMembers) ->
-      GremlinClass = gremlinDefinitions.Pool.getInstance().define name, constructor, instanceMembers, staticMembers
-      app?.refresh()
-      GremlinClass
-
-    #derive: (parentName, name, constructor, instanceMembers, staticMembers) ->
-
     Gizmo: gremlinDefinitions.Gizmo
+
     Helper: util.Helper
     Module: modules.Module
-    namespace: namespace
-    ns: namespace
     Package: packages.Package
-    require: packages.Package.get
 
   g = new GremlinAdapter
 

src/scripts/gremlinDefinitions/Gizmo.coffee

@@ -1,12 +1,38 @@
 goog.provide 'gremlinDefinitions.Gizmo'
 
+goog.require 'util.Helper'
+
 class gremlinDefinitions.Gizmo
+
+  define = (Parent, constructor, instanceMembers, staticMembers) ->
+    unless typeof constructor is 'function'
+      throw new Error("The second parameter when defining a gremlin has to be the constructor function!")
+
+    unless typeof instanceMembers is 'undefined' or typeof instanceMembers is 'object'
+      throw new Error("The third parameter when defining a gremlin has to be an object providing the instance members of the gremlin!")
+
+    unless typeof staticMembers is 'undefined' or typeof staticMembers is 'object'
+      throw new Error("The fourth parameter when defining a gremlin has to be an object providing the static members of the gremlin!")
+
+
+    class Gremlin extends Parent
+      constructor: ->
+        super
+        constructor.call this
+
+    util.Helper.mixin Gremlin, instanceMembers
+    Gremlin[key] = member for own key, member of staticMembers
+
+    return Gremlin
+
+  @extend: (constructor, instanceMembers, staticMembers) ->
+    define @, constructor, instanceMembers, staticMembers
+
   # @property [Object] the data object holding the dom element's data attributes
   data: null
   el: null
   id: null
-  klass: null
-
+
   # The constructor function used internally to instantiate gremlins.
   # 
   # 

src/scripts/gremlinDefinitions/Pool.coffee

@@ -1,4 +1,5 @@
 goog.provide 'gremlinDefinitions.Pool'
+
 goog.require 'util.Helper'
 goog.require 'gremlinDefinitions.Gizmo'
 goog.require 'modules.ModuleCollection'
@@ -22,44 +23,13 @@ class gremlinDefinitions.Pool
       modules.ModuleCollection.extendGizmo name, Definition
       definitions[name] = Definition
 
-    define: (name, constructor, instanceMembers, staticMembers) ->
-      unless typeof name is 'string'
-        throw new Error("The first parameter when defining a gremlin has to be a string, the gremlin definition's name!")
-
-      unless typeof constructor is 'function'
-        throw new Error("The second parameter when defining a gremlin has to be the constructor function!")
-
-      unless instanceMembers is undefined or typeof instanceMembers is 'object'
-        throw new Error("The third parameter when defining a gremlin has to be an object providing the instance members of the gremlin!")
-
-      unless staticMembers is undefined or typeof staticMembers is 'object'
-        throw new Error("The fourth parameter when defining a gremlin has to be an object providing the static members of the gremlin!")
-
-
-      #constructor = noop if typeof constructor is 'object'
-
-      class Gremlin extends gremlinDefinitions.Gizmo
-        constructor: ->
-          super
-          constructor.call this
-
-      Gremlin::klass = Gremlin
-
-      util.Helper.mixin Gremlin, instanceMembers
-      Gremlin[key] = member for own key, member of staticMembers
-
-      @set name, Gremlin
-      return Gremlin
-
     addClass: (name, Gremlin) ->
       unless typeof name is 'string'
         throw new Error("Please provide the name of the gremlin!")
 
       unless typeof Gremlin is 'function'
         throw new Error("When adding a gremlin, you have to provide a constructor function!")
 
-      Gremlin::klass = Gremlin
-
       @set name, Gremlin
       return Gremlin
 

src/scripts/modules/ModuleCollection.coffee

@@ -31,7 +31,7 @@ class modules.ModuleCollection
     module.extend Gizmo for module in modules
 
   @bindGizmo: (name, gizmo) ->
-    modules = getModules name, gizmo.klass
+    modules = getModules name, gizmo.constructor
     module.bind gizmo for module in modules
 
 

src/scripts/packages/Package.coffee

@@ -1,10 +1,8 @@
 goog.provide 'packages.Package'
 
-goog.require 'namespace'
-
 class packages.Package
 
-  root = namespace
+  root = {}
 
   getNamespace = (name, content = null) ->
     items = name.split '.'
@@ -19,4 +17,4 @@ class packages.Package
     return new packages.Package arguments... if this not instanceof packages.Package
     @_package  = getNamespace ns, content
 
-  @get: (ns) -> getNamespace ns
+  @require: (ns) -> getNamespace ns

test/js/gremlins/cs/InheritTest.coffee

@@ -0,0 +1,12 @@
+class window.InheritTestParent extends G.Gizmo
+  @FOO: 'FOO'
+  constructor : ->
+    super
+
+  foo: ->
+
+  bar: 'bar'
+
+class window.InheritTestChild extends window.InheritTestParent
+  constructor: ->
+    super

test/js/gremlins/cs/InheritTest.map

@@ -0,0 +1,10 @@
+{
+  "version": 3,
+  "file": "InheritTest.js",
+  "sourceRoot": "",
+  "sources": [
+    "InheritTest.coffee"
+  ],
+  "names": [],
+  "mappings": ";AAAA;CAAA,KAAA;oSAAA;;CAAA,CAAM,IAAM;CACV;;CAAA,EAAA,CAAA,CAAA,YAAC;;CACa,EAAA,CAAA,uBAAA;CACZ,KAAA,GAAA,2CAAA;CAFF,IACc;;CADd,EAIA,MAAK;;CAJL,EAMA,EANA;;CAAA;;CADqC;;CAAvC,CASM,IAAM;CACV;;CAAa,EAAA,CAAA,sBAAA;CACX,KAAA,GAAA,0CAAA;CADF,IAAa;;CAAb;;CADoC,KAAM;CAT5C"
+}