serverside 0.2.7 → 0.2.8

data/CHANGELOG

@@ -1,3 +1,19 @@
+==0.2.8
+
+* Refactored ServerSide::Static to use HTTP::Caching code.
+
+* Added spec coverage rake task.
+
+* Added HTTP::Caching module.
+
+* Added response_headers attribute to HTTP::Request.
+
+* Refactored ServerSide::Static constants.
+
+* Renamed ServerSide::StaticFiles to ServerSide::Static.
+
+* Added static_server.rb script.
+
 ==0.2.7
 
 * Wrote spec for HTTP::Connection.

data/Rakefile

@@ -7,7 +7,7 @@ require 'fileutils'
 include FileUtils
 
 NAME = "serverside"
-VERS = "0.2.7"
+VERS = "0.2.8"
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']
 RDOC_OPTS = ['--quiet', '--title', "ServerSide Documentation",
   "--opname", "index.html",
@@ -109,6 +109,21 @@ task :aok do
   sh %{rake spec}
 end
 
+require 'spec/rake/spectask'
+
+desc "Run specs RCov"
+Spec::Rake::SpecTask.new('specs_with_rcov') do |t|
+  t.spec_files = FileList['test/spec/*_spec.rb']
+  t.rcov = true
+end
+
+require 'spec/rake/rcov_verify'
+
+RCov::VerifyTask.new(:rcov_verify => :rcov) do |t|
+  t.threshold = 95.4 # Make sure you have rcov 0.7 or higher!
+  t.index_html = 'doc/output/coverage/index.html'
+end
+
 desc 'Update docs and upload to rubyforge.org'
 task :doc_rforge do
   sh %{rake doc}

data/lib/serverside/caching.rb

@@ -0,0 +1,56 @@
+require 'time'
+
+module ServerSide
+  module HTTP
+    # This module implements HTTP cache negotiation with a client.
+    module Caching
+      ETAG = 'ETag'.freeze
+      CACHE_CONTROL = 'Cache-Control'.freeze
+      DEFAULT_MAX_AGE = (86400 * 30).freeze
+      IF_NONE_MATCH = 'If-None-Match'.freeze
+      ETAG_WILDCARD = '*'.freeze
+      IF_MODIFIED_SINCE = 'If-Modified-Since'.freeze
+      LAST_MODIFIED = "Last-Modified".freeze
+      NOT_MODIFIED_CLOSE = "HTTP/1.1 304 Not Modified\r\nDate: %s\r\nConnection: close\r\nLast-Modified: %s\r\nETag: \"%s\"\r\nCache-Control: max-age=%d\r\n\r\n".freeze
+      NOT_MODIFIED_PERSIST = "HTTP/1.1 304 Not Modified\r\nDate: %s\r\nLast-Modified: %s\r\nETag: \"%s\"\r\nCache-Control: max-age=%d\r\n\r\n".freeze
+      MAX_AGE = 'max-age=%d'.freeze
+
+      def valid_client_cache?(etag, http_stamp)
+        none_match = @headers[IF_NONE_MATCH]
+        modified_since = @headers[IF_MODIFIED_SINCE]
+        (none_match && (none_match =~ /\*|"#{etag}"/)) ||
+          (modified_since && (modified_since == http_stamp))
+      end
+      
+      def validate_cache(etag, stamp, max_age = DEFAULT_MAX_AGE, &block)
+        http_stamp = stamp.httpdate
+        if valid_client_cache?(etag, http_stamp)
+          send_not_modified(etag, http_stamp, max_age)
+        else
+          @response_headers[ETAG] = "\"#{etag}\""
+          @response_headers[LAST_MODIFIED] = http_stamp
+          @response_headers[CACHE_CONTROL] = MAX_AGE % max_age
+          block.call
+        end
+      end
+
+      def send_not_modified(etag, http_time, max_age = DEFAULT_MAX_AGE)
+        @socket << ((@persistent ? NOT_MODIFIED_PERSIST : NOT_MODIFIED_CLOSE) % 
+          [Time.now.httpdate, http_time, etag, max_age])
+      end
+    end          
+  end
+end
+
+__END__
+
+Reality::Controller.new(:node_history) do
+  default_flavor :html
+  valid_method :get
+  
+  def html
+    validate_cache(etag, http_time) {|cache_headers|
+      render_template(cache_headers)
+    }
+  end
+end

data/lib/serverside/request.rb

@@ -43,17 +43,18 @@ module ServerSide
       CONTENT_TYPE = "Content-Type".freeze
       CONTENT_TYPE_URL_ENCODED = 'application/x-www-form-urlencoded'.freeze
       
-      include StaticFiles
+      include Static
       
       attr_reader :socket, :method, :path, :query, :version, :parameters,
         :headers, :persistent, :cookies, :response_cookies, :body,
-        :content_length, :content_type
+        :content_length, :content_type, :response_headers
       
       # Initializes the request instance. Any descendants of HTTP::Request
       # which override the initialize method must receive socket as the
       # single argument, and copy it to @socket.
       def initialize(socket)
         @socket = socket
+        @response_headers = {}
       end
 
       # Processes the request by parsing it and then responding.      
@@ -146,9 +147,12 @@ module ServerSide
       # Sends an HTTP response.
       def send_response(status, content_type, body = nil, content_length = nil, 
         headers = nil)
-        h = headers ? 
-          headers.inject('') {|m, kv| m << (HEADER % kv)} : ''
+        @response_headers.merge!(headers) if headers
+        h = @response_headers.inject('') {|m, kv| m << (HEADER % kv)}
         
+        # calculate content_length if needed. if we dont have the content_length,
+        # we consider the response as a streaming response, and so the connection
+        # will not be persistent.
         content_length = body.length if content_length.nil? && body
         @persistent = false if content_length.nil?
         

data/lib/serverside/static.rb

@@ -1,32 +1,23 @@
-require 'time'
+require File.join(File.dirname(__FILE__), 'caching')
 
 module ServerSide
   # This module provides functionality for serving files and directory listings
   # over HTTP.
-  module StaticFiles
-    # Frozen constants to be used by the module.
-    module Const
-      ETag = 'ETag'.freeze
-      ETagFormat = '%x:%x:%x'.inspect.freeze
-      CacheControl = 'Cache-Control'.freeze
-      MaxAge = "max-age=#{86400 * 30}".freeze
-      IfNoneMatch = 'If-None-Match'.freeze
-      IfModifiedSince = 'If-Modified-Since'.freeze
-      LastModified = "Last-Modified".freeze
-      NotModifiedClose = "HTTP/1.1 304 Not Modified\r\nDate: %s\r\nConnection: close\r\nLast-Modified: %s\r\nETag: %s\r\nCache-Control: #{MaxAge}\r\n\r\n".freeze
-      NotModifiedPersist = "HTTP/1.1 304 Not Modified\r\nDate: %s\r\nLast-Modified: %s\r\nETag: %s\r\nCache-Control: #{MaxAge}\r\n\r\n".freeze
-      TextPlain = 'text/plain'.freeze
-      TextHTML = 'text/html'.freeze
-      MaxCacheFileSize = 100000.freeze # 100KB for the moment
-      
-      DirListingStart = '<html><head><title>Directory Listing for %s</title></head><body><h2>Directory listing for %s:</h2>'.freeze
-      DirListing = '<a href="%s">%s</a><br/>'.freeze
-      DirListingStop = '</body></html>'.freeze
-      FileNotFound = 'File not found.'.freeze
-      RHTML = /\.rhtml$/.freeze
-    end
+  module Static
+    include HTTP::Caching
+    
+    ETAG_FORMAT = '%x:%x:%x'.inspect.freeze
+    TEXT_PLAIN = 'text/plain'.freeze
+    TEXT_HTML = 'text/html'.freeze
+    MAX_CACHE_FILE_SIZE = 100000.freeze # 100KB for the moment
     
-    @@mime_types = Hash.new {|h, k| ServerSide::StaticFiles::Const::TextPlain}
+    DIR_LISTING_START = '<html><head><title>Directory Listing for %s</title></head><body><h2>Directory listing for %s:</h2>'.freeze
+    DIR_LISTING = '<a href="%s">%s</a><br/>'.freeze
+    DIR_LISTING_STOP = '</body></html>'.freeze
+    FILE_NOT_FOUND = 'File not found.'.freeze
+    RHTML = /\.rhtml$/.freeze
+    
+    @@mime_types = Hash.new {|h, k| TEXT_PLAIN}
     @@mime_types.merge!({
       '.html'.freeze => 'text/html'.freeze,
       '.css'.freeze => 'text/css'.freeze,
@@ -46,48 +37,35 @@ module ServerSide
     # rendered.
     def serve_file(fn)
       stat = File.stat(fn)
-      etag = (Const::ETagFormat % [stat.mtime.to_i, stat.size, stat.ino]).freeze
-      date = stat.mtime.httpdate
-      
-      etag_match = @headers[Const::IfNoneMatch]
-      last_date = @headers[Const::IfModifiedSince]
-      
-      modified = (!etag_match && !last_date) || 
-        (etag_match && (etag != etag_match)) || (last_date && (last_date != date))
-      
-      if modified
+      etag = (ETAG_FORMAT % [stat.mtime.to_i, stat.size, stat.ino]).freeze
+      validate_cache(etag, stat.mtime) do
         if @@static_files[fn] && (@@static_files[fn][0] == etag)
           content = @@static_files[fn][1]
         else
           content = IO.read(fn).freeze
           @@static_files[fn] = [etag.freeze, content]
         end
-        
-        send_response(200, @@mime_types[File.extname(fn)], content, stat.size, {
-          Const::ETag => etag, 
-          Const::LastModified => date, 
-          Const::CacheControl => Const::MaxAge
-        })
-      else
-        @socket << ((@persistent ? Const::NotModifiedPersist : 
-          Const::NotModifiedClose) % [Time.now.httpdate, date, etag, stat.size])
+        send_response(200, @@mime_types[File.extname(fn)], content, stat.size)
       end
     rescue => e
-      send_response(404, Const::TextPlain, 'Error reading file.')
+      puts e.message
+      send_response(404, TEXT_PLAIN, 'Error reading file.')
     end
     
     # Serves a directory listing over HTTP in the form of an HTML page.
     def serve_dir(dir)
-      html = (Const::DirListingStart % [@path, @path]) +
-        Dir.entries(dir).inject('') {|m, fn|
-          (fn == '.') ? m : m << Const::DirListing % [@path/fn, fn]
-        } + Const::DirListingStop
+      entries = Dir.entries(dir)
+      entries.reject! {|fn| fn =~ /^\./}
+      entries.unshift('..') if dir != './'
+      html = (DIR_LISTING_START % [@path, @path]) +
+        entries.inject('') {|m, fn| m << DIR_LISTING % [@path/fn, fn]} +
+        DIR_LISTING_STOP
       send_response(200, 'text/html', html)
     end
     
     def serve_template(fn, b = nil)
-      if (fn =~ Const::RHTML) || (File.file?(fn = fn + '.rhtml'))
-        send_response(200, Const::TextHTML, Template.render(fn, b || binding))
+      if (fn =~ RHTML) || (File.file?(fn = fn + '.rhtml'))
+        send_response(200, TEXT_HTML, Template.render(fn, b || binding))
       end
     end
     
@@ -100,7 +78,7 @@ module ServerSide
       elsif File.directory?(path)
         serve_dir(path)
       else
-        send_response(404, 'text', Const::FileNotFound)
+        send_response(404, 'text', FILE_NOT_FOUND)
       end
     rescue => e
       send_response(500, 'text', e.message)

data/test/functional/static_server.rb

@@ -0,0 +1,7 @@
+require 'lib/serverside'
+
+trap('INT') {exit}
+include ServerSide
+puts "Serving on port 8000..."
+Router.route_default {serve_static('.'/@path)}
+HTTP::Server.new('0.0.0.0', 8000, Router)

data/test/spec/caching_spec.rb

@@ -0,0 +1,101 @@
+require File.join(File.dirname(__FILE__), '../../lib/serverside')
+require 'stringio'
+include ServerSide::HTTP
+
+class DummyRequest < Request
+  attr_accessor :socket
+  include Caching
+  
+  def initialize
+    super(StringIO.new)
+    @headers = {}
+  end
+end
+
+context "Caching::validate_cache" do
+  specify "should set etag and last-modified response headers" do
+    r = DummyRequest.new
+    t = Time.now
+    r.validate_cache('aaaa', t) {
+      r.send_response(200, 'text/plain', 'hi', nil, {'F' => 1})
+    }
+    r.socket.rewind
+    resp = r.socket.read
+    
+    resp.should_match /ETag:\s"aaaa"\r\n/
+    resp.should_match /Last-Modified:\s#{t.httpdate}\r\n/
+    resp.should_match /F:\s1\r\n/
+  end
+  
+  specify "should send not modified response if client includes a suitable validator" do
+    r = DummyRequest.new
+    t = Time.now
+    r.headers['If-None-Match'] = '"bbbb"'
+    r.validate_cache('bbbb', t) {raise "This should not be called"}
+    r.socket.rewind
+    resp = r.socket.read
+
+    resp.should_match /^HTTP\/1.1\s304 Not Modified\r\n/
+    resp.should_match /ETag:\s"bbbb"\r\n/
+    resp.should_match /Last-Modified:\s#{t.httpdate}\r\n/
+
+    r = DummyRequest.new
+    t = Time.now
+    r.headers['If-Modified-Since'] = t.httpdate
+    r.validate_cache('cccc', t) {raise "This should not be called"}
+    r.socket.rewind
+    resp = r.socket.read
+
+    resp.should_match /^HTTP\/1.1\s304 Not Modified\r\n/
+    resp.should_match /ETag:\s"cccc"\r\n/
+    resp.should_match /Last-Modified:\s#{t.httpdate}\r\n/
+  end
+end
+
+context "Caching::send_not_modified" do
+  specify "should send back a valid 304 response with headers" do
+    r = DummyRequest.new
+    t = Time.now
+    r.send_not_modified('dddd', t.httpdate, 240)
+    r.socket.rewind
+    resp = r.socket.read
+
+    resp.should_match /^HTTP\/1.1\s304 Not Modified\r\n/
+    resp.should_match /ETag:\s"dddd"\r\n/
+    resp.should_match /Last-Modified:\s#{t.httpdate}\r\n/
+    resp.should_match /Cache-Control:\smax-age=240\r\n/
+  end
+end
+
+context "Caching::valid_client_cache?" do
+  specify "should check if-none-match validator for etag" do
+    r = DummyRequest.new
+    t = Time.now
+    r.valid_client_cache?('eeee', t).should_be_nil
+    r.headers['If-None-Match'] = '"abc"'
+    r.valid_client_cache?('eeee', t).should_be_nil
+    r.headers['If-None-Match'] = '"eeee"'
+    r.valid_client_cache?('eeee', t).should_not_be_nil
+    r.headers['If-None-Match'] = '"aaa", "bbb", "ccc"'
+    r.valid_client_cache?('eeee', t).should_be_nil
+    r.headers['If-None-Match'] = '"aaa", "eeee", "ccc"'
+    r.valid_client_cache?('eeee', t).should_not_be_nil
+  end
+  
+  specify "should check if-none-match validator for wildcard" do
+    r = DummyRequest.new
+    r.headers['If-None-Match'] = '*'
+    r.valid_client_cache?('eeee', nil).should_not_be_nil
+    r.headers['If-None-Match'] = '*, "aaaa"'
+    r.valid_client_cache?('eeee', nil).should_not_be_nil
+  end
+  
+  specify "should check if-modified-since validator for etag" do
+    r = DummyRequest.new
+    t = Time.now
+    r.headers['If-Modified-Since'] = (t-1).httpdate
+    r.valid_client_cache?('eeee', t.httpdate).should_be false
+    r.headers['If-Modified-Since'] = t.httpdate
+    r.valid_client_cache?('eeee', t.httpdate).should_not_be false
+  end
+end

data/test/spec/connection_spec.rb

@@ -1,7 +1,5 @@
 require File.join(File.dirname(__FILE__), '../../lib/serverside')
 
-# String extensions
-
 class ServerSide::HTTP::Connection
   attr_reader :socket, :request_class, :thread
 end

data/test/unit/request_test.rb

@@ -42,7 +42,7 @@ class RequestTest < Test::Unit::TestCase
   end
   
   class ServerSide::HTTP::Request
-    attr_writer :socket, :persistent
+    attr_writer :socket, :persistent, :response_headers
   end
   
   def test_process_result
@@ -149,6 +149,7 @@ class RequestTest < Test::Unit::TestCase
   def test_send_response
     r = ServerSide::HTTP::Request.new(nil)
     # simple case
+    r.response_headers = {}
     r.socket = StringIO.new
     r.persistent = true
     r.send_response(200, 'text', 'Hello there!')
@@ -157,6 +158,7 @@ class RequestTest < Test::Unit::TestCase
       r.socket.read
 
     # include content-length    
+    r.response_headers = {}
     r.socket = StringIO.new
     r.persistent = true
     r.send_response(404, 'text/html', '<h1>404!</h1>', 10) # incorrect length
@@ -165,6 +167,7 @@ class RequestTest < Test::Unit::TestCase
       r.socket.read
 
     # headers
+    r.response_headers = {}
     r.socket = StringIO.new
     r.persistent = true
     r.send_response(404, 'text/html', '<h1>404!</h1>', nil, {'ETag' => 'xxyyzz'})
@@ -173,6 +176,7 @@ class RequestTest < Test::Unit::TestCase
       r.socket.read
 
     # no body
+    r.response_headers = {}
     r.socket = StringIO.new
     r.persistent = true
     r.send_response(404, 'text/html', nil, nil, {'Set-Cookie' => 'abc=123'})
@@ -182,6 +186,7 @@ class RequestTest < Test::Unit::TestCase
     assert_equal false, r.persistent
 
     # not persistent
+    r.response_headers = {}
     r.socket = StringIO.new
     r.persistent = false
     r.send_response(200, 'text', 'Hello there!')
@@ -190,6 +195,7 @@ class RequestTest < Test::Unit::TestCase
       r.socket.read
       
     # socket error
+    r.response_headers = {}
     r.socket = nil
     r.persistent = true
     assert_nothing_raised {r.send_response(200, 'text', 'Hello there!')}
@@ -219,6 +225,7 @@ class RequestTest < Test::Unit::TestCase
     r.socket.rewind
     assert_equal "HTTP/1.1 302\r\nDate: #{Time.now.httpdate}\r\nConnection: close\r\nLocation: http://mau.com/132\r\n\r\n", r.socket.read
 
+    r.response_headers = {}
     r.socket = StringIO.new
     r.redirect('http://www.google.com/search?q=meaning%20of%20life', true)
     r.socket.rewind
@@ -245,4 +252,27 @@ class RequestTest < Test::Unit::TestCase
     r.socket.rewind
     assert_equal "HTTP/1.1 200\r\nDate: #{Time.now.httpdate}\r\nConnection: close\r\nContent-Type: text\r\nSet-Cookie: session=; path=/; expires=#{Time.at(0).rfc2822}\r\nContent-Length: 3\r\n\r\nHi!", r.socket.read
   end
+  
+  def test_response_headers
+    r = ServerSide::HTTP::Request.new(nil)
+    r.socket = StringIO.new
+    assert_equal({}, r.response_headers)
+    r.response_headers = {'A' => '1', 'B' => 2}
+    r.send_response(200, 'text', 'Hi!')
+    r.socket.rewind
+    resp = r.socket.read
+    assert_not_nil resp.match("A: 1\r\n")
+    assert_not_nil resp.match("B: 2\r\n")
+    
+    r.response_headers = {}
+    r.socket = StringIO.new
+    assert_equal({}, r.response_headers)
+    r.response_headers = {'D' => '1', 'E' => 2}
+    r.send_response(200, 'text', 'Hi!', nil, {'F' => 3})
+    r.socket.rewind
+    resp = r.socket.read
+    assert_not_nil resp.match("D: 1\r\n")
+    assert_not_nil resp.match("E: 2\r\n")
+    assert_not_nil resp.match("F: 3\r\n")
+  end
 end

data/test/unit/static_test.rb

@@ -15,6 +15,7 @@ class StaticTest < Test::Unit::TestCase
     attr_accessor :path, :socket, :headers
     
     def initialize
+      super(nil)
       @headers = {}
     end
   end
@@ -29,7 +30,7 @@ class StaticTest < Test::Unit::TestCase
     cache = Dummy.static_files[__FILE__]
     assert_not_nil cache
     stat = File.stat(__FILE__)
-    etag = (ServerSide::StaticFiles::Const::ETagFormat % 
+    etag = (ServerSide::Static::ETAG_FORMAT % 
       [stat.mtime.to_i, stat.size, stat.ino])
     assert_equal etag, cache[0]
     assert_equal IO.read(__FILE__), cache[1]
@@ -58,11 +59,10 @@ class StaticTest < Test::Unit::TestCase
     assert_equal '200', /HTTP\/1.1\s(.*)\r\n/.match(resp)[1]
     fc = IO.read(__FILE__)
     stat = File.stat(__FILE__)
-    etag = (ServerSide::StaticFiles::Const::ETagFormat % 
+    etag = (ServerSide::Static::ETAG_FORMAT % 
       [stat.mtime.to_i, stat.size, stat.ino])
-    assert_equal etag, /ETag:\s(.*)\r\n/.match(resp)[1]
-    assert_equal ServerSide::StaticFiles::Const::MaxAge,
-      /Cache-Control:\s(.*)\r\n/.match(resp)[1]
+    assert_not_nil resp =~ /ETag:\s"#{etag}"\r\n/
+    assert_not_nil resp =~ /Cache-Control:\smax-age=#{ServerSide::HTTP::Caching::DEFAULT_MAX_AGE}\r\n/
     assert_equal stat.size.to_s,
       /Content-Length:\s(.*)\r\n/.match(resp)[1]
   end
@@ -79,16 +79,15 @@ class StaticTest < Test::Unit::TestCase
     assert_equal '200', /HTTP\/1.1\s(.*)\r\n/.match(resp)[1]
     fc = IO.read(__FILE__)
     stat = File.stat(__FILE__)
-    etag = (ServerSide::StaticFiles::Const::ETagFormat % 
+    etag = (ServerSide::Static::ETAG_FORMAT % 
       [stat.mtime.to_i, stat.size, stat.ino])
-    assert_equal etag, /ETag:\s(.*)\r\n/.match(resp)[1]
-    assert_equal ServerSide::StaticFiles::Const::MaxAge,
-      /Cache-Control:\s(.*)\r\n/.match(resp)[1]
+    assert_not_nil resp =~ /ETag:\s"#{etag}"\r\n/
+    assert_not_nil resp =~ /Cache-Control:\smax-age=#{ServerSide::HTTP::Caching::DEFAULT_MAX_AGE}\r\n/
     assert_equal stat.size.to_s,
       /Content-Length:\s(.*)\r\n/.match(resp)[1]
       
     c.socket = StringIO.new
-    c.headers[ServerSide::StaticFiles::Const::IfNoneMatch] = etag
+    c.headers[ServerSide::Static::IF_NONE_MATCH] = "\"#{etag}\""
     c.serve_file(__FILE__)
     c.socket.rewind
     resp = c.socket.read
@@ -97,15 +96,14 @@ class StaticTest < Test::Unit::TestCase
     assert_equal '304 Not Modified', /HTTP\/1.1\s(.*)\r\n/.match(resp)[1]
     fc = IO.read(__FILE__)
     stat = File.stat(__FILE__)
-    etag = (ServerSide::StaticFiles::Const::ETagFormat % 
+    etag = (ServerSide::Static::ETAG_FORMAT % 
       [stat.mtime.to_i, stat.size, stat.ino])
-    assert_equal etag, /ETag:\s(.*)\r\n/.match(resp)[1]
-    assert_equal ServerSide::StaticFiles::Const::MaxAge,
-      /Cache-Control:\s(.*)\r\n/.match(resp)[1]
+    assert_not_nil resp =~ /ETag:\s"#{etag}"\r\n/
+    assert_not_nil resp =~ /Cache-Control:\smax-age=#{ServerSide::HTTP::Caching::DEFAULT_MAX_AGE}\r\n/
     
     FileUtils.touch(__FILE__)
     c.socket = StringIO.new
-    c.headers[ServerSide::StaticFiles::Const::IfNoneMatch] = etag
+    c.headers[ServerSide::Static::IF_NONE_MATCH] = etag
     c.serve_file(__FILE__)
     c.socket.rewind
     resp = c.socket.read
@@ -114,11 +112,10 @@ class StaticTest < Test::Unit::TestCase
     assert_equal '200', /HTTP\/1.1\s(.*)\r\n/.match(resp)[1]
     fc = IO.read(__FILE__)
     stat = File.stat(__FILE__)
-    etag = (ServerSide::StaticFiles::Const::ETagFormat % 
+    etag = (ServerSide::Static::ETAG_FORMAT % 
       [stat.mtime.to_i, stat.size, stat.ino])
-    assert_equal etag, /ETag:\s(.*)\r\n/.match(resp)[1]
-    assert_equal ServerSide::StaticFiles::Const::MaxAge,
-      /Cache-Control:\s(.*)\r\n/.match(resp)[1]
+    assert_not_nil resp =~ /ETag:\s"#{etag}"\r\n/
+    assert_not_nil resp =~ /Cache-Control:\smax-age=#{ServerSide::HTTP::Caching::DEFAULT_MAX_AGE}\r\n/
     assert_equal stat.size.to_s,
       /Content-Length:\s(.*)\r\n/.match(resp)[1]
   end
@@ -135,7 +132,7 @@ class StaticTest < Test::Unit::TestCase
     resp = c.socket.read
     
     Dir.entries(dir).each do |fn|
-      next if fn == '.'
+      next if fn =~ /^\./
       assert_not_nil resp =~ /<a href="#{dir/fn}">(#{fn})<\/a>/
     end
   end
@@ -151,7 +148,7 @@ class StaticTest < Test::Unit::TestCase
     resp = c.socket.read
     
     Dir.entries(dir).each do |fn|
-      next if fn == '.'
+      next if fn =~ /^\./
       assert_not_nil resp =~ /<a href="#{dir/fn}">(#{fn})<\/a>/
     end
 
@@ -164,11 +161,10 @@ class StaticTest < Test::Unit::TestCase
     assert_equal '200', /HTTP\/1.1\s(.*)\r\n/.match(resp)[1]
     fc = IO.read(__FILE__)
     stat = File.stat(__FILE__)
-    etag = (ServerSide::StaticFiles::Const::ETagFormat % 
+    etag = (ServerSide::Static::ETAG_FORMAT % 
       [stat.mtime.to_i, stat.size, stat.ino])
-    assert_equal etag, /ETag:\s(.*)\r\n/.match(resp)[1]
-    assert_equal ServerSide::StaticFiles::Const::MaxAge,
-      /Cache-Control:\s(.*)\r\n/.match(resp)[1]
+    assert_not_nil resp =~ /ETag:\s"#{etag}"\r\n/
+    assert_not_nil resp =~ /Cache-Control:\smax-age=#{ServerSide::HTTP::Caching::DEFAULT_MAX_AGE}\r\n/
     assert_equal stat.size.to_s,
       /Content-Length:\s(.*)\r\n/.match(resp)[1]
   end