Prototypal inheritance.

benpickles · Apr 4, 2011 · 7523d56 · 7523d56
1 parent 01f2286
commit 7523d56
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 2 deletions.
diff --git a/lib/bundler.rb b/lib/bundler.rb
@@ -39,6 +39,7 @@ def files
           model_rest
           model_uid
           model_version
+          model_base
         )
       end
 

diff --git a/src/model.js b/src/model.js
@@ -17,8 +17,9 @@ var Model = function(name, func) {
   model
     .extend(Model.Callbacks)
     .extend(Model.ClassMethods)
-    .include(Model.Callbacks)
-    .include(Model.InstanceMethods)
+
+  model.prototype = new Model.Base
+  model.prototype.constructor = model
 
   if (jQuery.isFunction(func)) func.call(model, model, model.prototype)
 

diff --git a/src/model_base.js b/src/model_base.js
@@ -0,0 +1,5 @@
+Model.Base = (function() {
+  function Base() {}
+  Base.prototype = jQuery.extend({}, Model.Callbacks, Model.InstanceMethods)
+  return Base
+})();
diff --git a/test/tests/inheritance_test.js b/test/tests/inheritance_test.js
@@ -0,0 +1,18 @@
+module("Model inheritance")
+
+test("methods added to Model.Base after an instance has been defined", function() {
+  var Post = Model("post")
+  var post = new Post({ title: "upper" })
+
+  ok(post.attrUpper === undefined)
+
+  Model.Base.prototype.attrUpper = function(attr) {
+    return this.attr(attr).toUpperCase()
+  }
+
+  equal("UPPER", post.attrUpper("title"))
+
+  delete Model.Base.prototype.attrUpper
+
+  ok(post.attrUpper === undefined)
+})
diff --git a/test/views/index.erb b/test/views/index.erb
@@ -27,6 +27,7 @@
 <script src="tests/model_rest_test.js"></script>
 <script src="tests/model_uid_test.js"></script>
 <script src="tests/model_local_storage_test.js"></script>
+<script src="tests/inheritance_test.js"></script>
 </head>
 <body>
 <h1 id="qunit-header">js-model Tests</h1>