Changeset 338e5235f0585384ca0db9d54211b880de159b37

Timestamp:

10/28/09 22:49:10 (4 weeks ago)

Author:

Nelson Elhage <nelhage@mit.edu>

git-author:

Nelson Elhage <nelhage@mit.edu> / 2009-10-27T23:52:55Z-0400

Parents:

7ca5d3e3f8c76c75f3200773de375d80ac951461

git-committer:

Nelson Elhage <nelhage@mit.edu> / 2009-10-28T22:49:10Z-0400

Message:

Some work towards composable/customizable styles.

Replace most direct method calls on message objects with calls to
methods on the style that (by default) just delegate to the object.

This allows for subclasses to override these methods to customize the
display. With the use of the C3 mro (use mro 'c3'; in perl 5.10) in
subclasses, this even allows for subclasses to be composed with each
other by making a subclass with multiple parent classes.

Location:

perl/lib/BarnOwl/Style

Files:

• Default.pm (modified) (6 diffs)
• OneLine.pm (modified) (4 diffs)

perl/lib/BarnOwl/Style/Default.pm

@@ -39 +39 @@
 ################################################################################
 
+BEGIN {
+    for my $field qw(body
+                     context subcontext
+                     personal_context short_personal_context
+                     login login_type login_extra
+                     pretty_sender long_sender
+                     pretty_recipient ) {
+        no strict 'refs';
+        *{"BarnOwl::Style::Default::$field"} = sub {
+            my $self = shift;
+            my $m = shift;
+            return $m->$field;
+        }
+    }
+};
+
 sub format_time {
     my $self = shift;
@@ -51 +67 @@
     return sprintf(
         '@b<%s%s> for @b(%s) (%s) %s',
-        uc( $m->login ),
-        $m->login_type,
-        $m->pretty_sender,
-        $m->login_extra,
+        uc( $self->login($m) ),
+        $self->login_type($m),
+        $self->pretty_sender($m),
+        $self->login_extra($m),
         $self->format_time($m)
        );
@@ -62 +78 @@
     my $self = shift;
     my $m = shift;
-    my $personal_context = $m->personal_context;
+    my $personal_context = $self->personal_context($m);
     $personal_context = ' [' . $personal_context . ']' if $personal_context;
-    return "\@b(PING)" . $personal_context . " from \@b(" . $m->pretty_sender . ")";
+    return "\@b(PING)" . $personal_context . " from \@b(" . $self->pretty_sender($m) . ")";
 }
 
@@ -85 +101 @@
     my $header;
     if ( $m->is_personal ) {
-        my $personal_context = $m->personal_context;
+        my $personal_context = $self->personal_context($m);
         $personal_context = ' [' . $personal_context . ']' if $personal_context;
 
         if ( $m->direction eq "out" ) {
-            $header = ucfirst $m->type . $personal_context . " sent to " . $m->pretty_recipient;
+            $header = ucfirst $m->type . $personal_context . " sent to " . $self->pretty_recipient($m);
         } else {
-            $header = ucfirst $m->type . $personal_context . " from " . $m->pretty_sender;
+            $header = ucfirst $m->type . $personal_context . " from " . $self->pretty_sender($m);
         }
     } else {
-        $header = $m->context;
-        if(defined $m->subcontext) {
-            $header .= ' / ' . $m->subcontext;
+        $header = $self->context($m);
+        if(defined $self->subcontext($m)) {
+            $header .= ' / ' . $self->subcontext($m);
         }
-        $header .= ' / @b{' . $m->pretty_sender . '}';
+        $header .= ' / @b{' . $self->pretty_sender($m) . '}';
     }
 
@@ -112 +128 @@
     my $self = shift;
     my $m = shift;
-    my $sender = $m->long_sender;
+    my $sender = $self->long_sender($m);
     $sender =~ s/\n.*$//s;
     if (BarnOwl::getvar('colorztext') eq 'on') {
@@ -126 +142 @@
     my $m = shift;
 
-    my $body = $m->body;
+    my $body = $self->body($m);
     if ($m->{should_wordwrap}) {
       $body = BarnOwl::wordwrap($body, BarnOwl::getnumcols()-9);

perl/lib/BarnOwl/Style/OneLine.pm

@@ -26 +26 @@
     '<',
     $m->type,
-    uc( $m->login ),
-    $m->pretty_sender)
-    . ($m->login_extra ? "at ".$m->login_extra : '');
+    uc( $self->login(m) ),
+    $self->pretty_sender($m))
+    . ($self->login_extra($m) ? "at ".$self->login_extra($m) : '');
 }
 
@@ -39 +39 @@
     $m->type,
     'PING',
-    $m->pretty_sender)
+    $self->pretty_sender($m))
 }
 
@@ -62 +62 @@
                    $dirsym,
                    $m->type,
-                   maybe($m->short_personal_context),
+                   maybe($self->short_personal_context($m)),
                    ($dir eq 'out'
-                    ? $m->pretty_recipient
-                    : $m->pretty_sender));
+                    ? $self->pretty_recipient($m)
+                    : $self->pretty_sender($m)));
   }
   else {
     $line = sprintf(BASE_FORMAT,
                     $dirsym,
-                    maybe($m->context),
-                    maybe($m->subcontext),
+                    maybe($self->context($m)),
+                    maybe($self->subcontext($m)),
                     ($dir eq 'out'
-                     ? $m->pretty_recipient
-                     : $m->pretty_sender));
+                     ? $self->pretty_recipient($m)
+                     : $self->pretty_sender($m)));
   }
 
-  my $body = $m->{body};
+  my $body = $self->body($m);
   $body =~ tr/\n/ /;
   $line .= $body;
@@ -89 +89 @@
   my $m = shift;
   my $line = sprintf(BASE_FORMAT, '<', 'ADMIN', '', '');
-  my $body = $m->{body};
+  my $body = $self->body($m);
   $body =~ tr/\n/ /;
   return $line.$body;