Changeset 907

Timestamp:

12/10/06 21:22:38 (2 years ago)

Author:

earle

Message:

Report Config::Tiny errors - closes #109. Now croaks if specified config file can't be read.

Location:

trunk

Files:

• lib/OpenGuides/Config.pm (modified) (3 diffs)
• t/11_utils.t (modified) (2 diffs)

trunk/lib/OpenGuides/Config.pm

@@ -2 +2 @@
 use strict;
 
+use Carp qw( croak );
 use Config::Tiny;
 
@@ -103 +104 @@
     if ( $args{file} ) {
         my $read_config = Config::Tiny->read( $args{file} ) or
-            warn "Cannot read config file $args{file}";
-        %stored = $read_config ? %{ $read_config->{_} } : ();
+            croak "Cannot read config file '$args{file}': " . $Config::Tiny::errstr;
+        %stored = $read_config->{_};
     } elsif ( $args{vars} ) {
         %stored = %{ $args{vars} };
@@ -158 +159 @@
         http_charset => "What character set should we put in the http headers? (This won't change the character set internally, just what it's reported as). Leave blank for none to be sent",
         formatting_rules_node => "What's the name of the node or page to use for the text formatting rules link (this is by default an external document, but if you make formatting_rules_link empty, it will be a wiki node instead",
-        formatting_rules_link => "What URL do you want to use for the text formatting rules (leave blank to use a wiki node instead)?",
+        formatting_rules_link => "What URL do you want to use for the text formatting rules (leave blank to use a wiki node instead)?",
         backlinks_in_title => "Make node titles link to node backlinks (C2 style)?",
         ellipsoid => "Which ellipsoid do you want to use? (eg 'Airy', 'WGS-84')",

trunk/t/11_utils.t

@@ -3 +3 @@
 use OpenGuides::Config;
 use OpenGuides::Utils;
-use Test::More tests => 7;
+use Test::More tests => 8;
 
 eval { my $wiki = OpenGuides::Utils->make_wiki_object; };
@@ -10 +10 @@
 eval { my $wiki = OpenGuides::Utils->make_wiki_object( config => "foo" ); };
 ok( $@, "...and if config param isn't an OpenGuides::Config object" );
+
+eval {
+    my $wiki = OpenGuides::Utils->make_wiki_object(
+        config => OpenGuides::Config->new( file => 'fake' )
+    );
+};
+
+like( $@, qr/File 'fake' does not exist/, '...and Config::Tiny errors are reported');
 
 eval { require DBD::SQLite; };