Changeset 1332

Timestamp:

01/28/08 14:38:52 (9 months ago)

Author:

iv..@gweezlebur.com

Message:

better (non-magic) model/controller loading for dependencies -- closes #466 -- Thanks to all who worked on this one: coryodaniel, oliver, hassox

Files:

• trunk/lib/merb/boot_loader.rb (modified) (2 diffs)

trunk/lib/merb/boot_loader.rb

@@ -139 +139 @@
-      
-      def load_application
-
-
+
+
+
+
+
+
+
+
+
-        $LOAD_PATH.unshift( File.join(Merb.root , '/lib') )
-        Merb.load_paths.each do |glob|
-
-
+
+
+
+
+
+
+
+
+
+
+
-        load_action_arguments
-        load_controller_template_path_cache
@@ -152 +168 @@
-        (@after_app_blocks || []).each { |b| b.call }
-      end
+      
+      
+      def load_classes_with_requirements(orphaned_paths)
+        
+        #Make the list unique
+        orphaned_paths.uniq!
+        
+        while orphaned_paths.size > 0
+          #Take the size for comparison later
+          size_at_start = orphaned_paths.size
+
+          fail_list = [] #List of failures
+          
+          # Try to load each path again, this time the order is reversed
+          (orphaned_paths).each do |m|
+            # Remove the path from the list
+            orphaned_paths.delete(m)
+            begin
+              require m
+            rescue NameError
+              # Add it back on if it failed to load due to NameError
+              fail_list.push(m)
+            end
+          end
+
+          orphaned_paths.concat(fail_list)
+
+          # Stop processing if everything loaded (size == 0) or if the size didn't change 
+          # (ie something couldn't be loaded)
+          break if(orphaned_paths.size == size_at_start || orphaned_paths.size == 0)
+        end
+        
+        return orphaned_paths
+      end
+      
-      
-      def load_libraries