httphere 1.0.0 → 1.0.1

data/README.rdoc

@@ -2,6 +2,12 @@
 
 httphere is a very small and simple ruby command-line HTTP file server.
 
+== Features
+
+* Serves any file found at the current path, simply the content-type determined by shared-mime-types, and the content of the file.
+* Defaults to index.* for a root request.
+* Renders *.markdown as Markdown (html).
+
 = To work on
 
 * Improve content-negotiation behind the scenes. For example, a file found to be "application/x-ruby" could just as well be transferred as "text/plain".

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/bin/httphere

@@ -534,19 +534,42 @@ end
 
 require 'iconv'
 require 'rubygems'
+module Renderers
+  autoload :Markdown, 'httphere/markdown'
+  autoload :Textile,  'httphere/textile'
+end
 require 'UniversalDetector'
 require 'shared-mime-info'
 class FileServer < EventParsers::Http11Parser::Request
   # This is where the routing is processed.
   def process
     # Get the filename desired
-    filename = resource_uri.sub(/^\//,'')
+    filename, query = resource_uri.split('?',2)
+    filename = filename.sub(/^\//,'')
+    # Default to any file named index.*
+    filename = Dir["index.*"].first if filename.to_s == '' && Dir["index.*"].length > 0
+    file_extension = (filename.match(/\.([^\.]+)$/) || [])[1]
+
     if File.exists?(filename) && !File.directory?(filename)
       content_type = MIME.check(filename).type
       file_body = File.read(filename)
+
+      # If .markdown, render as Markdown
+      if file_extension == 'markdown'
+        file_body = Renderers::Markdown.render_content(file_body)
+        content_type = 'text/html'
+      end
+
+      # If .textile, render as Textile
+      if file_extension == 'textile'
+        file_body = Renderers::Textile.render_content(file_body)
+        content_type = 'text/html'
+      end
+
+      # Send Response
       respond!('200 Ok', content_type, file_body)
     else
-      respond!('400 Not Found', 'text/plain', "Could not find file: '#{resource_uri}'")
+      respond!('404 Not Found', 'text/plain', "Could not find file: '#{resource_uri}'")
     end
   end
 
@@ -571,7 +594,7 @@ class FileServer < EventParsers::Http11Parser::Request
     puts (status =~ /200/ ?
       "Served #{resource_uri} (#{content_type})" :
       "404 #{resource_uri}"
-    ) + " at #{1 / span} requests/second"
+    ) + " at #{1 / span} requests/second" unless status =~ /404/ && resource_uri == '/favicon.ico'
   end
 end
 

data/httphere.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{httphere}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Parker"]
-  s.date = %q{2010-01-06}
+  s.date = %q{2010-02-10}
   s.default_executable = %q{httphere}
   s.description = %q{httphere is a very small and simple ruby command-line HTTP file server.}
   s.email = %q{gems@behindlogic.com}
@@ -26,7 +26,9 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "bin/httphere",
-     "httphere.gemspec"
+     "httphere.gemspec",
+     "lib/httphere/markdown.rb",
+     "lib/httphere/textile.rb"
   ]
   s.homepage = %q{http://dcparker.github.com/httphere}
   s.post_install_message = %q{

data/lib/httphere/markdown.rb

@@ -0,0 +1,9 @@
+module Renderers
+  class Markdown
+    def self.render_content(content)
+      require 'rubygems'
+      require 'bluecloth'
+      BlueCloth.new(content).to_html
+    end
+  end
+end

data/lib/httphere/textile.rb

@@ -0,0 +1,9 @@
+module Renderers
+  class Textile
+    def self.render_content(content)
+      require 'rubygems'
+      require 'redcloth'
+      RedCloth.new(content).to_html
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: httphere
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Daniel Parker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-06 00:00:00 -05:00
+date: 2010-02-10 00:00:00 -05:00
 default_executable: httphere
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,8 @@ files:
 - VERSION
 - bin/httphere
 - httphere.gemspec
+- lib/httphere/markdown.rb
+- lib/httphere/textile.rb
 has_rdoc: true
 homepage: http://dcparker.github.com/httphere
 licenses: []