Changeset 92 in bookmarks for trunk/lib

Timestamp:

06/05/15 22:48:45 (9 years ago)

Author:

peter

Message:

issue #10: added basic test of the web app and the Bookmark class

To make the application testable, BookmarksApp now does not require a
config_file to be set, and can just be configured via a config hash in the
constructor. In addition, authentication and reverse proxy rewriting are now
conditionally enabled based on whether there is an auth and proxy_ip key in
the config, respecitvely.

Added Plack 1.0036 to the cpanfile dependencies, since that is the version that
contains Plack::Test.

Also fixed the Bookmarks::create_tables() method to load the
bookmarks.sql file from the correct location.

Location:

trunk/lib

Files:

• Bookmarks.pm (modified) (1 diff)
• BookmarksApp.pm (modified) (3 diffs)

trunk/lib/Bookmarks.pm

@@ -39 +39 @@
     my $self = shift;
     require File::Slurp;
-    require FindBin;
-    my $table_definitions = File::Slurp::read_file("$FindBin::RealBin/bookmarks.sql");
+    require File::Basename;
+    my $table_definitions = File::Slurp::read_file(File::Basename::dirname($INC{'Bookmarks.pm'}) . "/../bookmarks.sql");
     $self->dbh->{sqlite_allow_multiple_statements} = 1;
     $self->dbh->do($table_definitions);

trunk/lib/BookmarksApp.pm

@@ -17 +17 @@
     my $self = shift;
 
-    -e $self->config_file or die "Config file " . $self->config_file . " not found\n";
+    my $config = $self->config;
 
-    my $config = YAML::LoadFile($self->config_file);
-    $self->config($config);
+    # if the config_file is set, try to load the config from there
+    # note that currently, if there is a config_file and a config,
+    # all of the values in config are ignored in favor of those in
+    # the config_file
+    if ($self->config_file) {
+        -e $self->config_file or die "Config file " . $self->config_file . " not found\n";
+        $config = YAML::LoadFile($self->config_file);
+        #TODO: merge the configs instead of overwriting?
+        $self->config($config);
+    }
 
     my $router = router {
@@ -75 +83 @@
     $self->_app(
         builder {
-            enable_if { $_[0]->{REMOTE_ADDR} eq $config->{proxy_ip} } 'ReverseProxy';
+            enable_if { $_[0]->{REMOTE_ADDR} eq $config->{proxy_ip} } 'ReverseProxy'
+                if $config->{proxy_ip};
             enable_if { $_[0]->{REQUEST_METHOD} ne 'GET' } 'Auth::Digest', (
                 realm           => 'Bookmarks',
@@ -81 +90 @@
                 password_hashed => 1,
                 authenticator   => sub { $config->{digest_password} }
-            );
+            ) if $config->{auth};
             sub { $router->dispatch(shift); };
         }