[Catalyst-commits] r14291 - in trunk/Catalyst-Plugin-Snippets: . lib/Catalyst/Plugin

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2012-05-05 13:36:30 +0000 (Sat, 05 May 2012)
New Revision: 14291

Modified:
   trunk/Catalyst-Plugin-Snippets/Changes
   trunk/Catalyst-Plugin-Snippets/MANIFEST.SKIP
   trunk/Catalyst-Plugin-Snippets/lib/Catalyst/Plugin/Snippets.pm
Log:
0.03, fixes RT#74195

Modified: trunk/Catalyst-Plugin-Snippets/Changes
===================================================================
--- trunk/Catalyst-Plugin-Snippets/Changes	2012-05-05 13:19:55 UTC (rev 14290)
+++ trunk/Catalyst-Plugin-Snippets/Changes	2012-05-05 13:36:30 UTC (rev 14291)
@@ -1,3 +1,6 @@
+0.03 2012-05-05
+  - RT#74195: Plugin config defaults overwrite user config
+
 0.02 2010-01-04
   - Switch to Module::Install
   - Switch from NEXT to MRO::Compat

Modified: trunk/Catalyst-Plugin-Snippets/MANIFEST.SKIP
===================================================================
--- trunk/Catalyst-Plugin-Snippets/MANIFEST.SKIP	2012-05-05 13:19:55 UTC (rev 14290)
+++ trunk/Catalyst-Plugin-Snippets/MANIFEST.SKIP	2012-05-05 13:36:30 UTC (rev 14291)
@@ -1,3 +1,6 @@
+MYMETA.yml
+MYMETA.json
+
 # Avoid version control files.
 \bRCS\b
 \bCVS\b

Modified: trunk/Catalyst-Plugin-Snippets/lib/Catalyst/Plugin/Snippets.pm
===================================================================
--- trunk/Catalyst-Plugin-Snippets/lib/Catalyst/Plugin/Snippets.pm	2012-05-05 13:19:55 UTC (rev 14290)
+++ trunk/Catalyst-Plugin-Snippets/lib/Catalyst/Plugin/Snippets.pm	2012-05-05 13:36:30 UTC (rev 14291)
@@ -8,19 +8,19 @@
 
 BEGIN { eval { require JSON::Syck } }
 
-our $VERSION = "0.02";
+our $VERSION = "0.03";
 
 sub setup {
     my $app = shift;
     my $ret = $app->maybe::next::method(@_);
 
     %{ $app->config->{snippets} } = (
-        %{ $app->config->{snippets} || {} },
         format            => "plain",
         allow_refs        => 1,
         use_session_id    => 0,
         json_content_type => "application/javascript+json",
         content_type      => "text/plain",
+        %{ $app->config->{snippets} || {} },
     );
 
     $ret;