X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Frm%2Fplugins%2Fdavical.rb;h=f7d116e0e783a08364701c97334668d04ca14d45;hp=04d5fbf024dde17e47375afa486d4359c897c9dd;hb=72696d3f6e95ef773af9727e9c3459b9038b0fc2;hpb=8064b7be68006d07889e2d24eb0bddc6063d3275

diff --git a/lib/rm/plugins/davical.rb b/lib/rm/plugins/davical.rb
index 04d5fbf..f7d116e 100644
--- a/lib/rm/plugins/davical.rb
+++ b/lib/rm/plugins/davical.rb
@@ -12,11 +12,11 @@ class DavicalRm
   include RmPlugin
 
 
-  def delete_account(account)
+  def delete_user(user)
     # Delete the given username. DAViCal uses foreign keys properly
     # and only supports postgres, so we let the ON DELETE CASCADE
     # trigger handle most of the work.
-    raise NonexistentAccountError.new(account) if not user_exists(account)
+    raise NonexistentUserError.new(user) if not user_exists(user)
 
     sql_queries = ['DELETE FROM usr WHERE username = $1']
 
@@ -30,7 +30,7 @@ class DavicalRm
                                   @db_pass)
 
       sql_queries.each do |sql_query|
-        connection.query(sql_query, [account])
+        connection.query(sql_query, [user])
       end
 
       connection.close()