From a804a079c111b1c267e69bdf009603a3b7b0bf52 Mon Sep 17 00:00:00 2001
From: Tom Locke <tom@tomlocke.com>
Date: Tue, 29 Apr 2008 14:37:22 +0100
Subject: [PATCH] Ensure assemble.rb gets run even for generators

---
 hobo/lib/hobo/model_router.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/hobo/lib/hobo/model_router.rb b/hobo/lib/hobo/model_router.rb
index f4c28745d..15469f645 100644
--- a/hobo/lib/hobo/model_router.rb
+++ b/hobo/lib/hobo/model_router.rb
@@ -51,9 +51,6 @@ def linkable?(klass, action, options={})
       end
       
       def add_routes(map)
-        # Don't create routes if it's a generator that's running
-        return if caller[-1] =~ /script[\/\\]generate:\d+$/
-        
         reset_linkables
         
         begin 
@@ -63,9 +60,13 @@ def add_routes(map)
           return
         end
 
-        require "#{APP_ROOT}/controllers/application" unless Object.const_defined? :ApplicationController
         load "#{APP_ROOT}/assemble.rb" if File.exists? "#{APP_ROOT}/assemble.rb"
 
+        # Don't create routes if it's a generator that's running
+        return if caller[-1] =~ /script[\/\\]generate:\d+$/
+        
+        require "#{APP_ROOT}/controllers/application" unless Object.const_defined? :ApplicationController
+
         # Add non-subsite routes
         add_routes_for(map, nil)