From: Dave Rolsky <autarch@urth.org>
Date: Wed, 4 Feb 2009 17:24:44 +0000 (+0000)
Subject: rename Overriden to Overridden
X-Git-Tag: 0.68~5
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=74862722038562bf00fbefad67e3bfff2975841b;p=gitmo%2FMoose.git

rename Overriden to Overridden
---

diff --git a/lib/Moose.pm b/lib/Moose.pm
index 5f87f39..6d8b417 100644
--- a/lib/Moose.pm
+++ b/lib/Moose.pm
@@ -270,7 +270,7 @@ $_->make_immutable(
     Moose::Meta::Method::Accessor
     Moose::Meta::Method::Constructor
     Moose::Meta::Method::Destructor
-    Moose::Meta::Method::Overriden
+    Moose::Meta::Method::Overridden
     Moose::Meta::Method::Augmented
 
     Moose::Meta::Role
diff --git a/lib/Moose/Meta/Class.pm b/lib/Moose/Meta/Class.pm
index efea6f9..152c3c0 100644
--- a/lib/Moose/Meta/Class.pm
+++ b/lib/Moose/Meta/Class.pm
@@ -15,7 +15,7 @@ our $VERSION   = '0.67';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
-use Moose::Meta::Method::Overriden;
+use Moose::Meta::Method::Overridden;
 use Moose::Meta::Method::Augmented;
 use Moose::Error::Default;
 
@@ -212,7 +212,7 @@ sub add_override_method_modifier {
     (!$self->has_method($name))
         || $self->throw_error("Cannot add an override method if a local method is already present");
 
-    $self->add_method($name => Moose::Meta::Method::Overriden->new(
+    $self->add_method($name => Moose::Meta::Method::Overridden->new(
         method  => $method,
         class   => $self,
         package => $_super_package, # need this for roles
@@ -238,7 +238,7 @@ sub _find_next_method_by_name_which_is_not_overridden {
     my ($self, $name) = @_;
     foreach my $method ($self->find_all_methods_by_name($name)) {
         return $method->{code}
-            if blessed($method->{code}) && !$method->{code}->isa('Moose::Meta::Method::Overriden');
+            if blessed($method->{code}) && !$method->{code}->isa('Moose::Meta::Method::Overridden');
     }
     return undef;
 }
diff --git a/lib/Moose/Meta/Method/Augmented.pm b/lib/Moose/Meta/Method/Augmented.pm
index ab920ad..a7a54d8 100644
--- a/lib/Moose/Meta/Method/Augmented.pm
+++ b/lib/Moose/Meta/Method/Augmented.pm
@@ -26,7 +26,7 @@ sub new {
 
     my $_super_package = $super->package_name;
     # BUT!,... if this is an overridden method ....
-    if ($super->isa('Moose::Meta::Method::Overriden')) {
+    if ($super->isa('Moose::Meta::Method::Overridden')) {
         # we need to be sure that we actually
         # find the next method, which is not
         # an 'override' method, the reason is
diff --git a/lib/Moose/Meta/Method/Overriden.pm b/lib/Moose/Meta/Method/Overridden.pm
similarity index 94%
rename from lib/Moose/Meta/Method/Overriden.pm
rename to lib/Moose/Meta/Method/Overridden.pm
index 31182cc..99e71b7 100644
--- a/lib/Moose/Meta/Method/Overriden.pm
+++ b/lib/Moose/Meta/Method/Overridden.pm
@@ -1,4 +1,4 @@
-package Moose::Meta::Method::Overriden;
+package Moose::Meta::Method::Overridden;
 
 use strict;
 use warnings;
@@ -55,7 +55,7 @@ __END__
 
 =head1 NAME
 
-Moose::Meta::Method::Overriden - A Moose Method metaclass for overridden methods
+Moose::Meta::Method::Overridden - A Moose Method metaclass for overridden methods
 
 =head1 DESCRIPTION
 
diff --git a/t/030_roles/008_role_conflict_edge_cases.t b/t/030_roles/008_role_conflict_edge_cases.t
index 3ff06cd..46dcbcb 100644
--- a/t/030_roles/008_role_conflict_edge_cases.t
+++ b/t/030_roles/008_role_conflict_edge_cases.t
@@ -88,7 +88,7 @@ ok(Role::Base2->meta->has_override_method_modifier('foo'), '... have the method
 ok(Role::Derived3->meta->has_override_method_modifier('foo'), '... have the method foo as expected');
 ok(Role::Derived4->meta->has_override_method_modifier('foo'), '... have the method foo as expected');
 ok(My::Test::Class2->meta->has_method('foo'), '... have the method foo as expected');
-isa_ok(My::Test::Class2->meta->get_method('foo'), 'Moose::Meta::Method::Overriden');
+isa_ok(My::Test::Class2->meta->get_method('foo'), 'Moose::Meta::Method::Overridden');
 ok(My::Test::Class2::Base->meta->has_method('foo'), '... have the method foo as expected');
 isa_ok(My::Test::Class2::Base->meta->get_method('foo'), 'Class::MOP::Method');