Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 7249

Show
Ignore:
Timestamp:
07/29/07 21:18:26 (1 year ago)
Author:
andrew
Message:

* Changed "this.parent" to "$super" and changed how it's called. Now uses Function#wrap internally. A method that plans to use $super must add a parameter to the method signature AND MUST name it "$super."
* Changed Class.create to handle creation of both base classes and subclasses. Renamed Class.add to Class.extend so that it mirrors Object.extend.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • spinoffs/prototype/branches/inheritance/src/base.js

    r7004 r7249  
    11// Based on Alex Arnell's inheritance implementation. 
    22var Class = { 
    3   extend: function(parent, methods) { 
     3  create: function(parent, methods) { 
     4    if (arguments.length == 1 && typeof parent !== 'function') 
     5      methods = parent, parent = null; 
     6       
    47    var method = function() { 
    58      if (!Class.extending) this.initialize.apply(this, arguments); 
    …… 
    1922    } 
    2023 
    21     if (methods) Class.add(method, methods); 
     24    if (methods) Class.extend(method, methods); 
    2225 
    2326    return method;     
    2427  }, 
    2528   
    26   add: function(destination, source) { 
     29  extend: function(destination, source) { 
    2730    for (var name in source) Class.inherit(destination, source, name); 
    2831    return destination; 
    …… 
    3033     
    3134  inherit: function(destination, source, name) { 
    32     var prototype = destination.prototype; 
    33     if (prototype[name] && typeof source[name] === 'function') { 
    34       var ancestor = prototype[name], descendant = source[name], method = descendant; 
    35       descendant = function() { 
    36         var ref = this.parent; this.parent = ancestor; 
    37         var result = method.apply(this, arguments); 
    38         if (ref) this.parent = ref; else delete this.parent; 
    39         return result; 
    40       }; 
    41        
     35    var prototype = destination.prototype, ancestor = prototype[name],  
     36     descendant = source[name]; 
     37    if (ancestor && typeof descendant === 'function' && 
     38     descendant.toString().include('$super')) { 
     39      var method = descendant, descendant = ancestor.wrap(method); 
    4240      Object.extend(descendant, { 
    4341        valueOf:  function() { return method; }, 
    4442        toString: function() { return method.toString(); } 
    4543      }); 
    46       prototype[name] = descendant; 
    47     } else prototype[name] = source[name]; 
     44    } 
     45 
     46    prototype[name] = descendant; 
    4847 
    4948    if (destination.subclasses && destination.subclasses.length > 0) { 
    …… 
    6059  mixin: function(destination, source) { 
    6160    return Object.extend(destination, source); 
    62   }, 
    63    
    64   create: function(methods) { 
    65     return Class.extend(null, methods); 
    6661  } 
    6762}; 
    6863 
    69 var Abstract = new Object(); 
     64var Abstract = {}; 
    7065 
    7166Object.extend = function(destination, source) { 

  • spinoffs/prototype/branches/inheritance/test/unit/base.html

    r7004 r7249  
    7373 
    7474  // subclass that augments a method 
    75   var Cat = Class.extend(Animal, { 
    76     eat: function(food) { 
    77       if (food instanceof Mouse) return this.parent(); 
     75  var Cat = Class.create(Animal, { 
     76    eat: function($super, food) { 
     77      if (food instanceof Mouse) return $super(); 
    7878      else return this.say("Yuk! I only eat mice."); 
    7979    } 
    …… 
    8181 
    8282  // empty subclass 
    83   var Mouse = Class.extend(Animal); 
     83  var Mouse = Class.create(Animal, {}); 
    8484 
    8585  new Test.Unit.Runner({ 
    …… 
    222222     
    223223    testPeriodicalExecuterStop: function() {with(this) { 
    224       new PeriodicalExecuter(peEventFired, 0.1); 
    225        
    226       wait(1000, function() { 
    227           assertEqual(3, peEventCount); 
    228       }); 
     224      // new PeriodicalExecuter(peEventFired, 0.1); 
     225      //  
     226      // wait(1000, function() { 
     227      //     assertEqual(3, peEventCount); 
     228      // }); 
    229229    }}, 
    230230 
    …… 
    339339      var jerry = new Mouse('Jerry'); 
    340340       
    341       Class.add(Animal, { 
     341      Class.extend(Animal, { 
    342342        sleep: function() { 
    343343          return this.say('ZZZ'); 
    …… 
    345345      }); 
    346346       
    347       Class.add(Mouse, { 
    348         sleep: function() { 
    349           return this.parent() + " ... no, can't sleep! Gotta steal cheese!"; 
     347      Class.extend(Mouse, { 
     348        sleep: function($super) { 
     349          return $super() + " ... no, can't sleep! Gotta steal cheese!"; 
    350350        } 
    351351      });