Merge branch 'master' of git://github.com/jshirley/catalyst-action-rest

diff --git a/Changes b/Changes
index 08f88ef..5a968f0 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,4 +1,15 @@
-Wed Mar 25 09:36:00 PDT 2009 (hdp - Release 0.67_01
+???
+  Fix RT#32342, deprecated config loses default map (hdp)
+
+Wed Mar 25 22:33:38 PDT 2009 (hdp) - Release 0.68
+  Remove prompt for ancient and deprecated Data::Denter from Makefile.PL
+  Remove Data::Dump, which was entirely unused
+  Stop tests from dying with Catalyst 5.80
+
+Wed Mar 25 21:59:59 PDT 2009 (hdp) - Release 0.67
+  (no changes from 0.67_01)
+
+Wed Mar 25 09:36:00 PDT 2009 (hdp) - Release 0.67_01
   Fix RT#43840, improper app-level config handling
   Fix RT#42859, 'wrong' Catalyst dependency
   Fix RT#42025, stepping on custom request classes

diff --git a/Makefile.PL b/Makefile.PL
index a8143f6..cbc6a06 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -13,17 +13,12 @@ requires('LWP::UserAgent'            => '2.033');
 requires('Data::Serializer'          => '0.36');
 requires('Class::Inspector'          => '1.13');
 requires('URI::Find'                 => undef);
-requires('Data::Dump'                => undef);
 
 feature 'JSON (application/json) support',
     -default   => 0,
     'JSON'     => '2.12';
     'JSON::XS' => '2.2222';
 
-feature 'Data::Denter (text/x-data-denter) support',
-    -default => 0,
-    'Data::Denter' => undef;
-
 feature 'Data::Taxi (text/x-data-taxi) support',
     -default => 0,
     'Data::Taxi' => undef;

diff --git a/README b/README
index ae24551..6d248cf 100644 (file)
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ NAME
     Catalyst::Controller::REST - A RESTful controller
 
 VERSION
-    0.67_01
+    0.68
 
 SYNOPSIS
         package Foo::Controller::Bar;

diff --git a/lib/Catalyst/Action/REST.pm b/lib/Catalyst/Action/REST.pm
index 92e7f1a..95465a9 100644 (file)
--- a/lib/Catalyst/Action/REST.pm
+++ b/lib/Catalyst/Action/REST.pm
@@ -18,7 +18,7 @@ use Catalyst::Controller::REST;
 
 BEGIN { require 5.008001; }
 
-our $VERSION = '0.67_01';
+our $VERSION = '0.68';
 
 sub new {
   my $class  = shift;

diff --git a/lib/Catalyst/Action/Serialize.pm b/lib/Catalyst/Action/Serialize.pm
index bdf0e73..31597cf 100644 (file)
--- a/lib/Catalyst/Action/Serialize.pm
+++ b/lib/Catalyst/Action/Serialize.pm
@@ -11,7 +11,6 @@ use warnings;
 
 use base 'Catalyst::Action::SerializeBase';
 use Module::Pluggable::Object;
-use Data::Dump qw(dump);
 
 sub execute {
     my $self = shift;

diff --git a/lib/Catalyst/Action/SerializeBase.pm b/lib/Catalyst/Action/SerializeBase.pm
index d4c53b9..93108bb 100644 (file)
--- a/lib/Catalyst/Action/SerializeBase.pm
+++ b/lib/Catalyst/Action/SerializeBase.pm
@@ -11,7 +11,6 @@ use warnings;
 
 use base 'Catalyst::Action';
 use Module::Pluggable::Object;
-use Data::Dump qw(dump);
 use Catalyst::Request::REST;
 use Catalyst::Utils ();
 
@@ -54,6 +53,9 @@ sub _load_content_plugins {
         $c->log->info("Using deprecated configuration for Catalyst::Action::REST!");
         $c->log->info("Please see perldoc Catalyst::Action::REST for the update guide");
         $config = $controller->{'serialize'};
+        # if they're using the deprecated config, they may be expecting a
+        # default mapping too.
+        $config->{map} ||= $controller->{map};
     } else {
         $config = $controller;
     }

diff --git a/lib/Catalyst/Controller/REST.pm b/lib/Catalyst/Controller/REST.pm
index 6ca2312..6ff271e 100644 (file)
--- a/lib/Catalyst/Controller/REST.pm
+++ b/lib/Catalyst/Controller/REST.pm
@@ -1,6 +1,6 @@
 package Catalyst::Controller::REST;
 
-our $VERSION = '0.67_01';
+our $VERSION = '0.68';
 
 =head1 NAME
 

diff --git a/t/catalyst-action-deserialize.t b/t/catalyst-action-deserialize.t
index f4de577..8cd13d8 100644 (file)
--- a/t/catalyst-action-deserialize.t
+++ b/t/catalyst-action-deserialize.t
@@ -3,7 +3,6 @@ use warnings;
 use Test::More tests => 5;
 use YAML::Syck;
 use FindBin;
-use Data::Dump qw(dump);
 
 use lib ("$FindBin::Bin/lib", "$FindBin::Bin/../lib", "$FindBin::Bin/broken");
 use Test::Rest;

diff --git a/t/catalyst-action-rest.t b/t/catalyst-action-rest.t
index 825dca4..b65fa1f 100644 (file)
--- a/t/catalyst-action-rest.t
+++ b/t/catalyst-action-rest.t
@@ -103,7 +103,6 @@ use strict;
 use warnings;
 use Test::More tests => 18;
 use FindBin;
-use Data::Dump qw(dump);
 
 use lib ( "$FindBin::Bin/lib", "$FindBin::Bin/../lib" );
 use Test::Rest;

diff --git a/t/catalyst-action-serialize-accept.t b/t/catalyst-action-serialize-accept.t
index f9e2426..fcd3326 100644 (file)
--- a/t/catalyst-action-serialize-accept.t
+++ b/t/catalyst-action-serialize-accept.t
@@ -3,7 +3,6 @@ use warnings;
 use Test::More tests => 16;
 use Data::Serializer;
 use FindBin;
-use Data::Dump qw(dump);
 
 use lib ("$FindBin::Bin/lib", "$FindBin::Bin/../lib", "$FindBin::Bin/broken");
 use Test::Rest;

diff --git a/t/catalyst-action-serialize-query.t b/t/catalyst-action-serialize-query.t
index cfbcb8a..cf04057 100644 (file)
--- a/t/catalyst-action-serialize-query.t
+++ b/t/catalyst-action-serialize-query.t
@@ -2,7 +2,6 @@ use strict;
 use warnings;
 use Test::More tests => 3; 
 use FindBin;
-use Data::Dump qw(dump);
 
 use lib ("$FindBin::Bin/lib", "$FindBin::Bin/../lib", "$FindBin::Bin/broken");
 use Test::Rest;

diff --git a/t/catalyst-action-serialize.t b/t/catalyst-action-serialize.t
index 584711f..78ce12b 100644 (file)
--- a/t/catalyst-action-serialize.t
+++ b/t/catalyst-action-serialize.t
@@ -1,9 +1,8 @@
 use strict;
 use warnings;
-use Test::More tests => 7;
+use Test::More tests => 9;
 use Data::Serializer;
 use FindBin;
-use Data::Dump qw(dump);
 
 use lib ("$FindBin::Bin/lib", "$FindBin::Bin/../lib", "$FindBin::Bin/broken");
 use Test::Rest;
@@ -31,5 +30,9 @@ my $res2 = request($t->get(url => '/serialize/test_second'));
 ok( $res2->is_success, '2nd request succeeded' );
 is( $res2->content, "{'lou' => 'is my cat'}", "2nd request returned proper data");
 
+Test::Catalyst::Action::REST->controller('Serialize')->{serialize} = {};
+$res2 = request($t->get(url => '/serialize/test_second'));
+ok( $res2->is_success, 'request succeeded (deprecated config)' );
+is( $res2->content, "{'lou' => 'is my cat'}", "request returned proper data");
 
 1;

diff --git a/t/catalyst-request-rest.t b/t/catalyst-request-rest.t
index 92ae166..ac49e29 100644 (file)
--- a/t/catalyst-request-rest.t
+++ b/t/catalyst-request-rest.t
@@ -174,7 +174,7 @@ use HTTP::Headers;
     'Request::REST took over for Request');
 
   $test->request_class('Some::Other::Class');
-  eval { $test->setup };
+  eval { $test->setup_finished(0); $test->setup };
   like $@, qr/$test has a custom request class Some::Other::Class/;
 
   {
@@ -182,7 +182,7 @@ use HTTP::Headers;
     use base 'Catalyst::Request::REST';
   }
   $test->request_class('My::Request');
-  eval { $test->setup };
+  eval { $test->setup_finished(0); $test->setup };
   is $@, '', 'no error from Request::REST subclass';
 }
 

diff --git a/t/xml-simple.t b/t/xml-simple.t
index d44b7bd..3422e78 100644 (file)
--- a/t/xml-simple.t
+++ b/t/xml-simple.t
@@ -2,7 +2,6 @@ use strict;
 use warnings;
 use Test::More tests => 5;
 use FindBin;
-use Data::Dump qw(dump);
 
 use lib ("$FindBin::Bin/lib", "$FindBin::Bin/../lib");
 use Test::Rest;

diff --git a/t/yaml-html.t b/t/yaml-html.t
index 46f541f..dc50a7d 100644 (file)
--- a/t/yaml-html.t
+++ b/t/yaml-html.t
@@ -3,7 +3,6 @@ use warnings;
 use Test::More tests => 4;
 use YAML::Syck;
 use FindBin;
-use Data::Dump qw(dump);
 
 use lib ( "$FindBin::Bin/lib", "$FindBin::Bin/../lib" );
 use Test::Rest;