[Jifty-commit] r1235 - in jifty/trunk: lib/Jifty
share/web/templates/__jifty/admin
share/web/templates/__jifty/admin/_elements
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Fri Jun 9 15:15:41 EDT 2006
Author: clkao
Date: Fri Jun 9 15:15:35 2006
New Revision: 1235
Modified:
jifty/trunk/lib/Jifty/API.pm
jifty/trunk/lib/Jifty/ClassLoader.pm
jifty/trunk/lib/Jifty/Config.pm
jifty/trunk/lib/Jifty/Everything.pm
jifty/trunk/lib/Jifty/Script/Schema.pm
jifty/trunk/share/web/templates/__jifty/admin/_elements/nav
jifty/trunk/share/web/templates/__jifty/admin/index.html
Log:
Adjust Module::Pluggable uses for the Holy Emacs Followers.
Do not load .#ThisIsABackupFile!
Modified: jifty/trunk/lib/Jifty/API.pm
==============================================================================
--- jifty/trunk/lib/Jifty/API.pm (original)
+++ jifty/trunk/lib/Jifty/API.pm Fri Jun 9 15:15:35 2006
@@ -37,6 +37,7 @@
"Jifty::Action",
map {ref($_)."::Action"} Jifty->plugins,
],
+ except => qr/\.#/,
sub_name => "_actions",
);
Modified: jifty/trunk/lib/Jifty/ClassLoader.pm
==============================================================================
--- jifty/trunk/lib/Jifty/ClassLoader.pm (original)
+++ jifty/trunk/lib/Jifty/ClassLoader.pm Fri Jun 9 15:15:35 2006
@@ -184,7 +184,8 @@
search_path =>
[ map { $base . "::" . $_ } 'Model', 'Action', 'Notification' ],
require => 1,
- inner => 0
+ except => qr/\.#/,
+ inner => 0
);
$self->{models}{$_} = 1 for grep {/^($base)::Model::(.*)$/ and not /Collection$/} $self->plugins;
for my $full (keys %{$self->{models}}) {
Modified: jifty/trunk/lib/Jifty/Config.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Config.pm (original)
+++ jifty/trunk/lib/Jifty/Config.pm Fri Jun 9 15:15:35 2006
@@ -20,8 +20,6 @@
use Hash::Merge;
Hash::Merge::set_behavior('RIGHT_PRECEDENT');
-require Module::Pluggable;
-
use File::Basename();
use base qw/Class::Accessor::Fast/;
Modified: jifty/trunk/lib/Jifty/Everything.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Everything.pm (original)
+++ jifty/trunk/lib/Jifty/Everything.pm Fri Jun 9 15:15:35 2006
@@ -73,7 +73,9 @@
use Jifty::Web::Menu ();
use Module::Pluggable;
-Module::Pluggable->import(search_path => ['Jifty::Web::Form::Field'], require => 1);
+Module::Pluggable->import(search_path => ['Jifty::Web::Form::Field'],
+ require => 1,
+ except => qr/\.#/);
__PACKAGE__->plugins;
1;
Modified: jifty/trunk/lib/Jifty/Script/Schema.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Script/Schema.pm (original)
+++ jifty/trunk/lib/Jifty/Script/Schema.pm Fri Jun 9 15:15:35 2006
@@ -116,6 +116,7 @@
require Module::Pluggable;
Module::Pluggable->import(
require => 1,
+ except => qr/\.#/,
search_path =>
[ "Jifty::Model", $self->{'_application_class'} . "::Model" ],
sub_name => 'models',
Modified: jifty/trunk/share/web/templates/__jifty/admin/_elements/nav
==============================================================================
--- jifty/trunk/share/web/templates/__jifty/admin/_elements/nav (original)
+++ jifty/trunk/share/web/templates/__jifty/admin/_elements/nav Fri Jun 9 15:15:35 2006
@@ -10,6 +10,7 @@
# names.
Module::Pluggable->import(
require => 1,
+ except => qr/\.#/,
search_path => [ $ApplicationClass . "::Model" ],
sub_name => 'jifty_app_models',
);
Modified: jifty/trunk/share/web/templates/__jifty/admin/index.html
==============================================================================
--- jifty/trunk/share/web/templates/__jifty/admin/index.html (original)
+++ jifty/trunk/share/web/templates/__jifty/admin/index.html Fri Jun 9 15:15:35 2006
@@ -10,6 +10,7 @@
# names.
Module::Pluggable->import(
require => 1,
+ except => qr/\.#/,
search_path => [ $ApplicationClass . "::Model" ],
sub_name => 'jifty_app_models',
);
More information about the Jifty-commit
mailing list