whitespace changes for attributes

r17650@martha (orig r7671):  groditi | 2008-05-03 15:33:51 -0400

diff --git a/lib/Catalyst/Action.pm b/lib/Catalyst/Action.pm
index 0e2bb58..2023303 100644 (file)
--- a/lib/Catalyst/Action.pm
+++ b/lib/Catalyst/Action.pm
@@ -19,12 +19,12 @@ L<Catalyst::Controller> subclasses.
 
 use Moose;
 
-has class       => (is => 'rw');
-has namespace   => (is => 'rw');
-has 'reverse'   => (is => 'rw');
-has attributes  => (is => 'rw');
-has name        => (is => 'rw');
-has code        => (is => 'rw');
+has class => (is => 'rw');
+has namespace => (is => 'rw');
+has 'reverse' => (is => 'rw');
+has attributes => (is => 'rw');
+has name => (is => 'rw');
+has code => (is => 'rw');
 
 no Moose;
 

diff --git a/lib/Catalyst/ActionContainer.pm b/lib/Catalyst/ActionContainer.pm
index e2292e0..9d41f4e 100644 (file)
--- a/lib/Catalyst/ActionContainer.pm
+++ b/lib/Catalyst/ActionContainer.pm
@@ -24,7 +24,7 @@ use overload (
 
 );
 
-has part    => (is => 'rw', required => 1, lazy => 1, default => sub { {} });
+has part => (is => 'rw', required => 1, lazy => 1, default => sub { {} });
 has actions => (is => 'rw', required => 1, lazy => 1, default => sub { {} });
 
 around 'new' => sub {

diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm
index e735cf0..44f2705 100644 (file)
--- a/lib/Catalyst/Dispatcher.pm
+++ b/lib/Catalyst/Dispatcher.pm
@@ -18,21 +18,22 @@ use Scalar::Util ();
 use overload '""' => sub { return ref(shift) }, fallback => 1;
 
 
+#do these belong as package vars or should we build these via a builder method?
 # Preload these action types
 our @PRELOAD = qw/Index Path Regex/;
 
 # Postload these action types
 our @POSTLOAD = qw/Default/;
 
-has _tree                       => (is => 'rw');
-has _dispatch_types             => (is => 'rw');
-has _registered_dispatch_types  => (is => 'rw');
-has _method_action_class        => (is => 'rw');
-has _action_container_class     => (is => 'rw');
-has preload_dispatch_types      => (is => 'rw', required => 1, lazy => 1, default => sub { [@PRELOAD] });
-has postload_dispatch_types     => (is => 'rw', required => 1, lazy => 1, default => sub { [@POSTLOAD] });
-has _action_hash                => (is => 'rw', required => 1, lazy => 1, default => sub { {} });
-has _container_hash             => (is => 'rw', required => 1, lazy => 1, default => sub { {} });
+has _tree => (is => 'rw');
+has _dispatch_types => (is => 'rw');
+has _registered_dispatch_types => (is => 'rw');
+has _method_action_class => (is => 'rw');
+has _action_container_class => (is => 'rw');
+has preload_dispatch_types => (is => 'rw', required => 1, lazy => 1, default => sub { [@PRELOAD] });
+has postload_dispatch_types => (is => 'rw', required => 1, lazy => 1, default => sub { [@POSTLOAD] });
+has _action_hash => (is => 'rw', required => 1, lazy => 1, default => sub { {} });
+has _container_hash => (is => 'rw', required => 1, lazy => 1, default => sub { {} });
 
 no Moose;
 

diff --git a/lib/Catalyst/Log.pm b/lib/Catalyst/Log.pm
index 1314ceb..726ef7d 100644 (file)
--- a/lib/Catalyst/Log.pm
+++ b/lib/Catalyst/Log.pm
@@ -6,7 +6,7 @@ use Data::Dump;
 our %LEVELS = ();
 
 has level => (is => 'rw');
-has _body  => (is => 'rw');
+has _body => (is => 'rw');
 has abort => (is => 'rw');
 
 {

diff --git a/lib/Catalyst/Request.pm b/lib/Catalyst/Request.pm
index e5dcc85..099b137 100644 (file)
--- a/lib/Catalyst/Request.pm
+++ b/lib/Catalyst/Request.pm
@@ -9,20 +9,20 @@ use URI::QueryParam;
 
 use Moose;
 
-has action            => (is => 'rw');
-has address           => (is => 'rw');
-has arguments         => (is => 'rw', default => sub { [] });
-has cookies           => (is => 'rw', default => sub { {} });
-has query_keywords    => (is => 'rw');
-has match             => (is => 'rw');
-has method            => (is => 'rw');
-has protocol          => (is => 'rw');
+has action => (is => 'rw');
+has address => (is => 'rw');
+has arguments => (is => 'rw', default => sub { [] });
+has cookies => (is => 'rw', default => sub { {} });
+has query_keywords => (is => 'rw');
+has match => (is => 'rw');
+has method => (is => 'rw');
+has protocol => (is => 'rw');
 has query_parameters  => (is => 'rw', default => sub { {} });
-has secure            => (is => 'rw', default => 0);
-has captures          => (is => 'rw', default => sub { [] });
-has uri               => (is => 'rw');
-has user              => (is => 'rw');
-has headers           => (
+has secure => (is => 'rw', default => 0);
+has captures => (is => 'rw', default => sub { [] });
+has uri => (is => 'rw');
+has user => (is => 'rw');
+has headers => (
   is      => 'rw',
   isa     => 'HTTP::Headers',
   handles => [qw(content_encoding content_length content_type header referer user_agent)],
@@ -34,10 +34,10 @@ has _context => (
 );
 
 has body_parameters => (
-  is        => 'rw',
-  required  => 1,
-  lazy      => 1,
-  default   => sub { {} },
+  is => 'rw',
+  required => 1,
+  lazy => 1,
+  default => sub { {} },
 );
 
 before body_parameters => sub {
@@ -46,10 +46,10 @@ before body_parameters => sub {
 };
 
 has uploads => (
-  is        => 'rw',
-  required  => 1,
-  lazy      => 1,
-  default   => sub { {} },
+  is => 'rw',
+  required => 1,
+  lazy => 1,
+  default => sub { {} },
 );
 
 before uploads => sub {
@@ -77,14 +77,12 @@ before parameters => sub {
 };
 
 has base => (
-  is        => 'rw',
-  required  => 1,
-  lazy      => 1,
-  default   => sub {
+  is => 'rw',
+  required => 1,
+  lazy => 1,
+  default => sub {
     my $self = shift;
-    if( $self->uri ){
-      return $self->path;
-    }
+    return $self->path if $self->uri;
   },
 );
 

diff --git a/lib/Catalyst/Request/Upload.pm b/lib/Catalyst/Request/Upload.pm
index 59168d0..b1bd4e6 100644 (file)
--- a/lib/Catalyst/Request/Upload.pm
+++ b/lib/Catalyst/Request/Upload.pm
@@ -7,12 +7,12 @@ use File::Copy ();
 use IO::File   ();
 use File::Spec::Unix;
 
-has filename  => (is => 'rw');
-has headers   => (is => 'rw');
-has size      => (is => 'rw');
-has tempname  => (is => 'rw');
-has type      => (is => 'rw');
-has basename  => (is => 'rw');
+has filename => (is => 'rw');
+has headers => (is => 'rw');
+has size => (is => 'rw');
+has tempname => (is => 'rw');
+has type => (is => 'rw');
+has basename => (is => 'rw');
 
 has fh => (
   is => 'rw',