Skip to content

Commit

Permalink
BackwardsCompatibilityBreak - Changed fInflection to fGrammar, fixed …
Browse files Browse the repository at this point in the history 
…bugs in fURL and fORMFile, added ability to reset saved search values in fCRUD using the query string '?reset'
  • Loading branch information
@wbond
wbond committed Apr 12, 2012
1 parent 504d697 commit a96e097
Show file tree
Hide file tree
Showing 24 changed files with 377 additions and 302 deletions.
84 changes: 42 additions & 42 deletions classes/database/object_relational_mapping/fActiveRecord.php
View file
Expand Up @@ -54,7 +54,7 @@ abstract class fActiveRecord
*/
public function __call($method_name, $parameters)
{
list ($action, $subject) = explode('_', fInflection::underscorize($method_name), 2);
list ($action, $subject) = explode('_', fGrammar::underscorize($method_name), 2);

if (fORM::checkHookCallback($this, 'replace::' . $method_name . '()')) {
return fORM::callHookCallback(
Expand All @@ -73,7 +73,7 @@ public function __call($method_name, $parameters)
if (($action == 'set' || $action == 'associate' || $action == 'inject') && sizeof($parameters) < 1) {
fCore::toss(
'fProgrammerException',
fCore::compose(
fGrammar::compose(
'The method, %s, requires at least one parameter',
$method_name . '()'
)
Expand Down Expand Up @@ -112,52 +112,52 @@ public function __call($method_name, $parameters)

// Related data methods
case 'associate':
$subject = fInflection::singularize($subject);
$subject = fInflection::camelize($subject, TRUE);
$subject = fGrammar::singularize($subject);
$subject = fGrammar::camelize($subject, TRUE);

if (isset($parameters[1])) {
return fORMRelated::associateRecords($this, $this->related_records, $subject, $parameters[0], $parameters[1]);
}
return fORMRelated::associateRecords($this, $this->related_records, $subject, $parameters[0]);

case 'build':
$subject = fInflection::singularize($subject);
$subject = fInflection::camelize($subject, TRUE);
$subject = fGrammar::singularize($subject);
$subject = fGrammar::camelize($subject, TRUE);

if (isset($parameters[0])) {
return fORMRelated::constructRecordSet($this, $this->values, $this->related_records, $subject, $parameters[0]);
}
return fORMRelated::constructRecordSet($this, $this->values, $this->related_records, $subject);

case 'create':
$subject = fInflection::camelize($subject, TRUE);
$subject = fGrammar::camelize($subject, TRUE);

if (isset($parameters[0])) {
return fORMRelated::constructRecord($this, $this->values, $subject, $parameters[0]);
}
return fORMRelated::constructRecord($this, $this->values, $subject);

case 'inject':
$subject = fInflection::singularize($subject);
$subject = fInflection::camelize($subject, TRUE);
$subject = fGrammar::singularize($subject);
$subject = fGrammar::camelize($subject, TRUE);

if (isset($parameters[1])) {
return fORMRelated::setRecords($this, $this->related_records, $subject, $parameters[0], $parameters[1]);
}
return fORMRelated::setRecords($this, $this->related_records, $subject, $parameters[0]);

case 'link':
$subject = fInflection::singularize($subject);
$subject = fInflection::camelize($subject, TRUE);
$subject = fGrammar::singularize($subject);
$subject = fGrammar::camelize($subject, TRUE);

if (isset($parameters[0])) {
return fORMRelated::linkRecords($this, $this->related_records, $subject, $parameters[0]);
}
return fORMRelated::linkRecords($this, $this->related_records, $subject);

case 'populate':
$subject = fInflection::singularize($subject);
$subject = fInflection::camelize($subject, TRUE);
$subject = fGrammar::singularize($subject);
$subject = fGrammar::camelize($subject, TRUE);

if (isset($parameters[0])) {
return fORMRelated::populateRecords($this, $this->related_records, $subject, $parameters[0]);
Expand All @@ -168,7 +168,7 @@ public function __call($method_name, $parameters)
default:
fCore::toss(
'fProgrammerException',
fCore::compose('Unknown method, %s, called', $method_name . '()')
fGrammar::compose('Unknown method, %s, called', $method_name . '()')
);
}
}
Expand Down Expand Up @@ -224,7 +224,7 @@ public function __construct($primary_key=NULL)
if ((sizeof($pk_columns) > 1 && array_keys($primary_key) != $pk_columns) || (sizeof($pk_columns) == 1 && !is_scalar($primary_key))) {
fCore::toss(
'fProgrammerException',
fCore::compose(
fGrammar::compose(
'An invalidly formatted primary key was passed to this %s object',
fORM::getRecordName($this)
)
Expand Down Expand Up @@ -345,7 +345,7 @@ public function delete()
if (!$this->exists()) {
fCore::toss(
'fProgrammerException',
fCore::compose(
fGrammar::compose(
'This %s object does not yet exist in the database, and thus can not be deleted',
fORM::getRecordName($this)
)
Expand Down Expand Up @@ -395,7 +395,7 @@ public function delete()
$route = fORMSchema::getRouteNameFromRelationship($type, $relationship);

$related_class = fORM::classize($relationship['related_table']);
$related_objects = fInflection::pluralize($related_class);
$related_objects = fGrammar::pluralize($related_class);
$method = 'build' . $related_objects;

// Grab the related records
Expand All @@ -415,9 +415,9 @@ public function delete()
// Otherwise we have a restriction
$related_class_name = fORM::classize($relationship['foreign_table']);
$related_record_name = fORM::getRecordName($related_class_name);
$related_record_name = fInflection::pluralize($related_record_name);
$related_record_name = fGrammar::pluralize($related_record_name);

$restriction_message[] = fCore::compose("One or more %s references it", $related_record_name);
$restriction_message[] = fGrammar::compose("One or more %s references it", $related_record_name);
}
}

Expand All @@ -426,7 +426,7 @@ public function delete()
'fValidationException',
sprintf(
"<p>%s</p>\n<ul>\n<li>%s</li>\n</ul>",
fCore::compose('This %s can not be deleted because:', fORM::getRecordName($this)),
fGrammar::compose('This %s can not be deleted because:', fORM::getRecordName($this)),
join("</li>\n<li>", $restriction_messages)
)
);
Expand Down Expand Up @@ -495,19 +495,19 @@ public function delete()
// Check to see if the validation exception came from a related record, and fix the message
if ($e instanceof fValidationException) {
$message = $e->getMessage();
$search = fCore::compose('This %s can not be deleted because:', fORM::getRecordName($this));
$search = fGrammar::compose('This %s can not be deleted because:', fORM::getRecordName($this));
if (stripos($message, $search) === FALSE) {
$regex = fCore::compose('This %s can not be deleted because:', '__');
$regex = fGrammar::compose('This %s can not be deleted because:', '__');
$regex_parts = explode('__', $regex);
$regex = '#(' . preg_quote($regex_parts[0], '#') . ').*?(' . preg_quote($regex_parts[0], '#') . ')#';

$message = preg_replace($regex, '\1' . fORM::getRecordName($this) . '\2', $message);

$find = fCore::compose("One or more %s references it", '__');
$find = fGrammar::compose("One or more %s references it", '__');
$find_parts = explode('__', $find);
$find_regex = '#' . preg_quote($find_parts[0], '#') . '(.*?)' . preg_quote($find_parts[1], '#') . '#';

$replace = fCore::compose("One or more %s indirectly references it", '__');
$replace = fGrammar::compose("One or more %s indirectly references it", '__');
$replace_parts = explode('__', $replace);
$replace_regex = $replace_parts[0] . '\1' . $replace_parts[1];

Expand Down Expand Up @@ -560,7 +560,7 @@ protected function encode($column, $formatting=NULL)
if (!array_key_exists($column, $this->values)) {
fCore::toss(
'fProgrammerException',
fCore::compose(
fGrammar::compose(
'The column specified, %s, does not exist',
fCore::dump($column)
)
Expand All @@ -573,7 +573,7 @@ protected function encode($column, $formatting=NULL)
if (in_array($column_type, array('blob'))) {
fCore::toss(
'fProgrammerException',
fCore::compose(
fGrammar::compose(
'The column specified, %s, does not support forming because it is a blob column',
fCore::dump($column)
)
Expand All @@ -583,23 +583,23 @@ protected function encode($column, $formatting=NULL)
if ($formatting !== NULL && in_array($column_type, array('varchar', 'char', 'text', 'boolean', 'integer'))) {
fCore::toss(
'fProgrammerException',
fCore::compose(
fGrammar::compose(
'The column specified, %s, does not support any formatting options',
fCore::dump($column)
)
);
}

// Grab the value for empty value checking
$method_name = 'get' . fInflection::camelize($column, TRUE);
$method_name = 'get' . fGrammar::camelize($column, TRUE);
$value = $this->$method_name();

// Date/time objects
if (is_object($value) && in_array($column_type, array('date', 'time', 'timestamp'))) {
if ($formatting === NULL) {
fCore::toss(
'fProgrammerException',
fCore::compose(
fGrammar::compose(
'The column specified, %s, requires one formatting parameter, a valid date() formatting string',
fCore::dump($column)
)
Expand All @@ -617,7 +617,7 @@ protected function encode($column, $formatting=NULL)
if (is_object($value)) {
fCore::toss(
'fProgrammerException',
fCore::compose(
fGrammar::compose(
'The column specified, %s, contains an object that does not have a __toString() method - unsure how to get object value',
fCore::dump($column)
)
Expand Down Expand Up @@ -687,7 +687,7 @@ protected function get($column)
if (!array_key_exists($column, $this->values)) {
fCore::toss(
'fProgrammerException',
fCore::compose(
fGrammar::compose(
'The column specified, %s, does not exist',
fCore::dump($column)
)
Expand All @@ -709,7 +709,7 @@ protected function inspect($column, $element=NULL)
if (!array_key_exists($column, $this->values)) {
fCore::toss(
'fProgrammerException',
fCore::compose(
fGrammar::compose(
'The column specified, %s, does not exist',
fCore::dump($column)
)
Expand Down Expand Up @@ -756,7 +756,7 @@ public function load()
} catch (fExpectedException $e) {
fCore::toss(
'fNotFoundException',
fCore::compose(
fGrammar::compose(
'The %s requested could not be found',
fORM::getRecordName($this)
)
Expand Down Expand Up @@ -888,7 +888,7 @@ public function populate()
$column_info = fORMSchema::getInstance()->getColumnInfo($table);
foreach ($column_info as $column => $info) {
if (fRequest::check($column)) {
$method = 'set' . fInflection::camelize($column, TRUE);
$method = 'set' . fGrammar::camelize($column, TRUE);
$this->$method(fRequest::get($column));
}
}
Expand Down Expand Up @@ -924,7 +924,7 @@ protected function prepare($column, $formatting=NULL)
if (!array_key_exists($column, $this->values)) {
fCore::toss(
'fProgrammerException',
fCore::compose(
fGrammar::compose(
'The column specified, %s, does not exist',
fCore::dump($column)
)
Expand All @@ -938,7 +938,7 @@ protected function prepare($column, $formatting=NULL)
if (in_array($column_type, array('blob'))) {
fCore::toss(
'fProgrammerException',
fCore::compose(
fGrammar::compose(
'The column specified, %s, can not be prepared because it is a blob column',
fCore::dump($column)
)
Expand All @@ -948,23 +948,23 @@ protected function prepare($column, $formatting=NULL)
if ($formatting !== NULL && in_array($column_type, array('integer', 'boolean'))) {
fCore::toss(
'fProgrammerException',
fCore::compose(
fGrammar::compose(
'The column specified, %s, does not support any formatting options',
fCore::dump($column)
)
);
}

// Grab the value for empty value checking
$method_name = 'get' . fInflection::camelize($column, TRUE);
$method_name = 'get' . fGrammar::camelize($column, TRUE);
$value = $this->$method_name();

// Date/time objects
if (is_object($value) && in_array($column_type, array('date', 'time', 'timestamp'))) {
if ($formatting === NULL) {
fCore::toss(
'fProgrammerException',
fCore::compose(
fGrammar::compose(
'The column specified, %s, requires one formatting parameter, a valid date() formatting string',
fCore::dump($column)
)
Expand All @@ -982,7 +982,7 @@ protected function prepare($column, $formatting=NULL)
if (is_object($value)) {
fCore::toss(
'fProgrammerException',
fCore::compose(
fGrammar::compose(
'The column specified, %s, contains an object that does not have a __toString() method - unsure how to get object value',
fCore::dump($column)
)
Expand Down Expand Up @@ -1040,7 +1040,7 @@ protected function set($column, $value)
if (!array_key_exists($column, $this->values)) {
fCore::toss(
'fProgrammerException',
fCore::compose(
fGrammar::compose(
'The column specified, %s, does not exist',
fCore::dump($column)
)
Expand Down Expand Up @@ -1307,7 +1307,7 @@ public function validate($return_messages=FALSE)
'fValidationException',
sprintf(
"<p>%s</p>\n<ul>\n<li>%s</li>\n</ul>",
fCore::compose("The following problems we found:"),
fGrammar::compose("The following problems we found:"),
join("</li>\n<li>", $validation_messages)
)
);
Expand Down
14 changes: 7 additions & 7 deletions classes/database/object_relational_mapping/fORM.php
View file
Expand Up @@ -209,7 +209,7 @@ static public function checkIdentityMap($class, $primary_key_data)
static public function classize($table_name)
{
if (!isset(self::$table_class_map[$table_name])) {
self::$table_class_map[$table_name] = fInflection::camelize(fInflection::singularize($table_name), TRUE);
self::$table_class_map[$table_name] = fGrammar::camelize(fGrammar::singularize($table_name), TRUE);
}
return self::$table_class_map[$table_name];
}
Expand Down Expand Up @@ -237,7 +237,7 @@ static public function createActiveRecordClass($class_name)

fCore::toss(
'fProgrammerException',
fCore::compose(
fGrammar::compose(
'The class specified, %s, does not correspond to a database table',
fCore::dump($class_name)
)
Expand Down Expand Up @@ -312,7 +312,7 @@ static public function getColumnName($class, $column)
}

if (!isset(self::$column_names[$class][$column])) {
self::$column_names[$class][$column] = fInflection::humanize($column);
self::$column_names[$class][$column] = fGrammar::humanize($column);
}

return self::$column_names[$class][$column];
Expand All @@ -332,7 +332,7 @@ static public function getRecordName($class)
$class = self::getClassName($class);

if (!isset(self::$record_names[$class])) {
self::$record_names[$class] = fInflection::humanize($class);
self::$record_names[$class] = fGrammar::humanize($class);
}

return self::$record_names[$class];
Expand Down Expand Up @@ -505,7 +505,7 @@ static public function registerHookCallback($class, $hook, $callback)
if (!in_array($hook, $valid_hooks) && !$replace_hook) {
fCore::toss(
'fProgrammerException',
fCore::compose(
fGrammar::compose(
'The hook specified, %s, should be one of: %s or %s.',
fCore::expose($hook),
join(', ', $valid_hooks),
Expand All @@ -517,7 +517,7 @@ static public function registerHookCallback($class, $hook, $callback)
if ($replace_hook && in_array($hook, $invalid_replace_hooks)) {
fCore::toss(
'fProgrammerException',
fCore::compose(
fGrammar::compose(
'The hook specified, %s, is an invalid %s hook. Can not be one of: %s.',
fCore::dump($hook),
'replace::',
Expand Down Expand Up @@ -643,7 +643,7 @@ static public function tablize($class)
$class = self::getClassName($class);

if (!$table_name = array_search($class, self::$table_class_map)) {
$table_name = fInflection::underscorize(fInflection::pluralize($class));
$table_name = fGrammar::underscorize(fGrammar::pluralize($class));
self::$table_class_map[$table_name] = $class;
}

Expand Down

0 comments on commit a96e097

Please sign in to comment.