Merge pull request #26 from tamagokun/nocode_is_faster

Nocode is faster (cleanup and improvements)

Author: tamagokun

README.md

@@ -19,43 +19,32 @@ $ open http://localhost:9393
 
 ![](https://raw.github.com/tamagokun/rackem/master/hello-world.png)
 
-## Getting Started
-
-Rack'em likes [Composer](http://getcomposer.org/), go ahead and install it if it isn't already.
+## Features
 
-I like to install Rack'em globally so that I can use it in any project. Unfortunately, Composer does not have a way of doing this by default, so here is an easy way to allow global package installation:
+* Tiny
+* Provides a common interface for applications
+* Environment values are consistent regardless of web server
+* Run applications locally without other dependencies
 
-### Setting up Composer for global installtion
+## Getting Started
 
-```bash
-$ curl https://raw.github.com/gist/4242494/5d6344d2976e07d051ace18d41fa035113353e90/global_composer.sh | sh
-```
+Rack'em likes [Composer](http://getcomposer.org/), go ahead and install it if it isn't already.
 
 ### Installing Rack'em
 
-If you are using the global installtion method from above, you can easily do:
+Installing with Composer is the way to go:
 
 ```bash
-$ cd ~/.composer && composer require rackem/rackem:*
-```
-
-Otherwise, you need to add `rackem/rackem` to your project's composer.json:
-
-```json
-{
-	"require": {
-		"rackem/rackem": "*"
-	}
-}
+$ composer require rackem/rackem:@stable
 ```
 
-There's also a shortcut to do this with Composer:
+Installing globally is awesome:
 
 ```bash
-$ composer require rackem/rackem:*
+$ composer global require rackem/rackem:@stable
 ```
 
-Optionally, there is a PSR autoloader you can use:
+Optionally, download Rack'em and require rackem.php:
 
 ```php
 <?php
@@ -64,7 +53,7 @@ require 'rackem/rackem.php';
 
 ## rackem
 
-rackem is a tool for running Rack'em applications without the need for a web server. This makes developing Rack applications with PHP a breeze.
+rackem is a HTTP server for running Rack'em applications. This makes developing PHP applications a breeze.
 
 Provide rackem your main application script, and you are good to go:
 
@@ -77,9 +66,9 @@ $ rackem config.php
 
 ## Usage
 
-Any object that has a callable method `call()` can be considered a Rack application. Rack expects call to return an HTTP response array containing: status code, headers, and body.
+Anything that `is_callable()` or has an instance method `call()` can be considered an application. The application must return an HTTP response array containing: status code, headers, and body.
 
-Here is an example of a basic Rackem application:
+Here is an example of a basic Rack'em application:
 
 ```php
 <?php
@@ -95,7 +84,7 @@ class App
 return \Rackem::run("App");
 ```
 
-`Rack::run()` accepts 1 of 3 things:
+`Rackem::run()` accepts 1 of 3 things:
 
  - String referencing a Class
  - Class instance
@@ -113,18 +102,23 @@ return \Rackem::run($app);
 
 ## Middleware
 
-Just like Rack, Rack'em supports the use of Middleware. Middleware is basically a Rack application that must be passed `$app` in its constructor, with an optional `$options` parameter. `$app` is an instance of the previous application in the Rack stack.
+Fill your rack with middleware for ultimate awesomeness.
+
+Middleware is basically an application that is passed the previous application in the stack and optionally an array of options in its constructor.
 
-Here is an example of a Middleware class that just passes the response on:
+The most basic middleware (hint: it doesn't do anything):
 
 ```php
 <?php
 
 class MyMiddleware
 {
-	public function __construct($app)
+	public $app, $options;
+
+	public function __construct($app, $options = array())
 	{
 		$this->app = $app;
+		$this->options = $options;
 	}
 
 	public function call($env)
@@ -137,7 +131,7 @@ class MyMiddleware
 return \Rackem::run( new App() );
 ```
 
-There is also a Middleware helper class to make things a bit easier:
+There is also of course a helper class to make things a bit easier:
 
 ```php
 <?php
@@ -146,7 +140,8 @@ class MyMiddleware extends \Rackem\Middleware
 {
 	public function call($env)
 	{
-		return $this->app->call($env);
+		// do stuff
+		return parent::call($env);
 	}
 }
 ```
@@ -180,7 +175,7 @@ class JsonFormatter extends \Rackem\Middleware
 		$res = new \Rackem\Response($this->app->call($env));
 
 		if($req->params()->format == 'json')    //?format=json
-			$res->write(json_encode($res->body));
+			$res[] = json_encode($res->body);
 		return $res->finish();
 	}
 }

bin/rackem

@@ -17,7 +17,7 @@ if(function_exists("date_default_timezone_set"))
 $argv = $GLOBALS['argv'];
 array_shift($argv);
 
-$flags = array('h','process');
+$flags = array('h','process','ruby','basic');
 $args = array();
 $opts = array();
 while(list($k,$arg) = each($argv))
@@ -41,20 +41,23 @@ while(list($k,$arg) = each($argv))
 	each($argv);
 }
 
-$config = count($args) > 0? $args[0] : 'config.php';
-if(!file_exists($config))
+$app = count($args) > 0? $args[0] : 'config.php';
+
+if(isset($opts['basic']))
+{
+	$app = "\\Rackem\\BasicWebServer";
+}else if(!file_exists($app))
 {
-	echo "configuration {$config} not found\n";
+	echo "configuration {$app} not found\n";
 	exit(1);
 }
 
 $host = isset($opts['host'])? $opts['host'] : '0.0.0.0';
 $port = isset($opts['port'])? $opts['port'] : '9393';
 $client = isset($opts['client'])? $opts['client'] : false;
 
-\Rackem::$handler = "php";
-$server = new \Rackem\Server($host,$port);
+$server = new \Rackem\Server($host, $port, $app);
 if(isset($opts['process']) && $opts['process'])
-	echo $server->process(realpath($config), stream_get_contents(fopen("php://stdin","r")), $client);
+	echo $server->process(stream_get_contents(fopen("php://stdin","r")), $client);
 else
-	$server->start(realpath($config));
+	$server->start();

lib/Rackem.php

@@ -2,14 +2,9 @@
 
 class Rackem
 {
-	public static $handler = "cgi";
+	public static $handler = null;
 	protected static $builder = null;
 
-	public static function cli_req_is_file()
-	{
-		return file_exists($_SERVER['SCRIPT_FILENAME']) && !preg_match('/\.php/',$_SERVER['SCRIPT_FILENAME']);
-	}
-
 	public static function map($path, $app)
 	{
 		self::ensure_builder();
@@ -18,103 +13,31 @@ public static function map($path, $app)
 
 	public static function run($app = null)
 	{
-		if(php_sapi_name() == 'cli-server' && static::cli_req_is_file()) return false;
+		if(!$app) return false;
 
 		self::ensure_builder();
-		if($app) self::$builder->run($app);
+		self::$builder->run($app);
 
-		if(self::$handler == "php") return self::$builder;
+		if(!self::$handler) self::$handler = new \Rackem\Handler\Sapi();
+		if(isset($GLOBALS['argv']) && in_array('--ruby', $GLOBALS['argv'])) self::$handler = new \Rackem\Handler\Ruby();
 
-		// typical web server
-		if(isset($GLOBALS['argv']))
-			if(in_array('--ruby', $GLOBALS['argv'])) self::$handler = "ruby";
-		$env = static::env();
-		ob_start();
-		$result = self::$builder->call($env);
-		$output = ob_get_clean();
-		if($output) $result[1]['X-Output'] = json_encode($output);
-		static::execute($result, $env);
+		return self::$handler->run(self::$builder);
 	}
 
-	public static function use_middleware($middleware,$options = array())
+	public static function use_middleware($middleware, $options = array())
 	{
 		self::ensure_builder();
 		self::$builder->use_middleware($middleware, $options);
 	}
 
 	public static function version()
 	{
-		return array(1,1);
+		return array(0,4,5);
 	}
 
 /* private */
-
-	protected static function env()
-	{
-		return self::$handler == "ruby" ? static::build_env_ruby() : static::build_env_cgi();
-	}
-
-	protected static function build_env_cgi()
-	{
-		list($request_uri,$script_name) = static::url_parts();
-		$env = array_merge($_SERVER, array(
-			"REQUEST_METHOD" => $_SERVER['REQUEST_METHOD'],
-			"SCRIPT_NAME" => $script_name,
-			"PATH_INFO" => str_replace($script_name,"",$request_uri),
-			"SERVER_NAME" => $_SERVER['SERVER_NAME'],
-			"SERVER_PORT" => $_SERVER['SERVER_PORT'],
-			"QUERY_STRING" => isset($_SERVER['QUERY_STRING'])? $_SERVER['QUERY_STRING'] : '',
-			"rack.version" => static::version(),
-			"rack.url_scheme" => (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'])? 'https' : 'http',
-			"rack.input" => fopen('php://input', 'r'),
-			"rack.errors" => fopen('php://stderr', 'wb'),
-			"rack.multithread" => false,
-			"rack.multiprocess" => false,
-			"rack.run_once" => false,
-			"rack.session" => array(),
-			"rack.logger" => ""
-		));
-		return new \ArrayObject($env);
-	}
-
-	protected static function build_env_ruby()
-	{
-		$env = json_decode(file_get_contents('php://stdin'), true);
-		return new \ArrayObject($env);
-	}
-
 	protected static function ensure_builder()
 	{
 		if(!self::$builder) self::$builder = new Rackem\Builder();
 	}
-
-	protected static function execute($result, $env)
-	{
-		list($status, $headers, $body) = $result;
-		if(self::$handler == "ruby")
-		{
-			foreach($headers as $k=>&$v) if(is_numeric($v)) $v = (string)$v;
-			$headers = json_encode($headers);
-			$body = implode("",$body);
-			exit(implode("\n",array($status,$headers,$body)));
-		}
-		fclose($env['rack.input']);
-		fclose($env['rack.errors']);
-		if($env['rack.logger']) $env['rack.logger']->close();
-		$headers['X-Powered-By'] = "Rack'em ".implode(".",$env['rack.version']);
-		$headers['Status'] = $status;
-		header($env['SERVER_PROTOCOL']." ".$status);
-		foreach($headers as $key=>$values)
-			foreach(explode("\n",$values) as $value) header("$key: $value");
-		echo implode("",$body);
-		exit();
-	}
-
-	protected static function url_parts()
-	{
-		$request_uri = ($q = strpos($_SERVER['REQUEST_URI'],'?')) !== false? substr($_SERVER['REQUEST_URI'],0,$q) : $_SERVER['REQUEST_URI'];
-		$script_name = php_sapi_name() == 'cli-server'? '/' : $_SERVER['SCRIPT_NAME'];
-		if(strpos($request_uri, $script_name) !== 0) $script_name = dirname($script_name);
-		return array($request_uri,rtrim($script_name,'/'));
-	}
 }

lib/Rackem/Auth/Basic.php

@@ -97,7 +97,7 @@ public function username()
 /* private */
 	private function authorization_keys()
 	{
-		$keys = array('PHP_AUTH_USER','HTTP_AUTHORIZATION','X-HTTP_AUTHORIZATION','X_HTTP_AUTHORIZATION');	
+		$keys = array('PHP_AUTH_USER','HTTP_AUTHORIZATION','X-HTTP_AUTHORIZATION','X_HTTP_AUTHORIZATION');
 		foreach($keys as $key)
 			if(isset($this->env[$key])) $this->key = $key;
 		return $this->key;

lib/Rackem/BasicWebServer.php

@@ -0,0 +1,12 @@
+<?php
+namespace Rackem;
+
+class BasicWebServer
+{
+	public function call($env)
+	{
+		if(substr($env['PATH_INFO'], -1) == '/') $env['PATH_INFO'] .= "index.html";
+		$file = new \Rackem\File(getcwd());
+		return $file->call($env);
+	}
+}

lib/Rackem/Builder.php

@@ -14,11 +14,11 @@ public function __construct($app = null, $middleware = array())
 
 	public function call($env)
 	{
-		$this->use = array_reverse($this->use);
+		$this->use = $this->use ? array_reverse($this->use) : array();
 		$app = empty($this->map) ? $this->run : $this->generate_map($this->run, $this->map);
 		try
 		{
-			if(!empty($this->use)) foreach($this->use as $middleware) $app = $middleware($app);
+			foreach($this->use as $middleware) $app = $middleware($app);
 			return $app->call($env);
 		}catch(Exception $e)
 		{

lib/Rackem/Handler/Rackem.php

@@ -0,0 +1,15 @@
+<?php
+namespace Rackem\Handler;
+
+class Rackem
+{
+	public function run($app)
+	{
+		return $app;
+	}
+
+	public function env()
+	{
+		return false;
+	}
+}

lib/Rackem/Handler/Ruby.php

@@ -0,0 +1,26 @@
+<?php
+namespace Rackem\Handler;
+
+class Ruby
+{
+	public function run($app)
+	{
+		$env = $this->env();
+
+		ob_start();
+		list($status, $headers, $body) = $app->call($env);
+		$output = ob_get_clean();
+		if($output) $headers['X-Output'] = json_encode($output);
+
+		foreach($headers as $k=>&$v) if(is_numeric($v)) $v = (string)$v;
+		$headers = json_encode($headers);
+		$body = implode("",$body);
+		exit(implode("\n",array($status,$headers,$body)));
+	}
+
+	public function env()
+	{
+		$env = json_decode(file_get_contents('php://stdin'), true);
+		return new \ArrayObject($env);
+	}
+}