From d2c60d9a2de397d0b4420b15ff2e3167e4f8f982 Mon Sep 17 00:00:00 2001
From: Mike Koss <mckoss@startpad.org>
Date: Wed, 27 Apr 2011 16:59:11 -0700
Subject: [PATCH] strip

---
 namespace-plus.js     | 19 +++++++++++++++----
 namespace-plus.min.js |  4 ++--
 src/funcs.js          |  5 ++++-
 src/string.js         | 10 ++++++++--
 4 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/namespace-plus.js b/namespace-plus.js
index bcf2b03..055d672 100644
--- a/namespace-plus.js
+++ b/namespace-plus.js
@@ -163,6 +163,7 @@ function getFunctionName(fn) {
     return result[1];
 }
 });
+
 /* Source: src/funcs.js */
 namespace.module('org.startpad.funcs', function (exports, require) {
 var types = require('org.startpad.types');
@@ -291,23 +292,28 @@ function shadow(obj) {
     return new Dummy();
 }
 
-// Classical JavaScript inheritance pattern.
+// Classical JavaScript single-inheritance pattern.
+// Call super constructor via this._super(args);
+// Call super methods via this._proto.method.call(this, args)
 function subclass(ctor, parent, extraMethods) {
     ctor.prototype = shadow(parent.prototype);
     ctor.prototype.constructor = ctor;
     ctor.prototype._super = parent;
     ctor.prototype._proto = parent.prototype;
     methods(ctor, extraMethods);
+    return ctor;
 }
 });
+
 /* Source: src/string.js */
 namespace.module('org.startpad.string', function (exports, require) {
 var funcs = require('org.startpad.funcs');
 
 exports.extend({
-    'VERSION': '0.1.2',
+    'VERSION': '0.2.0r1',
     'patch': patch,
-    'format': format
+    'format': format,
+    'strip': strip
 });
 
 function patch() {
@@ -358,4 +364,9 @@ function format(st, args, re) {
     });
     return st;
 }
-});
\ No newline at end of file
+
+// Like Python strip() - remove leading/trailing space
+function strip(s) {
+    return (s || "").replace(/^\s+|\s+$/g, "");
+}
+});
diff --git a/namespace-plus.min.js b/namespace-plus.min.js
index 920de93..acb0069 100644
--- a/namespace-plus.min.js
+++ b/namespace-plus.min.js
@@ -4,5 +4,5 @@ function internalType(a){return Object.prototype.toString.call(a).match(/\[objec
 function extend(a){var b,c,d,e;a===void 0&&(a={});for(b=1;b<arguments.length;b++){d=arguments[b];for(e in d)d.hasOwnProperty(e)&&(a[e]=d[e]);if(enumBug)for(c=0;c<internalNames.length;c++)e=internalNames[c],d.hasOwnProperty(e)&&(a[e]=d[e])}return a}function project(a,b){for(var c={},d=0;d<b.length;d++){var e=b[d];a&&a.hasOwnProperty(e)&&(c[e]=a[e])}return c}function getFunctionName(a){if(typeof a=="function"){a=a.toString().match(/function\s*(\S+)\s*\(/);if(!a)return"";return a[1]}};var types=require("org.startpad.types");exports.extend({VERSION:"0.2.1",methods:methods,bind:bind,decorate:decorate,shadow:shadow,subclass:subclass,numericVersion:numericVersion,monkeyPatch:monkeyPatch,patch:patch});function numericVersion(a){if(!a)return 0;a=a.split(".");return 1E4*parseInt(a[0])+100*parseInt(a[1])+parseInt(a[2])}function monkeyPatch(a,b,c,d){if(!(a._patches&&numericVersion(a._patches[b])>=numericVersion(c)))a._patches=a._patches||{},a._patches[b]=c,methods(a,d)}
 function patch(){monkeyPatch(Function,"org.startpad.funcs",exports.VERSION,{methods:function(a){methods(this,a)},curry:function(){var a=[this,void 0].concat(types.copyArray(arguments));return bind.apply(void 0,a)},curryThis:function(){var a=types.copyArray(arguments);a.unshift(this);return bind.apply(void 0,a)},decorate:function(a){return decorate(this,a)},subclass:function(a,b){return subclass(this,a,b)}});return exports}function methods(a,b){types.extend(a.prototype,b)}
 function bind(a,b){function c(a,b){for(var c=types.copyArray(a),b=types.copyArray(b),d=0;d<c.length;d++)c[d]===void 0&&(c[d]=b.shift());return c.concat(b)}var d;d=arguments.length==3&&types.isArguments(arguments[2])?Array.prototype.slice.call(arguments[2],self1):Array.prototype.slice.call(arguments,2);return function(){return a.apply(b||this,c(d,arguments))}}function decorate(a,b){function c(){return b.call(this,a,arguments,c)}b.call(a,void 0,arguments,c);return c}
-function shadow(a){function b(){}b.prototype=a;return new b}function subclass(a,b,c){a.prototype=shadow(b.prototype);a.prototype.constructor=a;a.prototype._super=b;a.prototype._proto=b.prototype;methods(a,c)};var funcs=require("org.startpad.funcs");exports.extend({VERSION:"0.1.2",patch:patch,format:format});function patch(){funcs.monkeyPatch(String,"org.startpad.string",exports.VERSION,{format:function(){return arguments.length==1&&typeof arguments[0]=="object"?format(this,arguments[0]):format(this,arguments)}});return exports}var reFormat=/\{\s*([^} ]+)\s*\}/g;
-function format(a,b,c){c=c||reFormat;if(a==void 0)return"undefined";a=a.toString();return a=a.replace(c,function(a,c){for(var f=b,h=c.split("."),g=0;g<h.length;g++){var c=h[g],i=parseInt(c),f=isNaN(i)?f[c]:f[i];if(f==void 0)return""}return f})};
\ No newline at end of file
+function shadow(a){function b(){}b.prototype=a;return new b}function subclass(a,b,c){a.prototype=shadow(b.prototype);a.prototype.constructor=a;a.prototype._super=b;a.prototype._proto=b.prototype;methods(a,c);return a};var funcs=require("org.startpad.funcs");exports.extend({VERSION:"0.2.0r1",patch:patch,format:format,strip:strip});function patch(){funcs.monkeyPatch(String,"org.startpad.string",exports.VERSION,{format:function(){return arguments.length==1&&typeof arguments[0]=="object"?format(this,arguments[0]):format(this,arguments)}});return exports}var reFormat=/\{\s*([^} ]+)\s*\}/g;
+function format(a,b,c){c=c||reFormat;if(a==void 0)return"undefined";a=a.toString();return a=a.replace(c,function(a,c){for(var f=b,h=c.split("."),g=0;g<h.length;g++){var c=h[g],i=parseInt(c),f=isNaN(i)?f[c]:f[i];if(f==void 0)return""}return f})}function strip(a){return(a||"").replace(/^\s+|\s+$/g,"")};
\ No newline at end of file
diff --git a/src/funcs.js b/src/funcs.js
index 7aabd09..cdbdd69 100644
--- a/src/funcs.js
+++ b/src/funcs.js
@@ -124,11 +124,14 @@ function shadow(obj) {
     return new Dummy();
 }
 
-// Classical JavaScript inheritance pattern.
+// Classical JavaScript single-inheritance pattern.
+// Call super constructor via this._super(args);
+// Call super methods via this._proto.method.call(this, args)
 function subclass(ctor, parent, extraMethods) {
     ctor.prototype = shadow(parent.prototype);
     ctor.prototype.constructor = ctor;
     ctor.prototype._super = parent;
     ctor.prototype._proto = parent.prototype;
     methods(ctor, extraMethods);
+    return ctor;
 }
diff --git a/src/string.js b/src/string.js
index c39b493..f9f5a51 100644
--- a/src/string.js
+++ b/src/string.js
@@ -1,9 +1,10 @@
 var funcs = require('org.startpad.funcs');
 
 exports.extend({
-    'VERSION': '0.1.2',
+    'VERSION': '0.2.0r1',
     'patch': patch,
-    'format': format
+    'format': format,
+    'strip': strip
 });
 
 function patch() {
@@ -54,3 +55,8 @@ function format(st, args, re) {
     });
     return st;
 }
+
+// Like Python strip() - remove leading/trailing space
+function strip(s) {
+    return (s || "").replace(/^\s+|\s+$/g, "");
+}