[Jifty-commit] r6771 - in jifty/trunk/lib/Jifty: Mason View/Mason

[Jifty commits]

Author: alexmv
Date: Thu Apr  9 23:10:20 2009
New Revision: 6771

Added:
   jifty/trunk/lib/Jifty/View/Mason/Halo.pm
      - copied, changed from r6770, /jifty/trunk/lib/Jifty/Mason/Halo.pm
Removed:
   jifty/trunk/lib/Jifty/Mason/Halo.pm
Modified:
   jifty/trunk/lib/Jifty/Plugin.pm
   jifty/trunk/lib/Jifty/View/Mason/Handler.pm

Log:
Demote Jifty::Mason::Halo into Jifty::View::Mason::Halo

Modified: jifty/trunk/lib/Jifty/Plugin.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin.pm	Thu Apr  9 23:10:20 2009
@@ -62,13 +62,13 @@
     # plugins are loaded, initialized, and prereq-examined in the order they're
     # listed in the config files. Instead, each phase should be separate.
     Jifty::Util->require("Jifty::Plugin::Halo");
-    Jifty::Util->require("Jifty::Mason::Halo");
+    Jifty::Util->require("Jifty::View::Mason::Halo");
 
     if ($self->can('halo_pre_template')) {
         Jifty::Plugin::Halo->add_trigger(
             halo_pre_template => sub { $self->halo_pre_template(@_) },
         );
-        Jifty::Mason::Halo->add_trigger(
+        Jifty::View::Mason::Halo->add_trigger(
             halo_pre_template => sub { $self->halo_pre_template(@_) },
         );
     }
@@ -77,7 +77,7 @@
         Jifty::Plugin::Halo->add_trigger(
             halo_post_template => sub { $self->halo_post_template(@_) },
         );
-        Jifty::Mason::Halo->add_trigger(
+        Jifty::View::Mason::Halo->add_trigger(
             halo_post_template => sub { $self->halo_post_template(@_) },
         );
     }

Copied: jifty/trunk/lib/Jifty/View/Mason/Halo.pm (from r6770, /jifty/trunk/lib/Jifty/Mason/Halo.pm)
==============================================================================
--- /jifty/trunk/lib/Jifty/Mason/Halo.pm	(original)
+++ jifty/trunk/lib/Jifty/View/Mason/Halo.pm	Thu Apr  9 23:10:20 2009
@@ -1,6 +1,6 @@
 use warnings;
 use strict;
-package Jifty::Mason::Halo;
+package Jifty::View::Mason::Halo;
 use base qw/HTML::Mason::Plugin/;
 use Time::HiRes 'time';
 use Class::Trigger;
@@ -8,23 +8,19 @@
 
 =head1 NAME
 
-Jifty::Mason::Halo - Class for drawing "halos" around page components
+Jifty::View::Mason::Halo - Class for drawing "halos" around page components
 
 =head1 DESCRIPTION
 
-
-=cut
-
-
 =head2 start_component_hook CONTEXT_OBJECT
 
-Whenever we start to render a component, check to see if we can draw a halo around the component.
+Whenever we start to render a component, check to see if we can draw a
+halo around the component.
 
 Either way, record halo metadata.
 
 =cut
 
-
 sub start_component_hook {
     my $self    = shift;
     my $context = shift;
@@ -70,7 +66,6 @@
 
 =cut
 
-
 sub _unrendered_component {
     my $self    = shift;
     my $context = shift;
@@ -83,7 +78,6 @@
 the C<</body>> tag, we should call render_component_tree to output all
 the halo data and metadata.
 
-
 =cut
 
 sub render_component_tree {

Modified: jifty/trunk/lib/Jifty/View/Mason/Handler.pm
==============================================================================
--- jifty/trunk/lib/Jifty/View/Mason/Handler.pm	(original)
+++ jifty/trunk/lib/Jifty/View/Mason/Handler.pm	Thu Apr  9 23:10:20 2009
@@ -115,7 +115,7 @@
 
     # In developer mode, we want halos, refreshing and all that other good stuff. 
     if (Jifty->config->framework('DevelMode') ) {
-        push @{$config{'plugins'}}, 'Jifty::Mason::Halo';
+        push @{$config{'plugins'}}, 'Jifty::View::Mason::Halo';
         $config{static_source}    = 0;
         $config{use_object_files} = 0;
     }