MIT-LICENSE
apps/welcome/WelcomeApplication.class.php
apps/welcome/controllers/WelcomeHomeController.class.php
apps/welcome/views/common/footer.php
apps/welcome/views/common/header.php
apps/welcome/views/home/index.php
content/css/blueprint/LICENSE
@@ -1,5 +1,5 @@
<?php
-// Pre-release test runner. This will become a plug-in.
+// Pre-release test runner. This will become a mini-app in Recess Tools
require_once('recess/lib/simpletest/autorun.php');
require_once('recess/lib/simpletest/mock_objects.php');
TestRunner.php
@@ -53,6 +53,10 @@ abstract class RecessConf {
public static $policy;
static function init() {
+ if(self::$mode == self::PRODUCTION) {
+ self::$useTurboSpeed = true;
+ }
+
$_ENV['dir.recess'] = self::$recessDir;
$_ENV['dir.apps'] = self::$appsDir;
$_ENV['dir.test'] = self::$recessDir . 'test/';
bootstrap.php
@@ -15,14 +15,13 @@ RecessConf::$mode = RecessConf::DEVELOPMENT; // or RecessConf::PRODUCTION
RecessConf::$applications
= array( 'recess.apps.tools.RecessToolsApplication',
- 'blog.BlogApplication',
- 'customerBackend.CustomerBackendApplication',
+ 'welcome.WelcomeApplication',
);
RecessConf::$defaultTimeZone = 'America/New_York';
RecessConf::$defaultDatabase
- = array( // 'sqlite:' . $_ENV['dir.bootstrap'] . 'recess/sqlite/default.db'
+ = array( //'sqlite:' . $_ENV['dir.bootstrap'] . 'recess/sqlite/default.db'
'mysql:host=localhost;dbname=recess', 'recess', 'recess'
);
@@ -35,6 +34,8 @@ RecessConf::$namedDatabases
RecessConf::$recessDir = $_ENV['dir.bootstrap'] . 'recess/';
RecessConf::$appsDir = $_ENV['dir.bootstrap'] . 'apps/';
+// Cache providers are only enabled during DEPLOYMENT mode.
+// Always use at least the Sqlite cache.
RecessConf::$cacheProviders
= array(
// 'Apc',
@@ -42,5 +43,4 @@ RecessConf::$cacheProviders
'Sqlite',
);
-RecessConf::$useTurboSpeed = false; // I wanna go FAST! (Note: Experimental feature.)
?>
\ No newline at end of file
recess-conf.php
@@ -9,7 +9,7 @@ class {{programmaticName}}HomeController extends Controller {
/** !Route GET */
function index() {
- $this->flash = 'Welcome to your new Recess app!';
+ $this->flash = 'Welcome to your new Recess application!';
}
recess/lib/recess/apps/tools/templates/HomeController.template.php
@@ -2,7 +2,7 @@
$title = '{{appName}}';
include_once($viewsDir . 'common/header.php');
?>
-<h2>Welcome!</h2>
+<h2>Hello Kick-ass Developer!</h2>
<p class="highlight"><?php echo $flash; ?></p>
recess/lib/recess/apps/tools/templates/home.template.php
@@ -2,24 +2,9 @@
$title = '{{appName}}';
include_once($viewsDir . 'common/header.php');
?>
-<div class="span-24 last">
-<div class="span-12 notice">
-<p>Friends,</p>
-<p>I appreciate your interest in Recess! I hope you'll find these bits (somewhat) functional and fun.</p>
-<p>The Recess framework is early stage so please travel with caution.</p>
-<p>Thanks and Enjoy!</p>
-<p><a href="http://www.krisjordan.com/">Kris Jordan</a></p>
-</div>
-</div>
-<h2><?php echo $flash; ?></h2>
+<h1>Hello Kick-ass Developer!</h1>
-<h3>Next steps?</h3>
-
-<ul>
- <li><a href="<?php echo $_ENV['url.base']; ?>recess/">Recess Tools</a></li>
-</ul>
-
-<h3>For more information visit <a href="http://www.recessframework.org/">http://www.recessframework.org/</a></h3>
+<h2 class="highlight"><?php echo $flash; ?></h2>
<?php include_once($viewsDir . 'common/footer.php'); ?>
\ No newline at end of file
recess/lib/recess/apps/tools/templates/index.template.php
@@ -2,17 +2,16 @@
<div class="span-5 last infobar">
<h3><span>Recess! Resources</span></h3>
<ul>
- <li><a href="http://www.recessframework.com/">RecessFramework.com</a></li>
- <li><a href="http://www.recessframework.com/">Documentation</a></li>
- <li><a href="http://www.recessframework.com/">Recess! Blog</a></li>
- <li><a href="http://www.recessframework.com/">Kris' Blog</a></li>
- <li><a href="http://www.recessframework.com/">Mailing Group</a></li>
- <li><a href="http://www.recessframework.com/">Report Bugs</a></li>
- <li><a href="http://www.recessframework.com/">Recess! Source</a></li>
+ <li><a href="http://www.recessframework.org/">RecessFramework.org</a></li>
+ <li><a href="http://www.recessframework.org/blog">Recess! Blog</a></li>
+ <li><a href="http://www.krisjordan.com/">Kris' Blog</a></li>
+ <li><a href="http://groups.google.com/group/recess-framework">Mailing Group</a></li>
+ <li><a href="http://recess.lighthouseapp.com/">Report Bugs</a></li>
+ <li><a href="http://github.com/recess/recess/">Recess! Source</a></li>
</ul>
</div>
<div class="span-24 footer">
- <p class="quiet bottom"><a href="http://www.recessframework.com/">Recess! Framework</a> is © 2008 <a href="http://www.krisjordan.com/">Kris Jordan</a>. All rights reserved. Recess! is open source under the <a href="http://www.opensource.org/licenses/mit-license.php">MIT license</a>.</p>
+ <p class="quiet bottom"><a href="http://www.recessframework.org/">Recess! Framework</a> is © 2008 <a href="http://www.krisjordan.com/">Kris Jordan</a>. All rights reserved. Recess is open source under the <a href="http://www.opensource.org/licenses/mit-license.php">MIT license</a>.</p>
</div>
</div>
</body>
recess/lib/recess/apps/tools/views/common/footer.php
@@ -6,4 +6,24 @@ include_once($viewsDir . 'common/header.php');
<h1>Welcome to Recess!</h1>
+<h2>What is Tools?</h2>
+<p>
+Recess Tools is an application to help you along the development path. With Tools you can inspect the Recess Applications you have installed, ensure databases are connected properly, and browse code.
+</p>
+
+<h3><a href="<?php echo $_ENV['url.base'];?>recess/apps">Apps</a>: Browse and create apps, generate models & scaffolding, and view an app's routes.</h3>
+
+<h3><a href="<?php echo $_ENV['url.base'];?>recess/database">Database</a>: Ensure database connectivity and perform basic DB operations.</h3>
+
+<h3><a href="<?php echo $_ENV['url.base'];?>recess/code">Code</a>: Introspect your project's code.</h3>
+
+<h3><a href="<?php echo $_ENV['url.base'];?>recess/routes">Routes</a>: View routes for all active applications.</h3>
+
+<h2>Looking for other Tools?</h2>
+<p>
+As Recess matures the tool set will need to grow too. Have ideas for other useful tools? Perhaps you've built additional useful tools? Get involved over at <a href="http://www.recessframework.org/">RecessFramework.org</a>.
+</p>
+
+<h3>Enjoy!<br />-<a href="http://www.krisjordan.com/">Kris</a></h3>
+
<?php include_once($viewsDir . 'common/footer.php'); ?>
\ No newline at end of file
recess/lib/recess/apps/tools/views/home/home.php
@@ -19,7 +19,7 @@ class BelongsToRelationship extends Relationship {
$this->localClass = $modelClassName;
$this->name = $relationshipName;
$this->onDelete = Relationship::NULLIFY;
- $this->foreignKey = Inflector::toUnderscores($relationshipName) . '_id';
+ $this->foreignKey = Inflector::toCamelCaps($relationshipName) . 'Id';
$this->foreignClass = Inflector::toProperCaps($relationshipName);
}
recess/lib/recess/database/orm/relationships/BelongsToRelationship.class.php
@@ -20,7 +20,7 @@ class HasManyRelationship extends Relationship {
function init($modelClassName, $relationshipName) {
$this->localClass = $modelClassName;
$this->name = $relationshipName;
- $this->foreignKey = Inflector::toUnderscores($modelClassName) . '_id';
+ $this->foreignKey = Inflector::toCamelCaps($modelClassName) . 'Id';
$this->foreignClass = Inflector::toSingular(Inflector::toProperCaps($relationshipName));
$this->onDelete = Relationship::UNSPECIFIED;
}
recess/lib/recess/database/orm/relationships/HasManyRelationship.class.php
@@ -5,9 +5,17 @@ Library::import('recess.framework.routing.Route');
class RouteAnnotation extends ControllerAnnotation {
protected $methods = array();
protected $path;
+ protected $hasError = false;
function init($array) {
+ // Expectation GET, /some/path/info
if(count($array) == 1) {
+ if(is_string($array[0])) {
+ $fallBack = split(' ',trim($array[0]));
+ if(count($fallBack) > 1) {
+ $this->hasError = true;
+ }
+ }
$array[1] = ' ';
}
@@ -35,6 +43,18 @@ class RouteAnnotation extends ControllerAnnotation {
$route->fileDefined = $reflectedMethod->getFileName();
$route->lineDefined = $reflectedMethod->getStartLine();
$descriptor->routes[] = $route;
+
+ if($this->hasError == true) {
+ if(is_array($this->methods) && !empty($this->methods)) {
+ $parts = split(' ', $this->methods[0]);
+ if(sizeof($parts) > 1) {
+ $method = $parts[0];
+ $path = $parts[1];
+ throw new RecessErrorException('Invalid !Route annotation. Please separate HTTP Method and Path with a comma. Ex: /** !Route ' . $method . ', ' . $path . ' */', 0, 0, $reflectedMethod->getFileName(), $reflectedMethod->getStartLine(), array());
+ }
+ }
+ throw new RecessErrorException('Invalid !Route annotation. Please separate HTTP Method and Path with a comma. Ex: /** !Route GET, /path/info */', 0, 0, $reflectedMethod->getFileName(), $reflectedMethod->getStartLine(), array());
+ }
}
}
?>
\ No newline at end of file
recess/lib/recess/framework/controllers/annotations/RouteAnnotation.class.php
@@ -6,7 +6,7 @@ Library::import('recess.database.orm.Model');
Library::import('recess.database.orm.ModelDataSource');
/**
- * !BelongsTo owner, Class: Person, Key: person_id, OnDelete: Cascade
+ * !BelongsTo owner, Class: Person, Key: personId, OnDelete: Cascade
* !Table cars
*/
class Car extends Model {
@@ -39,8 +39,8 @@ class Group extends Model {}
class Groupship extends Model {}
/**
- * !HasMany books, Key: author_id, OnDelete: Cascade
- * !HasMany novels, Key: author_id, Class: Book
+ * !HasMany books, Key: authorId, OnDelete: Cascade
+ * !HasMany novels, Key: authorId, Class: Book
* !HasMany cars, OnDelete: Nullify
* !HasMany groups, Through: Groupship, OnDelete: Nullify
* !BelongsTo politicalParty
@@ -99,75 +99,75 @@ class ModelTest extends UnitTestCase {
function setUp() {
$this->source = new ModelDataSource('sqlite::memory:');
$this->source->beginTransaction();
- $this->source->exec('CREATE TABLE persons (id INTEGER PRIMARY KEY AUTOINCREMENT, first_name TEXT, last_name TEXT, age TEXT, political_party_id INTEGER)');
+ $this->source->exec('CREATE TABLE persons (id INTEGER PRIMARY KEY AUTOINCREMENT, firstName TEXT, lastName TEXT, age TEXT, politicalPartyId INTEGER)');
$this->source->exec('CREATE TABLE groups (id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT, description TEXT)');
- $this->source->exec('CREATE TABLE groupships (id INTEGER PRIMARY KEY ASC AUTOINCREMENT, group_id INTEGER, person_id INTEGER)');
- $this->source->exec('CREATE TABLE books (id INTEGER PRIMARY KEY ASC AUTOINCREMENT, author_id INTEGER, title TEXT)');
- $this->source->exec('CREATE TABLE chapters (id INTEGER PRIMARY KEY ASC AUTOINCREMENT, book_id INTEGER, title TEXT)');
- $this->source->exec('CREATE TABLE cars (pk INTEGER PRIMARY KEY ASC AUTOINCREMENT, person_id INTEGER, make TEXT, isDriveable BOOLEAN)');
- $this->source->exec('CREATE TABLE movies (id INTEGER PRIMARY KEY ASC AUTOINCREMENT, author_id INTEGER, title TEXT)');
+ $this->source->exec('CREATE TABLE groupships (id INTEGER PRIMARY KEY ASC AUTOINCREMENT, groupId INTEGER, personId INTEGER)');
+ $this->source->exec('CREATE TABLE books (id INTEGER PRIMARY KEY ASC AUTOINCREMENT, authorId INTEGER, title TEXT)');
+ $this->source->exec('CREATE TABLE chapters (id INTEGER PRIMARY KEY ASC AUTOINCREMENT, bookId INTEGER, title TEXT)');
+ $this->source->exec('CREATE TABLE cars (pk INTEGER PRIMARY KEY ASC AUTOINCREMENT, personId INTEGER, make TEXT, isDriveable BOOLEAN)');
+ $this->source->exec('CREATE TABLE movies (id INTEGER PRIMARY KEY ASC AUTOINCREMENT, authorId INTEGER, title TEXT)');
$this->source->exec('CREATE TABLE generas (id INTEGER PRIMARY KEY ASC AUTOINCREMENT, title INTEGER)');
- $this->source->exec('CREATE TABLE books_generas_joins (id INTEGER PRIMARY KEY ASC AUTOINCREMENT, book_id INTEGER, genera_id INTEGER)');
+ $this->source->exec('CREATE TABLE books_generas_joins (id INTEGER PRIMARY KEY ASC AUTOINCREMENT, bookId INTEGER, generaId INTEGER)');
$this->source->exec('CREATE TABLE political_partys (id INTEGER PRIMARY KEY ASC AUTOINCREMENT, party TEXT)');
- $this->source->exec('CREATE TABLE movies_generas_joins (id INTEGER PRIMARY KEY ASC AUTOINCREMENT, movie_id INTEGER, genera_id INTEGER)');
- $this->source->exec('INSERT INTO persons (first_name, last_name, age, political_party_id) VALUES ("Kris", "Jordan", 23, 1)');
- $this->source->exec('INSERT INTO persons (first_name, last_name, age, political_party_id) VALUES ("Joel", "Sutherland", 23, 1)');
- $this->source->exec('INSERT INTO persons (first_name, last_name, age, political_party_id) VALUES ("Clay", "Schossow", 22, 2)');
- $this->source->exec('INSERT INTO persons (first_name, last_name, age, political_party_id) VALUES ("Barack", "Obama", 47, 1)');
- $this->source->exec('INSERT INTO persons (first_name, last_name, age, political_party_id) VALUES ("Josh", "Lockhart", 22, 1)');
- $this->source->exec('INSERT INTO persons (first_name, last_name, age, political_party_id) VALUES ("John", "McCain", 72, 3)');
+ $this->source->exec('CREATE TABLE movies_generas_joins (id INTEGER PRIMARY KEY ASC AUTOINCREMENT, movieId INTEGER, generaId INTEGER)');
+ $this->source->exec('INSERT INTO persons (firstName, lastName, age, politicalPartyId) VALUES ("Kris", "Jordan", 23, 1)');
+ $this->source->exec('INSERT INTO persons (firstName, lastName, age, politicalPartyId) VALUES ("Joel", "Sutherland", 23, 1)');
+ $this->source->exec('INSERT INTO persons (firstName, lastName, age, politicalPartyId) VALUES ("Clay", "Schossow", 22, 2)');
+ $this->source->exec('INSERT INTO persons (firstName, lastName, age, politicalPartyId) VALUES ("Barack", "Obama", 47, 1)');
+ $this->source->exec('INSERT INTO persons (firstName, lastName, age, politicalPartyId) VALUES ("Josh", "Lockhart", 22, 1)');
+ $this->source->exec('INSERT INTO persons (firstName, lastName, age, politicalPartyId) VALUES ("John", "McCain", 72, 3)');
$this->source->exec('INSERT INTO political_partys (party) VALUES ("Democrat")');
$this->source->exec('INSERT INTO political_partys (party) VALUES ("Independent")');
$this->source->exec('INSERT INTO political_partys (party) VALUES ("Republican")');
- $this->source->exec('INSERT INTO books (author_id, title) VALUES (4,"The Audacity of Hope: Thoughts on Reclaiming the American Dream")');
- $this->source->exec('INSERT INTO chapters (book_id, title) VALUES (1,"Republicans and Democrats")');
- $this->source->exec('INSERT INTO chapters (book_id, title) VALUES (1,"Values")');
- $this->source->exec('INSERT INTO chapters (book_id, title) VALUES (1,"Our Constitution")');
- $this->source->exec('INSERT INTO chapters (book_id, title) VALUES (1,"Politics")');
- $this->source->exec('INSERT INTO chapters (book_id, title) VALUES (1,"Opportunity")');
- $this->source->exec('INSERT INTO chapters (book_id, title) VALUES (1,"Faith")');
- $this->source->exec('INSERT INTO chapters (book_id, title) VALUES (1,"Race")');
- $this->source->exec('INSERT INTO chapters (book_id, title) VALUES (1,"The World Beyond our Borders")');
- $this->source->exec('INSERT INTO chapters (book_id, title) VALUES (1,"Family")');
- $this->source->exec('INSERT INTO books (author_id, title) VALUES (3,"How to Be a Sketch Ball")'); // 1
- $this->source->exec('INSERT INTO books (author_id, title) VALUES (2,"Steve Nash: A Modern Day Hero")'); // 2
- $this->source->exec('INSERT INTO books (author_id, title) VALUES (1,"How Michael Scott Touched My Life, and Could Touch Yours Too")'); // 3
- $this->source->exec('INSERT INTO books (author_id, title) VALUES (4,"Dreams from My Father: A Story of Race and Inheritance")'); // 4
- $this->source->exec('INSERT INTO books (author_id, title) VALUES (4,"Barack Obama: What He Believes In - From His Own Works")'); // 5
- $this->source->exec('INSERT INTO books (author_id, title) VALUES (3,"Hoop Dreams, The Clay Schossow Story")'); // 6
- $this->source->exec('INSERT INTO movies (author_id, title) VALUES (3,"Hoop Dreams, The Clay Schossow Story, The Movie")');
- $this->source->exec('INSERT INTO movies (author_id, title) VALUES (3,"Clay Schossow: Unleashed")');
- $this->source->exec('INSERT INTO movies (author_id, title) VALUES (3,"LeBron James and Other Assorted Dreams of Clay Schossow")');
+ $this->source->exec('INSERT INTO books (authorId, title) VALUES (4,"The Audacity of Hope: Thoughts on Reclaiming the American Dream")');
+ $this->source->exec('INSERT INTO chapters (bookId, title) VALUES (1,"Republicans and Democrats")');
+ $this->source->exec('INSERT INTO chapters (bookId, title) VALUES (1,"Values")');
+ $this->source->exec('INSERT INTO chapters (bookId, title) VALUES (1,"Our Constitution")');
+ $this->source->exec('INSERT INTO chapters (bookId, title) VALUES (1,"Politics")');
+ $this->source->exec('INSERT INTO chapters (bookId, title) VALUES (1,"Opportunity")');
+ $this->source->exec('INSERT INTO chapters (bookId, title) VALUES (1,"Faith")');
+ $this->source->exec('INSERT INTO chapters (bookId, title) VALUES (1,"Race")');
+ $this->source->exec('INSERT INTO chapters (bookId, title) VALUES (1,"The World Beyond our Borders")');
+ $this->source->exec('INSERT INTO chapters (bookId, title) VALUES (1,"Family")');
+ $this->source->exec('INSERT INTO books (authorId, title) VALUES (3,"How to Be a Sketch Ball")'); // 1
+ $this->source->exec('INSERT INTO books (authorId, title) VALUES (2,"Steve Nash: A Modern Day Hero")'); // 2
+ $this->source->exec('INSERT INTO books (authorId, title) VALUES (1,"How Michael Scott Touched My Life, and Could Touch Yours Too")'); // 3
+ $this->source->exec('INSERT INTO books (authorId, title) VALUES (4,"Dreams from My Father: A Story of Race and Inheritance")'); // 4
+ $this->source->exec('INSERT INTO books (authorId, title) VALUES (4,"Barack Obama: What He Believes In - From His Own Works")'); // 5
+ $this->source->exec('INSERT INTO books (authorId, title) VALUES (3,"Hoop Dreams, The Clay Schossow Story")'); // 6
+ $this->source->exec('INSERT INTO movies (authorId, title) VALUES (3,"Hoop Dreams, The Clay Schossow Story, The Movie")');
+ $this->source->exec('INSERT INTO movies (authorId, title) VALUES (3,"Clay Schossow: Unleashed")');
+ $this->source->exec('INSERT INTO movies (authorId, title) VALUES (3,"LeBron James and Other Assorted Dreams of Clay Schossow")');
$this->source->exec('INSERT INTO generas (title) VALUES ("Sports Healing")'); // 1
$this->source->exec('INSERT INTO generas (title) VALUES ("Political Healing")'); // 2
$this->source->exec('INSERT INTO generas (title) VALUES ("Social Healing")'); // 3
$this->source->exec('INSERT INTO generas (title) VALUES ("Comedy Healing")'); // 4
- $this->source->exec('INSERT INTO books_generas_joins (book_id,genera_id) VALUES (1,3)');
- $this->source->exec('INSERT INTO books_generas_joins (book_id,genera_id) VALUES (2,3)');
- $this->source->exec('INSERT INTO books_generas_joins (book_id,genera_id) VALUES (2,4)');
- $this->source->exec('INSERT INTO books_generas_joins (book_id,genera_id) VALUES (3,1)'); // 4: 4, 6: 3
- $this->source->exec('INSERT INTO books_generas_joins (book_id,genera_id) VALUES (4,4)');
- $this->source->exec('INSERT INTO books_generas_joins (book_id,genera_id) VALUES (5,3)');
- $this->source->exec('INSERT INTO books_generas_joins (book_id,genera_id) VALUES (6,3)');
- $this->source->exec('INSERT INTO books_generas_joins (book_id,genera_id) VALUES (7,1)');
- $this->source->exec('INSERT INTO movies_generas_joins (movie_id,genera_id) VALUES (1,1)');
- $this->source->exec('INSERT INTO movies_generas_joins (movie_id,genera_id) VALUES (1,4)');
- $this->source->exec('INSERT INTO movies_generas_joins (movie_id,genera_id) VALUES (2,4)');
- $this->source->exec('INSERT INTO movies_generas_joins (movie_id,genera_id) VALUES (3,1)');
+ $this->source->exec('INSERT INTO books_generas_joins (bookId,generaId) VALUES (1,3)');
+ $this->source->exec('INSERT INTO books_generas_joins (bookId,generaId) VALUES (2,3)');
+ $this->source->exec('INSERT INTO books_generas_joins (bookId,generaId) VALUES (2,4)');
+ $this->source->exec('INSERT INTO books_generas_joins (bookId,generaId) VALUES (3,1)'); // 4: 4, 6: 3
+ $this->source->exec('INSERT INTO books_generas_joins (bookId,generaId) VALUES (4,4)');
+ $this->source->exec('INSERT INTO books_generas_joins (bookId,generaId) VALUES (5,3)');
+ $this->source->exec('INSERT INTO books_generas_joins (bookId,generaId) VALUES (6,3)');
+ $this->source->exec('INSERT INTO books_generas_joins (bookId,generaId) VALUES (7,1)');
+ $this->source->exec('INSERT INTO movies_generas_joins (movieId,generaId) VALUES (1,1)');
+ $this->source->exec('INSERT INTO movies_generas_joins (movieId,generaId) VALUES (1,4)');
+ $this->source->exec('INSERT INTO movies_generas_joins (movieId,generaId) VALUES (2,4)');
+ $this->source->exec('INSERT INTO movies_generas_joins (movieId,generaId) VALUES (3,1)');
$this->source->exec('INSERT INTO groups (name) VALUES ("NRA")'); // 1
$this->source->exec('INSERT INTO groups (name) VALUES ("Tree Huggers")'); // 2
$this->source->exec('INSERT INTO groups (name) VALUES ("Hackers")'); // 3
- $this->source->exec('INSERT INTO groupships (group_id,person_id) VALUES (2,1)');
- $this->source->exec('INSERT INTO groupships (group_id,person_id) VALUES (3,1)');
- $this->source->exec('INSERT INTO groupships (group_id,person_id) VALUES (3,2)');
- $this->source->exec('INSERT INTO groupships (group_id,person_id) VALUES (2,2)');
- $this->source->exec('INSERT INTO groupships (group_id,person_id) VALUES (1,3)');
- $this->source->exec('INSERT INTO groupships (group_id,person_id) VALUES (2,4)');
- $this->source->exec('INSERT INTO groupships (group_id,person_id) VALUES (2,5)');
- $this->source->exec('INSERT INTO groupships (group_id,person_id) VALUES (3,5)');
- $this->source->exec('INSERT INTO groupships (group_id,person_id) VALUES (1,6)');
- $this->source->exec('INSERT INTO cars (person_id,make,isDriveable) VALUES (1,"VW",1)');
- $this->source->exec('INSERT INTO cars (person_id,make,isDriveable) VALUES (2,"Toyota",1)');
+ $this->source->exec('INSERT INTO groupships (groupId,personId) VALUES (2,1)');
+ $this->source->exec('INSERT INTO groupships (groupId,personId) VALUES (3,1)');
+ $this->source->exec('INSERT INTO groupships (groupId,personId) VALUES (3,2)');
+ $this->source->exec('INSERT INTO groupships (groupId,personId) VALUES (2,2)');
+ $this->source->exec('INSERT INTO groupships (groupId,personId) VALUES (1,3)');
+ $this->source->exec('INSERT INTO groupships (groupId,personId) VALUES (2,4)');
+ $this->source->exec('INSERT INTO groupships (groupId,personId) VALUES (2,5)');
+ $this->source->exec('INSERT INTO groupships (groupId,personId) VALUES (3,5)');
+ $this->source->exec('INSERT INTO groupships (groupId,personId) VALUES (1,6)');
+ $this->source->exec('INSERT INTO cars (personId,make,isDriveable) VALUES (1,"VW",1)');
+ $this->source->exec('INSERT INTO cars (personId,make,isDriveable) VALUES (2,"Toyota",1)');
$this->source->commit();
$this->source->beginTransaction();
Databases::setDefaultSource($this->source);
@@ -187,9 +187,9 @@ class ModelTest extends UnitTestCase {
function testFindCriteria() {
$person = new Person();
$person->age = 23;
- $people = $person->find()->orderBy('last_name DESC');
+ $people = $person->find()->orderBy('lastName DESC');
$this->assertEqual(count($people),2);
- $this->assertEqual($people[0]->last_name, 'Sutherland');
+ $this->assertEqual($people[0]->lastName, 'Sutherland');
$this->assertEqual(get_class($people[0]), 'Person');
}
@@ -197,10 +197,10 @@ class ModelTest extends UnitTestCase {
$car = new Car();
$car->isDriveable = true;
$car->insert();
- $car_id = $car->pk;
+ $carId = $car->pk;
$car = new Car();
- $car->pk = $car_id;
+ $car->pk = $carId;
$driveable = $car->find()->first()->isDriveable;
$this->assertEqual($driveable === true, true);
@@ -223,7 +223,7 @@ class ModelTest extends UnitTestCase {
}
function testMultipleConditionsOnStrings() {
- $people = Make::a('Person')->like('first_name','%K%')->like('first_name','%s%');
+ $people = Make::a('Person')->like('firstName','%K%')->like('firstName','%s%');
$this->assertEqual(count($people), 1);
}
@@ -236,8 +236,8 @@ class ModelTest extends UnitTestCase {
function testHasManyRelationshipCriteria() {
$person = new Person();
- $person->first_name = 'Barack';
- $person->last_name = 'Obama';
+ $person->firstName = 'Barack';
+ $person->lastName = 'Obama';
$books = $person->books()->like('title','%Dream%')->orderBy('title ASC');
$this->assertEqual(count($books), 2);
$this->assertEqual($books[0]->title, 'Dreams from My Father: A Story of Race and Inheritance');
@@ -281,7 +281,7 @@ class ModelTest extends UnitTestCase {
$book->id = 1;
$barack = $book->author();
$this->assertEqual(get_class($barack), 'Person');
- $this->assertEqual($barack->first_name, 'Barack');
+ $this->assertEqual($barack->firstName, 'Barack');
$baracksBooks = $barack->books();
$this->assertEqual(count($baracksBooks), 3);
}
@@ -308,14 +308,14 @@ class ModelTest extends UnitTestCase {
function testUpdate() {
$people = Make::a('Person')->all();
$person = $people[0];
- $name = $person->first_name;
+ $name = $person->firstName;
- $person->first_name = 'UPDATE!';
+ $person->firstName = 'UPDATE!';
$person->update();
$people = Make::a('Person')->all();
- $this->assertEqual($person->first_name, $people[0]->first_name);
+ $this->assertEqual($person->firstName, $people[0]->firstName);
}
function testUpdateOnCollection() {
@@ -339,8 +339,8 @@ class ModelTest extends UnitTestCase {
$people_count = count($people);
$person = new Person();
- $person->first_name = 'Joe';
- $person->last_name = 'Biden';
+ $person->firstName = 'Joe';
+ $person->lastName = 'Biden';
$person->age = 65;
$person->insert();
@@ -369,7 +369,7 @@ class ModelTest extends UnitTestCase {
function testAddToHasManyRelationship() {
$person = new Person;
- $person->first_name = 'John';
+ $person->firstName = 'John';
$person->age = 22;
$book = new Book();
@@ -381,7 +381,7 @@ class ModelTest extends UnitTestCase {
}
function testRemoveFromHasManyRelationship() {
- $barack = Make::a('Person')->equal('first_name', 'Barack')->first();
+ $barack = Make::a('Person')->equal('firstName', 'Barack')->first();
$barackBooksCount = count($barack->books());
@@ -393,7 +393,7 @@ class ModelTest extends UnitTestCase {
function testSetOnBelongsToRelationship() {
$person = new Person;
- $person->first_name = 'John';
+ $person->firstName = 'John';
$person->age = 22;
$book = new Book();
@@ -404,7 +404,7 @@ class ModelTest extends UnitTestCase {
}
function testUnsetOnBelongsToRelationship() {
- $barack = Make::a('Person')->equal('first_name', 'Barack')->first();
+ $barack = Make::a('Person')->equal('firstName', 'Barack')->first();
$barackBooksCount = count($barack->books());
@@ -416,7 +416,7 @@ class ModelTest extends UnitTestCase {
function testNonDefaultPrimaryKey() {
$person = new Person;
- $person->first_name = 'Katie';
+ $person->firstName = 'Katie';
$person->age = 22;
$car = new Car();
@@ -455,7 +455,7 @@ class ModelTest extends UnitTestCase {
}
function testHasManyThrough() {
- $kris = Make::a('Person')->equal('first_name','Kris')->first();
+ $kris = Make::a('Person')->equal('firstName','Kris')->first();
$groups = $kris->groups();
$this->assertEqual(count($groups), 2);
}
@@ -472,13 +472,13 @@ class ModelTest extends UnitTestCase {
}
function testHasManyOnDeleteCascade() {
- $barack = Make::a('Person')->like('first_name','%Barack%')->first();
+ $barack = Make::a('Person')->like('firstName','%Barack%')->first();
$barack->delete();
$this->assertEqual(count(Make::a('Chapter')->all()), 0);
}
function testHasManyOnDeleteNullify() {
- $kris = Make::a('Person')->equal('first_name', 'Kris')->first();
+ $kris = Make::a('Person')->equal('firstName', 'Kris')->first();
$car = Make::a('Car');
@@ -502,7 +502,7 @@ class ModelTest extends UnitTestCase {
function testBelongsToDeleteDelete() {
$audacity = Make::a('Book')->like('title','%Audacity%')->first();
$audacity->delete();
- $barack = Make::a('Person')->equal('first_name','Barack');
+ $barack = Make::a('Person')->equal('firstName','Barack');
$this->assertEqual(0, count($barack));
}
@@ -517,10 +517,10 @@ class ModelTest extends UnitTestCase {
function testHasManyThroughDeleteNullify() {
$groupshipsCount = count(Make::a('Groupship')->all());
- $kris = Make::a('Person')->equal('first_name','Kris')->first();
+ $kris = Make::a('Person')->equal('firstName','Kris')->first();
$krisGroupsCount = count($kris->groups());
- $kris = Make::a('Person')->equal('first_name','Kris')->first();
+ $kris = Make::a('Person')->equal('firstName','Kris')->first();
$kris->delete();
$this->assertEqual($groupshipsCount - $krisGroupsCount, count(Make::a('Groupship')->all()));
@@ -555,7 +555,7 @@ class ModelTest extends UnitTestCase {
function testNoLongerByReference() {
$people = Make::a('Person')->all();
- $kris = $people->equal('first_name','Kris');
+ $kris = $people->equal('firstName','Kris');
$this->assertNotEqual(count($people),count($kris));
}
recess/test/lib/recess/database/orm/ModelTest.class.php
MIT_LICENSE
content/css/blueprint/plugins/buttons/icons/cross.png
content/css/blueprint/plugins/buttons/icons/key.png
content/css/blueprint/plugins/buttons/icons/tick.png
content/css/blueprint/plugins/buttons/readme.txt
content/css/blueprint/plugins/buttons/screen.css
content/css/blueprint/plugins/fancy-type/readme.txt
content/css/blueprint/plugins/fancy-type/screen.css
content/css/blueprint/plugins/link-icons/icons/doc.png
content/css/blueprint/plugins/link-icons/icons/email.png
content/css/blueprint/plugins/link-icons/icons/external.png
content/css/blueprint/plugins/link-icons/icons/feed.png
content/css/blueprint/plugins/link-icons/icons/im.png
content/css/blueprint/plugins/link-icons/icons/pdf.png
content/css/blueprint/plugins/link-icons/icons/visited.png
content/css/blueprint/plugins/link-icons/icons/xls.png
content/css/blueprint/plugins/link-icons/readme.txt
content/css/blueprint/plugins/link-icons/screen.css
content/css/blueprint/plugins/rtl/readme.txt
content/css/blueprint/plugins/rtl/screen.css
content/css/blueprint/src/forms.css
content/css/blueprint/src/grid.css
content/css/blueprint/src/grid.png
content/css/blueprint/src/ie.css
content/css/blueprint/src/print.css
content/css/blueprint/src/reset.css
content/css/blueprint/src/typography.css
713c699d523c9d922d93b7d12c268f28cd8d6723
Kris Jordan
krisjordan@gmail.com
http://github.com/recess/recess/commit/ca6148b9d541502d25af5b095dbe7f7ce22d187d
ca6148b9d541502d25af5b095dbe7f7ce22d187d
2008-12-24T18:08:23-08:00
2008-12-24T18:08:23-08:00
Preparing for Public Preview
a683a1917a8cbdd5bcc2eec4dd95a20e0f26f900
Kris Jordan
krisjordan@gmail.com