lib/radiant/extension_loader.rb in radiant-0.6.7 vs lib/radiant/extension_loader.rb in radiant-0.6.8

@@ -1,71 +1,71 @@
 require 'radiant/extension'
 require 'method_observer'
 
 module Radiant
   class ExtensionLoader
-    
+
     class DependenciesObserver < MethodObserver
       attr_accessor :config
-      
+
       def initialize(rails_config)
         @config = rails_config
       end
-      
+
       def before_clear(*args)
         ExtensionLoader.deactivate_extensions
       end
-      
+
       def after_clear(*args)
         ExtensionLoader.load_extensions
         ExtensionLoader.activate_extensions
       end
     end
 
     include Simpleton
-    
+
     attr_accessor :initializer, :extensions
-    
+
     def initialize
       self.extensions = []
     end
-    
+
     def configuration
       initializer.configuration
     end
-    
+
     def extension_load_paths
       load_extension_roots.map { |extension| load_paths_for(extension) }.flatten.select { |d| File.directory?(d) }
     end
 
     def plugin_paths
       load_extension_roots.map {|extension| "#{extension}/vendor/plugins" }.select {|d| File.directory?(d) }
     end
-    
+
     def add_extension_paths
       extension_load_paths.reverse_each do |path|
         configuration.load_paths.unshift path
         $LOAD_PATH.unshift path
       end
     end
-    
+
     def add_plugin_paths
       configuration.plugin_paths.concat plugin_paths
     end
 
     def controller_paths
       extensions.map { |extension| "#{extension.root}/app/controllers" }.select { |d| File.directory?(d) }
     end
-    
+
     def add_controller_paths
       configuration.controller_paths.concat(controller_paths)
     end
-    
+
     def view_paths
       extensions.map { |extension| "#{extension.root}/app/views" }.select { |d| File.directory?(d) }
     end
-    
+
     # Load the extensions
     def load_extensions
       @observer ||= DependenciesObserver.new(configuration).observe(::Dependencies)
       self.extensions = load_extension_roots.map do |root|
         begin
@@ -78,19 +78,21 @@
           $stderr.puts "Could not load extension from file: #{extension_file}.\n#{e.inspect}"
           nil
         end
       end.compact
     end
-    
+
     def deactivate_extensions
       extensions.each &:deactivate
     end
-    
+
     def activate_extensions
       initializer.initialize_default_admin_tabs
-      # Reset the view paths after 
+      # Reset the view paths after
       initializer.initialize_framework_views
+      # Reset the admin UI regions
+      initializer.admin.load_default_regions
       extensions.each &:activate
     end
     alias :reactivate :activate_extensions
 
     private
@@ -103,22 +105,22 @@
           end.compact << dir
         else
           []
         end
       end
-      
+
       def load_extension_roots
         @load_extension_roots ||= unless configuration.extensions.empty?
           select_extension_roots
         else
           []
         end
       end
-      
+
       def select_extension_roots
         all_roots = all_extension_roots.dup
-        
+
         roots = configuration.extensions.map do |ext_name|
           if :all === ext_name
             :all
           else
             ext_path = all_roots.detect do |maybe_path|
@@ -133,10 +135,10 @@
           # replace the :all symbol with any remaining paths
           roots[placeholder, 1] = all_roots
         end
         roots
       end
-      
+
       def all_extension_roots
         @all_extension_roots ||= configuration.extension_paths.map do |path|
           Dir["#{path}/*"].map {|f| File.expand_path(f) if File.directory?(f) }.compact.sort
         end.flatten
       end