From: Devin Austin <dhoss@squishface.com>
Date: Wed, 24 Feb 2010 22:10:48 +0000 (-0700)
Subject: removed NEXT stuff
X-Git-Tag: 0.07~7
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Plugin-ConfigLoader-Environment.git;a=commitdiff_plain;h=37564e20a70f815344087259fb1358970ae5a0d0

removed NEXT stuff
---

diff --git a/lib/Catalyst/Plugin/ConfigLoader/Environment.pm b/lib/Catalyst/Plugin/ConfigLoader/Environment.pm
index 4faef4a..1ab65a0 100644
--- a/lib/Catalyst/Plugin/ConfigLoader/Environment.pm
+++ b/lib/Catalyst/Plugin/ConfigLoader/Environment.pm
@@ -3,7 +3,7 @@ package Catalyst::Plugin::ConfigLoader::Environment;
 use warnings;
 use strict;
 use JSON::Any;
-
+use MRO::Compat;
 =head1 NAME
 
 Catalyst::Plugin::ConfigLoader::Environment - Configure your
@@ -15,7 +15,7 @@ Version 0.05
 
 =cut
 
-our $VERSION = '0.05';
+our $VERSION = '0.06';
 
 =head1 SYNOPSIS
 
@@ -120,7 +120,7 @@ Overriding Catalyst' setup routine.
 =cut
 
 sub setup {
-    my $c = shift;
+    my $c    = shift;
     my $prefix = Catalyst::Utils::class2env($c);
     my %env;
     grep { /^${prefix}[_](.+)$/ && ($env{$1}=$ENV{$_})} keys %ENV;
@@ -149,7 +149,7 @@ sub setup {
         $c->config( $var => $val );
     }
     
-    return $c->NEXT::setup(@_);
+    return $c->maybe::next::method(@_);
 }
 
 
diff --git a/t/01-live.t b/t/01-live.t
index 7214660..af88fd5 100644
--- a/t/01-live.t
+++ b/t/01-live.t
@@ -48,6 +48,7 @@ my $model_attributes = eval $r->content;
 is_deeply($model_attributes,
           {
               foo => 'bar', # From __PACKAGE__ default config
-              bar => 'baz', # Merged from my environment hash
+              bar => 'baz', # Merged from my environment hash,
+              catalyst_component_name => 'TestApp::Model::TestModel',
           },
           'JSON for top-level :: param with hash merge');