Add some new fixtures in preparation for prune tests.

[mailshears.git] / lib / common / roundcube_plugin.rb

diff --git a/lib/common/roundcube_plugin.rb b/lib/common/roundcube_plugin.rb
index 8e9d62259d78fd9819bc2ef77bc97c3c2b0fa96c..eb450f00059d038776046dc7604417e1de3c367e 100644 (file)
--- a/lib/common/roundcube_plugin.rb
+++ b/lib/common/roundcube_plugin.rb
@@ -1,12 +1,12 @@
 require 'common/plugin'
+require 'common/user'
 
 module RoundcubePlugin
   # Code that all Roundcube plugins (Prune, Rm, Mv...) will share.
   # That is, we implement the Plugin interface.
   include Plugin
 
-  def initialize()
-    cfg = Configuration.new()
+  def initialize(cfg)
     @db_host = cfg.roundcube_dbhost
     @db_port = cfg.roundcube_dbport
     @db_opts = cfg.roundcube_dbopts
@@ -17,27 +17,18 @@ module RoundcubePlugin
   end
 
 
-  def describe_domain(domain)
-    # Roundcube doesn't have a concept of domains.
-    return domain
+  def describe_user(user)
+    user_id = self.get_user_id(user)
+    return "User ID: #{user_id}"
   end
 
-  def describe_account(account)
-    user_id = self.get_user_id(account)
 
-    if user_id.nil?
-      return 'User not found'
-    else
-      return "User ID: #{user_id}"
-    end
-  end
-
-
-  protected;
-
-  def get_user_id(account)
-    user_id = nil
+  def list_users()
+    # Produce a list of Roundcube users. This is used in prune/rm, and
+    # is public because it is useful in testing.
+    usernames = []
 
+    # Just assume PostgreSQL for now.
     begin
       connection = PGconn.connect(@db_host,
                                   @db_port,
@@ -47,30 +38,25 @@ module RoundcubePlugin
                                   @db_user,
                                   @db_pass)
 
-      sql_query = "SELECT user_id FROM users WHERE username = $1;"
-
-      connection.query(sql_query, [account]) do |result|
-        if result.num_tuples > 0
-          user_id = result[0]['user_id']
-        end
+      sql_query = "SELECT username FROM users;"
+      connection.query(sql_query) do |result|
+        usernames = result.field_values('username')
       end
 
       connection.close()
-
     rescue PGError => e
       # Pretend like we're database-agnostic in case we ever are.
       raise DatabaseError.new(e)
     end
 
-    return user_id
+    return usernames.map{ |u| User.new(u) }
   end
 
+  protected;
 
-  # Used in both prune/rm.
-  def list_users()
-    usernames = []
+  def get_user_id(user)
+    user_id = nil
 
-    # Just assume PostgreSQL for now.
     begin
       connection = PGconn.connect(@db_host,
                                   @db_port,
@@ -80,18 +66,23 @@ module RoundcubePlugin
                                   @db_user,
                                   @db_pass)
 
-      sql_query = "SELECT username FROM users;"
-      connection.query(sql_query) do |result|
-        usernames = result.field_values('username')
+      sql_query = "SELECT user_id FROM users WHERE username = $1;"
+
+      connection.query(sql_query, [user.to_s()]) do |result|
+        if result.num_tuples > 0
+          user_id = result[0]['user_id']
+        end
       end
 
       connection.close()
+
     rescue PGError => e
       # Pretend like we're database-agnostic in case we ever are.
       raise DatabaseError.new(e)
     end
 
-    return usernames
+    return user_id
   end
 
+
 end