[Jifty-commit] r6124 - in Net-Jifty/trunk: .

[Jifty commits]

Author: sartak
Date: Tue Dec 16 22:39:54 2008
New Revision: 6124

Modified:
   Net-Jifty/trunk/   (props changed)
   Net-Jifty/trunk/Changes
   Net-Jifty/trunk/Makefile.PL
   Net-Jifty/trunk/lib/Net/Jifty.pm

Log:
 r77607 at onn:  sartak | 2008-12-16 22:39:51 -0500
 Make Hash::Merge and Path::Class more optional


Modified: Net-Jifty/trunk/Changes
==============================================================================
--- Net-Jifty/trunk/Changes	(original)
+++ Net-Jifty/trunk/Changes	Tue Dec 16 22:39:54 2008
@@ -1,6 +1,8 @@
 Revision history for Net-Jifty
 
 0.09
+        Hash::Merge and Path::Class are now depended-upon only if you want
+            cascading directory config
 
 0.08    Mon Nov 17 18:39:11 UTC-4 2008
         added form_form_data_args method to support file uploads (ruz)

Modified: Net-Jifty/trunk/Makefile.PL
==============================================================================
--- Net-Jifty/trunk/Makefile.PL	(original)
+++ Net-Jifty/trunk/Makefile.PL	Tue Dec 16 22:39:54 2008
@@ -10,9 +10,7 @@
 requires        'Encode';
 requires        'Email::Address';
 requires        'Term::ReadKey';
-requires        'Path::Class';
 requires        'Cwd';
-requires        'Hash::Merge';
 
 build_requires  'Test::More';
 build_requires  'Test::MockObject';
@@ -22,6 +20,11 @@
         -default => 0,
        recommends( 'DateTime')
     ],
+    'Cascading directory config' => [
+        -default => 0,
+        recommends('Hash::Merge'),
+        recommends('Path::Class'),
+    ],
 );
 
 WriteAll;

Modified: Net-Jifty/trunk/lib/Net/Jifty.pm
==============================================================================
--- Net-Jifty/trunk/lib/Net/Jifty.pm	(original)
+++ Net-Jifty/trunk/lib/Net/Jifty.pm	Tue Dec 16 22:39:54 2008
@@ -9,13 +9,11 @@
 use URI;
 
 use YAML;
-use Hash::Merge;
 
 use Encode;
 use Fcntl qw(:mode);
 
 use Cwd;
-use Path::Class;
 
 use Email::Address;
 
@@ -634,8 +632,10 @@
 
     my $all_config = {};
 
-    my $dir = dir(shift || getcwd);
+    require Path::Class;
+    my $dir = Path::Class::dir(shift || getcwd);
 
+    require Hash::Merge;
     my $old_behavior = Hash::Merge::get_behavior;
     Hash::Merge::set_behavior('RIGHT_PRECEDENT');