[Jifty-commit] r6602 - in jifty/trunk: lib/Jifty

[Jifty commits]

Author: alexmv
Date: Tue Mar 17 10:57:09 2009
New Revision: 6602

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/CurrentUser.pm
   jifty/trunk/lib/Jifty/Record.pm
   jifty/trunk/lib/Jifty/Web.pm

Log:
 r43241 at kohr-ah:  chmrr | 2009-03-17 10:12:42 -0400
 Mark a couple more places as not needing the require at runtime


Modified: jifty/trunk/lib/Jifty/CurrentUser.pm
==============================================================================
--- jifty/trunk/lib/Jifty/CurrentUser.pm	(original)
+++ jifty/trunk/lib/Jifty/CurrentUser.pm	Tue Mar 17 10:57:09 2009
@@ -77,8 +77,9 @@
     my %args = (@_);
 
     # Duck-typing to check to for a user class
-    if (keys %args and UNIVERSAL::can(Jifty->app_class('Model', 'User'), 'new')  ) {
-        $self->user_object(Jifty->app_class('Model', 'User')->new(current_user => $self));
+    my $user_class = Jifty->app_class({require => 0}, 'Model', 'User');
+    if (keys %args and UNIVERSAL::can($user_class, 'new')  ) {
+        $self->user_object($user_class->new(current_user => $self));
         $self->user_object->load_by_cols(%args);
     }
 

Modified: jifty/trunk/lib/Jifty/Record.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Record.pm	(original)
+++ jifty/trunk/lib/Jifty/Record.pm	Tue Mar 17 10:57:09 2009
@@ -250,7 +250,7 @@
 
     # Add plugin table prefix if a plugin model
     my $class = ref($self) ? ref($self) : $self;
-    my $app_plugin_root = Jifty->app_class('Plugin');
+    my $app_plugin_root = Jifty->app_class({require => 0}, 'Plugin');
     if ( $class =~ /^(?:Jifty::Plugin::|$app_plugin_root)/ ) {
 
         # Guess the plugin class name

Modified: jifty/trunk/lib/Jifty/Web.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web.pm	(original)
+++ jifty/trunk/lib/Jifty/Web.pm	Tue Mar 17 10:57:09 2009
@@ -251,11 +251,11 @@
     } elsif ( defined $self->_current_user ) {
         return $self->_current_user;
     } elsif ( my $id = $self->session->get('user_id') ) {
-         $object = Jifty->app_class("CurrentUser")->new( id => $id );
+         $object = Jifty->app_class({require => 0}, "CurrentUser")->new( id => $id );
     } elsif ( Jifty->config->framework('AdminMode')) {
-         $object = Jifty->app_class("CurrentUser")->superuser;
+         $object = Jifty->app_class({require => 0}, "CurrentUser")->superuser;
     } else {
-         $object = Jifty->app_class("CurrentUser")->new;
+         $object = Jifty->app_class({require => 0}, "CurrentUser")->new;
     }
     
     $self->_current_user($object);
@@ -529,10 +529,9 @@
     # Prepend the base path (probably "App::Action") unless it's there already
     $class = Jifty->api->qualify($class);
 
-    my $loaded = Jifty::Util->require( $class );
     # The implementation class is provided by the client, so this
     # isn't a "shouldn't happen"
-    return unless $loaded;
+    return unless Jifty::Util->require( $class );
 
     my $action;
     # XXX TODO bullet proof