lib/gumdrop/server.rb in gumdrop-0.6.4 vs lib/gumdrop/server.rb in gumdrop-0.7.0

@@ -9,11 +9,11 @@
 
   class Server < Sinatra::Base
     site_file= Gumdrop.fetch_site_file
     unless site_file.nil?
       site= Site.new site_file
-      site.scan()
+      site.rescan()
 
       set :port, site.config.server_port if site.config.server_port
       
       if site.config.proxy_enabled
         require 'gumdrop/proxy_handler'
@@ -46,10 +46,10 @@
             site.report "[#{$$}]  *Dynamic: #{file_path} (#{content.ext})"
             content_type :css if content.ext == '.css' # Meh?
             content_type :js if content.ext == '.js' # Meh?
             content_type :xml if content.ext == '.xml' # Meh?
             output= content.render 
-            site.content_filters.each {|f| output= f.call(output, self) }
+            site.content_filters.each {|f| output= f.call(output, content) }
             output
           else
             site.report "[#{$$}]  *Static: #{file_path}"
             send_file File.join( site.src_path, file_path)
           end
\ No newline at end of file