From b032776c8be077881511d3c3be1c81c36af3ef60 Mon Sep 17 00:00:00 2001
From: KrisJordan <krisjordan@gmail.com>
Date: Mon, 4 May 2009 17:48:29 -0400
Subject: [PATCH] Broken development commit. Introducing proper content
 negotiation facilities.

---
 .../recess/framework/DefaultPolicy.class.php  |  6 +--
 .../recess/http/ContentNegotiation.class.php  | 43 +++++++++++++++++++
 recess/recess/http/Environment.class.php      |  4 +-
 recess/recess/http/MimeType.class.php         | 35 +++++++++++++++
 recess/recess/http/Request.class.php          |  2 +
 .../recess/http/ContentNegotiationTest.php    | 22 ++++++++++
 recess/test/recess/http/RecessHttpTests.php   | 16 +++++++
 7 files changed, 122 insertions(+), 6 deletions(-)
 create mode 100644 recess/recess/http/ContentNegotiation.class.php
 create mode 100644 recess/recess/http/MimeType.class.php
 create mode 100644 recess/test/recess/http/ContentNegotiationTest.php
 create mode 100644 recess/test/recess/http/RecessHttpTests.php

diff --git a/recess/recess/framework/DefaultPolicy.class.php b/recess/recess/framework/DefaultPolicy.class.php
index bf28231..6964d11 100644
--- a/recess/recess/framework/DefaultPolicy.class.php
+++ b/recess/recess/framework/DefaultPolicy.class.php
@@ -24,11 +24,7 @@ public function preprocess(Request &$request) {
 		if($request->format != Formats::XHTML) {
 			$this->reparameterizeForFormat($request);
 		}
-		
-//		if($request->method == Methods::OPTIONS) {
-//			$response = new 
-//		}
-		
+			
 		return $request;
 	}
 	
diff --git a/recess/recess/http/ContentNegotiation.class.php b/recess/recess/http/ContentNegotiation.class.php
new file mode 100644
index 0000000..14a3db4
--- /dev/null
+++ b/recess/recess/http/ContentNegotiation.class.php
@@ -0,0 +1,43 @@
+<?php
+class ContentNegotiation {
+	
+	protected $headers;
+	
+	public function __construct($httpHeaders) {
+		$this->headers = $httpHeaders;
+	}
+		
+	public function nextFormat() {
+		return 'html';	
+	}
+	
+	public function resetFormats() {
+		
+	}
+	
+	public function nextLanguage() {
+		return 'en';
+	}
+
+	public function resetLanguages() {
+		
+	}
+		
+	public function nextEncoding() {
+		return 'gzip';
+	}
+	
+	public function resetEncodings() {
+		
+	}	
+	
+	public function nextCharset() {
+		return 'utf-8';
+	}
+	
+	public function resetCharset() {
+		
+	}
+	
+}
+?>
\ No newline at end of file
diff --git a/recess/recess/http/Environment.class.php b/recess/recess/http/Environment.class.php
index 16461cd..3ef835f 100644
--- a/recess/recess/http/Environment.class.php
+++ b/recess/recess/http/Environment.class.php
@@ -20,7 +20,7 @@ public static function getRawRequest() {
 		$request->method = $_SERVER['REQUEST_METHOD'];
 		
 		$request->format = Formats::XHTML;
-		
+				
 		$request->setResource(self::stripQueryString($_SERVER['REQUEST_URI']));
 		
 		$request->get = $_GET;
@@ -42,6 +42,8 @@ public static function getRawRequest() {
 		
 		$request->headers = self::getHttpRequestHeaders();
 		
+		$request->accepts = new Accepts($request->headers);
+		
 		$request->username = @$_SERVER['PHP_AUTH_USER'];
 		
 		$request->password = @$_SERVER['PHP_AUTH_PW'];
diff --git a/recess/recess/http/MimeType.class.php b/recess/recess/http/MimeType.class.php
new file mode 100644
index 0000000..c8d286e
--- /dev/null
+++ b/recess/recess/http/MimeType.class.php
@@ -0,0 +1,35 @@
+<?php
+abstract class MimeType {
+	
+	static function init() {
+		// TODO: Cache the MIME Type Data Structure
+		MimeType::registerMany(array(
+			array('all', '*/*'),
+			array('text', 'text/plain', array(), array('txt')),
+			array('html', 'text/html', array('application/xhtml+xml'), array('xhtml')),
+			array('js', 'text/javascript', array('application/javascript', 'application/x-javascript')),
+			array('css', 'text/css'),
+			array('ics', 'text/calendar'),
+			array('csv', 'text/csv'),
+			array('xml', 'application/xml', array('text/xml', 'application/x-xml')),
+			array('rss', 'application/rss+xml'),
+			array('atom', 'application/atom+xml'),
+			array('yaml', 'application/x-yaml', array('text/yaml')),
+			array('multipart_form', 'multipart/form-data'),
+			array('url_encoded_form', 'application/x-www-form-urlencoded'),
+			array('json', 'application/json', array('text/x-json','application/jsonrequest')),
+		));
+	}
+	
+	static function register($type, $extension, $synonyms = array()) {
+		self::registerMany(array(array($type,$extension,$synonyms)));
+	}
+	
+	static function registerMany($array) {
+		
+	}
+	
+}
+
+MimeType::init();
+?>
\ No newline at end of file
diff --git a/recess/recess/http/Request.class.php b/recess/recess/http/Request.class.php
index 8eff0bb..9a063c8 100644
--- a/recess/recess/http/Request.class.php
+++ b/recess/recess/http/Request.class.php
@@ -10,6 +10,8 @@
  */
 class Request {	
 	
+	public $accepts;
+	
 	public $format;
 	public $headers;
 	public $resource;
diff --git a/recess/test/recess/http/ContentNegotiationTest.php b/recess/test/recess/http/ContentNegotiationTest.php
new file mode 100644
index 0000000..abec910
--- /dev/null
+++ b/recess/test/recess/http/ContentNegotiationTest.php
@@ -0,0 +1,22 @@
+<?php
+Library::import('recess.http.ContentNegotiation');
+
+class ContentNegotiationTest extends PHPUnit_Framework_TestCase {
+	
+	function testAccepts() {
+		$negotiator = 
+			new ContentNegotiation(
+					array(	'ACCEPT' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+							'ACCEPT_LANGUAGE' => 'en-us,en;q=0.5',
+							'ACCEPT_ENCODING' => 'gzip,deflate',
+							'ACCEPT_CHARSET' => 'ISO-8859-1,utf-8;q=0.7,*;q=0.7')
+					);
+		
+		$this->assertEquals('things', Inflector::toPlural('thing'));
+		$this->assertEquals('persons', Inflector::toPlural('person'));
+		$this->assertEquals('oxs', Inflector::toPlural('ox'));
+	}
+	
+}
+
+?>
\ No newline at end of file
diff --git a/recess/test/recess/http/RecessHttpTests.php b/recess/test/recess/http/RecessHttpTests.php
new file mode 100644
index 0000000..d17d7cd
--- /dev/null
+++ b/recess/test/recess/http/RecessHttpTests.php
@@ -0,0 +1,16 @@
+<?php
+require_once 'PHPUnit/Framework.php';
+require_once 'recess/http/ContentNegotiationTest.php';
+
+class RecessHttpAllTests
+{
+    public static function suite()
+    {
+        $suite = new PHPUnit_Framework_TestSuite('recess.http');
+
+        $suite->addTestSuite('ContentNegotiationTest');
+ 		
+        return $suite;
+    }
+}
+?>
\ No newline at end of file