servit 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20ee4f2c7b099b37881a2665cec5580a9dfcce2d
-  data.tar.gz: 647bbcb42ad560c8ab4572831bc1ceb96f4f1f6c
+  metadata.gz: a9a3945f4e62d5000aa2bd5056764fc591198275
+  data.tar.gz: 9bd648ab83ac5df367d16a147971eb9d228169a9
 SHA512:
-  metadata.gz: 082118fbcbda5d308f4e11669402bd534121ebdd9bca0f148a5ce423eeba282ad3b0e5ddc238b5dfe524df1cfc21baabd0ea1f979befb46ab6ae929f7c1cf839
-  data.tar.gz: 73f625f161883592b4b6994d565151c7c1e293f28c7d98ceebdf21f6bc02e5c875a7fd88524003ad20ea39e236ef3a667c5be947998833307ac83d7575f4ee57
+  metadata.gz: 4bb111e5a461558f1258e15f322324f592d808e8e09ad68ba3f05c518fff1f6e17d16443597032e7e7fafe879db8940c7a1c1282513c9441cc9ff1c002bf83cb
+  data.tar.gz: 343477a5c4819c3fd26ccbed6ed984c511d4c243d20ec032b03d696e60938ce112078042fc4bb4a6e330fca77b97e5e83323470bab32303528904bc79c5e4e33

data/lib/servit.rb

@@ -45,29 +45,29 @@ loop do
   
   path = File.join(path, 'index.html') if File.directory?(path)
 
-  if File.exist?(path) && !File.directory?(path)
-    File.open(path, "rb") do |file|
-      socket.print "HTTP/1.1 200 OK\r\n" +
-                   "Content-Type: #{content_type(file)}\r\n" +
+    if File.exist?(path) && !File.directory?(path)
+      File.open(path, "rb") do |file|
+        socket.print "HTTP/1.1 200 OK\r\n" +
+                     "Content-Type: #{content_type(file)}\r\n" +
+                     "Content-Length: #{file.size}\r\n" +
+                     "Connection: close\r\n"
+
+        socket.print "\r\n"
+
+        IO.copy_stream(file, socket)
+      end
+    else
+      File.open("404.html") do |file|
+
+      socket.print "HTTP/1.1 404 Not Found\r\n" +
+                   "Content-Type: text/html\r\n" +
                    "Content-Length: #{file.size}\r\n" +
                    "Connection: close\r\n"
 
       socket.print "\r\n"
-
       IO.copy_stream(file, socket)
     end
-  else
-    message = "File not found\n"
-
-    socket.print "HTTP/1.1 404 Not Found\r\n" +
-                 "Content-Type: text/plain\r\n" +
-                 "Content-Length: #{message.size}\r\n" +
-                 "Connection: close\r\n"
 
-    socket.print "\r\n"
-
-    socket.print message
+    socket.close
   end
-
-  socket.close
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: servit
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Mike Elliott