[Jifty-commit] r6353 - in jifty/trunk: lib/Jifty plugins/Multipage/t/Multipage/etc plugins/Tag/t/TestApp-Plugin-Tag/etc t/TestApp-Collection-Select/etc t/TestApp-Mason/etc t/TestApp-Plugin-ActorMetadata/etc t/TestApp-Plugin-Attributes/etc t/TestApp-Template-Declare/etc

Jifty commits jifty-commit at lists.jifty.org
Wed Feb 18 19:28:23 EST 2009


Author: alexmv
Date: Wed Feb 18 19:28:23 2009
New Revision: 6353

Modified:
   jifty/trunk/lib/Jifty/Config.pm
   jifty/trunk/lib/Jifty/Dispatcher.pm
   jifty/trunk/lib/Jifty/Handler.pm
   jifty/trunk/plugins/Multipage/t/Multipage/etc/config.yml
   jifty/trunk/plugins/Tag/t/TestApp-Plugin-Tag/etc/config.yml
   jifty/trunk/t/TestApp-Collection-Select/etc/config.yml
   jifty/trunk/t/TestApp-Mason/etc/config.yml
   jifty/trunk/t/TestApp-Plugin-ActorMetadata/etc/config.yml
   jifty/trunk/t/TestApp-Plugin-Attributes/etc/config.yml
   jifty/trunk/t/TestApp-Regions/etc/config.yml
   jifty/trunk/t/TestApp-Template-Declare/etc/config.yml

Log:
 * Remove FallbackViewHandler, as it is no different from the last
   Handler in the View section.  For back-compat, Jifty::Handler still
   adds it to the set if it exists in your config file, though.


Modified: jifty/trunk/lib/Jifty/Config.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Config.pm	(original)
+++ jifty/trunk/lib/Jifty/Config.pm	Wed Feb 18 19:28:23 2009
@@ -467,7 +467,6 @@
             L10N       => { PoDir => "share/po", },
 
             View => {
-                FallbackHandler => 'Jifty::View::Mason::Handler',
                 Handlers => [
                     'Jifty::View::Static::Handler',
                     'Jifty::View::Declare::Handler',
@@ -541,7 +540,7 @@
         # These are the plugins which old apps expect because their
         # features used to be in the core.
         unshift (@{$config->{'framework'}->{'Plugins'}}, 
-            { SkeletonApp            => {}, },
+            { SkeletonApp        => {}, },
             { REST               => {}, },
             { Halo               => {}, },
             { ErrorTemplates     => {}, },

Modified: jifty/trunk/lib/Jifty/Dispatcher.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Dispatcher.pm	(original)
+++ jifty/trunk/lib/Jifty/Dispatcher.pm	Wed Feb 18 19:28:23 2009
@@ -1200,10 +1200,7 @@
 
     my $value = ref $template ? $$template : $template;
 
-    my @handlers = map {Jifty->handler->view($_)} Jifty->handler->view_handlers;
-    push @handlers, Jifty->handler->fallback_view_handler;
-
-    foreach my $handler ( @handlers ) {
+    foreach my $handler ( map {Jifty->handler->view($_)} Jifty->handler->view_handlers ) {
         if ( my $path = $handler->template_exists($value) ) {
             $$template = $path if ref $template;
             return $handler;

Modified: jifty/trunk/lib/Jifty/Handler.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Handler.pm	(original)
+++ jifty/trunk/lib/Jifty/Handler.pm	Wed Feb 18 19:28:23 2009
@@ -105,34 +105,21 @@
 =cut
 
 sub view_handlers {
-    @{Jifty->config->framework('View')->{'Handlers'}}
-}
-
-
-=head2 fallback_view_handler
-
-Returns the object for our "last-resort" view handler. By default, this is the L<HTML::Mason> handler.
-
-You can override this by specifying: 
-
-  framework:
-      View:
-         FallbackHandler: Jifty::View::Something::Handler
-
-=cut
-
+    my @default = @{Jifty->config->framework('View')->{'Handlers'}};
 
+    # If there's a (deprecated) fallback handler, and it's not already
+    # in our set of handlers, tack it on the end
+    my $fallback = Jifty->config->framework('View')->{'FallbackHandler'};
+    push @default, $fallback if defined $fallback and not grep {$_ eq $fallback} @default;
 
-sub fallback_view_handler { 
-   my $self = shift; 
-   return $self->view(Jifty->config->framework('View')->{'FallbackHandler'}); 
+    return @default;
 }
 
+
 =head2 setup_view_handlers
 
 Initialize all of our view handlers. 
 
-
 =cut
 
 sub setup_view_handlers {
@@ -146,7 +133,6 @@
 
 =head2 view ClassName
 
-
 Returns the Jifty view handler for C<ClassName>.
 
 =cut

Modified: jifty/trunk/plugins/Multipage/t/Multipage/etc/config.yml
==============================================================================
--- jifty/trunk/plugins/Multipage/t/Multipage/etc/config.yml	(original)
+++ jifty/trunk/plugins/Multipage/t/Multipage/etc/config.yml	Wed Feb 18 19:28:23 2009
@@ -31,7 +31,6 @@
   SkipAccessControl: 0
   TemplateClass: Multipage::View
   View: 
-    FallbackHandler: Jifty::View::Mason::Handler
     Handlers: 
       - Jifty::View::Static::Handler
       - Jifty::View::Declare::Handler

Modified: jifty/trunk/plugins/Tag/t/TestApp-Plugin-Tag/etc/config.yml
==============================================================================
--- jifty/trunk/plugins/Tag/t/TestApp-Plugin-Tag/etc/config.yml	(original)
+++ jifty/trunk/plugins/Tag/t/TestApp-Plugin-Tag/etc/config.yml	Wed Feb 18 19:28:23 2009
@@ -56,7 +56,6 @@
   SkipAccessControl: 0
   TemplateClass: TestApp::Plugin::Tag::View
   View: 
-    FallbackHandler: Jifty::View::Mason::Handler
     Handlers: 
       - Jifty::View::Static::Handler
       - Jifty::View::Declare::Handler

Modified: jifty/trunk/t/TestApp-Collection-Select/etc/config.yml
==============================================================================
--- jifty/trunk/t/TestApp-Collection-Select/etc/config.yml	(original)
+++ jifty/trunk/t/TestApp-Collection-Select/etc/config.yml	Wed Feb 18 19:28:23 2009
@@ -53,7 +53,6 @@
   SkipAccessControl: 0
   TemplateClass: TestApp::View
   View: 
-    FallbackHandler: Jifty::View::Mason::Handler
     Handlers: 
       - Jifty::View::Static::Handler
       - Jifty::View::Declare::Handler

Modified: jifty/trunk/t/TestApp-Mason/etc/config.yml
==============================================================================
--- jifty/trunk/t/TestApp-Mason/etc/config.yml	(original)
+++ jifty/trunk/t/TestApp-Mason/etc/config.yml	Wed Feb 18 19:28:23 2009
@@ -29,7 +29,6 @@
   SkipAccessControl: 0
   TemplateClass: TestApp::Mason::View
   View: 
-    FallbackHandler: Jifty::View::Mason::Handler
     Handlers: 
       - Jifty::View::Mason::Handler
   Web: 

Modified: jifty/trunk/t/TestApp-Plugin-ActorMetadata/etc/config.yml
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-ActorMetadata/etc/config.yml	(original)
+++ jifty/trunk/t/TestApp-Plugin-ActorMetadata/etc/config.yml	Wed Feb 18 19:28:23 2009
@@ -55,7 +55,6 @@
   SkipAccessControl: 0
   TemplateClass: TestApp::Plugin::ActorMetadata::View
   View: 
-    FallbackHandler: Jifty::View::Mason::Handler
     Handlers: 
       - Jifty::View::Static::Handler
       - Jifty::View::Declare::Handler

Modified: jifty/trunk/t/TestApp-Plugin-Attributes/etc/config.yml
==============================================================================
--- jifty/trunk/t/TestApp-Plugin-Attributes/etc/config.yml	(original)
+++ jifty/trunk/t/TestApp-Plugin-Attributes/etc/config.yml	Wed Feb 18 19:28:23 2009
@@ -55,7 +55,6 @@
   SkipAccessControl: 0
   TemplateClass: TestApp::Plugin::Attributes::View
   View: 
-    FallbackHandler: Jifty::View::Mason::Handler
     Handlers: 
       - Jifty::View::Static::Handler
       - Jifty::View::Declare::Handler

Modified: jifty/trunk/t/TestApp-Regions/etc/config.yml
==============================================================================
--- jifty/trunk/t/TestApp-Regions/etc/config.yml	(original)
+++ jifty/trunk/t/TestApp-Regions/etc/config.yml	Wed Feb 18 19:28:23 2009
@@ -53,7 +53,6 @@
   SkipAccessControl: 0
   TemplateClass: TestApp::Regions::View
   View: 
-    FallbackHandler: Jifty::View::Mason::Handler
     Handlers: 
       - Jifty::View::Static::Handler
       - Jifty::View::Declare::Handler

Modified: jifty/trunk/t/TestApp-Template-Declare/etc/config.yml
==============================================================================
--- jifty/trunk/t/TestApp-Template-Declare/etc/config.yml	(original)
+++ jifty/trunk/t/TestApp-Template-Declare/etc/config.yml	Wed Feb 18 19:28:23 2009
@@ -38,7 +38,6 @@
   SkipAccessControl: 0
   TemplateClass: TestApp::View
   View: 
-    FallbackHandler: Jifty::View::Mason::Handler
     Handlers: 
       - Jifty::View::Static::Handler
       - Jifty::View::Declare::Handler


More information about the Jifty-commit mailing list