use strict;
use warnings;
use Moose;
+use DBI;
+use Encode qw/ decode_utf8 /;
+use KiokuDB::GC::Naive;
use KiokuDB::TypeMap;
use KiokuDB::TypeMap::Entry::Naive;
+use Text::Tradition::Error;
extends 'KiokuX::Model';
);
my $tradition = Text::Tradition->new( @args );
+ my $stemma = $tradition->add_stemma( dotfile => $dotfile );
$d->save_tradition( $tradition );
- my $stemma = Text::Tradition::Stemma->new(
- 'dot' => $dotfile, 'collation' => $tradition->collation );
- $d->save_stemma( $stemma );
foreach my $id ( $d->traditions ) {
print $d->tradition( $id )->name;
- print $d->stemma( $id )->as_svg;
}
=head1 DESCRIPTION
=head2 new
-Returns a Directory object. Apart from those documented in L<KiokuX::Model>,
-options include:
+Returns a Directory object.
-=over
+=head2 traditionlist
-=item * preload - Load all traditions and stemmata into memory upon instantiation. Defaults to true. (TODO manage on-demand loading)
-
-=back
-
-=head2 tradition_ids
-
-Returns the ID of all traditions in the database.
+Returns a hashref mapping of ID => name for all traditions in the directory.
=head2 tradition( $id )
Returns the Text::Tradition object of the given ID.
-=head2 stemma( $id )
-
-Returns the Text::Tradition::Stemma object associated with the given tradition ID.
+=head2 save( $tradition )
-=head2 save_tradition( $tradition )
+Writes the given tradition to the database, returning its ID.
-Writes the given tradition to the database, returning its UUID.
+=head2 delete( $tradition )
-=head2 save_stemma( $stemma )
-
-Writes the given stemma to the database, returning its UUID.
+Deletes the given tradition object from the database.
+WARNING!! Garbage collection does not yet work. Use this sparingly.
=begin testing
+use TryCatch;
use File::Temp;
use Text::Tradition;
-use Text::Tradition::Stemma;
use_ok 'Text::Tradition::Directory';
my $fh = File::Temp->new();
my $file = $fh->filename;
$fh->close;
my $dsn = "dbi:SQLite:dbname=$file";
+my $uuid;
+my $t = Text::Tradition->new(
+ 'name' => 'inline',
+ 'input' => 'Tabular',
+ 'file' => 't/data/simple.txt',
+ );
-my $d = Text::Tradition::Directory->new( 'dsn' => $dsn,
- 'extra_args' => { 'create' => 1 } );
-is( ref $d, 'Text::Tradition::Directory', "Got directory object" );
+{
+ my $d = Text::Tradition::Directory->new( 'dsn' => $dsn,
+ 'extra_args' => { 'create' => 1 } );
+ is( ref $d, 'Text::Tradition::Directory', "Got directory object" );
+
+ my $scope = $d->new_scope;
+ $uuid = $d->save( $t );
+ ok( $uuid, "Saved test tradition" );
+
+ my $s = $t->add_stemma( dotfile => 't/data/simple.dot' );
+ ok( $d->save( $t ), "Updated tradition with stemma" );
+ is( $d->tradition( $uuid ), $t, "Correct tradition returned for id" );
+ is( $d->tradition( $uuid )->stemma(0), $s, "...and it has the correct stemma" );
+ try {
+ $d->save( $s );
+ } catch( Text::Tradition::Error $e ) {
+ is( $e->ident, 'database error', "Got exception trying to save stemma directly" );
+ like( $e->message, qr/Cannot directly save non-Tradition object/,
+ "Exception has correct message" );
+ }
+}
+my $nt = Text::Tradition->new(
+ 'name' => 'CX',
+ 'input' => 'CollateX',
+ 'file' => 't/data/Collatex-16.xml',
+ );
+is( ref( $nt ), 'Text::Tradition', "Made new tradition" );
+
+{
+ my $f = Text::Tradition::Directory->new( 'dsn' => $dsn );
+ my $scope = $f->new_scope;
+ is( scalar $f->traditionlist, 1, "Directory index has our tradition" );
+ my $nuuid = $f->save( $nt );
+ ok( $nuuid, "Stored second tradition" );
+ my @tlist = $f->traditionlist;
+ is( scalar @tlist, 2, "Directory index has both traditions" );
+ my $tf = $f->tradition( $uuid );
+ my( $tlobj ) = grep { $_->{'id'} eq $uuid } @tlist;
+ is( $tlobj->{'name'}, $tf->name, "Directory index has correct tradition name" );
+ is( $tf->name, $t->name, "Retrieved the tradition from a new directory" );
+ my $sid = $f->object_to_id( $tf->stemma(0) );
+ try {
+ $f->tradition( $sid );
+ } catch( Text::Tradition::Error $e ) {
+ is( $e->ident, 'database error', "Got exception trying to fetch stemma directly" );
+ like( $e->message, qr/not a Text::Tradition/, "Exception has correct message" );
+ }
+ try {
+ $f->delete( $sid );
+ } catch( Text::Tradition::Error $e ) {
+ is( $e->ident, 'database error', "Got exception trying to delete stemma directly" );
+ like( $e->message, qr/Cannot directly delete non-Tradition object/,
+ "Exception has correct message" );
+ }
+
+ $f->delete( $uuid );
+ ok( !$f->exists( $uuid ), "Object is deleted from DB" );
+ ok( !$f->exists( $sid ), "Object stemma also deleted from DB" );
+ is( scalar $f->traditionlist, 1, "Object is deleted from index" );
+}
-my $t = Text::Tradition->new(
- 'name' => 'inline',
- 'input' => 'Tabular',
- 'file' => 't/data/simple.txt',
- );
-my $uuid = $d->save_tradition( $t );
-ok( $uuid, "Saved test tradition" );
-
-my $s = Text::Tradition::Stemma->new(
- 'collation' => $t->collation,
- 'dotfile' => 't/data/simple.dot' );
-my $sid = $d->save_stemma( $s );
-ok( $sid, "Saved test stemma" );
-
-is( $d->tradition( $uuid ), $t, "Correct tradition returned for id" );
-is( $d->stemma( $uuid ), $s, "Correct stemma returned for id" );
-is( scalar $d->tradition_ids, 1, "Only one tradition in DB" );
-
-# Connect to a new instance
-my $e = Text::Tradition::Directory->new( 'dsn' => $dsn );
-is( scalar $e->tradition_ids, 1, "One tradition preloaded from DB" );
-my $te = $e->tradition( $uuid );
-is( $te->name, $t->name, "New instance returns correct tradition" );
-my $se = $e->stemma( $uuid );
-is( $se->graph, $s->graph, "New instance returns correct stemma" );
-is( $e->tradition( 'NOT-A-UUID' ), undef, "Undef returned for non-tradition" );
-is( $e->stemma( 'NOT-A-UUID' ), undef, "Undef returned for non-stemma" );
-$te->name( "Changed name" );
-my $new_id = $e->save_tradition( $te );
-is( $new_id, $uuid, "Updated tradition ID did not change" );
-
-my $f = Text::Tradition::Directory->new( 'dsn' => $dsn, 'preload' => 0 );
-is( scalar $f->tradition_ids, 0, "No traditions preloaded from DB" );
-### TODO This doesn't work, as I cannot get an object scope in the
-### 'tradition' wrapper.
-# my $tf = $f->tradition( $uuid );
-# is( $tf->name, $t->name, "Next instance returns correct tradition" );
-# is( $tf->name, "Changed name", "Change to tradition carried through" );
+{
+ my $g = Text::Tradition::Directory->new( 'dsn' => $dsn );
+ my $scope = $g->new_scope;
+ is( scalar $g->traditionlist, 1, "Now one object in new directory index" );
+ my $ntobj = $g->tradition( 'CX' );
+ my @w1 = sort { $a->sigil cmp $b->sigil } $ntobj->witnesses;
+ my @w2 = sort{ $a->sigil cmp $b->sigil } $nt->witnesses;
+ is_deeply( \@w1, \@w2, "Looked up remaining tradition by name" );
+}
=end testing
=cut
+use Text::Tradition::TypeMap::Entry;
-has data_hash => (
- traits => ['Hash'],
- default => sub { {} },
- handles => {
- tradition => 'get',
- stemma => 'get',
- add_tradition => 'set',
- add_stemma => 'set',
- tradition_ids => 'keys',
- },
-);
-
has +typemap => (
- is => 'rw',
- isa => 'KiokuDB::TypeMap',
- default => sub {
- KiokuDB::TypeMap->new(
- isa_entries => {
- "Graph" => KiokuDB::TypeMap::Entry::Naive->new,
- "Graph::AdjacencyMap" => KiokuDB::TypeMap::Entry::Naive->new,
- }
- );
- },
+ is => 'rw',
+ isa => 'KiokuDB::TypeMap',
+ default => sub {
+ KiokuDB::TypeMap->new(
+ isa_entries => {
+ "Text::Tradition" =>
+ KiokuDB::TypeMap::Entry::Naive->new(),
+ "Graph" => Text::Tradition::TypeMap::Entry->new(),
+ "Graph::AdjacencyMap" => Text::Tradition::TypeMap::Entry->new(),
+ }
+ );
+ },
);
-has preload => (
- is => 'ro',
- isa => 'Bool',
- default => 1,
- );
-
-around 'tradition' => sub {
- my( $orig, $self, @arg ) = @_;
- my $data = $self->$orig( @arg );
- unless( $data ) {
- # Connect to the DB and fetch the thing.
- $self->new_scope;
- my $id = shift @arg;
- my $trad = $self->lookup( $id );
- if( ref( $trad ) eq 'Text::Tradition' ) {
- $self->add_tradition( $id => $trad );
- return $trad;
- }
- # If we got this far...
- return undef;
+# Push some columns into the extra_args
+around BUILDARGS => sub {
+ my $orig = shift;
+ my $class = shift;
+ my $args;
+ if( @_ == 1 ) {
+ $args = $_[0];
+ } else {
+ $args = { @_ };
+ }
+ if( $args->{'dsn'} =~ /^dbi/ ) { # We're using Backend::DBI
+ my @column_args = ( 'columns',
+ [ 'name' => { 'data_type' => 'varchar', 'is_nullable' => 1 } ] );
+ my $ea = $args->{'extra_args'};
+ if( ref( $ea ) eq 'ARRAY' ) {
+ push( @$ea, @column_args );
+ } elsif( ref( $ea ) eq 'HASH' ) {
+ $ea = { %$ea, @column_args };
+ } else {
+ $ea = { @column_args };
+ }
+ $args->{'extra_args'} = $ea;
}
- return $data->{'object'};
+ return $class->$orig( $args );
};
-around 'stemma' => sub {
- my( $orig, $self, @arg ) = @_;
- my $data = $self->$orig( @arg );
- unless( $data ) {
- # Connect to the DB and fetch the thing.
- $self->new_scope;
- my $id = shift @arg;
- my $trad = $self->lookup( $id );
- if( ref( $trad ) eq 'Text::Tradition' ) {
- # Add it
- $self->add_tradition( $id => $trad );
- # Find the stemma whose collation belongs to $trad
- my $ret = $self->grep( sub { $_->collation eq $trad->collation } );
- my $stemma;
- until ( $ret->is_done ) {
- foreach my $st ( $ret->items ) {
- warn "Found two saved stemmas for tradition $id" if $stemma;
- $stemma = $st;
- }
- }
- if( $stemma ) {
- $self->add_stemma( $stemma );
- return $stemma;
+# before [ qw/ store update insert delete / ] => sub {
+before [ qw/ delete / ] => sub {
+ my $self = shift;
+ my @nontrad;
+ foreach my $obj ( @_ ) {
+ if( ref( $obj ) && ref( $obj ) ne 'Text::Tradition' ) {
+ # Is it an id => Tradition hash?
+ if( ref( $obj ) eq 'HASH' && keys( %$obj ) == 1 ) {
+ my( $k ) = keys %$obj;
+ next if ref( $obj->{$k} ) eq 'Text::Tradition';
}
- }
- # If we got this far...
- return undef;
+ push( @nontrad, $obj );
+ }
+ }
+ if( @nontrad ) {
+ throw( "Cannot directly save non-Tradition object of type "
+ . ref( $nontrad[0] ) );
}
- return $data->{'stemma'};
-};
-
-around 'add_tradition' => sub {
- my( $orig, $self, $id, $obj ) = @_;
- $self->$orig( $id => { 'object' => $obj } );
-};
-
-around 'add_stemma' => sub {
- my( $orig, $self, $id, $obj ) = @_;
- $self->{data_hash}->{$id}->{'stemma'} = $obj;
};
-# Load all the relevant data from the DSN we were passed.
+# TODO Garbage collection doesn't work. Suck it up and live with the
+# inflated DB.
+# after delete => sub {
+# my $self = shift;
+# my $gc = KiokuDB::GC::Naive->new( backend => $self->directory->backend );
+# $self->directory->backend->delete( $gc->garbage->members );
+# };
-sub BUILD {
+sub save {
my $self = shift;
- my $args = shift;
-
- $self->fetch_all if( $self->dsn && $self->preload );
+ return $self->store( @_ );
}
-# Connect to self, get the traditions and stemmas, and save them
-# in the directory.
-sub fetch_all {
- my $self = shift;
- my $scope = $self->new_scope;
- my $stream = $self->root_set;
- my %stemmata;
- until( $stream->is_done ) {
- foreach my $obj ( $stream->items ) {
- my $uuid = $self->object_to_id( $obj );
- if( ref( $obj ) eq 'Text::Tradition' ) {
- $self->add_tradition( $uuid => $obj );
- } elsif( ref( $obj ) eq 'Text::Tradition::Stemma' ) {
- $stemmata{$obj->collation} = $obj;
- } else {
- warn "Found root object in DB that is neither tradition nor stemma: $obj";
+sub tradition {
+ my( $self, $id ) = @_;
+ my $obj = $self->lookup( $id );
+ unless( $obj ) {
+ # Try looking up by name.
+ foreach my $item ( $self->traditionlist ) {
+ if( $item->{'name'} eq $id ) {
+ $obj = $self->lookup( $item->{'id'} );
+ last;
}
}
}
- # Now match the stemmata to their traditions.
- foreach my $id ( $self->tradition_ids ) {
- my $c = $self->tradition( $id )->collation;
- if( exists $stemmata{$c} ) {
- $self->add_stemma( $id => $stemmata{$c} );
- }
+ if( $obj && ref( $obj ) ne 'Text::Tradition' ) {
+ throw( "Retrieved object is a " . ref( $obj ) . ", not a Text::Tradition" );
}
+ return $obj;
}
-
-sub save_tradition {
- my( $self, $tradition ) = @_;
- # Write the thing to the db and return its ID.
- unless( ref( $tradition ) eq 'Text::Tradition' ) {
- warn "Object $tradition is not a Text::Tradition";
- return undef;
+sub traditionlist {
+ my $self = shift;
+ # If we are using DBI, we can do it the easy way; if not, the hard way.
+ # Easy way still involves making a separate DBI connection. Ew.
+ my @tlist;
+ if( $self->dsn =~ /^dbi:(\w+):/ ) {
+ my $dbtype = $1;
+ my @connection = @{$self->directory->backend->connect_info};
+ # Get rid of KiokuDB-specific arg
+ pop @connection if scalar @connection > 4;
+ $connection[3]->{'sqlite_unicode'} = 1 if $dbtype eq 'SQLite';
+ $connection[3]->{'pg_enable_utf8'} = 1 if $dbtype eq 'Pg';
+ my $dbh = DBI->connect( @connection );
+ my $q = $dbh->prepare( 'SELECT id, name from entries WHERE class = "Text::Tradition"' );
+ $q->execute();
+ while( my @row = $q->fetchrow_array ) {
+ my( $id, $name ) = @row;
+ # Horrible horrible hack
+ $name = decode_utf8( $name ) if $dbtype eq 'mysql';
+ push( @tlist, { 'id' => $row[0], 'name' => $row[1] } );
+ }
+ } else {
+ $self->scan( sub { my $o = shift;
+ push( @tlist, { 'id' => $self->object_to_id( $o ),
+ 'name' => $o->name } ) } );
}
- my $scope = $self->new_scope;
- my $uuid = $self->store( $tradition );
- $self->add_tradition( $uuid => $tradition );
- return $uuid;
+ return @tlist;
}
-sub save_stemma {
- my( $self, $stemma ) = @_;
- unless( ref( $stemma ) eq 'Text::Tradition::Stemma' ) {
- warn "Object $stemma is not a Text::Tradition::Stemma";
- return undef;
- }
- my $scope = $self->new_scope;
- # Get the tradition to which this stemma belongs.
- my $tradition = $stemma->collation->tradition;
- # Make sure the tradition is in the DB.
- my $tid = $self->save_tradition( $tradition );
- unless( $tid ) {
- warn "Could not access this stemma's tradition; aborting";
- return undef;
- }
- my $sid = $self->store( $stemma );
- $self->add_stemma( $tid => $stemma );
- return $tid;
+sub throw {
+ Text::Tradition::Error->throw(
+ 'ident' => 'database error',
+ 'message' => $_[0],
+ );
}
-
1;
-
\ No newline at end of file
+=head1 LICENSE
+
+This package is free software and is provided "as is" without express
+or implied warranty. You can redistribute it and/or modify it under
+the same terms as Perl itself.
+
+=head1 AUTHOR
+
+Tara L Andrews E<lt>aurum@cpan.orgE<gt>
projects / scpubgit/stemmatology.git / blobdiff