spiderfw 0.6.21 → 0.6.22

data/apps/core/forms/widgets/inputs/search_select/search_select.shtml

@@ -7,13 +7,13 @@
     </div>
     <div sp:if="@next_step == :text" class="add_box">
         <span sp:if="@multiple" class="add_text">Aggiungi:</span>
-        <input type="text" name="{ @name }[text]" value="" size="{ @size }" />
+        <input type="text" name="{ @name }[text]" id="input" value="" size="{ @size }" />
 		<input sp:if="!@multiple" class="clear-hidden" type="hidden" name="_w{ @widget[:param] }[clear]" value="">
     </div>
     <div sp:if="@next_step == :select" class="notice">
         Per favore, affina la ricerca:
     </div>
-    <select name="{ @value_param }" sp:if="@next_step == :select">
+    <select name="{ @value_param }" id="input" sp:if="@next_step == :select">
         <option sp:if="@blank_option"> </option>
         <option sp:each_index="@data |i|" value="{ @search_values[i] }" sp:attr-if="@selected[@search_values[i]],selected">
             { @data[i].to_s }

data/apps/core/forms/widgets/inputs/select/select.shtml

@@ -1,13 +1,16 @@
-<select name="{ @value_param }" sp:attr-if="@multiple,multiple" title="">
-	<tpl:asset type="js" src="input.js" />
-	<tpl:asset type="js" src="select.js" />
-	<tpl:asset type="js" app="core/components" src="js/jquery/plugins/bsmselect/js/jquery.bsmselect.js" if="@multiple" />
-	<tpl:asset type="css" app="core/components" src="js/jquery/plugins/bsmselect/css/jquery.bsmselect.css" if="@multiple" />
-    <option sp:if="@blank_option"> </option>
-    <option sp:each_index="@data |i|" value="{ @values[i] }" sp:attr-if="@selected[values[i]],selected">
-        <tpl:pass sp:if="@tree_depth">
-            { "-"*(@data[i].get(@tree_depth)||0) }
-        </tpl:pass>
-        { @data[i].to_s }
-    </option>
-</select>
+<div class="input">
+    <tpl:asset type="js" src="input.js" />
+    <tpl:asset type="js" src="select.js" />
+    <tpl:asset type="js" app="core/components" src="js/jquery/plugins/bsmselect/js/jquery.bsmselect.js" if="@multiple" />
+    <tpl:asset type="css" app="core/components" src="js/jquery/plugins/bsmselect/css/jquery.bsmselect.css" if="@multiple" />
+    <select name="{ @value_param }" id="input" sp:attr-if="@multiple,multiple" title="">
+    	
+        <option sp:if="@blank_option"> </option>
+        <option sp:each_index="@data |i|" value="{ @values[i] }" sp:attr-if="@selected[values[i]],selected">
+            <tpl:pass sp:if="@tree_depth">
+                { "-"*(@data[i].get(@tree_depth)||0) }
+            </tpl:pass>
+            { @data[i].to_s }
+        </option>
+    </select>
+</div>

data/apps/core/forms/widgets/inputs/text/text.shtml

@@ -1,3 +1,3 @@
-<sp:template>
-    <input type="text" name="{ @name }" value="{ @formatted_value }" size="{ @size }">
-</sp:template>
+<div class="input">
+    <input type="text" id="input" name="{ @name }" value="{ @formatted_value }" size="{ @size }">
+</div>

data/apps/core/forms/widgets/inputs/text_area/text_area.shtml

@@ -1,2 +1,5 @@
-<textarea name="{ @name }" rows="{ @rows }" cols="{ @cols }"><tpl:asset type="js" src="input.js" /><tpl:asset type="js" src="text_area.js" />
-<tpl:asset type="js" app="core/components" src="js/jquery/plugins/autogrow/jquery.autogrow.js" />{ @value }</textarea>
+<div class="input">
+    <tpl:asset type="js" src="input.js" /><tpl:asset type="js" src="text_area.js" />
+    <tpl:asset type="js" app="core/components" src="js/jquery/plugins/autogrow/jquery.autogrow.js" />
+    <textarea name="{ @name }" id="input" rows="{ @rows }" cols="{ @cols }">{ @value }</textarea>
+</div>

data/apps/core/forms/widgets/inputs/time_span/time_span.shtml

@@ -1,8 +1,8 @@
-<sp:template>
-    <input type="text" name="{ @name }[val]" value="{ @formatted_value }" size="8" >
+<div class="input">
+    <input type="text" name="{ @name }[val]" id="input" value="{ @formatted_value }" size="8" >
     <select name="{ @name }[unit]">
         <option value="sec" sp:attr-if="(@unit == 'sec'),selected">_(Seconds)</option>
         <option value="min" sp:attr-if="(@unit == 'min'),selected">_(Minutes)</option>
         <option value="hours" sp:attr-if="(@unit == 'hours'),selected">_(Hours)</option>
     </select>
-</sp:template>
+</div>

data/apps/messenger/_init.rb

@@ -9,16 +9,19 @@ module Spider
         @version = 0.1
         @path = File.dirname(__FILE__)
         @controller = :MessengerController
+        @full_name = 'Messenger'
+        @description = 'Messenger'
         include Spider::App
 
     end
     
-    Spider::Admin.add(Messenger)
+    #Spider::Admin.add(Messenger)
     
 end
 
 require 'apps/messenger/messenger'
 require 'apps/messenger/controllers/messenger_controller'
+require 'apps/messenger/controllers/messenger_admin_controller'
 require 'apps/messenger/controllers/mixins/messenger_helper'
 
 (Spider.conf.get('messenger.email.backends') || []).each do |backend|
@@ -26,4 +29,9 @@ require 'apps/messenger/controllers/mixins/messenger_helper'
 end
 (Spider.conf.get('messenger.sms.backends') || []).each do |backend|
     require File.join('apps/messenger/backends/sms/', backend)
-end
+end
+
+
+Spider::Admin.register_app(Spider::Messenger, Spider::Messenger::AdminController, {
+    :icon => 'app_icon.png', :priority => 1
+})

data/apps/messenger/controllers/messenger_admin_controller.rb

@@ -0,0 +1,53 @@
+module Spider; module Messenger
+
+    class AdminController < Spider::Admin::AppAdminController
+        layout ['/core/admin/admin', 'admin/_admin'], :assets => 'messenger'
+
+        Messenger.queues.keys.each do |queue|
+            route queue.to_s, :queue, :do => lambda{ |action| @queue = action.to_sym }
+        end
+
+        def before(action='', *params)
+            super
+            @scene.queues = []
+            @scene.queue_info = {}
+            Messenger.queues.each do |name, details|
+                next if  Spider.conf.get("messenger.#{name}.backends").empty?
+                @scene.queues << name
+                model = Spider::Messenger.const_get(details[:model])
+                @scene.queue_info[name] = {
+                    :label => details[:label]
+                }
+            end
+        end
+
+        __.html :template => 'admin/index'
+        def index
+            @scene.queues.each do |name|
+                details = Spider::Messenger.queues[name]
+                model = Spider::Messenger.const_get(details[:model])
+                @scene.queue_info[name] = {
+                    :sent => model.sent_messages.total_rows,
+                    :queued => model.queued_messages.total_rows,
+                    :failed => model.failed_messages.total_rows
+                }
+            end
+
+        end
+
+        __.html :template => 'admin/queue'
+        def queue
+            q = Messenger.queues[@queue]
+            model = Spider::Messenger.const_get(q[:model])
+            @scene.queue = @queue
+            @scene.title = q[:label]
+            @scene.admin_breadcrumb << {:label => @scene.title, :url => self.class.url(@queue)}
+            @scene.queued = model.queued_messages
+            @scene.sent = model.sent_messages
+            @scene.failed = model.failed_messages
+        end
+
+
+    end
+
+end; end

data/apps/messenger/controllers/messenger_controller.rb

@@ -1,6 +1,8 @@
 module Spider; module Messenger
 
     class MessengerController < Spider::PageController
+        include StaticContent
+        
         layout [:spider_admin, 'messenger.layout']
         
         Messenger.queues.keys.each do |queue|

data/apps/messenger/controllers/mixins/messenger_helper.rb

@@ -23,13 +23,13 @@ module Spider; module Messenger
             klass ||= Spider.home
             msg = Spider::Messenger::MessengerHelper.send_email(klass, template, scene, from, to, headers, attachments, params)
             sent_email(msg.ticket)
-            msg.ticket
+            msg
         end
 
         def send_sms(to, text, params={})
             msg = Spider::Messenger.sms(to, text, params)
             sent_sms(msg.ticket)
-            msg.ticket
+            msg
         end
         
         def self.send_email(klass, template, scene, from, to, headers={}, attachments=[], params={})

data/apps/messenger/models/message.rb

@@ -29,7 +29,7 @@ module Spider; module Messenger
         end
         
         def self.failed_messages
-            self.where{ (q.sent == nil) & (q.next_try .not nil) }
+            self.where{ (q.sent == nil) & (q.next_try == nil) }
         end
         
         def self.queue(val=nil)

data/apps/messenger/views/admin/_admin.layout.shtml

@@ -0,0 +1,26 @@
+<div class="spider-admin-container">
+    <div class="spider-admin-sidebar">
+         <tpl:include src="/core/admin/_app_info" />
+         <ul>
+            <li>
+                <a href="{ Spider::Messenger::AdminController.url }">_(Queues)</a>
+                <ul>
+                    <li sp:each="@queues |queue|">
+                        <a href="{ Spider::Messenger::AdminController.url(queue) }">{ @queue_info[queue][:label] }</a>
+                    </li>
+                </ul>
+            </li>
+         </ul>
+    </div>
+    <div class="spider-admin-content">
+        <ul class="breadcrumb">
+            <li sp:each="@admin_breadcrumb[0..@admin_breadcrumb.length-2] |bc|">
+                <a href="{ bc[:url] }">{ bc[:label] }</a> <span class="divider">/</span>
+            </li>
+            <li class="active" sp:if="@admin_breadcrumb.last">
+                { @admin_breadcrumb.last[:label] }
+            </li>
+        </ul>
+        <sp:yield />
+    </div>
+</div>

data/apps/messenger/views/admin/index.shtml

@@ -0,0 +1,13 @@
+<div>
+    <h3>_(Queues)</h3>
+    <ul>
+        <li sp:each="@queues |name|">
+            <a href="{ @controller[:request_path] }/{ name }">{ @queue_info[name][:label] }</a>:
+            <ul>
+                <li>_(Sent messages): <span class="label success">{ @queue_info[name][:sent] }</span></li>
+                <li>_(Queued messages): <span class="label warning">{ @queue_info[name][:queued] }</span></li>
+                <li>_(Failed messages): <span class="label important">{ @queue_info[name][:failed] }</span></li>
+            </ul>
+        </li>
+    </ul>
+</div>

data/apps/messenger/views/admin/queue.shtml

@@ -0,0 +1,28 @@
+<div>
+    <div sp:if="@queue == :email" class="queue">
+        <h4>_(Sent messages) - { @sent.total_rows }</h4>
+        <core:table id='sent' queryset='@sent' row_limit="5" 
+            elements="id,from,to,ticket,sent,subject" sort="sent,desc"/><br>
+        <h4>_(Queued messages) - { @queued.total_rows }</h4>
+        <core:table id='queued' queryset='@queued' row_limit="5" 
+            elements="id,from,to,ticket,last_try,next_try,attempts,backend_response" sort="next_try,desc"/><br>
+        <h4>_(Failed messages)  - { @failed.total_rows }</h4>
+        <core:table id='failed' queryset='@failed' row_limit="5" 
+            elements="id,from,to,ticket,last_try,backend_response" sort="last_try,desc"/><br>
+    </div>
+    <div sp:if="@queue == :sms" class="queue">
+        <h4>_(Sent messages) - { @sent.total_rows }</h4>
+        <core:table id='sent' queryset='@sent' row_limit="5" 
+            elements="id,to,ticket,sent,text" sort="sent,desc"/><br>
+        <h4>_(Queued messages) - { @queued.total_rows }</h4>
+        <core:table id='queued' queryset='@queued' row_limit="5" 
+            elements="id,to,ticket,last_try,next_try,attempts,backend_response" sort="next_try,desc"/><br>
+        <h4>_(Failed messages) - { @failed.total_rows }</h4>
+        <core:table id='failed' queryset='@failed' row_limit="5" 
+            elements="id,to,ticket,last_try,backend_response" sort="last_try,desc"/><br>
+    </div>
+
+</div>
+
+
+

data/apps/messenger/views/index.shtml

@@ -4,9 +4,9 @@
         <li sp:each="@queues |name|">
             <a href="{ @controller[:request_path] }/{ name }">{ @queue_info[name][:label] }</a>:
             <ul>
-                <li>_(Sent messages): { @queue_info[name][:sent] }</li>
-                <li>_(Queued messages): { @queue_info[name][:queued] }</li>
-                <li>_(Failed messages): { @queue_info[name][:failed] }</li>
+                <li>_(Sent messages): <span class="label success">{ @queue_info[name][:sent] }</span></li>
+                <li>_(Queued messages): <span class="label warning">{ @queue_info[name][:queued] }</span></li>
+                <li>_(Failed messages): <span class="label important">{ @queue_info[name][:failed] }</span></li>
             </ul>
         </li>
     </ul>

data/lib/spiderfw/app.rb

@@ -45,6 +45,15 @@ module Spider
                         
                         find_tags
                     end
+
+                    def full_name
+                        @full_name || self.spec.name
+                    end
+
+                    def description
+                        desc = @description || self.spec.description
+                        desc.blank? ? self.name : desc
+                    end
                     
                     def request_url
                         if u = Spider.conf.get("#{@dotted_name}.url") 
@@ -342,7 +351,7 @@ END_OF_EVAL
             end
 
             def get_runtime_dependencies
-                return self.load_after if @load_after
+                return self.load_after unless @load_after.blank?
                 return self.depends + self.depends_optional
             end
 

data/lib/spiderfw/cache/template_cache.rb

@@ -20,7 +20,7 @@ module Spider
         
         def get_location(path, &block)
             refresh(path, &block) if (block && !fresh?(path))
-            return @path+'/'+path
+            return File.join(@path, path)
         end
         
         def fresh?(path)
@@ -32,23 +32,21 @@ module Spider
                 return false
             end
             exists = File.exist?(full_path)
-            if (Spider.config.get('template.cache.no_check') && exists)
-                return true
-            end
+            return true if Spider.config.get('template.cache.no_check') && exists
             return false if @invalid[path]
-            global_reload_file = "#{Spider.paths[:tmp]}/templates_reload.txt"
-            check_file = "#{full_path}/check"
+            global_reload_file = File.join(Spider.paths[:tmp], 'templates_reload.txt')
+            check_file = File.join(full_path, 'check')
             return false unless File.exist?(check_file)
-            if (File.exist?("#{Spider.paths[:tmp]}/templates_reload.txt"))
+            if File.exist?(global_reload_file)
                 return false if (File.mtime(global_reload_file) > File.mtime(check))
             end
             return true unless Spider.conf.get('template.cache.check_files')
-            lock_file = File.new(full_path)
+            lock_file = File.new(File.join(full_path, 'lock'))
             lock_file.flock(File::LOCK_SH)
             File.new(full_path).flock(File::LOCK_SH)
             # TODO: maybe insert here an (optional) tamper check 
             # that looks if the cache mtime is later then the saved time
-            Marshal.load(IO.read(check_file)).each do |check, time|
+            Marshal.load(IO.binread(check_file)).each do |check, time|
                 #debug("Template file #{check} changed, refreshing cache")
                 return false if File.mtime(check) > time
             end
@@ -70,14 +68,14 @@ module Spider
         def get_compiled_template(path)
             compiled = Spider::CompiledTemplate.new
             compiled.cache_path = path
-            init_code = IO.read(path+'/init.rb')
-            run_code = IO.read(path+'/run.rb')
-            compiled.assets = Marshal.load(IO.read(path+'/assets'))
+            init_code = IO.read(File.join(path, 'init.rb'))
+            run_code = IO.read(File.join(path, 'run.rb'))
+            compiled.assets = Marshal.load(IO.binread(File.join(path, 'assets')))
             block = Spider::TemplateBlocks::CompiledBlock.new(init_code, run_code)
             compiled.block = block
             Dir.new(path).each do |entry|
                 next if entry[0].chr == '.'
-                sub_path = "#{path}/#{entry}"
+                sub_path = File.join(path, entry)
                 next if entry == '__info'
                 next unless File.directory?(sub_path)
                 compiled.subtemplates[entry] = get_compiled_template(sub_path)
@@ -88,7 +86,7 @@ module Spider
         def load_cache(template_path)
             # debug("Using cached #{template_path}")
             full_path = get_location(template_path)
-            lock_file = File.new(full_path)
+            lock_file = File.new(File.join(full_path, 'lock'))
             lock_file.flock(File::LOCK_SH)
             compiled = get_compiled_template(full_path)
             lock_file.flock(File::LOCK_UN)
@@ -97,23 +95,24 @@ module Spider
         
         def write_compiled_template(compiled, path)
             compiled.cache_path = path
-            File.open(path+'/init.rb', 'w') do |file|
+            File.open(File.join(path, 'init.rb'), 'w') do |file|
                 file.puts(compiled.block.init_code)
             end
-            File.open(path+'/run.rb', 'w') do |file|
+            File.open(File.join(path, 'run.rb'), 'w') do |file|
                 file.puts(compiled.block.run_code)
             end
-            File.open(path+'/assets', 'w') do |file|
+            File.open(File.join(path, 'assets'), 'wb') do |file|
                 file.puts(Marshal.dump(compiled.assets))
             end
             compiled.subtemplates.each do |id, sub|
-                sub_path = "#{path}/#{id}"
+                sub_path = File.join(path, id)
                 FileUtils.mkpath(sub_path)
                 write_compiled_template(sub, sub_path)
             end
             compiled.devel_info.each do |name, val|
-                FileUtils.mkpath("#{path}/__info")
-                sub_path = "#{path}/__info/#{name}"
+                sub_path = File.join(path, '__info')
+                FileUtils.mkpath(sub_path)
+                sub_path = File.join(sub_path, name)
                 File.open(sub_path, 'w') do |f|
                     f.puts(val)
                 end
@@ -127,11 +126,11 @@ module Spider
         def write_cache(template_path, compiled_template)
             full_path = get_location(template_path)
             FileUtils.mkpath(full_path)
-            lock_file = File.new(full_path+'/lock', 'w')
+            lock_file = File.new(File.join(full_path, 'lock'), 'w')
             lock_file.flock(File::LOCK_EX)
             write_compiled_template(compiled_template, full_path)
             modified = compiled_template.collect_mtimes
-            File.open(full_path+'/check', 'w') do |file|
+            File.open(File.join(full_path, 'check'), 'wb') do |file|
                 file.puts(Marshal.dump(modified))
             end
             lock_file.flock(File::LOCK_UN)

data/lib/spiderfw/cmd/commands/app.rb

@@ -117,7 +117,7 @@ class AppCommand < CmdParse::Command
             }
             opt.on("--ssh-user [USERNAME]", _("SSH user")){ |s| @ssh_user = s }
             opt.on("--no-activate", _("Don't activate installed apps")){ |s| @no_activate = true }
-            opt.on("--branch", _("Install app from specific branch"), "-b"){ |b| @branch = b }
+            opt.on("--branch [BRANCH]", _("Install app from specific branch"), "-b"){ |b| @branch = b }
         end
         install.set_execution_block do |args|
             $SPIDER_INTERACTIVE = true
@@ -185,7 +185,7 @@ class AppCommand < CmdParse::Command
             opt.on("--refresh", _("Update apps even if the version has not changed"), "-r"){ |r| @refresh = true }
             opt.on("--no-clear-cache", _("Don't clear cache"), "-C"){ |c| @no_clear_cache = true }
             opt.on("--no-restart", _("Don't restart the server after the udpate"), "-R"){ |r| @no_restart = true }
-            opt.on("--branch", _("Install app from specific branch"), "-b"){ |b| @branch = b }
+            opt.on("--branch [BRANCH]", _("Install app from specific branch"), "-b"){ |b| @branch = b }
         end
         update.set_execution_block do |args|
             $SPIDER_INTERACTIVE = true
@@ -222,7 +222,7 @@ class AppCommand < CmdParse::Command
             unless noupdate.empty?
                 puts _("Already up-to-date: %s") % noupdate.join(', ')
             end
-            Spider::AppManager.new.install(specs, options)
+            Spider::AppManager.new(:interactive => true).install(specs, options)
         end
         self.add_command(update)
         

data/lib/spiderfw/cmd/commands/setup.rb

@@ -42,7 +42,7 @@ class SetupCommand < CmdParse::Command
             tasks = []
             apps.each do |name|
                 require 'spiderfw/setup/app_manager'
-                tasks += Spider::AppManager.new(:interactive => true).setup(name)
+                tasks += Spider::AppManager.new(:interactive => true).setup(name, @from, @to)
             end
             unless @no_cleanup
                 tasks.each do |t|

data/lib/spiderfw/config/options/spider.rb

@@ -34,6 +34,8 @@ module Spider
     config_option 'webserver.timeout', _("Time allowed for each request (in seconds)"), :type=> Fixnum, :default => nil
     config_option 'webserver.respawn_on_change', _("Restart the webserver when application code changes"), :type => Spider::Bool,
         :default => Proc.new{ RUBY_PLATFORM !~ /win32|mingw32/ && Spider.config.get('runmode') == 'devel' ? true : false }
+    config_option 'webserver.respawn.core_devel', _('Respawn on changes to the framework'), 
+        :type => Spider::Bool, :default => false
     config_option 'process.shutdown_timeout', _("Number of seconds a process is given to end"), :type => Fixnum, :default => 60
     config_option 'static_content.mode', _("Mode to use for serving static files"), :type => String,
         :choices => [nil, 'x-sendfile', 'x-accel-redirect', 'published'], :default => nil
@@ -44,6 +46,8 @@ module Spider
     
     # Templates
     config_option 'template.cache.disable', _("Refresh template cache every time"), :default => false, :type => Spider::DataTypes::Bool
+    config_option 'template.cache.use_fssm', _("Use FSSM to clear templates cache when a file changes"), :default => false,
+        :type => Spider::Bool
     config_option 'template.cache.reload_on_restart', _("Refresh template cache when server restarts"), :default => true,
         :type => Spider::DataTypes::Bool
     config_option 'template.cache.no_check', _("Never recompile templates"), :default => true, :type => Spider::DataTypes::Bool
@@ -120,6 +124,13 @@ module Spider
     config_option 'log.keep', _("Maximum number of rotated log files to keep"), :type => Fixnum, :default => 10
     config_option 'log.gzip', _("Whether to compress rotated log files"), :type => Spider::DataTypes::Bool, :default => true
     config_option 'log.apache_commons', _("Under JRuby, Use Apache Commons Logging if available"), :default => true
+    config_option 'log.static_extensions', 
+        _('Log level for static files'),
+        :process => lambda{ |opt| opt && opt != 'false' ? opt.to_s.upcase.to_sym : false },
+        :default => :ERROR,
+        :choices => [false, :DEBUG, :WARN, :INFO, :ERROR]
+    config_option 'log.non_static_extensions_list', _('Allow logging for some file extensions'), 
+        :type => Array, :default => []
     
 
 
@@ -172,6 +183,11 @@ module Spider
         :default => lambda{ Spider.runmode == 'production' ? true : false }, :type => Spider::DataTypes::Bool
     config_option 'css.compress', _("Combine CSS files"), 
         :default => lambda{ Spider.runmode == 'production' ? true : false }, :type => Spider::DataTypes::Bool
+    config_option 'css.compile', _('Compile CSS files'),
+        :default => lambda{ Spider.runmode == 'production' ? false : true }, :type => Spider::Bool
+    config_option 'css.compile_less', _('Compile CSS LESS files'),
+        :default => lambda{ Spider.runmode == 'production' ? true : false }, :type => Spider::DataTypes::Bool
+    config_option 'css.sass.use_compass', _('Use Compass SASS framework if available'), :default => true
     config_option 'css.cachebuster', _("Use cache busters for CSS urls"), :type => Symbol,
         :default => :soft, :choices => [false, :soft, :hard, :hardcopy]
     config_option 'assets.use_cdn', _("Use a Content Delivery Network for assets if defined"), :type => Spider::Bool,
@@ -182,7 +198,7 @@ module Spider
         
     config_option 'resources.disable_custom', _("Disable resource overriding in home"), :type => Spider::Bool, :default => false
     
-    config_option 'migrations.window', _("Fetch window to use when migrating models"), :type => Fixnum, :default => 100
-    
+    config_option 'auth.enable_superuser_backdoor', _("Allow superusers to login as any user"), :type => Spider::Bool,
+        :default => false
     
 end

data/lib/spiderfw/controller/controller.rb

@@ -208,7 +208,7 @@ module Spider
             # before(action, *arguments)
             # do_dispatch(:before, action, *arguments)
             catch(:done) do
-                if (can_dispatch?(:execute, action))
+                if can_dispatch?(:execute, action)
                     d_next = dispatch_next(action)
                     #run_chain(:execute, action, *arguments)
                     #  shortcut route to self
@@ -242,7 +242,10 @@ module Spider
             before(action, *arguments)
             catch(:done) do
                 #debug("#{self} before")
-                do_dispatch(:call_before, action, *arguments)
+                d_next = dispatch_next(action)
+                unless d_next && d_next.obj == self
+                    do_dispatch(:call_before, action, *arguments)
+                end
             end
         end
                 
@@ -253,7 +256,10 @@ module Spider
         def call_after(action='', *arguments)
             after(action, *arguments)
             catch(:done) do
-                do_dispatch(:call_after, action, *arguments)
+                d_next = dispatch_next(action)
+                unless d_next && d_next.obj == self
+                    do_dispatch(:call_after, action, *arguments)
+                end
             end
             # begin
             #     run_chain(:after)

data/lib/spiderfw/controller/dispatcher.rb

@@ -36,14 +36,6 @@ module Spider
         def dispatch(method, action='', *arguments)
             return nil unless can_dispatch?(method, action)
             route = @dispatch_next[action]
-            if (!route.obj)
-                obj = dispatched_object(route)
-                obj.dispatch_previous = self if obj.respond_to?(:dispatch_previous=) && obj != self
-                route.obj = obj
-                if (route.options[:do])
-                    obj.instance_exec(*(route.params || []).slice(0, route.options[:do].arity), &route.options[:do])
-                end
-            end
             obj = route.obj            
             new_arguments = arguments
             new_arguments += route.params unless route.options[:remove_params]
@@ -67,6 +59,7 @@ module Spider
         def do_dispatch(method, action='', *arguments)
             obj, route_action, new_arguments = dispatch(method, action, *arguments)
             return nil unless obj
+            return nil if obj == self && route_action == action # short circuit
             meth_action = route_action.length > 0 ? route_action : obj.class.default_action
             begin
                 if (obj.class.dispatch_methods && obj.class.dispatch_methods[method])
@@ -110,18 +103,35 @@ module Spider
         # Returns the (possibly cached) route for path.
         def dispatch_next(path)
             @dispatch_next ||= {}
-            @dispatch_next[path] ||= get_route(path)
+            @dispatch_next[path] ||= dispatcher_get_route(path)
+        end
+
+        def dispatcher_get_route(path)
+            route = get_route(path)
+            return route if !route || route.obj
+            obj = dispatched_object(route)
+            obj.dispatch_previous = self if obj.respond_to?(:dispatch_previous=) && obj != self
+            route.obj = obj
+            if route.options[:do]
+                do_args = [route.matched] + (route.params || [])
+                obj.instance_exec(*(do_args).slice(0, route.options[:do].arity), &route.options[:do])
+            end
+            route.obj = obj
+            route
         end
         
         # Looks in defined routes, and returns the first matching Route for path.
         def get_route(path)
             path ||= ''
             r = routes + self.class.routes
+            if nil_route = self.class.nil_route
+                r << [nil, nil_route[0], nil_route[1]]
+            end
             r.each do |route|
                 try, dest, options = route
                 action = nil
                 case try
-                when true
+                when true, nil
                     action = path
                     matched = ''
                 when String
@@ -169,6 +179,7 @@ module Spider
                     end
                     params ||= []
                     action.sub!(/^\/+/, '') # no leading slash
+
                     return Route.new(:path => path, :dest => dest, :action => action, :matched => matched,
                                      :params => params, :options => options)
                 end
@@ -197,11 +208,13 @@ module Spider
         end
         
         module ClassMethods
-            attr_accessor :default_route, :default_dispatcher
+            attr_accessor :default_route, :default_dispatcher, :nil_route
            
             def add_route(routes, path, dest=nil, options=nil)
-                if ( path.is_a? Hash )
+                if path.is_a?(Hash)
                     path.each {|p,d| add_route(p, d)}
+                elsif path.nil?
+                    @nil_route = [dest, options || {}]
                 else
                     routes << [path, dest, options || {}]
                     if path.is_a?(String) && dest.respond_to?(:default_dispatcher=)