[Jifty-commit] r2070 - in jifty/trunk: lib lib/Jifty
share/web/templates/__jifty/admin/fragments/list
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Thu Oct 26 02:09:57 EDT 2006
Author: clkao
Date: Thu Oct 26 02:09:56 2006
New Revision: 2070
Modified:
jifty/trunk/lib/Jifty.pm
jifty/trunk/lib/Jifty/API.pm
jifty/trunk/lib/Jifty/Client.pm
jifty/trunk/lib/Jifty/LetMe.pm
jifty/trunk/lib/Jifty/Notification.pm
jifty/trunk/lib/Jifty/Plugin.pm
jifty/trunk/lib/Jifty/Web.pm
jifty/trunk/share/web/templates/__jifty/admin/fragments/list/list
jifty/trunk/share/web/templates/__jifty/admin/fragments/list/new_item
jifty/trunk/share/web/templates/__jifty/admin/fragments/list/update
jifty/trunk/share/web/templates/__jifty/admin/fragments/list/view
jifty/trunk/share/web/templates/__jifty/admin/model/dhandler
Log:
Use Jifty->app_class to construct app-space class names.
Modified: jifty/trunk/lib/Jifty.pm
==============================================================================
--- jifty/trunk/lib/Jifty.pm (original)
+++ jifty/trunk/lib/Jifty.pm Thu Oct 26 02:09:56 2006
@@ -137,7 +137,7 @@
# Get a classloader set up
my $class_loader = Jifty::ClassLoader->new(
- base => Jifty->config->framework('ApplicationClass')
+ base => Jifty->app_class,
);
Jifty->class_loader($class_loader);
@@ -152,7 +152,7 @@
# Call the application's start method to let it do anything
# application specific for startup
- my $app = Jifty->config->framework('ApplicationClass');
+ my $app = Jifty->app_class;
$app->start()
if $app->can('start');
@@ -222,6 +222,18 @@
return $API;
}
+=head2 app_class(@names)
+
+Return Class in application space. For example C<app_class('Model', 'Foo')>
+returns YourApp::Model::Foo.
+
+=cut
+
+sub app_class {
+ shift;
+ join('::', Jifty->config->framework('ApplicationClass'), @_);
+}
+
=head2 web
An accessor for the L<Jifty::Web> object that the web interface uses.
@@ -286,7 +298,7 @@
or not Jifty->config->framework('Database') )
{
- my $handle_class = (Jifty->config->framework('ApplicationClass') . "::Handle");
+ my $handle_class = Jifty->app_class("Handle");
Jifty::Util->require( $handle_class );
Jifty->handle( $handle_class->new );
Jifty->handle->connect();
Modified: jifty/trunk/lib/Jifty/API.pm
==============================================================================
--- jifty/trunk/lib/Jifty/API.pm (original)
+++ jifty/trunk/lib/Jifty/API.pm Thu Oct 26 02:09:56 2006
@@ -32,7 +32,7 @@
Jifty::Module::Pluggable->import(
search_path => [
- Jifty->config->framework('ApplicationClass') . "::Action",
+ Jifty->app_class("Action"),
"Jifty::Action",
map {ref($_)."::Action"} Jifty->plugins,
],
@@ -56,7 +56,7 @@
my $self = shift;
my $action = shift;
- my $base_path = Jifty->config->framework('ApplicationClass') . "::Action";
+ my $base_path = Jifty->app_class("Action");
return $action
if $action =~ /^Jifty::/
@@ -78,7 +78,7 @@
my $self = shift;
# Set up defaults
- my $app_actions = Jifty->config->framework('ApplicationClass') . "::Action";
+ my $app_actions = Jifty->app_class("Action");
$self->action_limits(
[ { deny => 1, restriction => qr/.*/ },
Modified: jifty/trunk/lib/Jifty/Client.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Client.pm (original)
+++ jifty/trunk/lib/Jifty/Client.pm Thu Oct 26 02:09:56 2006
@@ -334,7 +334,7 @@
return undef unless $session;
my $id = $session->get('user_id');
- my $object = (Jifty->config->framework('ApplicationClass')."::CurrentUser")->new();
+ my $object = Jifty->app_class("CurrentUser")->new();
my $user = $session->get('user_ref')->new( current_user => $object );
$user->load_by_cols( id => $id );
$object->user_object($user);
Modified: jifty/trunk/lib/Jifty/LetMe.pm
==============================================================================
--- jifty/trunk/lib/Jifty/LetMe.pm (original)
+++ jifty/trunk/lib/Jifty/LetMe.pm Thu Oct 26 02:09:56 2006
@@ -80,7 +80,7 @@
sub _user_from_email {
my $self = shift;
my $email = shift;
- my $currentuser_object_class = Jifty->config->framework('ApplicationClass')."::CurrentUser";
+ my $currentuser_object_class = Jifty->app_class("CurrentUser");
return $currentuser_object_class->new( email => $email );
}
Modified: jifty/trunk/lib/Jifty/Notification.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Notification.pm (original)
+++ jifty/trunk/lib/Jifty/Notification.pm Thu Oct 26 02:09:56 2006
@@ -203,7 +203,7 @@
sub send {
my $self = shift;
- my $currentuser_object_class = Jifty->config->framework('ApplicationClass')."::CurrentUser";
+ my $currentuser_object_class = Jifty->app_class("CurrentUser");
for my $to ( grep {defined} ($self->to, $self->to_list) ) {
if ($to->can('id')) {
next if $currentuser_object_class->can("nobody")
Modified: jifty/trunk/lib/Jifty/Plugin.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin.pm (original)
+++ jifty/trunk/lib/Jifty/Plugin.pm Thu Oct 26 02:09:56 2006
@@ -57,7 +57,7 @@
# Start a plugin classloader set up on behalf of the application
require Jifty::Plugin::ClassLoader;
Jifty::Plugin::ClassLoader->new(
- base => Jifty->config->framework('ApplicationClass'),
+ base => Jifty->app_class,
plugin => $class,
)->require;
Modified: jifty/trunk/lib/Jifty/Web.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web.pm (original)
+++ jifty/trunk/lib/Jifty/Web.pm Thu Oct 26 02:09:56 2006
@@ -99,6 +99,7 @@
=cut
sub out {
+ Carp::cluck unless defined $_[0]->mason;
shift->mason->out(@_);
}
@@ -219,15 +220,11 @@
return $self->_current_user;
} elsif ( my $id = $self->session->get('user_id') ) {
- my $object = (
- Jifty->config->framework('ApplicationClass') . "::CurrentUser" )
- ->new( id => $id );
+ my $object = Jifty->app_class("CurrentUser")->new( id => $id );
$self->_current_user($object);
return $object;
} else {
- my $object = (
- Jifty->config->framework('ApplicationClass') . "::CurrentUser" )
- ->new();
+ my $object = Jifty->app_class("CurrentUser")->new;
$object->is_superuser(1) if Jifty->config->framework('AdminMode');
$self->_current_user($object);
return ($object);
Modified: jifty/trunk/share/web/templates/__jifty/admin/fragments/list/list
==============================================================================
--- jifty/trunk/share/web/templates/__jifty/admin/fragments/list/list (original)
+++ jifty/trunk/share/web/templates/__jifty/admin/fragments/list/list Thu Oct 26 02:09:56 2006
@@ -5,7 +5,7 @@
$item_path => "/__jifty/admin/fragments/list/view"
</%args>
<%init>
-my $collection_class = Jifty->config->framework('ApplicationClass')."::Model::".$object_type."Collection";
+my $collection_class = Jifty->app_class("Model", $object_type."Collection");
my $search = Jifty->web->response->result('search');
my $collection;
if(!$search) {
Modified: jifty/trunk/share/web/templates/__jifty/admin/fragments/list/new_item
==============================================================================
--- jifty/trunk/share/web/templates/__jifty/admin/fragments/list/new_item (original)
+++ jifty/trunk/share/web/templates/__jifty/admin/fragments/list/new_item Thu Oct 26 02:09:56 2006
@@ -3,7 +3,7 @@
$region
</%args>
<%init>
-my $record_class = Jifty->config->framework('ApplicationClass')."::Model::".$object_type;
+my $record_class = Jifty->app_class("Model", $object_type);
my $create = Jifty->web->new_action(class => 'Create'.$object_type);
</%init>
<div class="jifty_admin create item inline">
Modified: jifty/trunk/share/web/templates/__jifty/admin/fragments/list/update
==============================================================================
--- jifty/trunk/share/web/templates/__jifty/admin/fragments/list/update (original)
+++ jifty/trunk/share/web/templates/__jifty/admin/fragments/list/update Thu Oct 26 02:09:56 2006
@@ -3,7 +3,7 @@
$object_type
</%args>
<%init>
-my $record_class = Jifty->config->framework('ApplicationClass')."::Model::".$object_type;
+my $record_class = Jifty->app_class("Model", $object_type);
my $record = $record_class->new();
$record->load($id);
my $update = Jifty->web->new_action(
Modified: jifty/trunk/share/web/templates/__jifty/admin/fragments/list/view
==============================================================================
--- jifty/trunk/share/web/templates/__jifty/admin/fragments/list/view (original)
+++ jifty/trunk/share/web/templates/__jifty/admin/fragments/list/view Thu Oct 26 02:09:56 2006
@@ -3,7 +3,7 @@
$object_type
</%args>
<%init>
-my $record_class = Jifty->config->framework('ApplicationClass')."::Model::".$object_type;
+my $record_class = Jifty->app_class("Model", $object_type);
my $record = $record_class->new();
$record->load($id);
my $update = Jifty->web->new_action(
Modified: jifty/trunk/share/web/templates/__jifty/admin/model/dhandler
==============================================================================
--- jifty/trunk/share/web/templates/__jifty/admin/model/dhandler (original)
+++ jifty/trunk/share/web/templates/__jifty/admin/model/dhandler Thu Oct 26 02:09:56 2006
@@ -1,7 +1,7 @@
<%init>
my $object_type = $m->dhandler_arg;
-my $collection_class = Jifty->config->framework('ApplicationClass')."::Model::".$object_type."Collection";
+my $collection_class = Jifty->app_class("Model", $object_type."Collection");
my $records = $collection_class->new();
$records->unlimit;
</%init>
More information about the Jifty-commit
mailing list