[Jifty-commit] r2131 - in jifty/trunk: lib/Jifty lib/Jifty/Script
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Fri Nov 10 18:25:53 EST 2006
Author: alexmv
Date: Fri Nov 10 18:25:53 2006
New Revision: 2131
Modified:
jifty/trunk/ (props changed)
jifty/trunk/lib/Jifty/Handler.pm
jifty/trunk/lib/Jifty/Script/Schema.pm
jifty/trunk/lib/Jifty/Subs.pm
Log:
r19808 at zoq-fot-pik: chmrr | 2006-11-10 18:25:29 -0500
* Use Jifty->app_class whenever possible
* Code cleanups in Jifty/Subs.pm
Modified: jifty/trunk/lib/Jifty/Handler.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Handler.pm (original)
+++ jifty/trunk/lib/Jifty/Handler.pm Fri Nov 10 18:25:53 2006
@@ -65,8 +65,7 @@
# $_[-1] = Jifty->handler->cgi if Jifty->handler->cgi;
# };
- $self->dispatcher(
- Jifty->config->framework('ApplicationClass') . "::Dispatcher" );
+ $self->dispatcher( Jifty->app_class( "Dispatcher" ) );
Jifty::Util->require( $self->dispatcher );
$self->dispatcher->import_plugins;
$self->dispatcher->dump_rules;
Modified: jifty/trunk/lib/Jifty/Script/Schema.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Script/Schema.pm (original)
+++ jifty/trunk/lib/Jifty/Script/Schema.pm Fri Nov 10 18:25:53 2006
@@ -129,20 +129,18 @@
my $self = shift;
# Set up application-specific parts
- $self->{'_application_class'}
- = Jifty->config->framework('ApplicationClass');
$self->{'_schema_generator'}
= Jifty::DBI::SchemaGenerator->new( Jifty->handle )
or die "Can't make Jifty::DBI::SchemaGenerator";
# This creates a sub "models" which when called, finds packages under
-# $self->{'_application_class'}::Model, requires them, and returns a list of their
+# the application's ::Model, requires them, and returns a list of their
# names.
Jifty::Module::Pluggable->import(
require => 1,
except => qr/\.#/,
search_path =>
- [ "Jifty::Model", $self->{'_application_class'} . "::Model" ],
+ [ "Jifty::Model", Jifty->app_class("Model") ],
sub_name => 'models',
);
}
@@ -208,7 +206,7 @@
my $log = Log::Log4perl->get_logger("SchemaTool");
$log->info(
- "Generating SQL for application $self->{'_application_class'}...");
+ "Generating SQL for application @{[Jifty->app_class]}...");
my $appv
= version->new( Jifty->config->framework('Database')->{'Version'} );
@@ -261,7 +259,7 @@
# Load initial data
eval {
- my $bootstrapper = $self->{'_application_class'} . "::Bootstrap";
+ my $bootstrapper = Jifty->app_class("Bootstrap");
Jifty::Util->require($bootstrapper);
$bootstrapper->run()
@@ -327,7 +325,7 @@
my $appv
= version->new( Jifty->config->framework('Database')->{'Version'} );
- return unless $self->upgrade_tables( $self->{_application_class} => $dbv, $appv );
+ return unless $self->upgrade_tables( Jifty->app_class, $dbv, $appv );
if( $self->{print} ) {
warn "Need to upgrade application_db_version to $appv here!";
} else {
Modified: jifty/trunk/lib/Jifty/Subs.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Subs.pm (original)
+++ jifty/trunk/lib/Jifty/Subs.pm Fri Nov 10 18:25:53 2006
@@ -32,17 +32,13 @@
sub add {
my $class = shift;
my $args = {@_};
- unless (Jifty->config->framework('PubSub')->{'Enable'}) {
+ unless (Jifty->config->framework('PubSub')->{'Enable'}) {
Jifty->log->error("PubSub disabled, but $class->add called");
- return undef
+ return undef;
}
my $id = ($args->{window_id} || Jifty->web->session->id);
- my $event_class = join('::' =>
- Jifty->config->framework("ApplicationClass"),
- 'Event',
- $args->{class},
- );
+ my $event_class = Jifty->app_class("Event", $args->{class});
my $queries = $args->{queries} || [];
my $channel = $event_class->encode_queries(@$queries);
@@ -86,9 +82,9 @@
sub cancel {
my ($class, $channel_id) = @_;
- unless (Jifty->config->framework('PubSub')->{'Enable'}) {
+ unless (Jifty->config->framework('PubSub')->{'Enable'}) {
Jifty->log->error("PubSub disabled, but $class->add called");
- return undef
+ return undef;
}
my ($channel, $id) = split(/!/, $channel_id, 2);
@@ -104,7 +100,7 @@
Jifty->bus->modify(
"$id-render" => sub {
- delete $_->{$channel}
+ delete $_->{$channel};
}
);
@@ -118,9 +114,9 @@
sub list {
my $self = shift;
- unless (Jifty->config->framework('PubSub')->{'Enable'}) {
+ unless (Jifty->config->framework('PubSub')->{'Enable'}) {
Jifty->log->error("PubSub disabled, but $self->add called");
- return undef
+ return undef;
}
my $id = (shift || Jifty->web->session->id);
More information about the Jifty-commit
mailing list