remerge into trunk

[catagits/Catalyst-Plugin-ConfigLoader.git] / lib / Catalyst / Plugin / ConfigLoader / JSON.pm

diff --git a/lib/Catalyst/Plugin/ConfigLoader/JSON.pm b/lib/Catalyst/Plugin/ConfigLoader/JSON.pm
index 53a356d..1c100ce 100644 (file)
--- a/lib/Catalyst/Plugin/ConfigLoader/JSON.pm
+++ b/lib/Catalyst/Plugin/ConfigLoader/JSON.pm
@@ -15,6 +15,9 @@ Loads JSON files. Example:
         "name": "TestApp",\r
         "Controller::Foo": {\r
             "foo": "bar"\r
+        },\r
+        "Model::Baz": {\r
+            "qux": "xyzzy"\r
         }\r
     }\r
 \r
@@ -41,7 +44,7 @@ sub load {
     my $file  = shift;\r
 \r
     open( my $fh, $file ) or die $!;\r
-    my $content; $content = do { local $/; $content = <$fh> };\r
+    my $content = do { local $/; <$fh> };\r
     close $fh;\r
 \r
     eval { require JSON::Syck; };\r
@@ -78,6 +81,10 @@ it under the same terms as Perl itself.
 \r
 =item * L<Catalyst::Plugin::ConfigLoader>\r
 \r
+=item * L<JSON>\r
+\r
+=item * L<JSON::Syck>\r
+\r
 =back\r
 \r
 =cut\r