Merge branch 'uri_for_action'

diff --git a/Changes b/Changes
index 7db0ab6..f1c67b7 100644 (file)
--- a/Changes
+++ b/Changes
@@ -43,6 +43,8 @@
         - Import related cleanups and consistency fixes (rafl)
         - Fix test suite TestApp /dump/env action (t0m)
         - Add $res->code as alias for $res->status (hdp)
+        - Make Catalyst::ClassData compatible with the latest Class::MOP::Class
+          changes. Also depend on the latest Class::MOP. (rafl)
 
 5.8000_06 2009-02-04 21:00
         - Disallow writing to config after setup (rafl)

diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
index 10378bb..24b316c 100644 (file)
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@ -1,41 +1 @@
-# Avoid version control files.
-\bRCS\b
-\bCVS\b
-,v$
-\B\.svn\b
-
-# Avoid Makemaker generated and utility files.
-\bMakefile$
-\bblib
-\bMakeMaker-\d
-\bpm_to_blib$
-\bblibdirs$
-^MANIFEST\.SKIP$
-
-# Avoid Module::Build generated and utility files.
-\bBuild$
-\b_build
-
-# Avoid temp and backup files.
-~$
-\.tmp$
-\.old$
-\.bak$
-\#$
-\b\.#
-\.DS_Store$
-
-# Avoid Apache::Test files
-t/conf/apache_test_config.pm
-t/conf/extra.conf$
-t/conf/httpd.conf
-t/conf/mime.types
-t/htdocs
-t/logs
-t/var
-
-# No tarballs!
-\.gz$
-
-# Skip the roadmap
-lib/Catalyst/ROADMAP.pod
+^(?!script/\w+\.pl$|TODO$|lib/.+(?<!ROADMAP)\.p(m|od)$|inc/|t/aggregate/.*\.t$|t/.*\.(gif|yml|pl|t)$|t/lib/.*\.pm$|t/something/(Makefile.PL|script/foo/bar/for_dist)$|t/conf/extra.conf.in$|Makefile.PL$|README$|MANIFEST$|Changes$|META.yml$)

diff --git a/Makefile.PL b/Makefile.PL
index 97d9b8e..bc86517 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -8,10 +8,10 @@ all_from 'lib/Catalyst/Runtime.pm';
 requires 'namespace::clean';
 requires 'Scope::Upper' => '0.06';
 requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00800';
-requires 'Moose' => '0.70';
+requires 'Moose' => '0.73';
 requires 'Carp';
 requires 'Class::C3::Adopt::NEXT' => '0.07';
-requires 'Class::MOP';
+requires 'Class::MOP' => '0.79';
 requires 'CGI::Simple::Cookie';
 requires 'Data::Dump';
 requires 'File::Modified';

diff --git a/lib/Catalyst/ClassData.pm b/lib/Catalyst/ClassData.pm
index 0f0b27d..553a851 100644 (file)
--- a/lib/Catalyst/ClassData.pm
+++ b/lib/Catalyst/ClassData.pm
@@ -46,17 +46,16 @@ sub mk_classdata {
   my $meta = $class->Class::MOP::Object::meta();
   confess "${class}'s metaclass is not a Class::MOP::Class"
     unless $meta->isa('Class::MOP::Class');
-  my $immutable_options;
-  if( $meta->is_immutable ){
-    $immutable_options = $meta->get_immutable_options;
-    $meta->make_mutable;
-  }
+
+  my $was_immutable = $meta->is_immutable;
+  $meta->make_mutable if $was_immutable;
+
   my $alias = "_${attribute}_accessor";
   $meta->add_method($alias, $accessor);
   $meta->add_method($attribute, $accessor);
-  if(defined $immutable_options){
-    $meta->make_immutable(%{ $immutable_options });
-  }
+
+  $meta->make_immutable if $was_immutable;
+
   $class->$attribute($_[2]) if(@_ > 2);
   return $accessor;
 }