[Catalyst-commits] r9000 - in Catalyst-Runtime/5.80/trunk: . lib/Catalyst t

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2009-01-04 00:03:16 +0000 (Sun, 04 Jan 2009)
New Revision: 9000

Modified:
   Catalyst-Runtime/5.80/trunk/Changes
   Catalyst-Runtime/5.80/trunk/TODO
   Catalyst-Runtime/5.80/trunk/lib/Catalyst/ClassData.pm
   Catalyst-Runtime/5.80/trunk/t/cdi_backcompat_plugin_accessor_override.t
Log:
Chop that chunk of sh*t out again, as we're going to hit anything which relies on it until it's fixed.

Modified: Catalyst-Runtime/5.80/trunk/Changes
===================================================================
--- Catalyst-Runtime/5.80/trunk/Changes	2009-01-03 23:56:43 UTC (rev 8999)
+++ Catalyst-Runtime/5.80/trunk/Changes	2009-01-04 00:03:16 UTC (rev 9000)
@@ -1,7 +1,5 @@
 # This file documents the revision history for Perl extension Catalyst.
 
-        - Fix plugins which hook onto setup_finished being called (t0m)
-          - Test for this (t0m)
         - Fix calling use Catalyst::Test 'MyApp' 'foo' which used to work,
           but stopped as the 2nd parameter can be an options hash now (t0m)
         - Bump Moose dependency to fix make_immutable bug (t0m)
@@ -40,10 +38,6 @@
           method is called, fixing issues with plugins which have their 
           own new methods by inlining a constructor on MyApp (t0m)
           - Test for this and method modifiers in MyApp (t0m)
-        - Fix Catalyst::Plugin::Authentication's authentication
-          plugin backwards compatibility issues by fixing 
-          Class::Data::Inheritable compatibility (t0m)
-          - Test for this (t0m)
         - Fix bug causing Catalyst::Request::Upload's basename method
           to return undef (t0m)
           - Test for this (Carl Franks)

Modified: Catalyst-Runtime/5.80/trunk/TODO
===================================================================
--- Catalyst-Runtime/5.80/trunk/TODO	2009-01-03 23:56:43 UTC (rev 8999)
+++ Catalyst-Runtime/5.80/trunk/TODO	2009-01-04 00:03:16 UTC (rev 9000)
@@ -31,16 +31,17 @@
      
      - Catalyst-Plugin-Cache dies due to mk_accessors('meta')
      
-     - CatalystX-CRUD fails tests against 5.80 (karpet)
+     - CatalystX-CRUD and CatalystX-CRUD-ModelAdapter-DBIC
+       fail tests against 5.80 (karpet)
 
      - Catalyst-Plugin-Authorization-ACL fails as 
        Catalyst::Dispatcher::_do_forward does not fix arguments if you throw
        an exception. Needs a test case (Caelum)
      
-     - Catalyst::Plugin::Authentication::Store::DBIC relies on 
-       hooking the setup_finished class data method in a plugin
-       (see t/cdi_backcompat_accessor_override.t).
-       Is this insane / should we support this?
+     - Catalyst::Plugin::Authentication new release.
+     
+     - Deprecation/Upgrade notice in Catalyst Makefile.PL for known broken
+       versions of plugins.
 
   - Issues with TWMC not being loaded when it used to be in 5.70 
     (Bill Moseley)

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/ClassData.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/ClassData.pm	2009-01-03 23:56:43 UTC (rev 8999)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/ClassData.pm	2009-01-04 00:03:16 UTC (rev 9000)
@@ -16,18 +16,6 @@
     my $meta = $pkg->Class::MOP::Object::meta();
     if (@_ > 1) {
       $meta->namespace->{$attribute} = \$_[1];
-      no strict 'refs';
-      if (! *{"${pkg}::${attribute}"}{CODE} ) {
-        foreach my $super ( $meta->linearized_isa ) {
-          # If there is a code symbol for this class data in a parent class, but not in our 
-          # class then copy it into our package. This is evil.
-          my $parent_symbol = *{"${super}::${attribute}"}{CODE} ? \&{"${super}::${attribute}"} : undef;
-          if (defined $parent_symbol) {
-            *{"${pkg}::${attribute}"} = $parent_symbol;
-            last;
-          }
-        }      
-      }
       return $_[1];
     }
 

Modified: Catalyst-Runtime/5.80/trunk/t/cdi_backcompat_plugin_accessor_override.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/cdi_backcompat_plugin_accessor_override.t	2009-01-03 23:56:43 UTC (rev 8999)
+++ Catalyst-Runtime/5.80/trunk/t/cdi_backcompat_plugin_accessor_override.t	2009-01-04 00:03:16 UTC (rev 9000)
@@ -24,13 +24,16 @@
     __PACKAGE__->config;
 }
 
-lives_ok {
-    CDICompatTestApp->setup;
-} 'Setup app with plugins which says use base qw/Class::Accessor::Fast/';
+SKIP: {
+  skip 'Not trying to replicate the nasty CDI hackness', 2;
+  lives_ok {
+      CDICompatTestApp->setup;
+  } 'Setup app with plugins which says use base qw/Class::Accessor::Fast/';
 
-# And the plugin's setup_finished method should have been run, as accessors
-# are not created in MyApp until the data is written to.
-{
-    no warnings 'once';
-    is $CDICompatTestPlugin::Data::HAS_RUN_SETUP_FINISHED, 1, 'Plugin setup_finish run';
-}
+  # And the plugin's setup_finished method should have been run, as accessors
+  # are not created in MyApp until the data is written to.
+  {
+      no warnings 'once';
+      is $CDICompatTestPlugin::Data::HAS_RUN_SETUP_FINISHED, 1, 'Plugin setup_finish run';
+  }
+}
\ No newline at end of file