[Catalyst-commits] r10204 - in Catalyst-Runtime/5.80/trunk: .
lib/Catalyst t t/aggregate
dandv at dev.catalyst.perl.org
dandv at dev.catalyst.perl.org
Tue May 19 23:36:15 GMT 2009
Author: dandv
Date: 2009-05-19 23:36:15 +0000 (Tue, 19 May 2009)
New Revision: 10204
Modified:
Catalyst-Runtime/5.80/trunk/Changes
Catalyst-Runtime/5.80/trunk/lib/Catalyst/Action.pm
Catalyst-Runtime/5.80/trunk/lib/Catalyst/Component.pm
Catalyst-Runtime/5.80/trunk/t/aggregate/live_engine_response_headers.t
Catalyst-Runtime/5.80/trunk/t/unit_controller_config.t
Catalyst-Runtime/5.80/trunk/t/unit_utils_subdir.t
Log:
Fixed "its" vs "it's"
Modified: Catalyst-Runtime/5.80/trunk/Changes
===================================================================
--- Catalyst-Runtime/5.80/trunk/Changes 2009-05-19 16:15:25 UTC (rev 10203)
+++ Catalyst-Runtime/5.80/trunk/Changes 2009-05-19 23:36:15 UTC (rev 10204)
@@ -852,7 +852,7 @@
- helpers now create .new files where files already exist and differ
- fixed $Data::Dumper::Terse (Robin Berjon)
- added arguments for detach
- - new credits section in pod
+ - new credits section in POD
- fixed detach to allow relative action names (Matt and Robert)
- added the ability to have whitespaces in Path( '' ) and Regex( '' )
Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Action.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Action.pm 2009-05-19 16:15:25 UTC (rev 10203)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Action.pm 2009-05-19 23:36:15 UTC (rev 10204)
@@ -10,7 +10,7 @@
=head1 DESCRIPTION
-This class represents a Catalyst Action. You can access the object for the
+This class represents a Catalyst Action. You can access the object for the
currently dispatched action via $c->action. See the L<Catalyst::Dispatcher>
for more information on how actions are dispatched. Actions are defined in
L<Catalyst::Controller> subclasses.
@@ -62,7 +62,7 @@
sub match {
my ( $self, $c ) = @_;
#would it be unreasonable to store the number of arguments
- #the action has as it's own attribute?
+ #the action has as its own attribute?
#it would basically eliminate the code below. ehhh. small fish
return 1 unless exists $self->attributes->{Args};
my $args = $self->attributes->{Args}[0];
Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Component.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Component.pm 2009-05-19 16:15:25 UTC (rev 10203)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Component.pm 2009-05-19 23:36:15 UTC (rev 10204)
@@ -34,7 +34,7 @@
my ( $self, $c ) = @_;
$c->response->output( $self->{foo} );
}
-
+
1;
# Methods can be a request step
@@ -47,7 +47,7 @@
=head1 DESCRIPTION
-This is the universal base class for Catalyst components
+This is the universal base class for Catalyst components
(Model/View/Controller).
It provides you with a generic new() for instantiation through Catalyst's
@@ -60,12 +60,12 @@
sub BUILDARGS {
my ($self) = @_;
-
+
# Temporary fix, some components does not pass context to constructor
my $arguments = ( ref( $_[-1] ) eq 'HASH' ) ? $_[-1] : {};
my $args = $self->merge_config_hashes( $self->config, $arguments );
-
+
return $args;
}
@@ -140,8 +140,8 @@
it is called by Catalyst during setup_components with the application class
as $c and any config entry on the application for this component (for example,
in the case of MyApp::Controller::Foo this would be
-MyApp->config->{'Controller::Foo'}). The arguments are expected to be a
-hashref and are merged with the __PACKAGE__->config hashref before calling
+MyApp->config->{'Controller::Foo'}). The arguments are expected to be a
+hashref and are merged with the __PACKAGE__->config hashref before calling
->new to instantiate the component.
=head2 $c->config
@@ -150,15 +150,15 @@
=head2 $c->config($key, $value, ...)
-Accessor for this component's config hash. Config values can be set as
+Accessor for this component's config hash. Config values can be set as
key value pair, or you can specify a hashref. In either case the keys
-will be merged with any existing config settings. Each component in
-a Catalyst application has it's own config hash.
+will be merged with any existing config settings. Each component in
+a Catalyst application has its own config hash.
=head2 $c->process()
This is the default method called on a Catalyst component in the dispatcher.
-For instance, Views implement this action to render the response body
+For instance, Views implement this action to render the response body
when you forward to them. The default is an abstract method.
=head2 $c->merge_config_hashes( $hashref, $hashref )
Modified: Catalyst-Runtime/5.80/trunk/t/aggregate/live_engine_response_headers.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/aggregate/live_engine_response_headers.t 2009-05-19 16:15:25 UTC (rev 10203)
+++ Catalyst-Runtime/5.80/trunk/t/aggregate/live_engine_response_headers.t 2009-05-19 23:36:15 UTC (rev 10204)
@@ -42,7 +42,7 @@
# method name is echo'd back in content-body, which
# accounts for difference in content length. In normal
# cases the Content-Length should be the same regardless
- # of if its a GET or HEAD request.
+ # of whether it's a GET or HEAD request.
SKIP:
{
if ( $ENV{CATALYST_SERVER} ) {
Modified: Catalyst-Runtime/5.80/trunk/t/unit_controller_config.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/unit_controller_config.t 2009-05-19 16:15:25 UTC (rev 10203)
+++ Catalyst-Runtime/5.80/trunk/t/unit_controller_config.t 2009-05-19 23:36:15 UTC (rev 10204)
@@ -34,11 +34,11 @@
package controller_a;
use base 'base_controller';
-
+
__PACKAGE__->config( key_a => 'value_a' );
}
-
-
+
+
{
package controller_b;
@@ -55,26 +55,26 @@
## ----------------------------------------------------------------------------
## THE TESTS. Basically we first check to make sure that all the children of
## the base_controller properly inherit the {base_key => 'base_value'} info
-## and that each of the children also has it's local config data and that none
+## and that each of the children also has its local config data and that none
## of the classes have data that is unexpected.
## ----------------------------------------------------------------------------
# First round, does everything have what we expect to find? If these tests fail there is something
-# wrong with the way config is storing it's information.
+# wrong with the way config is storing its information.
ok( base_controller->config->{base_key} eq 'base_value', 'base_controller has expected config value for "base_key"') or
diag('"base_key" defined as "'.base_controller->config->{base_key}.'" and not "base_value" in config');
ok( controller_a->config->{base_key} eq 'base_value', 'controller_a has expected config value for "base_key"') or
diag('"base_key" defined as "'.controller_a->config->{base_key}.'" and not "base_value" in config');
-
+
ok( controller_a->config->{key_a} eq 'value_a', 'controller_a has expected config value for "key_a"') or
diag('"key_a" defined as "'.controller_a->config->{key_a}.'" and not "value_a" in config');
ok( controller_b->config->{base_key} eq 'base_value', 'controller_b has expected config value for "base_key"') or
diag('"base_key" defined as "'.controller_b->config->{base_key}.'" and not "base_value" in config');
-
+
ok( controller_b->config->{key_b} eq 'value_b', 'controller_b has expected config value for "key_b"') or
diag('"key_b" defined as "'.controller_b->config->{key_b}.'" and not "value_b" in config');
@@ -83,9 +83,9 @@
ok( scalar(keys %{base_controller->config}) == 1, 'base_controller has the expected number of config values') or
diag("base_controller should have 1 config value, but it has ".scalar(keys %{base_controller->config}));
-
+
ok( scalar(keys %{controller_a->config}) == 2, 'controller_a has the expected number of config values') or
diag("controller_a should have 2 config value, but it has ".scalar(keys %{base_controller->config}));
-
+
ok( scalar(keys %{controller_b->config}) == 2, 'controller_b has the expected number of config values') or
diag("controller_a should have 2 config value, but it has ".scalar(keys %{base_controller->config}));
Modified: Catalyst-Runtime/5.80/trunk/t/unit_utils_subdir.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/unit_utils_subdir.t 2009-05-19 16:15:25 UTC (rev 10203)
+++ Catalyst-Runtime/5.80/trunk/t/unit_utils_subdir.t 2009-05-19 23:36:15 UTC (rev 10204)
@@ -4,7 +4,7 @@
use warnings;
# simulates an entire testapp rooted at t/something
-# except without bothering creating it since its
+# except without bothering creating it since it's
# only the -e check on the Makefile.PL that matters
BEGIN { use_ok 'Catalyst::Utils' }
@@ -14,21 +14,21 @@
{
$INC{'TestApp.pm'} = "$FindBin::Bin/something/script/foo/../../lib/TestApp.pm";
my $home = Catalyst::Utils::home('TestApp');
- like($home, qr{t[\/\\]something}, "has path TestApp/t/something");
+ like($home, qr{t[\/\\]something}, "has path TestApp/t/something");
unlike($home, qr{[\/\\]script[\/\\]foo}, "doesn't have path /script/foo");
}
{
$INC{'TestApp.pm'} = "$FindBin::Bin/something/script/foo/bar/../../../lib/TestApp.pm";
my $home = Catalyst::Utils::home('TestApp');
- like($home, qr{t[\/\\]something}, "has path TestApp/t/something");
+ like($home, qr{t[\/\\]something}, "has path TestApp/t/something");
unlike($home, qr{[\/\\]script[\/\\]foo[\/\\]bar}, "doesn't have path /script/foo/bar");
}
{
$INC{'TestApp.pm'} = "$FindBin::Bin/something/script/../lib/TestApp.pm";
my $home = Catalyst::Utils::home('TestApp');
- like($home, qr{t[\/\\]something}, "has path TestApp/t/something");
+ like($home, qr{t[\/\\]something}, "has path TestApp/t/something");
unlike($home, qr{[\/\\]script[\/\\]foo}, "doesn't have path /script/foo");
}
@@ -36,7 +36,7 @@
$INC{'TestApp.pm'} = "TestApp.pm";
my $dir = "$FindBin::Bin/something";
chdir( $dir );
-
+
my $home = Catalyst::Utils::home('TestApp');
$dir = Path::Class::Dir->new( $dir );
More information about the Catalyst-commits
mailing list