serve 0.9.5 → 0.9.6

data/History.txt

@@ -1,3 +1,8 @@
+== 0.9.6 (February 20, 2008)
+
+* Changed default port to 4000 so that serve plays nicely with Rails apps.
+* Rearranged source.
+
 == 0.9.5 (February 19, 2008)
 
 * Added support for rendering other files with the following syntax:

data/Manifest.txt

@@ -7,11 +7,19 @@ bin/serve
 config/hoe.rb
 config/requirements.rb
 lib/serve.rb
+lib/serve/handlers/email_handler.rb
+lib/serve/handlers/file_type_handler.rb
+lib/serve/handlers/haml_handler.rb
+lib/serve/handlers/markdown_handler.rb
+lib/serve/handlers/redirect_handler.rb
+lib/serve/handlers/sass_handler.rb
+lib/serve/handlers/textile_handler.rb
 lib/serve/version.rb
-lib/webrick/extensions.rb
+lib/serve/webrick/extensions.rb
 log/debug.log
 script/destroy
 script/generate
+script/txt2html
 setup.rb
 spec/serve_spec.rb
 spec/spec.opts
@@ -19,4 +27,5 @@ spec/spec_helper.rb
 tasks/deployment.rake
 tasks/environment.rake
 tasks/rspec.rake
+tasks/undefine.rake
 tasks/website.rake

data/README.txt

@@ -1,7 +1,5 @@
 == Serve
 
-=== What is Serve?
-
 Serve is a small Ruby script that makes it easy to start up a WEBrick server
 in any directory. Serve is ideal for HTML prototyping and simple file sharing.
 If the haml, redcloth, and bluecloth gems are installed serve can handle Haml,
@@ -17,7 +15,7 @@ At a command prompt all you need to type to start serve is:
 This will launch a WEBrick server which you can access from any Web browser at
 the following address:
 
-  http://localhost:3000
+  http://localhost:4000
 
 Once the server is going it will output a running log of its activity. To
 stop the server at any time, type CTRL+C at the command prompt. By default the
@@ -28,7 +26,7 @@ behavior, `cd` to the appropriate directory before starting serve.
 === Advanced Options
 
 The serve command automatically binds to 0.0.0.0 (localhost) and uses port
-3000 by default. To serve files over a different IP (that is bound to your
+4000 by default. To serve files over a different IP (that is bound to your
 computer) or port specify those options on the command line:
 
   $ serve 4000               # a custom port
@@ -67,10 +65,22 @@ It is recommended that you install serve via RubyGems:
   $ sudo gem install serve
 
 
+=== More Information
+
+For more information, be sure to look through the documentation over at
+RubyForge:
+
+http://serve.rubyforge.org/
+
+Or visit the project page here:
+
+http://rubyforge.org/projects/serve/
+
+
 === License
 
-Serve is released under the MIT license and is copyright (c) John W. Long.
-A copy of the MIT license can be found in the License.txt file.
+Serve is released under the MIT license and is copyright (c) 2006-2007
+John W. Long. A copy of the MIT license can be found in the License.txt file.
 
 
 Enjoy!

data/Rakefile

@@ -1,4 +1,13 @@
 require 'config/requirements'
 require 'config/hoe' # setup Hoe + all gem configuration
 
-Dir['tasks/**/*.rake'].each { |rake| load rake }
+Dir['tasks/**/*.rake'].each { |rake| load rake }
+
+undefine_task %w(
+  default
+  test
+  test_deps
+  config_hoe
+)
+
+task :default => :spec

data/bin/serve

@@ -16,7 +16,7 @@ args = args.split(/[ :]/).compact
 help = args.delete('--help') || args.delete('-h') || false
 version = args.delete('--version') || args.delete('-v') || false
 environment = args.delete('production') || args.delete('test') || args.delete('test') || 'development'
-port = args.pop || 3000
+port = args.pop
 address = args.pop || '0.0.0.0'
 script = Dir.pwd + '/script/server'
 
@@ -39,25 +39,27 @@ when help
   puts "Description:"
   puts "  Starts a WEBrick server on the specified address and port with its document "
   puts "  root set to the current working directory. By default the command uses "
-  puts "  0.0.0.0 for the address and 3000 for the port. This means that once the "
+  puts "  0.0.0.0 for the address and 4000 for the port. This means that once the "
   puts "  command has been started you can access the documents in the current "
   puts "  directory with any Web browser at:"
   puts "  "
-  puts "    http://localhost:3000/"
-  puts "  "
-  puts "  If the Rails command script/server exists in the current directory the "
-  puts "  script will start that instead with the specified environment or the "
-  puts "  development environment if none is specified."
+  puts "    http://localhost:4000/"
   puts "  "
   puts "  If the haml, redcloth, or bluecloth gems are installed the command can serve "
   puts "  Haml, Sass, Textile, and Markdown for documents with haml, sass, textile, "
   puts "  and markdown file extensions."
   puts "  "
+  puts "  If the Rails command script/server exists in the current directory the "
+  puts "  script will start that instead with the specified environment or the "
+  puts "  development environment if none is specified. Rails apps are started by "
+  puts "  default on port 3000."
+  puts "  "
   puts "Options:"
   puts "  -h, --help      Show this message and quit."
   puts "  -v, --version   Show the program version number and quit."
 else
   unless File.file?(script) and File.executable?(script)
+    port ||= 4000
     server = Serve::Server.new(
       :Port => port,
       :BindAddress => address,
@@ -68,6 +70,7 @@ else
     trap("INT") { server.shutdown }
     server.start
   else
+    port ||= 3000
     system "#{script} -p #{port} -b #{address} -e #{environment}"
   end
 end

data/lib/serve.rb

@@ -1,231 +1,15 @@
+require 'webrick'
 require 'serve/version'
-require 'webrick/extensions'
+require 'serve/webrick/extensions'
+require 'serve/handlers/file_type_handler'
+require 'serve/handlers/textile_handler'
+require 'serve/handlers/markdown_handler'
+require 'serve/handlers/haml_handler'
+require 'serve/handlers/sass_handler'
+require 'serve/handlers/email_handler'
+require 'serve/handlers/redirect_handler'
 
 module Serve #:nodoc:
-  class FileTypeHandler < WEBrick::HTTPServlet::AbstractServlet #:nodoc:
-    
-    def self.extension(extension)
-      WEBrick::HTTPServlet::FileHandler.add_handler(extension, self)
-    end
-    
-    def initialize(server, name)
-      super
-      @script_filename = name
-    end
-    
-    def process(req, res)
-      data = open(@script_filename){|io| io.read }
-      res['content-type'] = content_type
-      res.body = parse(data)
-    end
-    
-    def do_GET(req, res)
-      begin
-        process(req, res)
-      rescue StandardError => ex
-        raise
-      rescue Exception => ex
-        @logger.error(ex)
-        raise WEBrick::HTTPStatus::InternalServerError, ex.message
-      end
-    end
-    
-    alias do_POST do_GET
-    
-    protected
-    
-      def content_type
-        'text/html'
-      end
-      
-      def parse(string)
-        string.dup
-      end
-      
+  class Server < ::WEBrick::HTTPServer #:nodoc:
   end
-  
-  class TextileHandler < FileTypeHandler #:nodoc:
-    extension 'textile'
-    
-    def parse(string)
-      require 'redcloth'
-      "<html><body>#{ RedCloth.new(string).to_html }</body></html>"
-    end
-  end
-  
-  class MarkdownHandler < FileTypeHandler #:nodoc:
-    extension 'markdown'
-    
-    def parse(string)
-      require 'bluecloth'
-      "<html><body>#{ BlueCloth.new(string).to_html }</body></html>"
-    end
-  end
-  
-  class HamlHandler < FileTypeHandler #:nodoc:
-    extension 'haml'
-    
-    def parse(string)
-      require 'haml'
-      engine = Haml::Engine.new(string,
-        :attr_wrapper => '"',
-        :filename => @script_filename
-      )
-      layout = find_layout(@script_filename)
-      if layout
-        lines = IO.read(layout)
-        context = Context.new(Dir.pwd, @script_filename, engine.options.dup)
-        context.content = engine.render(context) do |*args|
-          context.get_content_for(*args)
-        end
-        layout_engine = Haml::Engine.new(lines, engine.options.dup)
-        layout_engine.render(context) do |*args|
-          context.get_content_for(*args)
-        end
-      else
-        engine.render
-      end
-    end
-    
-    def find_layout(filename)
-      root = Dir.pwd
-      path = filename[root.size..-1]
-      layout = nil
-      begin
-        path = File.dirname(path)
-        l = File.join(root, path, '_layout.haml')
-        layout = l if File.file?(l)
-      end until layout or path == "/"
-      layout
-    end
-    
-    class Context
-      attr_accessor :content
-      
-      def initialize(root, script_filename, engine_options)
-        @root, @script_filename, @engine_options = root, script_filename, engine_options
-      end
-      
-      # Content_for methods
-      
-      def content_for(symbol, &block)
-        set_content_for(symbol, capture_haml(&block))
-      end
-      
-      def content_for?(symbol)
-        !(get_content_for(symbol)).nil?
-      end
-      
-      def get_content_for(symbol = :content)
-        if symbol.to_s.intern == :content
-          @content
-        else
-          instance_variable_get("@content_for_#{symbol}") || instance_variable_get("@#{symbol}")
-        end
-      end
-      
-      def set_content_for(symbol, value)
-        instance_variable_set("@content_for_#{symbol}", value)
-      end
-      
-      # Render methods
-      
-      def render(options)
-        partial = options.delete(:partial)
-        template = options.delete(:template)
-        case
-        when partial
-          render_partial(partial)
-        when template
-          render_template(template)
-        else
-          raise "render options not supported #{options.inspect}"
-        end
-      end
-      
-      def render_partial(partial)
-        render_template(partial, :partial => true)
-      end
-      
-      def render_template(template, options={})
-        path = File.dirname(@script_filename)
-        if template =~ %r{^/}
-          template = template[1..-1]
-          path = @root
-        end
-        filename = template_filename(File.join(path, template), :partial => options.delete(:partial))
-        if File.file?(filename)
-          lines = IO.read(filename)
-          engine = Haml::Engine.new(lines, @engine_options)
-          engine.render(self) do |*args|
-            get_content_for(*args)
-          end
-        else
-          raise "File does not exist #{filename.inspect}"
-        end
-      end
-      
-      def template_filename(name, options)
-        path = File.dirname(name)
-        template = File.basename(name)
-        template = "_" + template if options.delete(:partial)
-        template += ".haml" unless name =~ /\.haml$/
-        File.join(path, template)
-      end
-    end
-  end
-  
-  class SassHandler < FileTypeHandler #:nodoc:
-    extension 'sass'
-    
-    def parse(string)
-      require 'sass'
-      engine = Sass::Engine.new(string,
-        :style => :expanded,
-        :filename => @script_filename
-      )
-      engine.render 
-    end
-    
-    def content_type
-      'text/css'
-    end
-  end
-  
-  class EmailHandler < FileTypeHandler #:nodoc:
-    extension 'email'
-    
-    def parse(string)
-      title = "E-mail"
-      title = $1 + " #{title}" if string =~ /^Subject:\s*(\S.*?)$/im
-      head, body = string.split("\n\n", 2)
-      output = []
-      output << "<html><head><title>#{title}</title></head>"
-      output << '<body style="font-family: Arial; line-height: 1.2em; font-size: 90%; margin: 0; padding: 0">'
-      output << '<div id="head" style="background-color: #E9F2FA; padding: 1em">'
-      head.each do |line|
-        key, value = line.split(":", 2).map { |a| a.strip }
-        output << "<div><strong>#{key}:</strong> #{value}</div>"
-      end
-      output << '</div><pre id="body" style="font-size: 110%; padding: 1em">'
-      output << body
-      output << '</pre></body></html>'
-      output.join("\n")
-    end
-  end
-  
-  class RedirectHandler < FileTypeHandler  #:nodoc:
-    extension 'redirect'
-    
-    def process(req, res)
-      data = super
-      res['location'] = data.strip
-      res.body = ''
-      raise WEBrick::HTTPStatus::Found
-    end
-  end
-  
-  class Server < WEBrick::HTTPServer #:nodoc:
-  end
-  
-end
+end

data/lib/serve/handlers/email_handler.rb

@@ -0,0 +1,23 @@
+module Serve #:nodoc:
+  class EmailHandler < FileTypeHandler #:nodoc:
+    extension 'email'
+    
+    def parse(string)
+      title = "E-mail"
+      title = $1 + " #{title}" if string =~ /^Subject:\s*(\S.*?)$/im
+      head, body = string.split("\n\n", 2)
+      output = []
+      output << "<html><head><title>#{title}</title></head>"
+      output << '<body style="font-family: Arial; line-height: 1.2em; font-size: 90%; margin: 0; padding: 0">'
+      output << '<div id="head" style="background-color: #E9F2FA; padding: 1em">'
+      head.each do |line|
+        key, value = line.split(":", 2).map { |a| a.strip }
+        output << "<div><strong>#{key}:</strong> #{value}</div>"
+      end
+      output << '</div><pre id="body" style="font-size: 110%; padding: 1em">'
+      output << body
+      output << '</pre></body></html>'
+      output.join("\n")
+    end
+  end
+end

data/lib/serve/handlers/file_type_handler.rb

@@ -0,0 +1,43 @@
+module Serve #:nodoc:
+  class FileTypeHandler < ::WEBrick::HTTPServlet::AbstractServlet #:nodoc:
+  
+    def self.extension(extension)
+      ::WEBrick::HTTPServlet::FileHandler.add_handler(extension, self)
+    end
+  
+    def initialize(server, name)
+      super
+      @script_filename = name
+    end
+  
+    def process(req, res)
+      data = open(@script_filename){|io| io.read }
+      res['content-type'] = content_type
+      res.body = parse(data)
+    end
+  
+    def do_GET(req, res)
+      begin
+        process(req, res)
+      rescue StandardError => ex
+        raise
+      rescue Exception => ex
+        @logger.error(ex)
+        raise ::WEBrick::HTTPStatus::InternalServerError, ex.message
+      end
+    end
+  
+    alias do_POST do_GET
+  
+    protected
+  
+      def content_type
+        'text/html'
+      end
+    
+      def parse(string)
+        string.dup
+      end
+    
+  end
+end

data/lib/serve/handlers/haml_handler.rb

@@ -0,0 +1,114 @@
+module Serve #:nodoc:
+  class HamlHandler < FileTypeHandler #:nodoc:
+    extension 'haml'
+  
+    def parse(string)
+      require 'haml'
+      engine = Haml::Engine.new(string,
+        :attr_wrapper => '"',
+        :filename => @script_filename
+      )
+      layout = find_layout(@script_filename)
+      if layout
+        lines = IO.read(layout)
+        context = Context.new(Dir.pwd, @script_filename, engine.options.dup)
+        context.content = engine.render(context) do |*args|
+          context.get_content_for(*args)
+        end
+        layout_engine = Haml::Engine.new(lines, engine.options.dup)
+        layout_engine.render(context) do |*args|
+          context.get_content_for(*args)
+        end
+      else
+        engine.render
+      end
+    end
+  
+    def find_layout(filename)
+      root = Dir.pwd
+      path = filename[root.size..-1]
+      layout = nil
+      begin
+        path = File.dirname(path)
+        l = File.join(root, path, '_layout.haml')
+        layout = l if File.file?(l)
+      end until layout or path == "/"
+      layout
+    end
+  
+    class Context #:nodoc:
+      attr_accessor :content
+    
+      def initialize(root, script_filename, engine_options)
+        @root, @script_filename, @engine_options = root, script_filename, engine_options
+      end
+    
+      # Content_for methods
+    
+      def content_for(symbol, &block)
+        set_content_for(symbol, capture_haml(&block))
+      end
+    
+      def content_for?(symbol)
+        !(get_content_for(symbol)).nil?
+      end
+    
+      def get_content_for(symbol = :content)
+        if symbol.to_s.intern == :content
+          @content
+        else
+          instance_variable_get("@content_for_#{symbol}") || instance_variable_get("@#{symbol}")
+        end
+      end
+    
+      def set_content_for(symbol, value)
+        instance_variable_set("@content_for_#{symbol}", value)
+      end
+    
+      # Render methods
+    
+      def render(options)
+        partial = options.delete(:partial)
+        template = options.delete(:template)
+        case
+        when partial
+          render_partial(partial)
+        when template
+          render_template(template)
+        else
+          raise "render options not supported #{options.inspect}"
+        end
+      end
+    
+      def render_partial(partial)
+        render_template(partial, :partial => true)
+      end
+    
+      def render_template(template, options={})
+        path = File.dirname(@script_filename)
+        if template =~ %r{^/}
+          template = template[1..-1]
+          path = @root
+        end
+        filename = template_filename(File.join(path, template), :partial => options.delete(:partial))
+        if File.file?(filename)
+          lines = IO.read(filename)
+          engine = Haml::Engine.new(lines, @engine_options)
+          engine.render(self) do |*args|
+            get_content_for(*args)
+          end
+        else
+          raise "File does not exist #{filename.inspect}"
+        end
+      end
+    
+      def template_filename(name, options)
+        path = File.dirname(name)
+        template = File.basename(name)
+        template = "_" + template if options.delete(:partial)
+        template += ".haml" unless name =~ /\.haml$/
+        File.join(path, template)
+      end
+    end
+  end
+end

data/lib/serve/handlers/markdown_handler.rb

@@ -0,0 +1,10 @@
+module Serve #:nodoc:
+  class MarkdownHandler < FileTypeHandler #:nodoc:
+    extension 'markdown'
+  
+    def parse(string)
+      require 'bluecloth'
+      "<html><body>#{ BlueCloth.new(string).to_html }</body></html>"
+    end
+  end
+end

data/lib/serve/handlers/redirect_handler.rb

@@ -0,0 +1,12 @@
+module Serve #:nodoc:
+  class RedirectHandler < FileTypeHandler  #:nodoc:
+    extension 'redirect'
+    
+    def process(req, res)
+      data = super
+      res['location'] = data.strip
+      res.body = ''
+      raise ::WEBrick::HTTPStatus::Found
+    end
+  end
+end

data/lib/serve/handlers/sass_handler.rb

@@ -0,0 +1,18 @@
+module Serve #:nodoc:
+  class SassHandler < FileTypeHandler #:nodoc:
+    extension 'sass'
+  
+    def parse(string)
+      require 'sass'
+      engine = Sass::Engine.new(string,
+        :style => :expanded,
+        :filename => @script_filename
+      )
+      engine.render 
+    end
+  
+    def content_type
+      'text/css'
+    end
+  end
+end

data/lib/serve/handlers/textile_handler.rb

@@ -0,0 +1,10 @@
+module Serve #:nodoc:
+  class TextileHandler < FileTypeHandler #:nodoc:
+    extension 'textile'
+  
+    def parse(string)
+      require 'redcloth'
+      "<html><body>#{ RedCloth.new(string).to_html }</body></html>"
+    end
+  end
+end

data/lib/serve/version.rb

@@ -2,7 +2,7 @@ module Serve #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 9
-    TINY  = 5
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/serve/webrick/extensions.rb

@@ -0,0 +1,33 @@
+module Serve #:nodoc:
+  module WEBrick #:nodoc:
+    module FileHandlerExtensions #:nodoc:
+      
+      def self.included(base)
+        base.extend(self)
+        base.class_eval do
+          alias :search_file_without_auto_appending :search_file
+          alias :search_file :search_file_with_auto_appending
+        end
+      end
+      
+      def search_file_with_auto_appending(req, res, basename)
+        if result = search_file_without_auto_appending(req, res, basename)
+          return result
+        end
+        extensions = @config[:AppendExtensions]
+        basename = $1 if basename =~ %r{^(.*?)/$}
+        if extensions
+          extensions.each do |ext|
+            if result = search_file_without_auto_appending(req, res, "#{basename}.#{ext}")
+              return result
+            end
+          end
+        end
+        return nil
+      end
+      
+    end
+  end
+end
+
+WEBrick::HTTPServlet::FileHandler.class_eval { include Serve::WEBrick::FileHandlerExtensions }

data/script/txt2html

@@ -0,0 +1,74 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+begin
+  require 'newgem'
+rescue LoadError
+  puts "\n\nGenerating the website requires the newgem RubyGem"
+  puts "Install: gem install newgem\n\n"
+  exit(1)
+end
+require 'redcloth'
+require 'syntax/convertors/html'
+require 'erb'
+require File.dirname(__FILE__) + '/../lib/serve/version.rb'
+
+version  = Serve::VERSION::STRING
+download = 'http://rubyforge.org/projects/serve'
+
+class Fixnum
+  def ordinal
+    # teens
+    return 'th' if (10..19).include?(self % 100)
+    # others
+    case self % 10
+    when 1: return 'st'
+    when 2: return 'nd'
+    when 3: return 'rd'
+    else    return 'th'
+    end
+  end
+end
+
+class Time
+  def pretty
+    return "#{mday}#{mday.ordinal} #{strftime('%B')} #{year}"
+  end
+end
+
+def convert_syntax(syntax, source)
+  return Syntax::Convertors::HTML.for_syntax(syntax).convert(source).gsub(%r!^<pre>|</pre>$!,'')
+end
+
+if ARGV.length >= 1
+  src, template = ARGV
+  template ||= File.join(File.dirname(__FILE__), '/../website/template.rhtml')
+  
+else
+  puts("Usage: #{File.split($0).last} source.txt [template.rhtml] > output.html")
+  exit!
+end
+
+template = ERB.new(File.open(template).read)
+
+title = nil
+body = nil
+File.open(src) do |fsrc|
+  title_text = fsrc.readline
+  body_text = fsrc.read
+  syntax_items = []
+  body_text.gsub!(%r!<(pre|code)[^>]*?syntax=['"]([^'"]+)[^>]*>(.*?)</\1>!m){
+    ident = syntax_items.length
+    element, syntax, source = $1, $2, $3
+    syntax_items << "<#{element} class='syntax'>#{convert_syntax(syntax, source)}</#{element}>"
+    "syntax-temp-#{ident}"
+  }
+  title = RedCloth.new(title_text).to_html.gsub(%r!<.*?>!,'').strip
+  body = RedCloth.new(body_text).to_html
+  body.gsub!(%r!(?:<pre><code>)?syntax-temp-(\d+)(?:</code></pre>)?!){ syntax_items[$1.to_i] }
+end
+stat = File.stat(src)
+created = stat.ctime
+modified = stat.mtime
+
+$stdout << template.result(binding)

data/spec/serve_spec.rb

@@ -1,11 +1,11 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-# Time to add your specs!
-# http://rspec.rubyforge.org/
-describe "Place your specs here" do
+describe "Serve" do
   
-  it "find this spec in spec directory" do
-    violated "Be sure to write your specs"
+  it "should register all of the file type handlers" do
+    handlers = ["cgi", "email", "haml", "markdown", "redirect", "rhtml", "sass", "textile"]
+    table = WEBrick::HTTPServlet::FileHandler::HandlerTable
+    table.keys.sort.should == handlers
   end
   
 end

data/spec/spec_helper.rb

@@ -4,4 +4,8 @@ rescue LoadError
   require 'rubygems'
   gem 'rspec'
   require 'spec'
-end
+end
+
+$: << File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'serve'

data/tasks/rspec.rake

@@ -18,4 +18,4 @@ desc "Run the specs under spec/models"
 Spec::Rake::SpecTask.new do |t|
   t.spec_opts = ['--options', "spec/spec.opts"]
   t.spec_files = FileList['spec/*_spec.rb']
-end
+end

data/tasks/undefine.rake

@@ -0,0 +1,5 @@
+def undefine_task(*names)
+  app = Rake.application
+  tasks = app.instance_variable_get('@tasks')
+  names.flatten.each { |name| tasks.delete(name) }
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: serve
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
-date: 2008-02-19 00:00:00 -05:00
+  version: 0.9.6
+date: 2008-02-20 00:00:00 -05:00
 summary: Serve is a small Ruby script that makes it easy to start up a WEBrick server in any directory. Serve is ideal for HTML prototyping and simple file sharing. If the haml, redcloth, and bluecloth gems are installed serve can handle Haml, Sass, Textile, and Markdown (in addition to HTML).
 require_paths: 
 - lib
@@ -60,11 +60,19 @@ files:
 - config/hoe.rb
 - config/requirements.rb
 - lib/serve.rb
+- lib/serve/handlers/email_handler.rb
+- lib/serve/handlers/file_type_handler.rb
+- lib/serve/handlers/haml_handler.rb
+- lib/serve/handlers/markdown_handler.rb
+- lib/serve/handlers/redirect_handler.rb
+- lib/serve/handlers/sass_handler.rb
+- lib/serve/handlers/textile_handler.rb
 - lib/serve/version.rb
-- lib/webrick/extensions.rb
+- lib/serve/webrick/extensions.rb
 - log/debug.log
 - script/destroy
 - script/generate
+- script/txt2html
 - setup.rb
 - spec/serve_spec.rb
 - spec/spec.opts
@@ -72,6 +80,7 @@ files:
 - tasks/deployment.rake
 - tasks/environment.rake
 - tasks/rspec.rake
+- tasks/undefine.rake
 - tasks/website.rake
 test_files: []
 

data/lib/webrick/extensions.rb

@@ -1,33 +0,0 @@
-require 'webrick'
-
-module Serve #:nodoc:
-  module FileHandlerExtensions
-    
-    def self.included(base)
-      base.extend(self)
-      base.class_eval do
-        alias :search_file_without_auto_appending :search_file
-        alias :search_file :search_file_with_auto_appending
-      end
-    end
-    
-    def search_file_with_auto_appending(req, res, basename)
-      if result = search_file_without_auto_appending(req, res, basename)
-        return result
-      end
-      extensions = @config[:AppendExtensions]
-      basename = $1 if basename =~ %r{^(.*?)/$}
-      if extensions
-        extensions.each do |ext|
-          if result = search_file_without_auto_appending(req, res, "#{basename}.#{ext}")
-            return result
-          end
-        end
-      end
-      return nil
-    end
-    
-  end
-end
-
-WEBrick::HTTPServlet::FileHandler.class_eval { include Serve::FileHandlerExtensions }