lib/gumdrop/server.rb in gumdrop-0.2.4 vs lib/gumdrop/server.rb in gumdrop-0.2.7

@@ -6,44 +6,59 @@
 
   class Server < Sinatra::Base
 
     set :port, Gumdrop.config.port if Gumdrop.config.port
     
-    get '/' do
-      redirect '/index.html'
-    end
-    
+    # get '/' do
+    #   redirect '/index.html'
+    # end
+
     get '/*' do
-      file_path= params[:splat].join('/')
-      matches= Dir["source/#{file_path}*"] 
-      if matches.length > 0
-        
-        Gumdrop.site= Gumdrop.layouts= Gumdrop.generators= Utils.content_hash("source/**/")
-        Gumdrop.partials= Utils.content_hash("source/**/_")
-                    
-        content= Content.new matches[0]
+      
+      Gumdrop.run :dry_run=>true if Gumdrop.config.force_reload
+      
+      file_path= get_content_path params[:splat].join('/')
+      
+      if Gumdrop.site.has_key? file_path
+        content= Gumdrop.site[file_path]
         if content.useLayout?
           content_type :css if content.ext == '.css' # Meh?
           content_type :js if content.ext == '.js' # Meh?
           content_type :xml if content.ext == '.xml' # Meh?
           content.render
         else
-          send_file matches[0]
+          send_file "source/#{file_path}"
         end
       else
         puts "NOT FOUND: #{file_path}"
         "#{file_path} Not Found"
       end
     end
     
+
+    def get_content_path(file_path)
+      keys= [
+        file_path,
+        "#{file_path}.html",
+        "#{file_path}/index.html"
+      ]
+      if file_path == ""
+        "index.html"
+      else
+        keys.detect {|k| Gumdrop.site.has_key?(k) }
+      end
+    end
+    
     if Gumdrop.config.auto_run
+      Gumdrop.run :dry_run=>true 
       run!
     end    
 
     def self.start(opts={})
       # Options
       opts.reverse_merge! :auto_run => true, :cache_data => false
       Gumdrop.config.merge! opts
+      Gumdrop.run :dry_run=>true 
       ::Gumdrop::Server
     end
 
   end
     
\ No newline at end of file