clay 1.5 → 1.6

data/src/clay.rb

@@ -6,7 +6,7 @@ require 'fileutils'
 require 'yaml'
 
 module Clay
-  VERSION = "1.5"
+  VERSION = "1.6"
   
   def self.init project_name
     puts "Creating the folder structure... "

data/src/rack/clay.rb

@@ -33,13 +33,14 @@ module Rack
       request = Request.new(env)
       path_info = request.path_info
       @files = ::Dir[@path + "/**/*"].inspect      
+      path_info += ".html" if @files.include?(path_info+".html")
       if @files.include?(path_info)
         if path_info =~ /(\/?)$/
           if @mimes.collect {|regex| path_info =~ regex }.compact.empty?
             path_info += $1.nil? ? "/index.html" : "index.html"
           end
         end
-        mime = mime(path_info)
+        mime_type = mime(path_info)
 
         file = file_info(@path + path_info)
         body = file[:body]
@@ -48,17 +49,12 @@ module Rack
         if time == request.env['HTTP_IF_MODIFIED_SINCE']
           [304, {'Last-Modified' => time}, []]
         else
-          [200, {"Content-Type" => mime, "Content-length" => body.length.to_s, 'Last-Modified' => time}, [body]]
+          [200, {"Content-Type" => mime_type, "Content-length" => body.length.to_s, 'Last-Modified' => time}, [body]]
         end
-
       else
         status, body, path_info = ::File.exist?(@path+"/404.html") ? [404,file_info(@path+"/404.html")[:body],"404.html"] : [404,"Not found","404.html"]
-        mime = mime(path_info)
-        if !@compiling
-          [status, {"Content-Type" => mime, "Content-length" => body.length.to_s}, [body]]
-        else
-          [200, {"Content-Type" => "text/plain"}, ["This site is currently generating pages. Please reload this page after 10 secs."]]
-        end
+        mime_type = mime(path_info)
+        [status, {"Content-Type" => mime_type, "Content-length" => body.length.to_s}, [body]]
       end
     end
 

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: clay
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 1
-  - 5
-  version: "1.5"
+  - 6
+  version: "1.6"
 platform: ruby
 authors: 
 - Pavlo Kerestey