[Bps-public-commit] Prophet branch, master, updated. 031008e5e1ab1874f9920efb133ec192dacd300e

[jesse]

The branch, master has been updated
       via  031008e5e1ab1874f9920efb133ec192dacd300e (commit)
       via  15b6a82672cb2f0f589f4e453a76e181173d21b8 (commit)
      from  f9b010f028c06b94c23a53d2c4a6081b264221bd (commit)

Summary of changes:
 lib/Prophet/Replica.pm           |    4 ++++
 lib/Prophet/Server/Dispatcher.pm |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit 15b6a82672cb2f0f589f4e453a76e181173d21b8
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Thu Apr 9 19:30:37 2009 -0400

    Run the reporting call back even when we skip a transaction

diff --git a/lib/Prophet/Replica.pm b/lib/Prophet/Replica.pm
index f893171..6cd1961 100644
--- a/lib/Prophet/Replica.pm
+++ b/lib/Prophet/Replica.pm
@@ -266,10 +266,14 @@ sub integrate_changeset {
     if (   $changeset->is_resolution || $changeset->is_nullification || !$changeset->has_changes ) {
         # if it's a changeset we don't care about, mark it as seen and move on
         $self->record_integration_of_changeset($changeset);
+        $args{'reporting_callback'}->( changeset => $changeset,
+           ) if ( $args{'reporting_callback'} );
         return;
 
     }  elsif ( $self->has_seen_changeset($changeset) ) {
                $self->record_integration_of_changeset($changeset);
+        $args{'reporting_callback'}->( changeset => $changeset,
+           ) if ( $args{'reporting_callback'} );
         return;
         }
 

commit 031008e5e1ab1874f9920efb133ec192dacd300e
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Thu Apr 9 19:31:11 2009 -0400

    when someone requests /, look for the template / rather than ''

diff --git a/lib/Prophet/Server/Dispatcher.pm b/lib/Prophet/Server/Dispatcher.pm
index 8200fb0..129acb9 100644
--- a/lib/Prophet/Server/Dispatcher.pm
+++ b/lib/Prophet/Server/Dispatcher.pm
@@ -33,7 +33,7 @@ under { method => 'GET' } => sub {
     };
 };
 
-on qr'^/(.*)$' => sub { shift->server->show_template($1) || next_rule; };
+on qr'^(.*)$' => sub { shift->server->show_template($1) || next_rule; };
 
 no Any::Moose;
 

-----------------------------------------------------------------------