Merge branch 'master' of github.com:tla/stemmatology

[scpubgit/stemmatology.git] / lib / Text / Tradition / Collation / Reading.pm

diff --git a/lib/Text/Tradition/Collation/Reading.pm b/lib/Text/Tradition/Collation/Reading.pm
index b8265e0..5dfa552 100644 (file)
--- a/lib/Text/Tradition/Collation/Reading.pm
+++ b/lib/Text/Tradition/Collation/Reading.pm
@@ -2,7 +2,6 @@ package Text::Tradition::Collation::Reading;
 
 use Moose;
 use overload '""' => \&_stringify, 'fallback' => 1;
-use Text::Tradition::Collation;
 
 =head1 NAME
 
@@ -82,7 +81,7 @@ has 'text' => (
        required => 1,
        writer => 'alter_text',
        );
-
+       
 has 'is_start' => (
        is => 'ro',
        isa => 'Bool',
@@ -124,11 +123,23 @@ around BUILDARGS => sub {
                $args = { @_ };
        }
        
+       # Did we get a JSON token to parse into a reading?  If so, massage it.
+       if( exists $args->{'json'} ) {
+               my $j = delete $args->{'json'};
+
+               # If we have separated punctuation, restore it.
+               if( exists $j->{'punctuation'} ) {
+                       $args->{'text'} = _restore_punct( $j->{'t'}, $j->{'punctuation'} );
+               } else {
+                       $args->{'text'} = $j->{'t'};
+                       # we don't use comparison or canonical forms yet
+               }
+       }
+               
        # If one of our special booleans is set, we change the text and the
        # ID to match.
-       
        if( exists $args->{'is_lacuna'} && !exists $args->{'text'} ) {
-               $args->{'text'} = sprintf( "#LACUNA_%s#", $args->{'id'} );
+               $args->{'text'} = '#LACUNA#';
        } elsif( exists $args->{'is_start'} ) {
                $args->{'id'} = '#START#';  # Change the ID to ensure we have only one
                $args->{'text'} = '#START#';
@@ -143,6 +154,15 @@ around BUILDARGS => sub {
        $class->$orig( $args );
 };
 
+# Utility function for parsing JSON from nCritic
+sub _restore_punct {
+       my( $word, @punct ) = @_;
+       foreach my $p ( sort { $a->{pos} <=> $b->{pos} } @punct ) {
+               substr( $word, $p->{pos}, 0, $p->{char} );
+       }
+       return $word;
+}      
+
 =head2 is_meta
 
 A meta attribute (ha ha), which should be true if any of our 'special'
@@ -162,6 +182,18 @@ sub related_readings {
        return $self->collation->related_readings( $self, @_ );
 }
 
+sub predecessors {
+       my $self = shift;
+       my @pred = $self->collation->sequence->predecessors( $self->id );
+       return map { $self->collation->reading( $_ ) } @pred;
+}
+
+sub successors {
+       my $self = shift;
+       my @succ = $self->collation->sequence->successors( $self->id );
+       return map { $self->collation->reading( $_ ) } @succ;
+}
+
 sub set_identical {
        my( $self, $other ) = @_;
        return $self->collation->add_relationship( $self, $other,