Changeset 380 for wiki-toolkit-plugin-categoriser

Timestamp:

Mar 6, 2007, 11:00:35 AM (14 years ago)

Author:

kake

Message:

Fix bug - ->categories was picking up out-of-date categories.

Location:

wiki-toolkit-plugin-categoriser/trunk

Files:

• Changes (modified) (1 diff)
• lib/Wiki/Toolkit/Plugin/Categoriser.pm (modified) (2 diffs)
• t/categoriser.t (modified) (2 diffs)

wiki-toolkit-plugin-categoriser/trunk/Changes

@@ +1 @@
+0.05
+        Fix bug - ->categories was picking up out-of-date categories.
+
 0.04    13 May 2006
         Renamed Wiki::Toolkit::Plugin::Categoriser

wiki-toolkit-plugin-categoriser/trunk/lib/Wiki/Toolkit/Plugin/Categoriser.pm

@@ -4 +4 @@
 
 use vars qw( $VERSION @ISA );
-$VERSION = '0.04';
+$VERSION = '0.05';
 @ISA = qw( Wiki::Toolkit::Plugin );
 
@@ -125 +125 @@
     my ($self, %args) = @_;
     my $dbh = $self->datastore->dbh;
-    my $sth = $dbh->prepare( "SELECT metadata_value FROM node INNER JOIN metadata ON (node_id = id) WHERE name = ? AND metadata_type = 'category'" );
+    my $sth = $dbh->prepare( "SELECT metadata_value
+                              FROM node
+                              INNER JOIN metadata
+                                ON ( node.id = metadata.node_id
+                                     AND node.version = metadata.version )
+                              WHERE name = ? AND metadata_type = 'category'" );
     $sth->execute( $args{node} );
     my @categories;

wiki-toolkit-plugin-categoriser/trunk/t/categoriser.t

@@ -4 +4 @@
 
 my $iterator = Wiki::Toolkit::TestLib->new_wiki_maker;
-plan tests => ( 1 + $iterator->number * 6 );
+plan tests => ( 1 + $iterator->number * 7 );
 
 use_ok( "Wiki::Toolkit::Plugin::Categoriser" );
@@ -42 +42 @@
     is_deeply( [ sort @categories ], [ "Pub Food", "Pubs" ],
                "...->categories returns all categories" );
+
+    # Make sure we only look at current category data.
+    my %node_data = $wiki->retrieve_node( "Calthorpe Arms" );
+    $wiki->write_node( "Calthorpe Arms",
+                       "Oh noes, they stopped doing food!",
+                       $node_data{checksum},
+                       { category => [ "Pubs" ] } )
+      or die "Can't write node";
+    @categories = $categoriser->categories( node => "Calthorpe Arms" );
+    is_deeply( \@categories, [ "Pubs" ],
+               "->categories ignores out-of-date data" );
 }