[Catalyst-commits] r8966 - in Catalyst-Runtime/5.80/trunk: . lib/Catalyst lib/Catalyst/Component lib/Catalyst/Component/Role

[rafl at dev.catalyst.perl.org]

Author: rafl
Date: 2008-12-28 14:14:25 +0000 (Sun, 28 Dec 2008)
New Revision: 8966

Added:
   Catalyst-Runtime/5.80/trunk/lib/Catalyst/Component/ApplicationAttribute.pm
Removed:
   Catalyst-Runtime/5.80/trunk/lib/Catalyst/Component/Role/CaptureApp.pm
Modified:
   Catalyst-Runtime/5.80/trunk/Changes
   Catalyst-Runtime/5.80/trunk/lib/Catalyst/Controller.pm
Log:
s/Catalyst::Component::Role::CaptureApp/Catalyst::Component::ApplicationAttribute/g

Modified: Catalyst-Runtime/5.80/trunk/Changes
===================================================================
--- Catalyst-Runtime/5.80/trunk/Changes	2008-12-28 13:17:14 UTC (rev 8965)
+++ Catalyst-Runtime/5.80/trunk/Changes	2008-12-28 14:14:25 UTC (rev 8966)
@@ -20,7 +20,7 @@
         - Change streaming test to serve itself rather than 01use.t, making 
           test sync for engines easier (t0m)
         - Refactor capturing of $app from Catalyst::Controller into
-          Catalyst::Component::Role::CaptureApp for easier reuse in other
+          Catalyst::Component::ApplicationAttribute for easier reuse in other
           components (Florian Ragwitz)
         - Make the test suites YAML dependency optional (Florian Ragwitz)
         - Make debug output show class name for the engine and dispatcher

Copied: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Component/ApplicationAttribute.pm (from rev 8963, Catalyst-Runtime/5.80/trunk/lib/Catalyst/Component/Role/CaptureApp.pm)
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Component/ApplicationAttribute.pm	                        (rev 0)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Component/ApplicationAttribute.pm	2008-12-28 14:14:25 UTC (rev 8966)
@@ -0,0 +1,20 @@
+package Catalyst::Component::ApplicationAttribute;
+
+use Moose::Role;
+use namespace::clean -except => 'meta';
+
+# Future - isa => 'ClassName|Catalyst' performance?
+#           required => 1 breaks tests..
+has _application => (is => 'ro', weak_ref => 1);
+sub _app { (shift)->_application(@_) }
+
+override BUILDARGS => sub {
+    my ($self, $app) = @_;
+
+    my $args = super();
+    $args->{_application} = $app;
+
+    return $args;
+};
+
+1;

Deleted: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Component/Role/CaptureApp.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Component/Role/CaptureApp.pm	2008-12-28 13:17:14 UTC (rev 8965)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Component/Role/CaptureApp.pm	2008-12-28 14:14:25 UTC (rev 8966)
@@ -1,20 +0,0 @@
-package Catalyst::Component::Role::CaptureApp;
-
-use Moose::Role;
-use namespace::clean -except => 'meta';
-
-# Future - isa => 'ClassName|Catalyst' performance?
-#           required => 1 breaks tests..
-has _application => (is => 'ro', weak_ref => 1);
-sub _app { (shift)->_application(@_) }
-
-override BUILDARGS => sub {
-    my ($self, $app) = @_;
-
-    my $args = super();
-    $args->{_application} = $app;
-
-    return $args;
-};
-
-1;

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Controller.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Controller.pm	2008-12-28 13:17:14 UTC (rev 8965)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Controller.pm	2008-12-28 14:14:25 UTC (rev 8966)
@@ -9,7 +9,7 @@
 use Catalyst::Exception;
 use Catalyst::Utils;
 
-with 'Catalyst::Component::Role::CaptureApp';
+with 'Catalyst::Component::ApplicationAttribute';
 
 has path_prefix =>
     (