[floe] r396 committed - cleaning up and documenting configuration constants

[fl...@googlecode.com]

Revision: 396
Author: coretxt
Date: Wed May 19 06:13:55 2010
Log: cleaning up and documenting configuration constants
http://code.google.com/p/floe/source/detail?r=396

Modified:
/trunk/src/server/receptors/IdentityDispatcher.class.php
/trunk/src/server/receptors/ResourceDispatcher.class.php

=======================================
--- /trunk/src/server/receptors/IdentityDispatcher.class.php Thu Oct 29
10:09:35 2009
+++ /trunk/src/server/receptors/IdentityDispatcher.class.php Wed May 19
06:13:55 2010
@@ -20,10 +20,18 @@
require_once dirname(__FILE__).'/../ResourceNotFound.class.php';
/**#@-*/

+if (defined('DefaultMethodBinding')) {
+ throw new Exception("Deprecated constant [DefaultMethodBinding]. Please
use [IdentityDispatcher_DefaultBinding]");
+}
+
+if (defined('BindMissingDefault')) {
+ throw new Exception("Deprecated constant [BindMissingDefault]. Please use
[IdentityDispatcher_BindMissing]");
+}
+
/**
- * Bind base URL requests to this method by default.
+ * Bind base URL requests to this controller method by default.
*/
-if (!defined('DefaultMethodBinding'))
define('DefaultMethodBinding', 'index');
+if (!defined('IdentityDispatcher_DefaultBinding'))
define('IdentityDispatcher_DefaultBinding', 'index');

/**
* Delegates request binding to a controller based on URI identity.
@@ -55,7 +63,7 @@
$base = (count($request->uri->segments()) == 1) ?
$request->uri->identity() : $request->uri->segment(0);
$identity = $request->uri->segment(1);
$params = $request->uri->segmentsFrom(2);
- if ($base == '') $base = DefaultMethodBinding;
+ if ($base == '') $base = IdentityDispatcher_DefaultBinding;
if ($identity == '') $identity = $base;
$path = CTR_DIR ."/$base.controller.php";
if (!file_exists($path)) {
@@ -64,8 +72,8 @@
$identity = $request->uri->segment(2);
if ($identity == '') $identity = $base;
$params = $request->uri->segmentsFrom(3);
- if (!file_exists($path) && defined('BindMissingDefault')) {
- $base = DefaultMethodBinding;
+ if (!file_exists($path) && defined('IdentityDispatcher_BindMissing')) {
+ $base = IdentityDispatcher_DefaultBinding;
$path = CTR_DIR ."/$base.controller.php";
$params = $request->uri->segmentsFrom(0);
if (!$path) {
@@ -92,8 +100,8 @@
$identity = $this->stripActionIdentifier($identity);
if (method_exists($controller, $identity)) {
$this->invoke($controller, $identity, $params);
- } elseif (method_exists($controller, DefaultMethodBinding)) {
- $this->invoke($controller, DefaultMethodBinding,
$request->uri->segmentsFrom(1));
+ } elseif (method_exists($controller, IdentityDispatcher_DefaultBinding))
{
+ $this->invoke($controller, IdentityDispatcher_DefaultBinding,
$request->uri->segmentsFrom(1));
} else {
throw new ResourceNotFound("Method $identity not defined in
$classname", $path);
}
=======================================
--- /trunk/src/server/receptors/ResourceDispatcher.class.php Wed Mar 3
02:46:21 2010
+++ /trunk/src/server/receptors/ResourceDispatcher.class.php Wed May 19
06:13:55 2010
@@ -14,7 +14,7 @@
/**
* Bind base URL requests to this controller by default.
*/
-if (!defined('DefaultControllerBinding'))
define('DefaultControllerBinding', 'index');
+if (!defined('ResourceDispatcher_DefaultBinding'))
define('ResourceDispatcher_DefaultBinding', 'index');

/**#@+
* Required dependency.
@@ -45,7 +45,7 @@
public function run(Request $request, Response $response) {
$base = $request->uri->segment(0);
$params = $request->uri->segmentsFrom(1);
- if ($base == '') $base = DefaultControllerBinding;
+ if ($base == '') $base = ResourceDispatcher_DefaultBinding;
$path = APP_DIR ."controllers/$base.controller.php";
if (!file_exists($path)) {
$identity = $request->uri->segment(1);

--
You received this message because you are subscribed to the Google Groups "Floe Commits" group.
To post to this group, send email to floe-c...@googlegroups.com.
To unsubscribe from this group, send email to floe-commits...@googlegroups.com.
For more options, visit this group at http://groups.google.com/group/floe-commits?hl=en.