[Jifty-commit] r5894 - in jifty/trunk: lib lib/Jifty t/TestApp/t

[Jifty commits]

Author: sartak
Date: Mon Sep 29 18:34:17 2008
New Revision: 5894

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/Makefile.PL
   jifty/trunk/lib/Jifty.pm
   jifty/trunk/lib/Jifty/ClassLoader.pm
   jifty/trunk/t/TestApp/t/11-current_user.t
   jifty/trunk/t/TestApp/t/before_access.t

Log:
 r73281 at onn:  sartak | 2008-09-29 18:33:08 -0400
 We don't need to explicitly finalize_triggers in Class::Trigger 0.13


Modified: jifty/trunk/Makefile.PL
==============================================================================
--- jifty/trunk/Makefile.PL	(original)
+++ jifty/trunk/Makefile.PL	Mon Sep 29 18:34:17 2008
@@ -8,7 +8,7 @@
 requires('Class::Accessor'); # Class::Accessor::Fast
 requires('Class::Container');
 requires('Class::Data::Inheritable');
-requires('Class::Trigger' => '0.12');
+requires('Class::Trigger' => '0.13');
 requires('Clone' => '0.27');
 requires('CGI' => '3.30');
 requires('CGI::Cookie::Splitter');

Modified: jifty/trunk/lib/Jifty.pm
==============================================================================
--- jifty/trunk/lib/Jifty.pm	(original)
+++ jifty/trunk/lib/Jifty.pm	Mon Sep 29 18:34:17 2008
@@ -233,12 +233,6 @@
     Jifty->class_loader($class_loader);
     $class_loader->require;
 
-    # Cache triggers on our model classes (the classloader does this
-    # for app model classes)
-    $_->finalize_triggers
-        for grep { $_->can('finalize_triggers') }
-        qw/Jifty::Model::Metadata Jifty::Model::Session/;
-
     # Configure the request handler and action API handler
     Jifty->handler(Jifty::Handler->new()) unless $args{no_views};
     Jifty->api(Jifty::API->new());

Modified: jifty/trunk/lib/Jifty/ClassLoader.pm
==============================================================================
--- jifty/trunk/lib/Jifty/ClassLoader.pm	(original)
+++ jifty/trunk/lib/Jifty/ClassLoader.pm	Mon Sep 29 18:34:17 2008
@@ -370,7 +370,6 @@
     for my $full ($self->models) {
         $self->_require_model_related_classes($full);
     }
-    $_->finalize_triggers for grep {$_->can('finalize_triggers')} $self->models;
 }
 
 # This class helps Jifty::ClassLoader::require() load each model, the model's

Modified: jifty/trunk/t/TestApp/t/11-current_user.t
==============================================================================
--- jifty/trunk/t/TestApp/t/11-current_user.t	(original)
+++ jifty/trunk/t/TestApp/t/11-current_user.t	Mon Sep 29 18:34:17 2008
@@ -20,7 +20,6 @@
 
 # Make it so that all users have full access
 TestApp::Model::User->add_trigger( before_access => sub { 'allow' } );
-TestApp::Model::User->finalize_triggers if TestApp::Model::User->can('finalize_triggers');
 
 # Create two users
 my $o = TestApp::Model::User->new(current_user => $system_user);

Modified: jifty/trunk/t/TestApp/t/before_access.t
==============================================================================
--- jifty/trunk/t/TestApp/t/before_access.t	(original)
+++ jifty/trunk/t/TestApp/t/before_access.t	Mon Sep 29 18:34:17 2008
@@ -19,7 +19,6 @@
     }
     return 'ignore';
 });
-TestApp::Model::User->finalize_triggers if TestApp::Model::User->can('finalize_triggers');
 
 # Try creating non-bob, which will be denied
 my $o = TestApp::Model::User->new(current_user => $system_user);