From 2dbe2108163aa73c792a43f68424de95ddc70db9 Mon Sep 17 00:00:00 2001
From: Sami Samhuri <sami.samhuri@gmail.com>
Date: Sun, 5 Jun 2011 18:10:56 -0700
Subject: [PATCH] finish up object.extendPrototype refactoring

---
 lib/array.js  | 6 ++++--
 lib/string.js | 8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/array.js b/lib/array.js
index 985bf2b..9904fe6 100644
--- a/lib/array.js
+++ b/lib/array.js
@@ -1,6 +1,8 @@
 // batteries
 // Copyright 2010 - 2011 Sami Samhuri <sami@samhuri.net>
 
+var batteries = require('./')
+
 var ArrayExt =
 { at: at
 , compact: compact
@@ -16,10 +18,10 @@ var ArrayExt =
 };
 
 exports.extendNative = function() {
-  require('./ext').extend(Array, ArrayExt);
+  batteries.object.extendPrototype(Array, ArrayExt);
 };
 
-require('./object').extend(exports, ArrayExt);
+batteries.object.extend(exports, ArrayExt);
 
 // TODO
 // - abbrev
diff --git a/lib/string.js b/lib/string.js
index 47fa4af..2c5f7b0 100644
--- a/lib/string.js
+++ b/lib/string.js
@@ -6,13 +6,15 @@
 // - unpack
 // - sha1
 
-var StringExt = { cmp: cmp };
+var batteries = require('./')
+  , StringExt = { cmp: cmp }
+  ;
 
 exports.extendNative = function() {
-  require('./ext').extend(String, StringExt);
+  batteries.object.extendPrototype(String, StringExt);
 };
 
-require('./object').extend(exports, StringExt);
+batteries.object.extend(exports, StringExt);
 
 function cmp(a, b) {
   if (a > b) return 1;