Implement "clear my foo.bar" preference

Author: mmcclimon

lib/Synergy/Reactor/Preferences.pm

@@ -23,6 +23,15 @@ sub listener_specs {
         return unless $e->text =~ /\Aset\s+(my|\w+'s)/in;
       },
     },
+    {
+      name      => 'clear',
+      method    => 'handle_clear',
+      exclusive => 1,
+      predicate => sub ($self, $e) {
+        return unless $e->was_targeted;
+        return unless $e->text =~ /\Aclear\s+(my|\w+'s)/in;
+      },
+    },
     {
       name      => 'list_all_preferences',
       method    => 'handle_list',
@@ -48,16 +57,38 @@ sub listener_specs {
 }
 
 sub handle_set ($self, $event) {
-  my ($who, $comp_name, $pref_name, $pref_value) =
+  my ($who, $pref_name, $pref_value) =
     $event->text =~ m{\A set \s+ (my|\w+'s) \s+         # set my
-                      ([-_a-z0-9]+) \.  ([-_a-z0-9]+)   # component.pref
+                      ([-_a-z0-9]+  \.   [-_a-z0-9]+)   # component.pref
                       \s+ to \s+ (.*)                   # to value
                      }x;
 
-  return unless $who;
+  return $self->_set_pref($event, $who, $pref_name, $pref_value);
+}
+
+sub handle_clear ($self, $event) {
+  my ($who, $pref_name, $rest) =
+    $event->text =~ m{\A clear \s+ (my|\w+'s) \s+       # set my
+                      ([-_a-z0-9]+  \.  [-_a-z0-9]+)    # component.pref
+                      \s* (.+)?
+                     }x;
+
+  return $event->error_reply("You can't pass a value to 'clear'")
+    if $rest;
 
+  return $self->_set_pref($event, $who, $pref_name, undef);
+}
+
+sub _set_pref ($self, $event, $who, $full_name, $pref_value) {
+  return unless $who;
   $who =~ s/'s$//;
 
+  my $user = $self->hub->user_directory->resolve_name($who, $event->from_user);
+  return $event->error_reply("Sorry, I couldn't find a user for <$who>")
+    unless $user;
+
+  my ($comp_name, $pref_name) = split /\./, $full_name, 2;
+
   my $component;
   try {
     $component = $self->hub->component_named($comp_name);
@@ -68,10 +99,6 @@ sub handle_set ($self, $event) {
 
   return unless $component;
 
-  my $user = $self->hub->user_directory->resolve_name($who, $event->from_user);
-  return $event->error_reply("Sorry, I couldn't find a user for <$who>")
-    unless $user;
-
   if ($user != $event->from_user && ! $event->from_user->is_master) {
     return $event->error_reply(
       "Sorry, only master users can set preferences for other people"

lib/Synergy/UserDirectory.pm

@@ -175,6 +175,7 @@ __PACKAGE__->add_preference(
   },
   describer => sub ($value) {
     return '<undef>' unless $value;
+    return '<undef>' unless @$value;
     return join(q{, }, @$value);
   },
 );