Modified the plugin model to correctly fire off install.rb by changing around its hooks

AJ Christensen · AJ Christensen · commit f16488365ce5 · 2008-06-24T15:44:30.000+12:00
diff --git a/app/models/plugin.rb b/app/models/plugin.rb
@@ -14,9 +14,9 @@ class Plugin
   property :active, Boolean
 
   before :save, :download
-  after :save, :install
-  after :save, :set_create_activity
-  after :save, :set_update_activity
+  after :create, :install
+  after :create, :set_create_activity
+  after :update, :set_update_activity
   after :destroy, :remove
 
   class << self
@@ -52,23 +52,22 @@ def download
   ##
   # This loads and installs the plugin
   def install
-    if new_record?
-      # Ensure we don't have any errors while saving already
-      if self.errors.empty?
-        begin
-          # Load the plugin
-          self.load
-          # Also, if there is an "install.rb" script present, run that to setup anything the plugin needs (database tables etc)
-          require File.join(self.path, "install.rb") if File.exists?(File.join(self.path, "install.rb"))
-        rescue Exception => err
-          # If we have an issue installing, lets destroy the plugin to rollback, and put an error on the object so it displays on the form
-          self.destroy
-          self.errors.add "Error installing plugin: #{err.message}"
-        end
-      else
-        # If we do, destroy the plugin to rollback, and then the form will display the errors
+    # Ensure we don't have any errors while saving already
+    if self.errors.empty?
+      begin
+        # Load the plugin
+        self.load
+        # Also, if there is an "install.rb" script present, run that to setup anything the plugin needs (database tables etc)
+        Merb.logger.debug!("Trying to autoload install.rb of plugin (#{File.join(self.path, "install.rb")})")
+        require File.join(self.path, "install.rb") if File.exists?(File.join(self.path, "install.rb"))
+      rescue Exception => err
+        # If we have an issue installing, lets destroy the plugin to rollback, and put an error on the object so it displays on the form
         self.destroy
+        self.errors.add "Error installing plugin: #{err.message}"
       end
+    else
+      # If we do, destroy the plugin to rollback, and then the form will display the errors
+      self.destroy
     end
   end
 
