RubyGems - serve - Versions diffs - 0.10.2 → 0.11.2 - Mend

serve 0.10.2 → 0.11.2

Files changed (19) hide show

data/CHANGELOG.rdoc +11 -0
data/QUICKSTART.rdoc +2 -0
data/README.rdoc +1 -1
data/VERSION +1 -1
data/bin/serve +1 -1
data/lib/serve/application.rb +15 -15
data/lib/serve/file_resolver.rb +0 -2
data/lib/serve/handlers/textile_handler.rb +1 -1
data/lib/serve/rack.rb +76 -41
data/lib/serve/response_cache.rb +13 -13
data/lib/serve/view_helpers.rb +2 -2
data/lib/serve.rb +4 -1
data/spec/response_cache_spec.rb +1 -1
data/spec/spec_helper.rb +1 -1
metadata +56 -21
data/lib/serve/webrick/extensions.rb +0 -98
data/lib/serve/webrick/server.rb +0 -17
data/lib/serve/webrick/servlet.rb +0 -19
data/spec/serve_spec.rb +0 -12

data/CHANGELOG.rdoc CHANGED Viewed

@@ -1,3 +1,14 @@
+= Change Log
+== 0.11.2 (May 25, 2010)
+* Add dependency on Rack to gemspec [jlong]
+== 0.11.1 (May 25, 2010)
+* Added support for Ruby 1.9 [jlong]
+* Refactored to use Rack internally [jlong]
 == 0.10.2 (May 13, 2010)
 * Changed render helper to support passing the name of the partial as the first parameter to match the new Rails syntax [jlong]

data/QUICKSTART.rdoc CHANGED Viewed

@@ -126,4 +126,6 @@ The page should now have a title and heading that both read "Login".
 == Content For
 == Partials

data/README.rdoc CHANGED Viewed

@@ -62,7 +62,7 @@ markdown :: Evaluates the document as Markdown (requires the Bluecloth gem)
 erb :: Experimental support for ERB
 haml :: Evaluates the document as Haml (requires the Haml gem)
 sass :: Evaluates the document as Sass (requires the Haml gem)
-scss :: Evaluates the document as Scss (requires the Haml gem)
+scss :: Evaluates the document as SCSS (requires the Haml gem)
 email :: Evaluates the document as if it is an e-mail message; the format is identical to a plain/text e-mail message's source
 redirect :: Redirects to the URL contained in the document

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 0.10.2
1	+ 0.11.2

data/bin/serve CHANGED Viewed

@@ -2,7 +2,7 @@
 lib = File.dirname(__FILE__) + '/../lib'
 require 'rubygems'
-gem 'activesupport'
+gem 'activesupport', '= 2.3.5'
 require 'active_support'
 if File.file?(lib + '/serve/version.rb')

data/lib/serve/application.rb CHANGED Viewed

@@ -1,8 +1,5 @@
-require 'webrick'
 require 'active_support'
-require 'serve/webrick/extensions'
-require 'serve/webrick/servlet'
-require 'serve/webrick/server'
+require 'serve/rack'
 module Serve
   class Application
@@ -75,8 +72,8 @@ module Serve
         "    http://localhost:4000/",
         "  ",
         "  If the haml, redcloth, or bluecloth gems are installed the command can serve ",
-        "  Haml, Sass, Textile, and Markdown for documents with haml, sass, textile, ",
-        "  and markdown file extensions.",
+        "  Haml, Sass, SCSS, Textile, and Markdown for documents with haml, sass, scss, ",
+        "  textile, and markdown file extensions.",
         "  ",
         "  If the Rails command script/server exists in the current directory the ",
         "  script will start that instead with the specified environment or the ",
@@ -138,15 +135,18 @@ module Serve
       end
       def run_server
-        extensions = Serve::WEBrick::Server.register_handlers
-        server = Serve::WEBrick::Server.new(
-          :Port => options[:port],
-          :BindAddress => options[:address],
-          :DocumentRoot => options[:root],
-          :DirectoryIndex => %w(index.html index.rhtml index.txt index.text) + extensions.collect {|ext| "index.#{ext}"}
-        )
-        trap("INT") { server.shutdown }
-        server.start
+        root = options[:root]
+        app = Rack::Builder.new do
+          use Rack::CommonLogger
+          use Rack::ShowStatus
+          use Rack::ShowExceptions
+          run Rack::Cascade.new([
+            Serve::RackAdapter.new(root),
+            Rack::Directory.new(root)
+          ])
+        end
+        webrick = Rack::Handler.get('webrick')
+        webrick.run app, :Port => options[:port], :BindAddress => options[:address]
       end
   end
 end

data/lib/serve/file_resolver.rb CHANGED Viewed

@@ -1,5 +1,3 @@
-require 'active_support'
 module Serve
   mattr_accessor :file_resolver

data/lib/serve/handlers/textile_handler.rb CHANGED Viewed

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

data/lib/serve/rack.rb CHANGED Viewed

@@ -1,57 +1,92 @@
 require 'active_support'
-require 'serve'
 require 'rack'
 module Serve
-  class Rack
-    def call(env)
-      path = Serve.resolve_file(Dir.pwd, env["PATH_INFO"])
-      return not_found unless path
-      ext = File.extname(path)[1..-1]
-      handler = Serve::FileTypeHandler.handlers[ext]
-      return no_handler(ext) unless handler
-      res = Response.new
-      handler.new(Dir.pwd, path).process(nil, res)
-      [200, res.headers, res.body]
-    rescue Exception => e
-      return html_response(500, %(
-<h1>Error!</h1>
-<h2>#{h(e.message)}</h2>
-<pre>
-#{h(e.backtrace.join("\n"))}
-</pre>))
-    end
-    def no_handler(ext)
-      html_response(501, %(
-<h1>No handler</h1>
-<p>Don't know how to handle resources of type "#{h(ext)}".</p>))
+  class Request < Rack::Request
+    def query
+      @query ||= Rack::Utils.parse_nested_query(query_string)
     end
-    def not_found
-      html_response(404, %(
-<h1>Not Found</h1>
-<p>The requested resource was not found.</p>))
+    def protocol
+      @scheme ||= scheme + "://"
+    end
+    def headers
+      @headers ||= Headers.new(@env)
+    end
+  end
+  class Response < Rack::Response
+    def body=(value)
+      # needed for Ruby 1.9
+      if value.respond_to? :each
+        super(value)
+      else
+        super([value])
+      end
+    end
+  end
+  # Borrowed from ActionDispatch in Rails
+  class Headers < Hash
+    extend ActiveSupport::Memoizable
+    def initialize(*args)
+      if args.size == 1 && args[0].is_a?(Hash)
+        super()
+        update(args[0])
+      else
+        super
+      end
     end
-    def html_response(code, body)
-      [code, {"Content-Type" => "text/html"}, %(<html><head></head><body>#{body}</body></html>)]
+    def [](header_name)
+      if include?(header_name)
+        super
+      else
+        super(env_name(header_name))
+      end
     end
-    def h(input)
-      CGI.escapeHTML(input)
+    private
+      # Converts a HTTP header name to an environment variable name.
+      def env_name(header_name)
+        "HTTP_#{header_name.upcase.gsub(/-/, '_')}"
+      end
+      memoize :env_name
+  end
+  class RackAdapter
+    def initialize(root)
+      @root = root
     end
-    class Response
-      attr_reader :headers
-      attr_accessor :body
-      def initialize
-        @headers = {}
+    def call(env)
+      request = Request.new(env)
+      response = Response.new()
+      process(request, response).to_a
+    end
+    def process(request, response)
+      path = Serve.resolve_file(@root, request.path)
+      if path
+        ext = File.extname(path)[1..-1]
+        handler = Serve::FileTypeHandler.handlers[ext]
+        if handler
+          handler.new(@root, path).process(request, response)
+          response
+        else
+          default(request, response)
+        end
+      else
+        default(request, response)
       end
     end
+    def default(request, response)
+      response.status = 404
+      response.body = "Not found!"
+      response
+    end
   end
 end

data/lib/serve/response_cache.rb CHANGED Viewed

@@ -11,12 +11,12 @@ module Serve
       :use_x_sendfile => false
     }
     cattr_accessor :defaults
     attr_accessor :directory, :expire_time, :default_extension, :perform_caching, :logger, :use_x_sendfile
     alias :page_cache_directory :directory
     alias :page_cache_extension :default_extension
     private :page_cache_directory, :page_cache_extension
     # Creates a ResponseCache object with the specified options.
     #
     # Options are as follows:
@@ -74,20 +74,20 @@ module Serve
     def response_cached?(path)
       perform_caching && !!read_metadata(path)
     end
     # Expires the cached response for the specified path.
     def expire_response(path)
       path = clean(path)
       expire_page(path)
     end
     # Expires the entire cache.
     def clear
       Dir["#{directory}/*"].each do |f|
         FileUtils.rm_rf f
       end
     end
     private
       # Ensures that path begins with a slash and remove extra slashes.
       def clean(path)
@@ -95,7 +95,7 @@ module Serve
         %r{^/?(.*?)/?$}.match(path)
         "/#{$1}"
       end
       # Reads a cached response from disk and updates a response object.
       def read_response(path, response, request)
         file_path = page_cache_path(path)
@@ -111,14 +111,14 @@ module Serve
         end
         response
       end
       def client_has_cache?(metadata, request)
           return false unless request
           request_time = Time.httpdate(request.env["HTTP_IF_MODIFIED_SINCE"]) rescue nil
           response_time = Time.httpdate(metadata['headers']['Last-Modified']) rescue nil
           return request_time && response_time && response_time <= request_time
       end
       # Writes a response to disk.
       def write_response(path, response)
         if response.cache_timeout
@@ -137,26 +137,26 @@ module Serve
         }.to_yaml
         cache_page(metadata, response.body, path)
       end
       def page_cache_path(path)
         path = (path.empty? || path == "/") ? "/_site-root" : URI.unescape(path)
         root_dir = File.expand_path(page_cache_directory)
         cache_path = File.expand_path(File.join(root_dir, path), root_dir)
         cache_path if cache_path.index(root_dir) == 0
       end
       def expire_page(path)
         return unless perform_caching
         if path = page_cache_path(path)
           File.delete("#{path}.yml") if File.exists?("#{path}.yml")
           File.delete("#{path}.data") if File.exists?("#{path}.data")
         end
       end
       def cache_page(metadata, content, path)
         return unless perform_caching
         if path = page_cache_path(path)
           FileUtils.makedirs(File.dirname(path))
           #dont want yml without data

data/lib/serve/view_helpers.rb CHANGED Viewed

@@ -94,8 +94,8 @@ module Serve #:nodoc:
       value = params[key]
       return default if value.blank?
       case value.strip.downcase
-        when 'true', '1'  : true
-        when 'false', '0' :  false
+        when 'true', '1'  then true
+        when 'false', '0' then false
         else raise 'Invalid value'
       end
     end

data/lib/serve.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+require 'active_support'
 require 'serve/version'
 require 'serve/file_resolver'
 require 'serve/handlers/file_type_handler'
@@ -7,4 +9,5 @@ require 'serve/handlers/dynamic_handler'
 require 'serve/handlers/sass_handler'
 require 'serve/handlers/email_handler'
 require 'serve/handlers/redirect_handler'
-require 'serve/response_cache'
+require 'serve/response_cache'
+require 'serve/rack'

data/spec/response_cache_spec.rb CHANGED Viewed

@@ -62,7 +62,7 @@ describe Serve::ResponseCache do
       @cache.cache_response(url, response)
       name = "#{@dir}/test/me.yml"
       File.exists?(name).should == true
-      file(name).should == "--- \nexpires: 2007-02-08 17:37:09 Z\nheaders: \n  Last-Modified: Tue, 27 Feb 2007 06:13:43 GMT\n"
+      file(name).should match("expires: 2007-02-08 17:37:09 Z")
       data_name = "#{@dir}/test/me.data"
       file(data_name).should == "content"
     end

data/spec/spec_helper.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rubygems'
-gem 'activesupport'
+gem 'activesupport', '= 2.3.5'
 require 'serve'
 require 'spec'

metadata CHANGED Viewed

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: serve
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  hash: 55
+  prerelease: false
+  segments:
+  - 0
+  - 11
+  - 2
+  version: 0.11.2
 platform: ruby
 authors:
 - John W. Long
@@ -10,30 +16,58 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-05-13 00:00:00 -04:00
+date: 2010-05-25 00:00:00 -04:00
 default_executable: serve
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rack
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - "="
+      - !ruby/object:Gem::Version
+        hash: 19
+        segments:
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
   type: :runtime
-  version_requirement:
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version
-        version: 2.0.2
-    version:
+        hash: 9
+        segments:
+        - 2
+        - 3
+        - 5
+        version: 2.3.5
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency
   name: rspec
-  type: :development
-  version_requirement:
-  version_requirements: !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
+        hash: 13
+        segments:
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version:
-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.
+  type: :development
+  version_requirements: *id003
+description: Serve is a small Rack-based web server 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
@@ -69,13 +103,9 @@ files:
 - lib/serve/response_cache.rb
 - lib/serve/version.rb
 - lib/serve/view_helpers.rb
-- lib/serve/webrick/extensions.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
 has_rdoc: true
@@ -88,26 +118,31 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
+      hash: 3
+      segments:
+      - 0
       version: "0"
-  version:
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
+      hash: 3
+      segments:
+      - 0
       version: "0"
-  version:
 requirements: []
 rubyforge_project:
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key:
 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/lib/serve/webrick/extensions.rb DELETED Viewed

@@ -1,98 +0,0 @@
-# Portions from Rails, Copyright (c) 2004-2008 David Heinemeier Hansson
-require 'active_support/memoizable'
-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)
-        full_path = File.join(res.filename, basename)
-        return basename if File.file?(full_path)
-        return nil if File.directory?(full_path)
-        Serve.resolve_file(Dir.pwd, req.path)
-      end
-    end
-  end
-end
-WEBrick::HTTPRequest.module_eval do
-  extend ActiveSupport::Memoizable
-  alias headers header
-  # Returns the \host for this request, such as "example.com".
-  def raw_host_with_port
-    @host + ':' + @port.to_s
-  end
-  # Returns 'https://' if this is an SSL request and 'http://' otherwise.
-  def protocol
-    ssl? ? 'https://' : 'http://'
-  end
-  memoize :protocol
-  # Is this an SSL request?
-  def ssl?
-    meta_vars['HTTPS'] == 'on'
-  end
-  def params
-    query.inject({}) {|m, (k,v)| m[k.to_s.to_sym] = v; m}
-  end
-  # Returns the host for this request, such as example.com.
-  def host
-    raw_host_with_port.sub(/:\d+$/, '')
-  end
-  memoize :host
-  # Returns a \host:\port string for this request, such as "example.com" or
-  # "example.com:8080".
-  def host_with_port
-    "#{host}#{port_string}"
-  end
-  memoize :host_with_port
-  # Returns the port number of this request as an integer.
-  def port
-    if raw_host_with_port =~ /:(\d+)$/
-      $1.to_i
-    else
-      standard_port
-    end
-  end
-  memoize :port
-  # Returns the standard \port number for this request's protocol.
-  def standard_port
-    case protocol
-      when 'https://' then 443
-      else 80
-    end
-  end
-  # Returns a \port suffix like ":8080" if the \port number of this request
-  # is not the default HTTP \port 80 or HTTPS \port 443.
-  def port_string
-    port == standard_port ? '' : ":#{port}"
-  end
-end
-WEBrick::HTTPResponse.module_eval do
-  alias headers header
-  def redirect(url, status)
-    set_redirect(::WEBrick::HTTPStatus[status.to_i], url)
-  end
-end
-WEBrick::HTTPServlet::FileHandler.class_eval { include Serve::WEBrick::FileHandlerExtensions }

data/lib/serve/webrick/server.rb DELETED Viewed

@@ -1,17 +0,0 @@
-module Serve #:nodoc:
-  module WEBrick
-    class Server < ::WEBrick::HTTPServer #:nodoc:
-      def self.register_handlers
-        extensions = []
-        Serve::FileTypeHandler.handlers.each do |ext, handler|
-          extensions << ext
-          handler_servlet = Class.new(Serve::WEBrick::Servlet) do
-            define_method(:handler) { handler }
-          end
-          ::WEBrick::HTTPServlet::FileHandler.add_handler(ext, handler_servlet)
-        end
-        extensions
-      end
-    end
-  end
-end

data/lib/serve/webrick/servlet.rb DELETED Viewed

@@ -1,19 +0,0 @@
-module Serve #:nodoc:
-  module WEBrick
-    class Servlet < ::WEBrick::HTTPServlet::AbstractServlet #:nodoc:
-      def do_GET(req, res)
-        begin
-          path = Serve.resolve_file(Dir.pwd, req.path)
-          handler.new(Dir.pwd, path).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
-    end
-  end
-end

data/spec/serve_spec.rb DELETED Viewed

@@ -1,12 +0,0 @@
-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", "scss", "textile"]
-    table = WEBrick::HTTPServlet::FileHandler::HandlerTable
-    table.keys.sort.should == handlers
-  end
-end