serve 0.9.10 → 0.10.0

data/spec/serve_spec.rb

@@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 describe "Serve" do
   
   it "should register all of the file type handlers" do
+    Serve::WEBrick::Server.register_handlers
     handlers = ["cgi", "email", "erb", "haml", "html.erb", "html.haml", "markdown", "redirect", "rhtml", "sass", "textile"]
     table = WEBrick::HTTPServlet::FileHandler::HandlerTable
     table.keys.sort.should == handlers

data/spec/spec_helper.rb

@@ -1,11 +1,12 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems'
-  gem 'rspec'
-  require 'spec'
-end
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-$: << File.join(File.dirname(__FILE__), '..', 'lib')
+require 'rubygems'
+gem 'activesupport'
 
-require 'serve'
+require 'serve'
+require 'spec'
+require 'spec/autorun'
+
+Spec::Runner.configure do |config|
+  
+end

metadata

@@ -1,71 +1,58 @@
 --- !ruby/object:Gem::Specification 
 name: serve
 version: !ruby/object:Gem::Version 
-  version: 0.9.10
+  version: 0.10.0
 platform: ruby
 authors: 
 - John W. Long
+- Adam I. Williams
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDLjCCAhagAwIBAgIBADANBgkqhkiG9w0BAQUFADA9MQswCQYDVQQDDAJtZTEZ
-  MBcGCgmSJomT8ixkARkWCWpvaG53bG9uZzETMBEGCgmSJomT8ixkARkWA2NvbTAe
-  Fw0wNzA5MjUwNTA3MDNaFw0wODA5MjQwNTA3MDNaMD0xCzAJBgNVBAMMAm1lMRkw
-  FwYKCZImiZPyLGQBGRYJam9obndsb25nMRMwEQYKCZImiZPyLGQBGRYDY29tMIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8MjmSgpGWiy+PyyumoFLnA/w
-  gOymrqEIoHwlNRV8Z2RcZkrUHuKnFcH8ShqRww+/1BBnDJlx2rGrQ8d2W75f+xKj
-  hxVwA+eFbLtpMMe1E0qfD69F2sQk5/+dB7WwtF4kI0vt/rHne4hYj7dN/OeJ248q
-  dfZbxohWzSlPg0zopxlQ7WuFjZKclkUNx9Euv7K04imu4i7Q5ThCldV3VVrBFqCq
-  VhI8lAeg7Yln1t6SaPLQ3AqQlq2hk8MA7APy4LdWaN03cunfKwkHVVwPaSD8ualr
-  wrBQsmIrc4f3h9hJq0Ri1u/k4B2CTxaRLA34mb7MrpwZo5RqFd3x512MJaqfhQID
-  AQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU2eSXhP+B
-  7zF3qc5Rrb75aLF7BXowDQYJKoZIhvcNAQEFBQADggEBAFdj2/TsGJSaeFXoMixS
-  ojVHMctKErQkA2pRM7URVyeLljJweAies3qlfpPSuUTcWFLpJf7+So1CNrU7OzXa
-  UNAIhlWzz+knSeMahQWyMQvNGW3nt07PEkaosVdsi/Y6hO+YKNiZicBFuKw7fFUl
-  1FQHJMmy4+bTXxWl6RUymFiDhIjagLHbr09igGHaIOptys1k7Fxpx3xBDNr/IC0H
-  c5GbUePwwNafnjsl9cQo3Xka285/d0IOT4grVUmAeLAh601oR/YGtsHDC7B0jWqq
-  S4yE0yydTjVFpgazHI/CP2fneTHKbaf+H6jwNRzKN9HtcDpP2yO0tYhtmMotuZUd
-  qXI=
-  -----END CERTIFICATE-----
+cert_chain: []
 
-date: 2008-10-25 00:00:00 -04:00
-default_executable: 
+date: 2009-12-28 00:00:00 -05:00
+default_executable: serve
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: activesupport
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.2.9
     version: 
-description: 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).
+description: Serve is a small web server (based on WEBrick) that makes it easy to serve ERB or HAML from any directory. Serve is an ideal tool for building HTML prototypes of Rails applications. Serve can also handle SASS, Textile, and Markdown if the appropriate gems are installed.
 email: me@johnwlong.com
 executables: 
 - serve
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- README.txt
+- LICENSE
+- README.rdoc
 files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- Quickstart.textile
-- README.txt
+- CHANGELOG.rdoc
+- LICENSE
+- QUICKSTART.rdoc
+- README.rdoc
 - Rakefile
+- VERSION
 - bin/serve
-- config/hoe.rb
-- config/requirements.rb
 - lib/serve.rb
 - lib/serve/application.rb
+- lib/serve/file_resolver.rb
 - lib/serve/handlers/dynamic_handler.rb
 - lib/serve/handlers/email_handler.rb
 - lib/serve/handlers/file_type_handler.rb
@@ -73,38 +60,30 @@ files:
 - lib/serve/handlers/redirect_handler.rb
 - lib/serve/handlers/sass_handler.rb
 - lib/serve/handlers/textile_handler.rb
+- lib/serve/rack.rb
+- lib/serve/rails.rb
+- lib/serve/rails/configuration.rb
+- lib/serve/rails/mount.rb
+- lib/serve/rails/routing.rb
+- lib/serve/rails/serve_controller.rb
+- lib/serve/response_cache.rb
 - lib/serve/version.rb
 - lib/serve/webrick/extensions.rb
-- log/debug.log
-- script/destroy
-- script/generate
-- script/txt2html
-- setup.rb
-- spec/serve_application_spec.rb
+- lib/serve/webrick/server.rb
+- lib/serve/webrick/servlet.rb
+- rails/init.rb
+- spec/application_spec.rb
+- spec/response_cache_spec.rb
 - spec/serve_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- tasks/deployment.rake
-- tasks/environment.rake
-- tasks/rspec.rake
-- tasks/undefine.rake
-- tasks/website.rake
-- test_project/_layout.haml
-- test_project/erb/_layout.html.erb
-- test_project/erb/_footer.html.erb
-- test_project/erb/index.html.erb
-- test_project/haml/_footer.haml
-- test_project/haml/_layout.haml
-- test_project/haml/index.haml
-- test_project/test.haml
-- test_project/test.html.erb
-- test_project/view_helpers.rb
 has_rdoc: true
-homepage: http://serve.rubyforge.org
+homepage: http://github.com/jlong/serve
+licenses: []
+
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -121,10 +100,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: serve
-rubygems_version: 1.2.0
+rubyforge_project: 
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
-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).
-test_files: []
-
+specification_version: 3
+summary: Serve is a small web server that makes it easy to serve ERB or HAML from any directory.
+test_files: 
+- spec/application_spec.rb
+- spec/response_cache_spec.rb
+- spec/serve_spec.rb
+- spec/spec_helper.rb

data/Manifest.txt

@@ -1,44 +0,0 @@
-History.txt
-License.txt
-Manifest.txt
-Quickstart.textile
-README.txt
-Rakefile
-bin/serve
-config/hoe.rb
-config/requirements.rb
-lib/serve.rb
-lib/serve/application.rb
-lib/serve/handlers/dynamic_handler.rb
-lib/serve/handlers/email_handler.rb
-lib/serve/handlers/file_type_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/serve/webrick/extensions.rb
-log/debug.log
-script/destroy
-script/generate
-script/txt2html
-setup.rb
-spec/serve_application_spec.rb
-spec/serve_spec.rb
-spec/spec.opts
-spec/spec_helper.rb
-tasks/deployment.rake
-tasks/environment.rake
-tasks/rspec.rake
-tasks/undefine.rake
-tasks/website.rake
-test_project/_layout.haml
-test_project/erb/_layout.html.erb
-test_project/erb/_footer.html.erb
-test_project/erb/index.html.erb
-test_project/haml/_footer.haml
-test_project/haml/_layout.haml
-test_project/haml/index.haml
-test_project/test.haml
-test_project/test.html.erb
-test_project/view_helpers.rb

data/config/hoe.rb

@@ -1,70 +0,0 @@
-require 'serve/version'
-
-AUTHOR = 'John W. Long'  # can also be an array of Authors
-EMAIL = "me@johnwlong.com"
-DESCRIPTION = "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)."
-GEM_NAME = 'serve' # what ppl will type to install your gem
-RUBYFORGE_PROJECT = 'serve' # The unix name for your project
-HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
-DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
-
-@config_file = "~/.rubyforge/user-config.yml"
-@config = nil
-RUBYFORGE_USERNAME = "jlong"
-def rubyforge_username
-  unless @config
-    begin
-      @config = YAML.load(File.read(File.expand_path(@config_file)))
-    rescue
-      puts <<-EOS
-ERROR: No rubyforge config file found: #{@config_file}
-Run 'rubyforge setup' to prepare your env for access to Rubyforge
- - See http://newgem.rubyforge.org/rubyforge.html for more details
-      EOS
-      exit
-    end
-  end
-  RUBYFORGE_USERNAME.replace @config["username"]
-end
-
-
-REV = nil 
-# UNCOMMENT IF REQUIRED: 
-# REV = `svn info`.each {|line| if line =~ /^Revision:/ then k,v = line.split(': '); break v.chomp; else next; end} rescue nil
-VERS = Serve::VERSION::STRING + (REV ? ".#{REV}" : "")
-RDOC_OPTS = ['--quiet', '--title', 'serve documentation',
-    "--opname", "index.html",
-    "--line-numbers", 
-    "--main", "README.txt",
-    "--inline-source"]
-
-class Hoe
-  def extra_deps 
-    @extra_deps.reject! { |x| Array(x).first == 'hoe' } 
-    @extra_deps
-  end 
-end
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-hoe = Hoe.new(GEM_NAME, VERS) do |p|
-  p.author = AUTHOR 
-  p.description = DESCRIPTION
-  p.email = EMAIL
-  p.summary = DESCRIPTION
-  p.url = HOMEPATH
-  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
-  p.test_globs = ["test/**/test_*.rb"]
-  p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']  #An array of file patterns to delete on clean.
-  
-  # == Optional
-  p.changes = p.paragraphs_of("History.txt", 0..1).join("\\n\\n")
-  #p.extra_deps = []     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
-  
-  #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
-  
-end
-
-CHANGES = hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
-PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
-hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')

data/config/requirements.rb

@@ -1,17 +0,0 @@
-require 'fileutils'
-include FileUtils
-
-require 'rubygems'
-%w[rake hoe newgem rubigen].each do |req_gem|
-  begin
-    require req_gem
-  rescue LoadError
-    puts "This Rakefile requires the '#{req_gem}' RubyGem."
-    puts "Installation: gem install #{req_gem} -y"
-    exit
-  end
-end
-
-$:.unshift(File.join(File.dirname(__FILE__), %w[.. lib]))
-
-require 'serve'

data/script/destroy

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.join(File.dirname(__FILE__), '..')
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/destroy'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme]
-RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.join(File.dirname(__FILE__), '..')
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/generate'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme]
-RubiGen::Scripts::Generate.new.run(ARGV)

data/script/txt2html

@@ -1,74 +0,0 @@
-#!/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)