* Person and people lists have now become interchangeable, with notifications

  only recording the username, rather than the Person/PeopleList.  This means
  that notifications in alert groups can use default #during clauses and #every
  values from people lists and persons.
* Notify clauses can now take an array of persons/people_lists, and people_lists
  can refer to other people lists.
* PeopleList names are now in the same namespace as usernames.
* Tests to go with.

1 files changed, 5 insertions, 10 deletions

diff --git a/lib/mauve/configuration_builders/people_list.rb b/lib/mauve/configuration_builders/people_list.rb
index fffa15c..7a5f3ab 100644
--- a/lib/mauve/configuration_builders/people_list.rb
+++ b/lib/mauve/configuration_builders/people_list.rb
@@ -9,9 +9,9 @@ module Mauve
 
     class PeopleList < ObjectBuilder
 
-     is_builder "notification", Notification
+     is_builder "notification", ConfigurationBuilders::Notification
 
-      def builder_setup(label, list)
+      def builder_setup(label, *list)
         @result = Mauve::PeopleList.new(label)
         @result += list
         @result
@@ -41,14 +41,9 @@ module Mauve
     # @param [Mauve::PeopleList] people_list
     #
     def created_people_list(people_list)
-      label = people_list.label
-      if @result.people_lists.has_key?(label)
-        _logger.warn("Duplicate people_list '#{label}'") 
-        @result.people_lists[label] += people_list.list
-      else
-        @result.people_lists[label] = people_list
-      end
+      name = people_list.username
+      raise ArgumentError.new("Duplicate person '#{name}'") if @result.people[name]
+      @result.people[name] = people_list
     end
-
   end
 end