From f95e978abc990b0a03b05b72e96ca45752a49f9f Mon Sep 17 00:00:00 2001
From: Kris Jordan <krisjordan@gmail.com>
Date: Sun, 13 Sep 2009 02:05:04 -0400
Subject: [PATCH] Refactoring. Moving all recess\core to recess\lang.

---
 recess/recess.php                             | 42 ++++++++++++++++++-
 recess/recess/{core => lang}/Candy.class.php  |  2 +-
 .../{core => lang}/ClassLoader.class.php      |  2 +-
 recess/recess/{core => lang}/Event.class.php  |  2 +-
 recess/test/recess/RecessAllTests.php         |  4 +-
 .../test/recess/core/RecessCoreAllTests.php   | 19 ---------
 .../test/recess/{core => lang}/CandyTest.php  |  4 +-
 .../recess/{core => lang}/ClassLoaderTest.php | 18 ++++----
 .../recess/{core => lang}/Dummy.class.php     |  2 +-
 .../test/recess/{core => lang}/EventTest.php  |  4 +-
 .../test/recess/lang/RecessLangAllTests.php   |  7 ++++
 11 files changed, 65 insertions(+), 41 deletions(-)
 rename recess/recess/{core => lang}/Candy.class.php (99%)
 rename recess/recess/{core => lang}/ClassLoader.class.php (95%)
 rename recess/recess/{core => lang}/Event.class.php (95%)
 delete mode 100644 recess/test/recess/core/RecessCoreAllTests.php
 rename recess/test/recess/{core => lang}/CandyTest.php (96%)
 rename recess/test/recess/{core => lang}/ClassLoaderTest.php (75%)
 rename recess/test/recess/{core => lang}/Dummy.class.php (74%)
 rename recess/test/recess/{core => lang}/EventTest.php (96%)

diff --git a/recess/recess.php b/recess/recess.php
index 1cd62e5..d637008 100644
--- a/recess/recess.php
+++ b/recess/recess.php
@@ -1,8 +1,46 @@
 <?php
 set_include_path(__DIR__ . PATH_SEPARATOR . get_include_path());
 
+function callable($callback) {
+	if(!is_callable($callback)) {
+		throw new Exception('First parameter $callable must be a valid is_callable value.');
+	}
+	
+	if(!is_array($callback)) {
+		return $callback;
+	}
+	
+	if(is_string($callback[0])) {
+		return function() use ($callback) {
+			$args = func_get_args();
+			switch(count($args)) {
+				case 0:	return $callback[0]::$callback[1]();
+				case 1:	return $callback[0]::$callback[1]($args[0]);
+				case 2: return $callback[0]::$callback[1]($args[0],$args[1]);
+				case 3: return $callback[0]::$callback[1]($args[0],$args[1],$args[2]);
+				case 4: return $callback[0]::$callback[1]($args[0],$args[1],$args[2],$args[3]);
+				case 5: return $callback[0]::$callback[1]($args[0],$args[1],$args[2],$args[3],$args[4]);
+				default: return call_user_func_array($callback,$args);
+			}
+		};
+	} else {
+		return function() use ($callback) {
+			$args = func_get_args();
+			switch(count($args)) {
+				case 0:	return $callback[0]->$callback[1]();
+				case 1:	return $callback[0]->$callback[1]($args[0]);
+				case 2: return $callback[0]->$callback[1]($args[0],$args[1]);
+				case 3: return $callback[0]->$callback[1]($args[0],$args[1],$args[2]);
+				case 4: return $callback[0]->$callback[1]($args[0],$args[1],$args[2],$args[3]);
+				case 5: return $callback[0]->$callback[1]($args[0],$args[1],$args[2],$args[3],$args[4]);
+				default: return call_user_func_array($callback,$args);
+			}
+		};
+	}
+}
+
 // Include the Autoloader
-include 'recess/core/ClassLoader.class.php';
+include 'recess/lang/ClassLoader.class.php';
 
 // Register Autoload Function
-spl_autoload_register('recess\core\ClassLoader::load');
\ No newline at end of file
+spl_autoload_register('recess\lang\ClassLoader::load');
\ No newline at end of file
diff --git a/recess/recess/core/Candy.class.php b/recess/recess/lang/Candy.class.php
similarity index 99%
rename from recess/recess/core/Candy.class.php
rename to recess/recess/lang/Candy.class.php
index d146ad1..75e24bc 100644
--- a/recess/recess/core/Candy.class.php
+++ b/recess/recess/lang/Candy.class.php
@@ -1,5 +1,5 @@
 <?php
-namespace recess\core;
+namespace recess\lang;
 /**
  * Turn callables into delicious Candy.
  * Candied callables that can be wrapped in the all the decorators you desire.
diff --git a/recess/recess/core/ClassLoader.class.php b/recess/recess/lang/ClassLoader.class.php
similarity index 95%
rename from recess/recess/core/ClassLoader.class.php
rename to recess/recess/lang/ClassLoader.class.php
index 74e00c4..2d3fa8f 100644
--- a/recess/recess/core/ClassLoader.class.php
+++ b/recess/recess/lang/ClassLoader.class.php
@@ -1,5 +1,5 @@
 <?php
-namespace recess\core;
+namespace recess\lang;
 
 require __DIR__.'/Event.class.php';
 require __DIR__.'/Candy.class.php';
diff --git a/recess/recess/core/Event.class.php b/recess/recess/lang/Event.class.php
similarity index 95%
rename from recess/recess/core/Event.class.php
rename to recess/recess/lang/Event.class.php
index 9186397..f11029b 100644
--- a/recess/recess/core/Event.class.php
+++ b/recess/recess/lang/Event.class.php
@@ -1,5 +1,5 @@
 <?php
-namespace recess\core;
+namespace recess\lang;
 /**
  * When something important happens, let others know with an Event.
  * 
diff --git a/recess/test/recess/RecessAllTests.php b/recess/test/recess/RecessAllTests.php
index 2f4ad23..6a9e888 100644
--- a/recess/test/recess/RecessAllTests.php
+++ b/recess/test/recess/RecessAllTests.php
@@ -1,15 +1,13 @@
 <?php
 require_once 'PHPUnit/Framework.php';
-require_once 'recess/core/RecessCoreAllTests.php';
 require_once 'recess/lang/RecessLangAllTests.php';
 
 class RecessAllTests
 {
     public static function suite()
     {
-        $suite = new PHPUnit_Framework_TestSuite('recess\lang');
+        $suite = new PHPUnit_Framework_TestSuite('recess');
 
-        $suite->addTestSuite(RecessCoreAllTests::suite());
         $suite->addTestSuite(RecessLangAllTests::suite());
  		
         return $suite;
diff --git a/recess/test/recess/core/RecessCoreAllTests.php b/recess/test/recess/core/RecessCoreAllTests.php
deleted file mode 100644
index 40b0dfd..0000000
--- a/recess/test/recess/core/RecessCoreAllTests.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-require_once 'PHPUnit/Framework.php';
-require_once 'recess/core/ClassLoaderTest.php';
-require_once 'recess/core/CandyTest.php';
-require_once 'recess/core/EventTest.php';
-
-class RecessCoreAllTests
-{
-    public static function suite()
-    {
-        $suite = new PHPUnit_Framework_TestSuite('recess\core');
-
-        $suite->addTestSuite('ClassLoaderTest');
-        $suite->addTestSuite('EventTest');
- 		$suite->addTestSuite('CandyTest');
- 		
-        return $suite;
-    }
-}
\ No newline at end of file
diff --git a/recess/test/recess/core/CandyTest.php b/recess/test/recess/lang/CandyTest.php
similarity index 96%
rename from recess/test/recess/core/CandyTest.php
rename to recess/test/recess/lang/CandyTest.php
index f863cee..c3b2fb7 100644
--- a/recess/test/recess/core/CandyTest.php
+++ b/recess/test/recess/lang/CandyTest.php
@@ -1,8 +1,8 @@
 <?php
 require_once 'PHPUnit/Framework.php';
 
-include_once __DIR__ . '/../../../recess/core/Candy.class.php';
-use recess\core\Candy;
+include_once __DIR__ . '/../../../recess/lang/Candy.class.php';
+use recess\lang\Candy;
 
 class CandyTest extends PHPUnit_Framework_TestCase {
 	
diff --git a/recess/test/recess/core/ClassLoaderTest.php b/recess/test/recess/lang/ClassLoaderTest.php
similarity index 75%
rename from recess/test/recess/core/ClassLoaderTest.php
rename to recess/test/recess/lang/ClassLoaderTest.php
index 7db0414..0877c3b 100644
--- a/recess/test/recess/core/ClassLoaderTest.php
+++ b/recess/test/recess/lang/ClassLoaderTest.php
@@ -1,8 +1,8 @@
 <?php
 require_once 'PHPUnit/Framework.php';
 
-include_once __DIR__ . '/../../../recess/core/ClassLoader.class.php';
-use recess\core\ClassLoader;
+include_once __DIR__ . '/../../../recess/lang/ClassLoader.class.php';
+use recess\lang\ClassLoader;
 
 set_include_path(__DIR__.'/../../'.PATH_SEPARATOR.get_include_path());
 
@@ -10,13 +10,13 @@ class ClassLoaderTest extends PHPUnit_Framework_TestCase {
 	
 	function testOnLoad() {
 		$onLoad = ClassLoader::onLoad();
-		$this->assertType('recess\core\Event',$onLoad);
+		$this->assertType('recess\lang\Event',$onLoad);
 		$onLoad2 = ClassLoader::onLoad();
 		$this->assertTrue($onLoad === $onLoad2);
 		$theClass = '';
 		ClassLoader::onLoad()->call(function($class) use (&$theClass) { $theClass = $class; });
-		ClassLoader::load('recess\core\Dummy');
-		$this->assertEquals('recess\core\Dummy',$theClass);
+		ClassLoader::load('recess\lang\Dummy');
+		$this->assertEquals('recess\lang\Dummy',$theClass);
 	}
 	
 	function testWrapLoad() {
@@ -36,14 +36,14 @@ function($load,$class) use (&$loadedCount) {
 	}
 	
 	function testLoadDummy() {
-		ClassLoader::load('recess\core\Dummy');
-		$dummy = new recess\core\Dummy;
-		$this->assertType('recess\core\Dummy',$dummy);
+		ClassLoader::load('recess\lang\Dummy');
+		$dummy = new recess\lang\Dummy;
+		$this->assertType('recess\lang\Dummy',$dummy);
 		$this->assertEquals('hello world',$dummy->helloWorld());
 	}
 	
 	function testWrapAfterLoadDummy() {
-		ClassLoader::load('recess\core\Dummy');
+		ClassLoader::load('recess\lang\Dummy');
 		$loadedCount = 0;
 		ClassLoader::wrapLoad(
 			function($load,$class) use (&$loadedCount) {
diff --git a/recess/test/recess/core/Dummy.class.php b/recess/test/recess/lang/Dummy.class.php
similarity index 74%
rename from recess/test/recess/core/Dummy.class.php
rename to recess/test/recess/lang/Dummy.class.php
index 4012509..d14bf6f 100644
--- a/recess/test/recess/core/Dummy.class.php
+++ b/recess/test/recess/lang/Dummy.class.php
@@ -1,5 +1,5 @@
 <?php
-namespace recess\core;
+namespace recess\lang;
 
 class Dummy {
 	function helloWorld() { return 'hello world'; }
diff --git a/recess/test/recess/core/EventTest.php b/recess/test/recess/lang/EventTest.php
similarity index 96%
rename from recess/test/recess/core/EventTest.php
rename to recess/test/recess/lang/EventTest.php
index eef6248..72df9fb 100644
--- a/recess/test/recess/core/EventTest.php
+++ b/recess/test/recess/lang/EventTest.php
@@ -1,8 +1,8 @@
 <?php
 require_once 'PHPUnit/Framework.php';
 
-include_once __DIR__ . '/../../../recess/core/Event.class.php';
-use recess\core\Event;
+include_once __DIR__ . '/../../../recess/lang/Event.class.php';
+use recess\lang\Event;
 
 class EventTest extends PHPUnit_Framework_TestCase {
 	
diff --git a/recess/test/recess/lang/RecessLangAllTests.php b/recess/test/recess/lang/RecessLangAllTests.php
index 1970c86..d924dda 100644
--- a/recess/test/recess/lang/RecessLangAllTests.php
+++ b/recess/test/recess/lang/RecessLangAllTests.php
@@ -1,5 +1,8 @@
 <?php
 require_once 'PHPUnit/Framework.php';
+require_once 'recess/lang/CandyTest.php';
+require_once 'recess/lang/EventTest.php';
+require_once 'recess/lang/ClassLoaderTest.php';
 require_once 'recess/lang/AnnotationTest.php';
 require_once 'recess/lang/AttachedMethodTest.php';
 require_once 'recess/lang/ReflectionMethodTest.php';
@@ -12,6 +15,10 @@ public static function suite()
     {
         $suite = new PHPUnit_Framework_TestSuite('recess\lang');
 
+        $suite->addTestSuite('EventTest');
+        $suite->addTestSuite('CandyTest');
+        $suite->addTestSuite('ClassLoaderTest');
+        
         $suite->addTestSuite('AnnotationTest');
         $suite->addTestSuite('AttachedMethodTest');
         $suite->addTestSuite('ReflectionClassTest');