X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fcommon%2Fagendav_plugin.rb;h=fc19d3d60fd45fccfec195ca745de1c0d7b5b3b5;hp=fad869f95235964884d58635a465d670cde7b455;hb=f819b178c5c1cb8adda0182c610e5c52fad8bea7;hpb=e3826d8926e11763837a591986d453e9ef5d9dec

diff --git a/lib/common/agendav_plugin.rb b/lib/common/agendav_plugin.rb
index fad869f..fc19d3d 100644
--- a/lib/common/agendav_plugin.rb
+++ b/lib/common/agendav_plugin.rb
@@ -1,4 +1,5 @@
 require 'common/plugin'
+require 'common/user'
 
 module AgendavPlugin
   # Code that all Agendav plugins (Prune, Rm, Mv...) will
@@ -6,8 +7,7 @@ module AgendavPlugin
   include Plugin
 
 
-  def initialize()
-    cfg = Configuration.new()
+  def initialize(cfg)
     @db_host = cfg.agendav_dbhost
     @db_port = cfg.agendav_dbport
     @db_opts = cfg.agendav_dbopts
@@ -19,29 +19,20 @@ module AgendavPlugin
 
 
   def describe_domain(domain)
-    # AgenDAV doesn't have a concept of domains.
-    return 'N/A'
+    return domain.to_s()
   end
 
-
-  def describe_account(account)
-    if self.user_exists(account)
-      return "Username: #{account}"
-    else
-      return 'User not found'
-    end
+  def describe_user(user)
+    return user.to_s()
   end
 
 
-  protected;
-
-  def user_exists(account)
-    ad_users = get_agendav_usernames()
-    return ad_users.include?(account)
-  end
-
-  def get_agendav_usernames()
-    usernames = []
+  def list_users()
+    #
+    # Produce a list of AgenDAV users. This is public because it's
+    # useful in testing.
+    #
+    users = []
 
     # Just assume PostgreSQL for now.
     begin
@@ -58,7 +49,7 @@ module AgendavPlugin
       sql_query += '(SELECT user_from FROM shared);'
 
       connection.query(sql_query) do |result|
-        usernames = result.field_values('username')
+        users = result.field_values('username')
       end
 
       connection.close()
@@ -67,7 +58,7 @@ module AgendavPlugin
       raise DatabaseError.new(e)
     end
 
-    return usernames
+    return users.map{ |u| User.new(u) }
   end
 
 end