[WIP] 1.1 Updates

ActiveRecord.php

@@ -1,50 +1,60 @@
-<?php
-if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 50300)
-	die('PHP ActiveRecord requires PHP 5.3 or higher');
-
-define('PHP_ACTIVERECORD_VERSION_ID','1.0');
-
-if (!defined('PHP_ACTIVERECORD_AUTOLOAD_PREPEND'))
-	define('PHP_ACTIVERECORD_AUTOLOAD_PREPEND',true);
-
-require __DIR__.'/lib/Singleton.php';
-require __DIR__.'/lib/Config.php';
-require __DIR__.'/lib/Utils.php';
-require __DIR__.'/lib/DateTimeInterface.php';
-require __DIR__.'/lib/DateTime.php';
-require __DIR__.'/lib/Model.php';
-require __DIR__.'/lib/Table.php';
-require __DIR__.'/lib/ConnectionManager.php';
-require __DIR__.'/lib/Connection.php';
-require __DIR__.'/lib/Serialization.php';
-require __DIR__.'/lib/SQLBuilder.php';
-require __DIR__.'/lib/Reflections.php';
-require __DIR__.'/lib/Inflector.php';
-require __DIR__.'/lib/CallBack.php';
-require __DIR__.'/lib/Exceptions.php';
-require __DIR__.'/lib/Cache.php';
-
-if (!defined('PHP_ACTIVERECORD_AUTOLOAD_DISABLE'))
-	spl_autoload_register('activerecord_autoload',false,PHP_ACTIVERECORD_AUTOLOAD_PREPEND);
-
-function activerecord_autoload($class_name)
-{
-	$path = ActiveRecord\Config::instance()->get_model_directory();
-	$root = realpath(isset($path) ? $path : '.');
-
-	if (($namespaces = ActiveRecord\get_namespaces($class_name)))
-	{
-		$class_name = array_pop($namespaces);
-		$directories = array();
-
-		foreach ($namespaces as $directory)
-			$directories[] = $directory;
-
-		$root .= DIRECTORY_SEPARATOR . implode($directories, DIRECTORY_SEPARATOR);
-	}
-
-	$file = "$root/$class_name.php";
-
-	if (file_exists($file))
-		require_once $file;
-}
+<?php
+if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 50300)
+	die('PHP ActiveRecord requires PHP 5.3 or higher');
+
+define('PHP_ACTIVERECORD_VERSION_ID','1.0');
+
+if (!defined('PHP_ACTIVERECORD_AUTOLOAD_PREPEND'))
+	define('PHP_ACTIVERECORD_AUTOLOAD_PREPEND',true);
+
+require __DIR__.'/lib/Singleton.php';
+require __DIR__.'/lib/Config.php';
+require __DIR__.'/lib/Utils.php';
+require __DIR__.'/lib/DateTimeInterface.php';
+require __DIR__.'/lib/DateTime.php';
+require __DIR__.'/lib/Model.php';
+require __DIR__.'/lib/Table.php';
+require __DIR__.'/lib/ConnectionManager.php';
+require __DIR__.'/lib/Connection.php';
+require __DIR__.'/lib/ConnectionInfo.php';
+require __DIR__.'/lib/Serialization.php';
+require __DIR__.'/lib/Expressions.php';
+require __DIR__.'/lib/SQLBuilder.php';
+require __DIR__.'/lib/Reflections.php';
+require __DIR__.'/lib/Inflector.php';
+require __DIR__.'/lib/CallBack.php';
+require __DIR__.'/lib/Exceptions.php';
+require __DIR__.'/lib/Cache.php';
+require __DIR__.'/lib/StrongParameters.php';
+
+if (!defined('PHP_ACTIVERECORD_AUTOLOAD_DISABLE'))
+	spl_autoload_register('activerecord_autoload',false,PHP_ACTIVERECORD_AUTOLOAD_PREPEND);
+
+function activerecord_autoload($class_name)
+{
+	$paths = ActiveRecord\Config::instance()->get_model_directories();
+	$namespace_directory = '';
+	if (($namespaces = ActiveRecord\get_namespaces($class_name)))
+	{
+		$class_name = array_pop($namespaces);
+		$directories = array();
+
+		foreach ($namespaces as $directory)
+			$directories[] = $directory;
+
+		$namespace_directory = DIRECTORY_SEPARATOR . implode($directories, DIRECTORY_SEPARATOR);
+	}
+	$paths = count($paths) ? $paths : array('.');
+
+	foreach($paths as $path)
+	{
+		$root = realpath($path);
+		$file = "{$root}{$namespace_directory}/{$class_name}.php";
+
+		if (file_exists($file))
+		{
+			require $file;
+			return;
+		}
+	}
+}

README.md

@@ -63,14 +63,17 @@ Example:
 ```php
 ActiveRecord\Config::initialize(function($cfg)
 {
-   $cfg->set_model_directory('/path/to/your/model_directory');
-   $cfg->set_connections(
-     array(
-       'development' => 'mysql://username:password@localhost/development_database_name',
-       'test' => 'mysql://username:password@localhost/test_database_name',
-       'production' => 'mysql://username:password@localhost/production_database_name'
-     )
-   );
+    $cfg->set_model_directories(array(
+      '/path/to/your/model_directory',
+      '/some/other/path/to/your/model_directory'
+    ));
+    $cfg->set_connections(
+      array(
+        'development' => 'mysql://username:password@localhost/development_database_name',
+        'test' => 'mysql://username:password@localhost/test_database_name',
+        'production' => 'mysql://username:password@localhost/production_database_name'
+      )
+    );
 });
 ```
 

examples/orders/models/Order.php

@@ -34,4 +34,3 @@ public function apply_tax()
 		$this->tax = $this->price * $tax;
 	}
 }
-?>

examples/orders/models/Payment.php

@@ -6,4 +6,3 @@ class Payment extends ActiveRecord\Model
 		array('person'),
 		array('order'));
 }
-?>

examples/orders/models/Person.php

@@ -10,4 +10,3 @@ class Person extends ActiveRecord\Model
 	static $validates_presence_of = array(
 		array('name'), array('state'));
 }
-?>

examples/orders/orders.php

@@ -76,4 +76,4 @@
 
 foreach ($order->people as $person)
 	echo "  payment of $$person->amount by " . $person->name . "\n";
-?>
+

examples/simple/simple.php

@@ -14,4 +14,3 @@ class Book extends ActiveRecord\Model { }
 });
 
 print_r(Book::first()->attributes());
-?>

examples/simple/simple_with_options.php

@@ -29,4 +29,3 @@ class Book extends ActiveRecord\Model
 });
 
 print_r(Book::first()->attributes());
-?>