Daddy, I just wanna go fast!

KrisJordan · Nov 13, 2008 · f868764 · f868764
1 parent 918d783
commit f868764
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 19 deletions.
diff --git a/apps/blog/controllers/PostsController.class.php b/apps/blog/controllers/PostsController.class.php
@@ -10,8 +10,7 @@ class PostsController extends Controller {
 	/** !Route GET, /blog/ */
 	function home() {
 
-		// $this->latestPosts = Make::a('Post')->find()->orderBy('id DESC')->range(0,5);
-		$this->latestPosts = array();
+		$this->latestPosts = Make::a('Post')->find()->orderBy('id DESC')->range(0,5);
 
 	}
 
@@ -27,7 +26,8 @@ function alphabetical() {
 	/** !Route GET, comments/$postId */
 	function comments($postId) {
 
-		$this->comments = Make::a('Post')->equal('id',$postId)->comments();
+		$this->post = Make::a('Post')->equal('id',$postId)->first();
+		$this->comments = $this->post->comments();
 
 	}
 

diff --git a/apps/blog/views/home/comments.php b/apps/blog/views/home/comments.php
@@ -1,5 +1,15 @@
+<form method="POST">
+	<input type="text" name="comment"></input>
+	<input type="submit"></input>
+</form>
+
+
+
 <?php
 
+echo '<a href="/blog/">Go Back</a>';
+echo '<h2>' . $post->title . '</h2>';
+
 foreach($comments as $comment) {
 
 	echo '<p>' . $comment->comment . '</p>';
@@ -8,9 +18,4 @@
 
 }
 
-?>
-
-<form method="POST">
-	<input type="text" name="comment"></input>
-	<input type="submit"></input>
-</form>
+?>
diff --git a/data/default.db b/data/default.db
diff --git a/lib/recess/framework/views/SmartyView.class.php b/lib/recess/framework/views/SmartyView.class.php
@@ -1,12 +1,12 @@
 <?php
-Library::import('smarty.Smarty');
 Library::import('recess.framework.views.AbstractView');
 Library::import('recess.http.Response');
 
 class SmartyView extends AbstractView {
 	protected $smarty = null;
 
 	public function __construct() {
+		Library::import('smarty.Smarty');
 		//Fetch Smarty object
 		if($this->smarty !== ''){
 			$this->smarty = new Smarty();

diff --git a/lib/recess/lang/Library.class.php b/lib/recess/lang/Library.class.php
@@ -52,7 +52,8 @@ static function beginNamedRun($name) {
 	}
 
 	static function namedRunMissed($class) {
-		self::$namedRuns[self::$namedRun][] = $class;
+		if($class != 'Smarty')
+			self::$namedRuns[self::$namedRun][] = $class;
 	}
 
 	static function persistNamedRuns() {
@@ -70,15 +71,14 @@ static function persistNamedRuns() {
 				$file = fopen($namedRunFile,'w');
 			}
 
-				echo $namedRun;
 			foreach($missedClasses as $class) {
 				$classInfo = self::$classesByClass[$class];
 				$fullName = $classInfo[self::NAME];
 				$path = self::$paths[$classInfo[self::PATH]];
 				$fileName = str_replace(self::dotSeparator,self::pathSeparator, $fullName) . '.class.php';
 				$classFile = $path . $fileName;
-				// $code = php_strip_whitespace($classFile);
-				$code = preg_replace('/\nLibrary::import\(.*/','',file_get_contents($classFile));
+				$code = file_get_contents($classFile);
+				// $code = preg_replace('/\nLibrary::import\(.*/','',file_get_contents($classFile));
 				fwrite($file, $code);
 			}
 
@@ -221,7 +221,7 @@ static function getClassName($fullName) {
 
 		$lastDotPosition = strrpos($fullName, self::dotSeparator);
 		if($lastDotPosition === false) {
-			self::$classNames[$fullName] = $fullName;
+			self::$classesByFull[$fullName] = $fullName;
 			return $fullName;
 		} else {
 			$className = substr($fullName, $lastDotPosition + 1);

diff --git a/lib/recess/lang/RecessReflectionClass.class.php b/lib/recess/lang/RecessReflectionClass.class.php
@@ -1,8 +1,5 @@
 <?php
-Library::import('recess.lang.Annotation');
 Library::import('recess.lang.RecessClass');
-Library::import('recess.lang.RecessReflectionMethod');
-Library::import('recess.lang.RecessReflectionProperty');
 
 /**
  * Recess! Framework reflection for class which introduces annotations.
@@ -24,6 +21,7 @@
  */
 class RecessReflectionClass extends ReflectionClass {
 	function getProperties() {
+		Library::import('recess.lang.RecessReflectionProperty');
 		$rawProperties = parent::getProperties();
 		$properties = array();
 		foreach($rawProperties as $rawProperty) {
@@ -32,19 +30,21 @@ function getProperties() {
 		return $properties;
 	}
 	function getMethods($getAttachedMethods = true){
+		Library::import('recess.lang.RecessReflectionMethod');
 		$rawMethods = parent::getMethods();
 		$methods = array();
 		foreach($rawMethods as $rawMethod) {
 			$method = new RecessReflectionMethod($this->name, $rawMethod->name);
 			$methods[] = $method;
 		}
-		if($getAttachedMethods && $this->isSubclassOf('RecessClass')) {
+		if($getAttachedMethods && $this instanceof RecessClass) {
 			// $attachedMethods = RecessClass::getAttachedMethods($this->name);
 			$methods = array_merge($methods, RecessClass::getAttachedMethods($this->name));
 		}
 		return $methods;
 	}
 	function getAnnotations() {
+		Library::import('recess.lang.Annotation');
 		$docstring = $this->getDocComment();
 		if($docstring == '') return array();
 		else {