RubyGems - serverside - Versions diffs - 0.2.9 → 0.3.0 - Mend

serverside 0.2.9 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (45) hide show

data/CHANGELOG +56 -0
data/Rakefile +12 -52
data/bin/serverside +1 -1
data/lib/serverside/application.rb +2 -1
data/lib/serverside/caching.rb +62 -50
data/lib/serverside/controllers.rb +91 -0
data/lib/serverside/core_ext.rb +6 -0
data/lib/serverside/daemon.rb +25 -5
data/lib/serverside/request.rb +17 -11
data/lib/serverside/routing.rb +11 -10
data/lib/serverside/server.rb +14 -6
data/lib/serverside/static.rb +7 -18
data/lib/serverside/template.rb +20 -12
data/spec/caching_spec.rb +318 -0
data/spec/cluster_spec.rb +140 -0
data/{test/spec → spec}/connection_spec.rb +4 -4
data/{test/spec/controller_spec.rb → spec/controllers_spec.rb} +15 -12
data/{test/spec → spec}/core_ext_spec.rb +23 -18
data/spec/daemon_spec.rb +99 -0
data/{test/spec → spec}/request_spec.rb +45 -45
data/spec/routing_spec.rb +240 -0
data/spec/server_spec.rb +40 -0
data/spec/static_spec.rb +279 -0
data/spec/template_spec.rb +129 -0
metadata +21 -35
data/lib/serverside/controller.rb +0 -67
data/test/functional/primitive_static_server_test.rb +0 -61
data/test/functional/request_body_test.rb +0 -93
data/test/functional/routing_server.rb +0 -14
data/test/functional/routing_server_test.rb +0 -41
data/test/functional/static_profile.rb +0 -17
data/test/functional/static_rfuzz.rb +0 -31
data/test/functional/static_server.rb +0 -7
data/test/functional/static_server_test.rb +0 -31
data/test/spec/caching_spec.rb +0 -139
data/test/test_helper.rb +0 -2
data/test/unit/cluster_test.rb +0 -129
data/test/unit/connection_test.rb +0 -48
data/test/unit/core_ext_test.rb +0 -46
data/test/unit/daemon_test.rb +0 -75
data/test/unit/request_test.rb +0 -278
data/test/unit/routing_test.rb +0 -171
data/test/unit/server_test.rb +0 -28
data/test/unit/static_test.rb +0 -171
data/test/unit/template_test.rb +0 -78

data/lib/serverside/static.rb CHANGED Viewed

@@ -6,10 +6,11 @@ module ServerSide
   module Static
     include HTTP::Caching
-    ETAG_FORMAT = '%x:%x:%x'.inspect.freeze
+    ETAG_FORMAT = '%x:%x:%x'.freeze
     TEXT_PLAIN = 'text/plain'.freeze
     TEXT_HTML = 'text/html'.freeze
     MAX_CACHE_FILE_SIZE = 100000.freeze # 100KB for the moment
+    MAX_AGE = 86400 # one day
     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
@@ -29,8 +30,6 @@ module ServerSide
       '.png'.freeze => 'image/png'.freeze
     })
-    @@static_files = {}
     # Serves a file over HTTP. The file is cached in memory for later retrieval.
     # If the If-None-Match header is included with an ETag, it is checked
     # against the file's current ETag. If there's a match, a 304 response is
@@ -38,17 +37,11 @@ module ServerSide
     def serve_file(fn)
       stat = File.stat(fn)
       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)
+      validate_cache(stat.mtime, MAX_AGE, etag) do
+        send_response(200, @@mime_types[File.extname(fn)], IO.read(fn),
+          stat.size)
       end
     rescue => e
-      puts e.message
       send_response(404, TEXT_PLAIN, 'Error reading file.')
     end
@@ -64,17 +57,13 @@ module ServerSide
     end
     def serve_template(fn, b = nil)
-      if (fn =~ RHTML) || (File.file?(fn = fn + '.rhtml'))
-        send_response(200, TEXT_HTML, Template.render(fn, b || binding))
-      end
+      send_response(200, TEXT_HTML, Template.render(fn, b || binding))
     end
     # Serves static files and directory listings.
     def serve_static(path)
       if File.file?(path)
-        serve_file(path)
-      elsif serve_template(path)
-        return
+        path =~ RHTML ? serve_template(path) : serve_file(path)
       elsif File.directory?(path)
         if File.file?(path/'index.html')
           serve_file(path/'index.html')

data/lib/serverside/template.rb CHANGED Viewed

@@ -4,33 +4,41 @@ module ServerSide
   # The Template module implements an ERB template rendering system. Templates
   # are cached and automatically reloaded if the file changes.
   class Template
-    # The @@templates variable is a hash keyed by template name. The values are
+    # The @@templates variable caches templates in use. The values are
     # arrays containing 2 objects: a file stamp (if the template comes from a
-    # file,) and the template object itself.
+    # file,) and the template object itself.
     @@templates = {}
-    # Stores a template for later use. The stamp parameter is used only when
+    # Caches a template for later use. The stamp parameter is used only when
     # the content of a template file is stored.
     def self.set(name, body, stamp = nil)
       @@templates[name] = [stamp, ERB.new(body)]
     end
-    # Renders a template. If the template name is not found, attemps to load
-    # the template from file. If the template has a non-nil stamp, the render
-    # method compares it to the file stamp, and reloads the template content
-    # if necessary.
-    def self.render(name, binding)
+    # Validates the referenced template by checking its stamp. If the name
+    # refers to a file, its stamp is checked against the cache stamp, and it
+    # is reloaded if necessary. The function returns an ERB instance or nil if
+    # the template is not found.
+    def self.validate(name)
       t = @@templates[name]
-      return t[1].result(binding) if t && t[0].nil?
+      return t[1] if t && t[0].nil?
       if File.file?(name)
         stamp = File.mtime(name)
         t = set(name, IO.read(name), stamp) if (!t || (stamp != t[0]))
-        t[1].result(binding)
+        t[1]
       else
         @@templates[name] = nil
+      end
+    end
+    # Renders a template by first validating it, and by invoking it with the
+    # supplied binding.
+    def self.render(name, binding)
+      if template = validate(name)
+        template.result(binding)
+      else
         raise RuntimeError, 'Template not found.'
       end
     end
-  end
+  end
 end

data/spec/caching_spec.rb ADDED Viewed

@@ -0,0 +1,318 @@
+require File.join(File.dirname(__FILE__), '../lib/serverside')
+require 'stringio'
+include ServerSide::HTTP
+class DummyRequest < Request
+  attr_accessor :socket, :persistent
+  include Caching
+  def initialize
+    super(StringIO.new)
+    @headers = {}
+  end
+end
+context "Caching#disable_caching" do
+  specify "should set the Cache-Control header to no-cache" do
+    r = DummyRequest.new
+    r.response_headers['Cache-Control'].should_be_nil
+    r.disable_caching
+    r.response_headers['Cache-Control'].should == 'no-cache'
+  end
+  specify "should remove all other cache-related headers" do
+    r = DummyRequest.new
+    r.response_headers['ETag'] = 'something'
+    r.response_headers['Vary'] = 'something'
+    r.response_headers['Expires'] = 'something'
+    r.response_headers['Last-Modified'] = 'something'
+    r.disable_caching
+    r.response_headers['ETag'].should_be_nil
+    r.response_headers['Vary'].should_be_nil
+    r.response_headers['Expires'].should_be_nil
+    r.response_headers['Last-Modified'].should_be_nil
+  end
+end
+context "Caching#etag_validators" do
+  specify "should return an empty array if no validators are present" do
+    r = DummyRequest.new
+    r.etag_validators.should == []
+  end
+  specify "should return an array containing all etag validators" do
+    r = DummyRequest.new
+    r.headers['If-None-Match'] = '"aaa-bbb"'
+    r.etag_validators.should == ['aaa-bbb']
+    r.headers['If-None-Match'] = '"aaa-bbb", "ccc-ddd"'
+    r.etag_validators.should == ['aaa-bbb', 'ccc-ddd']
+  end
+  specify "should handle etags with and without quotes" do
+    r = DummyRequest.new
+    r.headers['If-None-Match'] = 'aaa-bbb'
+    r.etag_validators.should == ['aaa-bbb']
+    r.headers['If-None-Match'] = 'aaa-bbb, "ccc-ddd"'
+    r.etag_validators.should == ['aaa-bbb', 'ccc-ddd']
+  end
+  specify "should handle a wildcard validator" do
+    r = DummyRequest.new
+    r.headers['If-None-Match'] = '*'
+    r.etag_validators.should == ['*']
+  end
+end
+context "Caching#valid_etag?" do
+  specify "should return nil if no validator matches the specified etag" do
+    r = DummyRequest.new
+    r.valid_etag?('xxx-yyy').should_be_nil
+    r.headers['If-None-Match'] = 'xx-yy, aaa-bbb'
+    r.valid_etag?('xxx-yyy').should_be_nil
+  end
+  specify "should return true if a validator matches the specifed etag" do
+    r = DummyRequest.new
+    r.headers['If-None-Match'] = 'xxx-yyy'
+    r.valid_etag?('xxx-yyy').should_be true
+    r.headers['If-None-Match'] = '"xxx-yyy"'
+    r.valid_etag?('xxx-yyy').should_be true
+    r.headers['If-None-Match'] = 'aaa-bbb, xxx-yyy'
+    r.valid_etag?('xxx-yyy').should_be true
+    r.headers['If-None-Match'] = 'xxx-yyy, aaa-bbb'
+    r.valid_etag?('xxx-yyy').should_be true
+  end
+  specify "should return true if a wildcard is included in If-None-Match" do
+    r = DummyRequest.new
+    r.headers['If-None-Match'] = '*'
+    r.valid_etag?('xxx-yyy').should_be true
+    r.headers['If-None-Match'] = 'aaa-bbb, *'
+    r.valid_etag?('xxx-yyy').should_be true
+  end
+end
+context "Caching#valid_etag? in expiry etag mode (no etag specified)" do
+  specify "should return nil if no etag validator is included" do
+    r = DummyRequest.new
+    r.valid_etag?.should_be_nil
+  end
+  specify "should return true if If-None-Match includes a wildcard" do
+    r = DummyRequest.new
+    r.headers['If-None-Match'] = '*'
+    r.valid_etag?.should_be true
+  end
+  specify "should ignore validators not formatted as expiry etags" do
+    r = DummyRequest.new
+    r.headers['If-None-Match'] = 'abcd'
+    r.valid_etag?.should_be_nil
+    r.headers['If-None-Match'] = 'xxx-yyy, zzz-zzz'
+    r.valid_etag?.should_be_nil
+  end
+  specify "should parse expiry etags and check the expiration stamp" do
+    r = DummyRequest.new
+    t = Time.now
+    fmt = Caching::EXPIRY_ETAG_FORMAT
+    r.headers['If-None-Match'] = fmt % [t.to_i, (t - 20).to_i]
+    r.valid_etag?.should_be_nil
+    r.headers['If-None-Match'] = fmt % [t.to_i, (t + 20).to_i]
+    r.valid_etag?.should_be true
+    r.headers['If-None-Match'] = "xxx-yyy, #{fmt % [t.to_i, (t + 20).to_i]}, #{fmt % [t.to_i, (t - 20).to_i]}"
+    r.valid_etag?.should_be true
+  end
+end
+context "Caching#expiry_etag" do
+  specify "should return an expiry etag with the stamp and expiration time" do
+    r = DummyRequest.new
+    t = Time.now
+    fmt = Caching::EXPIRY_ETAG_FORMAT
+    max_age = 54321
+    r.expiry_etag(t, max_age).should == (fmt % [t.to_i, (t + max_age).to_i])
+  end
+end
+context "Caching#valid_stamp?" do
+  specify "should return nil if no If-Modified-Since header is included" do
+    r = DummyRequest.new
+    r.valid_stamp?(Time.now).should_be_nil
+  end
+  specify "should return nil if the If-Modified-Since header is different than the specified stamp" do
+    t = Time.now
+    r = DummyRequest.new
+    r.headers['If-Modified-Since'] = t.httpdate
+    r.valid_stamp?(t + 1).should_be_nil
+    r.valid_stamp?(t - 1).should_be_nil
+  end
+  specify "should return true if the If-Modified-Since header matches the specified stamp" do
+    t = Time.now
+    r = DummyRequest.new
+    r.headers['If-Modified-Since'] = t.httpdate
+    r.valid_stamp?(t).should_be true
+  end
+end
+context "Caching#validate_cache" do
+  specify "should return nil if no validators are present" do
+    r = DummyRequest.new
+    r.validate_cache(Time.now, 360).should_be_nil
+  end
+  specify "should check for a stamp validator" do
+    r = DummyRequest.new
+    t = Time.now
+    r.headers['If-Modified-Since'] = t.httpdate
+    r.validate_cache(t + 1, 360).should_be_nil
+    r.validate_cache(t - 1, 360).should_be_nil
+    r.validate_cache(t, 360).should_be true
+  end
+  specify "should check for an etag validator" do
+    r = DummyRequest.new
+    t = Time.now
+    etag = 'abcdef'
+    r.validate_cache(t, 360, etag).should_be_nil
+    r.headers['If-None-Match'] = 'aaa-bbb'
+    r.validate_cache(t, 360, etag).should_be_nil
+    r.headers['If-None-Match'] = "aaa-bbb, #{etag}"
+    r.validate_cache(t, 360, etag).should_be true
+    r.headers['If-None-Match'] = '*'
+    r.validate_cache(t, 360, etag).should_be true
+  end
+  specify "should check for an expiry etag validator if etag is unspecified" do
+    r = DummyRequest.new
+    t = Time.now
+    fmt = Caching::EXPIRY_ETAG_FORMAT
+    r.headers['If-None-Match'] = 'aaa-bbb'
+    r.validate_cache(t, 360).should_be_nil
+    r.headers['If-None-Match'] = "aaa-bbb, #{fmt % [t.to_i, (t + 20).to_i]}"
+    r.validate_cache(t, 360).should_be true
+    r.headers['If-None-Match'] = '*'
+    r.validate_cache(t, 360).should_be true
+  end
+  specify "should set the response headers with caching info if request did not validate" do
+    r = DummyRequest.new
+    t = Time.now
+    r.validate_cache(t, 360, 'aaa-bbb', :public, 'Cookie')
+    r.response_headers['ETag'].should == '"aaa-bbb"'
+    r.response_headers['Last-Modified'].should == t.httpdate
+    r.response_headers['Expires'].should == ((t + 360).httpdate)
+    r.response_headers['Cache-Control'].should == :public
+    r.response_headers['Vary'].should == 'Cookie'
+  end
+  specify "should set an expiry etag if no etag is specified" do
+    r = DummyRequest.new
+    t = Time.now
+    fmt = Caching::EXPIRY_ETAG_FORMAT
+    r.validate_cache(t, 360)
+    r.response_headers['ETag'].should == (
+      "\"#{fmt % [t.to_i, (t + 360).to_i]}\"")
+  end
+  specify "should send a 304 response if the cache validates" do
+    r = DummyRequest.new
+    t = Time.now
+    fmt = Caching::EXPIRY_ETAG_FORMAT
+    r.headers['If-None-Match'] = "aaa-bbb, #{fmt % [t.to_i, (t + 20).to_i]}"
+    r.validate_cache(t, 360).should_be true
+    r.socket.rewind
+    resp = r.socket.read
+    resp.should_match /^HTTP\/1.1 304 Not Modified\r\n/
+    r = DummyRequest.new
+    t = Time.now
+    r.headers['If-Modified-Since'] = t.httpdate
+    r.validate_cache(t, 360).should_be true
+    r.socket.rewind
+    resp = r.socket.read
+    resp.should_match /^HTTP\/1.1 304 Not Modified\r\n/
+  end
+  specify "should not send anything if the cache doesn't validate" do
+    r = DummyRequest.new
+    t = Time.now
+    r.validate_cache(t, 360).should_be_nil
+    r.socket.rewind
+    resp = r.socket.read
+    resp.should_be_empty
+  end
+  specify "should not execute the given block if the cache validates" do
+    r = DummyRequest.new
+    t = Time.now
+    r.headers['If-Modified-Since'] = t.httpdate
+    proc {r.validate_cache(t, 360) {raise}}.should_not_raise
+  end
+  specify "should return the result of the given block if the cache doesn't validate" do
+    x = nil
+    l = proc {x = :executed}
+    r = DummyRequest.new
+    t = Time.now
+    r.validate_cache(t, 360, &l).should == :executed
+    x.should == :executed
+  end
+end
+context "Caching#send_not_modified_response" do
+  specify "should render a 304 response" do
+    r = DummyRequest.new
+    r.send_not_modified_response
+    r.socket.rewind
+    resp = r.socket.read
+    resp.should_match /^HTTP\/1.1 304 Not Modified\r\n/
+    resp.should_match /Content-Length: 0\r\n/
+    resp.should_match /\r\n\r\n$/ # empty response body
+  end
+  specify "should exclude Connection header if persistent" do
+    r = DummyRequest.new
+    r.persistent = true
+    r.send_not_modified_response
+    r.socket.rewind
+    resp = r.socket.read
+    resp.should_not_match /Connection: close\r\n/
+  end
+  specify "should include Connection header if persistent" do
+    r = DummyRequest.new
+    r.persistent = false
+    r.send_not_modified_response
+    r.socket.rewind
+    resp = r.socket.read
+    resp.should_match /Connection: close\r\n/
+  end
+end

data/spec/cluster_spec.rb ADDED Viewed

@@ -0,0 +1,140 @@
+require File.join(File.dirname(__FILE__), '../lib/serverside')
+__END__
+context "Daemon::Cluster::PidFile" do
+  setup do
+    @fn = Daemon::Cluster::PidFile::FN
+  end
+  specify "::FN should be the cluster's pid file" do
+    Daemon::Cluster::PidFile::FN.should == 'serverside_cluster.pid'
+  end
+  specify "should delete the cluster's pid file" do
+    FileUtils.touch(@fn)
+    File.file?(@fn).should == true
+    Daemon::Cluster::PidFile.delete
+    File.file?(@fn).should == false
+  end
+  specify "should store multiple pids" do
+    Daemon::Cluster::PidFile.delete
+    Daemon::Cluster::PidFile.store_pid(1111)
+    IO.read(@fn).should == "1111\n"
+    Daemon::Cluster::PidFile.store_pid(2222)
+    IO.read(@fn).should == "1111\n2222\n"
+  end
+  def test_pid_recall_pids
+    Daemon::Cluster::PidFile.delete
+    proc {Daemon::Cluster::PidFile.recall_pids}.should_raise Errno::ENOENT
+    File.open(@fn, 'w') {|f| f.puts 3333; f.puts 4444}
+    Daemon::Cluster::PidFile.recall_pids.should == [3333, 4444]
+    FileUtils.rm(@fn)
+    Daemon::Cluster::PidFile.store_pid(6666)
+    Daemon::Cluster::PidFile.store_pid(7777)
+    Daemon::Cluster::PidFile.recall_pids.should == [6666, 7777]
+  end
+end
+class DummyCluster < Daemon::Cluster
+  FN = 'result'
+  def self.server_loop(port)
+    at_exit {File.open(FN, 'a') {|f| f.puts port}}
+    loop {sleep 10}
+  end
+  def self.ports
+    5555..5556
+  end
+end
+context "Cluster.fork_server" do
+  specify "should fork a server on the specified port" do
+    FileUtils.rm(DummyCluster::FN) rescue nil
+    port = rand(5_000)
+    pid = DummyCluster.fork_server(port)
+    sleep 1
+    Process.kill('TERM', pid)
+    sleep 0.1
+    File.file?(DummyCluster::FN).should == true
+    File.open(DummyCluster::FN, 'r') do |f|
+      f.gets.to_i.should == port
+      f.eof?.should == true
+    end
+    FileUtils.rm(DummyCluster::FN) rescue nil
+  end
+end
+context "Cluster.start_servers" do
+  specify "should start a cluster of servers" do
+    FileUtils.rm(DummyCluster::FN) rescue nil
+    DummyCluster.start_servers
+    sleep 0.5
+    pids = Daemon::Cluster::PidFile.recall_pids
+    pids.length.should == 2
+    pids.each {|pid| Process.kill('TERM', pid)}
+    sleep 0.5
+    File.open(DummyCluster::FN, 'r') do |f|
+      p1, p2 = f.gets.to_i, f.gets.to_i
+      DummyCluster.ports.include?(p1).should == true
+      DummyCluster.ports.include?(p2).should == true
+      p1.should_not == p2
+      f.eof?.should == true
+    end
+    FileUtils.rm(DummyCluster::FN) rescue nil
+  end
+end
+context "Cluster.stop_servers" do
+  specify "should stop the cluster of servers" do
+    DummyCluster.start_servers
+    sleep 0.5
+    pids = Daemon::Cluster::PidFile.recall_pids
+    DummyCluster.stop_servers
+    sleep 0.5
+    File.file?(Daemon::Cluster::PidFile::FN).should == false
+    File.open(DummyCluster::FN, 'r') do |f|
+      p1, p2 = f.gets.to_i, f.gets.to_i
+      DummyCluster.ports.include?(p1).should == true
+      DummyCluster.ports.include?(p2).should == true
+      p1.should_not == p2
+      f.eof?.should == true
+    end
+    FileUtils.rm(DummyCluster::FN) rescue nil
+  end
+end
+class DummyCluster2 < Daemon::Cluster
+  def self.daemon_loop
+    @@a = true
+  end
+  def self.start_servers
+    @@b = true
+  end
+  def self.stop_servers
+    @@c = true
+  end
+  def self.a; @@a; end
+  def self.b; @@b; end
+  def self.c; @@c; end
+end
+context "Cluster.start and stop" do
+  specify "should start and stop the cluster daemon" do
+    DummyCluster2.start
+    DummyCluster2.a.should == true
+    DummyCluster2.b.should == true
+    proc {DummyCluster2.c}.should_raise
+    DummyCluster2.stop
+    DummyCluster2.c.should == true
+  end
+end

data/{test/spec → spec}/connection_spec.rb RENAMED Viewed

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../../lib/serverside')
+require File.join(File.dirname(__FILE__), '../lib/serverside')
 class ServerSide::HTTP::Connection
   attr_reader :socket, :request_class, :thread
@@ -49,11 +49,11 @@ context "Connection.initialize" do
     $pause_request = true
     c = Connection.new(DummySocket.new, DummyRequest1)
     c.thread.should_be_an_instance_of Thread
-    c.thread.alive?.should_equal true
-    DummyRequest1.instance_count.should_equal 1
+    c.thread.alive?.should == true
+    DummyRequest1.instance_count.should == 1
     $pause_request = false
     sleep 0.1 while c.thread.alive?
-    DummyRequest1.instance_count.should_equal 1000
+    DummyRequest1.instance_count.should == 1000
   end
 end

data/{test/spec/controller_spec.rb → spec/controllers_spec.rb} RENAMED Viewed

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../../lib/serverside')
+require File.join(File.dirname(__FILE__), '../lib/serverside')
 require 'stringio'
 class ServerSide::Router
@@ -28,14 +28,15 @@ context "ServerSide::Controller.mount" do
     ServerSide::Router.reset_rules
     rule = {:path => '/test'}
     c = ServerSide::Controller.mount(rule)
+    sub_class = Class.new(c)
     r = ServerSide::Router.rules.first
-    r.first.should_equal rule
+    r.first.should == rule
     r.last.should_be_a_kind_of Proc
     c.module_eval do
       define_method(:initialize) {|req| $req = req}
     end
     res = r.last.call
-    res.should_be_a_kind_of c
+    res.should_be_a_kind_of sub_class
     r = ServerSide::Router.new(StringIO.new)
     r.path = '/test'
@@ -46,13 +47,13 @@ context "ServerSide::Controller.mount" do
   specify "should accept either an argument or block as the rule" do
     ServerSide::Router.reset_rules
     rule = {:path => '/test'}
-    c = ServerSide::Controller.mount(rule)
+    c = Class.new(ServerSide::Controller.mount(rule))
     r = ServerSide::Router.rules.first
     r.first.should_be rule
     ServerSide::Router.reset_rules
     rule = proc {true}
-    c = ServerSide::Controller.mount(&rule)
+    c = Class.new(ServerSide::Controller.mount(&rule))
     r = ServerSide::Router.rules.first
     r.first.should_be rule
   end
@@ -69,10 +70,10 @@ end
 require 'metaid'
 class DummyController < ServerSide::Controller
-  attr_reader :process_called
+  attr_reader :response_called
-  def process
-    @process_called = true
+  def response
+    @response_called = true
   end
   def render_default
@@ -91,10 +92,10 @@ context "ServerSide::Controller new instance" do
     c.parameters.should_be req.parameters
   end
-  specify "should invoke the process method" do
+  specify "should invoke the response method" do
     req = ServerSide::HTTP::Request.new(StringIO.new)
     c = DummyController.new(req)
-    c.process_called.should_be true
+    c.response_called.should_be true
   end
   specify "should invoke render_default unless @rendered" do
@@ -103,7 +104,7 @@ context "ServerSide::Controller new instance" do
     c.rendered.should_be :default
     c_class = Class.new(DummyController) do
-      define_method(:process) {@rendered = true}
+      define_method(:response) {@rendered = true}
     end
     c = c_class.new(req)
     c.rendered.should_be true
@@ -134,6 +135,8 @@ context "ServerSide::Controller.render" do
     req = ServerSide::HTTP::Request.new(StringIO.new)
     c = ServerSide::Controller.new(req)
     c.render('hello world', 'text/plain')
-    c.rendered.should_equal true
+    c.rendered.should == true
   end
 end