distro updates. switch to module::install. regen readme (RT #16459)

diff --git a/Changes b/Changes
index 5757f1f..c5e1e0e 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,26 +1,39 @@
 Revision history for Perl extension Catalyst::Plugin::SubRequest
 
+0.12  2007-09-05
+        - Switch to Module::Install
+        - Fixed README (RT #16459)
+
 0.11  2007-04-03 14:13:00
         - $c->req->params restored after sub_request
+
 0.10  2005-12-08 13:15:00  
         - Updated test suite to work with new catalyst.
+
 0.09  2005-10-28 01:07:00 
        - localize body rather than output, which is an alias
+
 0.08  2005-12-10 01:34:00 
            - patch to handle NEXT trouble.
+
 0.07  2005-08-01 12:08:00 
         - reset path.
         - allow passing params.
+
 0.06  2005-06-08 20:27:00 
         - Flush params as well
         - allow stuff to be passed to the stash
+
 0.05  2005-03-19 20:27:00 
         - Added a log message in debug mode.
+
 0.04  2005-03-19 20:27:00
         - Updated forward to cat5 style
         - Using Catalyst::Dispatch::dispatch instead of forward.
+
 0.03  2005-03-19 20:27:00
         - Fixed documentation.
+
 0.02  2005-03-19 10:32:00
         - Ooops, missed MANIFEST
 

diff --git a/MANIFEST b/MANIFEST
deleted file mode 100644 (file)
index eb33b71..0000000
--- a/MANIFEST
+++ /dev/null
@@ -1,11 +0,0 @@
-Changes
-Makefile.PL
-MANIFEST                       This list of files
-META.yml
-README
-SubRequest.pm
-t/01use.t
-t/02subreq.t
-t/03pod.t
-t/04podcoverage.t
-t/lib/TestApp.pm

diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
new file mode 100644 (file)
index 0000000..f21a21f
--- /dev/null
+++ b/MANIFEST.SKIP
@@ -0,0 +1,29 @@
+# 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$
+
+# No tarballs!
+\.gz$

diff --git a/META.yml b/META.yml
deleted file mode 100644 (file)
index 3e0d0ab..0000000
--- a/META.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# http://module-build.sourceforge.net/META-spec.html
-#XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
-name:         Catalyst-Plugin-SubRequest
-version:      0.09
-version_from: SubRequest.pm
-installdirs:  site
-requires:
-    Catalyst:                      2.99
-
-distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.17

diff --git a/Makefile.PL b/Makefile.PL
index dc8febd..9201085 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,10 +1,11 @@
-use ExtUtils::MakeMaker;
-
-WriteMakefile(
-    NAME      => 'Catalyst::Plugin::SubRequest',
-    AUTHOR    => 'Marcus Ramberg <marcus@thefeed.no>',
-    PREREQ_PM => {
-        Catalyst     => '5.00',
-    },
-    VERSION_FROM => 'SubRequest.pm'
-);
+use inc::Module::Install 0.67;
+
+name 'Catalyst-Plugin-SubRequest';
+all_from 'lib/Catalyst/Plugin/SubRequest.pm';
+
+requires 'Catalyst::Runtime';
+
+requires 'Test::More';
+
+auto_install;
+WriteAll;

diff --git a/README b/README
index c41fd35..97cc02a 100644 (file)
--- a/README
+++ b/README
@@ -1,21 +1,35 @@
 NAME
-    Catalyst::Plugin::Static - Serve static files with Catalyst
+    Catalyst::Plugin::SubRequest - Make subrequests to actions in Catalyst
 
 SYNOPSIS
-        use Catalyst 'Static';
+        use Catalyst 'SubRequest';
 
-        $c->serve_static;
+        $c->subreq('/test/foo/bar', { template => 'magic.tt' });
+
+        $c->subreq(        {       path            => '/test/foo/bar',
+                           body            => $body        },
+                   {       template        => 'magic.tt'           });
 
 DESCRIPTION
-    Serve static files from config->{root}.
+    Make subrequests to actions in Catalyst. Uses the catalyst dispatcher,
+    so it will work like an external url call.
+
+METHODS
+    subreq [path as string or hash ref], [stash as hash ref], [parameters as
+    hash ref]
+    sub_request
+        Takes a full path to a path you'd like to dispatch to. If the path
+        is passed as a hash ref then it can include body, action, match and
+        path. Any additional parameters are put into the stash.
 
-  METHODS
-   serve_static
 SEE ALSO
     Catalyst.
 
 AUTHOR
-    Sebastian Riedel, "sri@cpan.org"
+    Marcus Ramberg, "mramberg@cpan.org"
+
+THANK YOU
+    SRI, for writing the awesome Catalyst framework
 
 COPYRIGHT
     This program is free software, you can redistribute it and/or modify it

diff --git a/SubRequest.pm b/lib/Catalyst/Plugin/SubRequest.pm
similarity index 99%
rename from SubRequest.pm
rename to lib/Catalyst/Plugin/SubRequest.pm
index 76e42d7..e2c2b01 100644 (file)
--- a/SubRequest.pm
+++ b/lib/Catalyst/Plugin/SubRequest.pm
@@ -3,7 +3,7 @@ package Catalyst::Plugin::SubRequest;
 use strict;
 use Time::HiRes qw/tv_interval/;
 
-our $VERSION = '0.11';
+our $VERSION = '0.12';
 
 =head1 NAME