Merge branch 'master' of git@github.com:tog/tog_mail

CHANGELOG.md

@@ -0,0 +1,4 @@
+Edge
+----
+* MailUserObserver refactored to call user.create_default_folders!
+* Create the default folders for every user on the migration.

app/models/mail_user_observer.rb

@@ -1,14 +1,6 @@
 class MailUserObserver  < ActiveRecord::Observer
   observe :user
   def after_save(user)
-    if user.recently_activated?
-      Tog::Config["plugins.tog_mail.messages.default_folders"].each(" "){|folder_type|
-        folder_type.strip!
-        Folder.new(:name => folder_type,
-        :deletable => false,
-        :folder_type => folder_type,
-        :user => user).save!
-      } if Tog::Config["plugins.tog_mail.messages.default_folders"]
-    end
+    user.create_default_folders! if user.recently_activated?
   end
 end

app/models/user.rb

@@ -1,5 +1,5 @@
 class User < ActiveRecord::Base
-  
+
   has_one :inbox, :class_name => "Folder", :foreign_key => "user_id", :conditions => ["folder_type = 'Inbox'"]
   has_one :outbox, :class_name => "Folder", :foreign_key => "user_id", :conditions => ["folder_type = 'Outbox'"]
 
@@ -14,5 +14,15 @@ def get_message(id)
       received_messages.find(id)
     end
   end
-
+
+  def create_default_folders!
+    default_folders = Tog::Config["plugins.tog_mail.messages.default_folders"] || ""
+    default_folders.each(" "){|folder_type|
+      folder_type.strip!
+      unless self.folders.find_by_name(folder_type)
+        self.folders.create(:name => folder_type, :deletable => false, :folder_type => folder_type)
+      end
+    }
+  end
+
 end

db/migrate/002_create_default_folders.rb

@@ -0,0 +1,11 @@
+class CreateDefaultFolders < ActiveRecord::Migration
+  def self.up
+    User.find(:all).each{|u|
+      u.create_default_folders!
+    }
+  end
+
+  def self.down
+    Folder.delete :all
+  end
+end

init.rb

@@ -1,5 +1,4 @@
 require_plugin 'tog_core'
-require_plugin 'tog_user'
 
 Tog::Plugins.settings :tog_mail, "messages.default_folders"   => "Inbox Outbox",
                                  "messages_list.size"         => "10"