[Jifty-commit] r2542 - in jifty/trunk: . lib/Jifty lib/Jifty/Script lib/Jifty/View/Static lib/Jifty/Web

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Tue Jan 23 02:14:34 EST 2007


Author: jesse
Date: Tue Jan 23 02:14:32 2007
New Revision: 2542

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/API.pm
   jifty/trunk/lib/Jifty/Continuation.pm
   jifty/trunk/lib/Jifty/DateTime.pm
   jifty/trunk/lib/Jifty/Model/Session.pm
   jifty/trunk/lib/Jifty/Result.pm
   jifty/trunk/lib/Jifty/Script/Action.pm
   jifty/trunk/lib/Jifty/Script/FastCGI.pm
   jifty/trunk/lib/Jifty/Script/Model.pm
   jifty/trunk/lib/Jifty/Script/Po.pm
   jifty/trunk/lib/Jifty/Script/Server.pm
   jifty/trunk/lib/Jifty/Server.pm
   jifty/trunk/lib/Jifty/Util.pm
   jifty/trunk/lib/Jifty/View/Static/Handler.pm
   jifty/trunk/lib/Jifty/Web.pm
   jifty/trunk/lib/Jifty/Web/Session.pm

Log:
 r21255 at hualien:  jesse | 2007-01-22 23:05:46 -0800
 * Misc minor startup-time performance improvements


Modified: jifty/trunk/lib/Jifty/API.pm
==============================================================================
--- jifty/trunk/lib/Jifty/API.pm	(original)
+++ jifty/trunk/lib/Jifty/API.pm	Tue Jan 23 02:14:32 2007
@@ -10,7 +10,7 @@
 
 =cut
 
-use Jifty::Everything;
+
 use base qw/Class::Accessor::Fast Jifty::Object/;
 
 

Modified: jifty/trunk/lib/Jifty/Continuation.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Continuation.pm	(original)
+++ jifty/trunk/lib/Jifty/Continuation.pm	Tue Jan 23 02:14:32 2007
@@ -36,7 +36,7 @@
 
 =cut
 
-use Jifty::Everything;
+
 use Storable 'dclone';
 
 use base qw/Class::Accessor::Fast/;

Modified: jifty/trunk/lib/Jifty/DateTime.pm
==============================================================================
--- jifty/trunk/lib/Jifty/DateTime.pm	(original)
+++ jifty/trunk/lib/Jifty/DateTime.pm	Tue Jan 23 02:14:32 2007
@@ -18,7 +18,6 @@
 
 use base qw(Jifty::Object DateTime);
 
-use Date::Manip ();
 
 =head2 new ARGS
 
@@ -82,6 +81,7 @@
         
         # Why are we parsing this as GMT? This feels really wrong.  It will get the wrong answer
         # if the current user is in another tz.
+        require Date::Manip;
         Date::Manip::Date_Init("TZ=GMT");
         $now = Date::Manip::UnixDate( $string, "%o" );
     }

Modified: jifty/trunk/lib/Jifty/Model/Session.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Model/Session.pm	(original)
+++ jifty/trunk/lib/Jifty/Model/Session.pm	Tue Jan 23 02:14:32 2007
@@ -30,7 +30,7 @@
 package Jifty::Model::Session;
 
 use base qw( Jifty::Record );
-use DateTime;
+use DateTime ();
 
 =head2 table
 

Modified: jifty/trunk/lib/Jifty/Result.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Result.pm	(original)
+++ jifty/trunk/lib/Jifty/Result.pm	Tue Jan 23 02:14:32 2007
@@ -15,7 +15,7 @@
 
 =cut
 
-use Jifty::Everything;
+
 
 use base qw/Jifty::Object Class::Accessor::Fast/;
 

Modified: jifty/trunk/lib/Jifty/Script/Action.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Script/Action.pm	(original)
+++ jifty/trunk/lib/Jifty/Script/Action.pm	Tue Jan 23 02:14:32 2007
@@ -4,7 +4,7 @@
 package Jifty::Script::Action;
 use base qw/App::CLI::Command/;
 
-use Jifty::Everything;
+
 
 =head1 NAME
 

Modified: jifty/trunk/lib/Jifty/Script/FastCGI.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Script/FastCGI.pm	(original)
+++ jifty/trunk/lib/Jifty/Script/FastCGI.pm	Tue Jan 23 02:14:32 2007
@@ -7,7 +7,7 @@
 
 use File::Basename;
 use CGI::Fast;
-use Jifty::Everything;
+
 
 =head1 NAME
 

Modified: jifty/trunk/lib/Jifty/Script/Model.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Script/Model.pm	(original)
+++ jifty/trunk/lib/Jifty/Script/Model.pm	Tue Jan 23 02:14:32 2007
@@ -4,7 +4,7 @@
 package Jifty::Script::Model;
 use base qw/App::CLI::Command/;
 
-use Jifty::Everything;
+
 
 =head1 NAME
 

Modified: jifty/trunk/lib/Jifty/Script/Po.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Script/Po.pm	(original)
+++ jifty/trunk/lib/Jifty/Script/Po.pm	Tue Jan 23 02:14:32 2007
@@ -4,12 +4,12 @@
 package Jifty::Script::Po;
 use base qw(App::CLI::Command Class::Accessor::Fast);
 
-use File::Copy;
-use Jifty::Config;
-use Jifty::YAML;
-use Locale::Maketext::Extract;
-use File::Find::Rule;
-use MIME::Types;
+use File::Copy ();
+use Jifty::Config ();
+use Jifty::YAML ();
+use Locale::Maketext::Extract ();
+use File::Find::Rule ();
+use MIME::Types ();
 our $MIME = MIME::Types->new();
 our $LMExtract = Locale::Maketext::Extract->new;
 use constant USE_GETTEXT_STYLE => 1;

Modified: jifty/trunk/lib/Jifty/Script/Server.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Script/Server.pm	(original)
+++ jifty/trunk/lib/Jifty/Script/Server.pm	Tue Jan 23 02:14:32 2007
@@ -17,7 +17,7 @@
 BEGIN { $SIG{__DIE__} = $x;}
 
 
-use Jifty::Everything;
+
 use File::Path ();
 
 use constant PIDFILE => 'var/jifty-server.pid';

Modified: jifty/trunk/lib/Jifty/Server.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Server.pm	(original)
+++ jifty/trunk/lib/Jifty/Server.pm	Tue Jan 23 02:14:32 2007
@@ -20,7 +20,7 @@
 
 =cut
 
-use Jifty::Everything;
+
 use base qw/HTTP::Server::Simple::CGI/;
 use base qw/Jifty::Object/;
 use File::Spec;

Modified: jifty/trunk/lib/Jifty/Util.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Util.pm	(original)
+++ jifty/trunk/lib/Jifty/Util.pm	Tue Jan 23 02:14:32 2007
@@ -12,16 +12,10 @@
 
 =cut
 
-use Jifty;
-use File::Spec;
-use File::Path;
-use File::ShareDir;
-use UNIVERSAL::require;
-use ExtUtils::MakeMaker ();
+use Jifty ();
+use File::Spec ();
 use Cwd ();
-use Config;
 
-# Trivial memoization to ward off evil Cwd calls.
 use vars qw/%ABSOLUTE_PATH $JIFTY_ROOT $SHARE_ROOT $APP_ROOT/;
 
 
@@ -107,6 +101,8 @@
 sub share_root {
     my $self = shift;
 
+    
+    Jifty::Util->require('File::ShareDir');
     $SHARE_ROOT ||=  eval { File::Spec->rel2abs( File::ShareDir::module_dir('Jifty') )};
     if (not $SHARE_ROOT or not -d $SHARE_ROOT) {
         # XXX TODO: This is a bloody hack
@@ -141,14 +137,14 @@
 
     push( @roots, Cwd::cwd() );
 
-    eval { require FindBin };
+    eval { Jifty::Util->require('FindBin') };
     if ( my $err = $@ ) {
-
         #warn $@;
     } else {
         push @roots, $FindBin::Bin;
     }
 
+    Jifty::Util->require('Config');
     for (@roots) {
         my @root = File::Spec->splitdir($_);
         while (@root) {
@@ -161,8 +157,8 @@
                 # %Config{bin} or %Config{scriptdir} or something like that
                 # for portablility.
                 (-e $try or (($^O =~ /(?:MSWin32|cygwin|os2)/) and MM->maybe_command($try)))
-                and $try ne File::Spec->catdir($Config{bin}, "jifty")
-                and $try ne File::Spec->catdir($Config{scriptdir}, "jifty") )
+                and $try ne File::Spec->catdir($Config::Config{bin}, "jifty")
+                and $try ne File::Spec->catdir($Config::Config{scriptdir}, "jifty") )
             {
                 return $APP_ROOT = File::Spec->catdir(@root);
             }
@@ -207,6 +203,7 @@
     my $self = shift;
     my $whole_path = shift;
     return 1 if (-d $whole_path);
+    Jifty::Util->require('File::Path');
     File::Path::mkpath([$whole_path]);
 }
 

Modified: jifty/trunk/lib/Jifty/View/Static/Handler.pm
==============================================================================
--- jifty/trunk/lib/Jifty/View/Static/Handler.pm	(original)
+++ jifty/trunk/lib/Jifty/View/Static/Handler.pm	Tue Jan 23 02:14:32 2007
@@ -10,8 +10,7 @@
 
 use base qw/Jifty::Object/;
 
-our $mime  = MIME::Types->new();
-our $magic = File::MMagic->new();
+our ($MIME,$MAGIC);
 
 =head1 NAME
 
@@ -160,12 +159,11 @@
     return ($type_override{$1})
         if $local_path =~ /\.(.+)$/ and defined $type_override{$1};
 
-    my $mimeobj   = $mime->mimeTypeOf($local_path);
-    my $mime_type = (
-          $mimeobj
-        ? $mimeobj->type
-        : $magic->checktype_filename($local_path)
-    );
+    # Defer initialization to first use. (It's not actually cheap)
+    $MIME ||= MIME::Types->new();
+    $MAGIC ||= File::MMagic->new();
+    my $mimeobj   = $MIME->mimeTypeOf($local_path);
+    my $mime_type = ( $mimeobj ? $mimeobj->type : $MAGIC->checktype_filename($local_path));
 
     return ($mime_type);
 }

Modified: jifty/trunk/lib/Jifty/Web.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web.pm	(original)
+++ jifty/trunk/lib/Jifty/Web.pm	Tue Jan 23 02:14:32 2007
@@ -11,7 +11,7 @@
 
 
 
-use Jifty::Everything;
+
 use CGI::Cookie;
 use XML::Writer;
 use CSS::Squish;

Modified: jifty/trunk/lib/Jifty/Web/Session.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/Session.pm	(original)
+++ jifty/trunk/lib/Jifty/Web/Session.pm	Tue Jan 23 02:14:32 2007
@@ -3,9 +3,9 @@
 
 package Jifty::Web::Session;
 use base qw/Jifty::Object/;
-use CGI::Cookie;
-use DateTime;
-
+use CGI::Cookie ();
+use DateTime ();
+ 
 =head1 NAME
 
 Jifty::Web::Session - A Jifty session handler


More information about the Jifty-commit mailing list