serverside 0.2.5 → 0.2.6

data/test/unit/request_test.rb

@@ -0,0 +1,248 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'stringio'
+
+class RequestTest < Test::Unit::TestCase
+  class DummyConnection
+    attr_reader :opened
+    
+    def initialize
+      @opened = true
+    end
+    
+    def close
+      @opened = false
+    end
+  end
+  
+  class DummyRequest2 < ServerSide::HTTP::Request
+    attr_accessor :count
+    
+    def parse
+      @count = 1
+    end
+    
+    def respond
+      @count += 1
+      @persistent = @count < 2
+    end
+  end
+  
+  def test_process
+    r = DummyRequest2.new(nil)
+    sleep 0.2
+    assert_equal false, r.process
+    assert_equal 2, r.count
+    assert_equal false, r.persistent
+  end
+  
+  class DummyRequest3 < ServerSide::HTTP::Request
+    attr_accessor :parse_result, :respond_result
+    def parse; @parse_result; end
+    def respond; @respond_result; end
+  end
+  
+  class ServerSide::HTTP::Request
+    attr_writer :conn, :persistent
+  end
+  
+  def test_process_result
+    r = DummyRequest3.new(nil)
+    r.parse_result = nil
+    r.persistent = true
+    assert_equal nil, r.process
+    r.parse_result = nil
+    r.respond_result = true
+    assert_equal nil, r.process
+    r.parse_result = {}
+    r.respond_result = nil
+    r.persistent = false
+    assert_equal false, r.process
+    r.parse_result = {}
+    r.respond_result = true
+    r.persistent = true
+    assert_equal true, r.process
+    r.parse_result = {}
+    r.persistent = 'hello'
+    assert_equal 'hello', r.process
+  end
+  
+  def test_parse_request_invalid
+    r = ServerSide::HTTP::Request.new(nil)
+    r.conn = StringIO.new('POST /test')
+    assert_nil r.parse
+    r.conn = StringIO.new('invalid string')
+    assert_nil r.parse
+    r.conn = StringIO.new('GET HTTP/1.1')
+    assert_nil r.parse
+    r.conn = StringIO.new('GET /test http')
+    assert_nil r.parse
+    r.conn = StringIO.new('GET /test HTTP')
+    assert_nil r.parse
+    r.conn = StringIO.new('GET /test HTTP/')
+    assert_nil r.parse
+    r.conn = StringIO.new('POST /test HTTP/1.1')
+    assert_nil r.parse
+  end
+  
+  def test_parse_request
+    r = ServerSide::HTTP::Request.new(nil)
+    r.conn = StringIO.new("POST /test HTTP/1.1\r\n\r\n")
+    assert_kind_of Hash, r.parse
+    assert_equal :post, r.method
+    assert_equal '/test', r.path
+    assert_nil r.query
+    assert_equal '1.1', r.version
+    assert_equal({}, r.parameters)
+    assert_equal({}, r.headers)
+    assert_equal({}, r.cookies)
+    assert_nil r.response_cookies
+    assert_equal true, r.persistent
+
+    # trailing slash in path    
+    r = ServerSide::HTTP::Request.new(nil)
+    r.conn = StringIO.new("POST /test/asdf/qw/?time=24%20hours HTTP/1.1\r\n\r\n")
+    assert_kind_of Hash, r.parse
+    assert_equal :post, r.method
+    assert_equal '/test/asdf/qw', r.path
+    assert_equal 'time=24%20hours', r.query
+    assert_equal '1.1', r.version
+    assert_equal({:time => '24 hours'}, r.parameters)
+    assert_equal({}, r.headers)
+    assert_equal({}, r.cookies)
+    assert_nil r.response_cookies
+    assert_equal true, r.persistent
+    
+    r.conn = StringIO.new("GET /cex?q=node_state HTTP/1.1\r\n\r\n")
+    assert_kind_of Hash, r.parse
+    assert_equal :get, r.method
+    assert_equal '/cex', r.path
+    assert_equal 'q=node_state', r.query
+    assert_equal({:q => 'node_state'}, r.parameters)
+    assert_equal({}, r.cookies)
+    assert_nil r.response_cookies
+    
+    r.conn = StringIO.new("GET / HTTP/1.0\r\n\r\n")
+    assert_kind_of Hash, r.parse
+    assert_equal false, r.persistent
+    assert_equal({}, r.cookies)
+    assert_nil r.response_cookies
+
+    r.conn = StringIO.new("GET / HTTP/invalid\r\n\r\n")
+    assert_kind_of Hash, r.parse
+    assert_equal 'invalid', r.version
+    assert_equal false, r.persistent
+    
+    r.conn = StringIO.new("GET / HTTP/1.1\r\nConnection: close\r\n\r\n")
+    assert_kind_of Hash, r.parse
+    assert_equal '1.1', r.version
+    assert_equal 'close', r.headers['Connection']
+    assert_equal false, r.persistent
+    
+    # cookies
+    r.conn = StringIO.new("GET / HTTP/1.1\r\nConnection: close\r\nCookie: abc=1342; def=7%2f4\r\n\r\n")
+    assert_kind_of Hash, r.parse
+    assert_equal 'abc=1342; def=7%2f4', r.headers['Cookie']
+    assert_equal '1342', r.cookies[:abc]
+    assert_equal '7/4', r.cookies[:def]
+  end
+  
+  def test_send_response
+    r = ServerSide::HTTP::Request.new(nil)
+    # simple case
+    r.conn = StringIO.new
+    r.persistent = true
+    r.send_response(200, 'text', 'Hello there!')
+    r.conn.rewind
+    assert_equal "HTTP/1.1 200\r\nContent-Type: text\r\nContent-Length: 12\r\n\r\nHello there!",
+      r.conn.read
+
+    # include content-length    
+    r.conn = StringIO.new
+    r.persistent = true
+    r.send_response(404, 'text/html', '<h1>404!</h1>', 10) # incorrect length
+    r.conn.rewind
+    assert_equal "HTTP/1.1 404\r\nContent-Type: text/html\r\nContent-Length: 10\r\n\r\n<h1>404!</h1>",
+      r.conn.read
+
+    # headers
+    r.conn = StringIO.new
+    r.persistent = true
+    r.send_response(404, 'text/html', '<h1>404!</h1>', nil, {'ETag' => 'xxyyzz'})
+    r.conn.rewind
+    assert_equal "HTTP/1.1 404\r\nContent-Type: text/html\r\nETag: xxyyzz\r\nContent-Length: 13\r\n\r\n<h1>404!</h1>",
+      r.conn.read
+
+    # no body
+    r.conn = StringIO.new
+    r.persistent = true
+    r.send_response(404, 'text/html', nil, nil, {'Set-Cookie' => 'abc=123'})
+    r.conn.rewind
+    assert_equal "HTTP/1.1 404\r\nConnection: close\r\nContent-Type: text/html\r\nSet-Cookie: abc=123\r\n\r\n",
+      r.conn.read
+    assert_equal false, r.persistent
+
+    # not persistent
+    r.conn = StringIO.new
+    r.persistent = false
+    r.send_response(200, 'text', 'Hello there!')
+    r.conn.rewind
+    assert_equal "HTTP/1.1 200\r\nConnection: close\r\nContent-Type: text\r\nContent-Length: 12\r\n\r\nHello there!",
+      r.conn.read
+      
+    # socket error
+    r.conn = nil
+    r.persistent = true
+    assert_nothing_raised {r.send_response(200, 'text', 'Hello there!')}
+    assert_equal false, r.persistent
+  end
+  
+  def test_stream
+    r = ServerSide::HTTP::Request.new(nil)
+    r.conn = StringIO.new
+    r.stream 'hey there'
+    r.conn.rewind
+    assert_equal 'hey there', r.conn.read
+    
+    r.conn = StringIO.new
+    r.persistent = true
+    r.send_response(404, 'text/html', nil, nil, {'Set-Cookie' => 'abc=123'})
+    r.stream('hey there')
+    r.conn.rewind
+    assert_equal "HTTP/1.1 404\r\nConnection: close\r\nContent-Type: text/html\r\nSet-Cookie: abc=123\r\n\r\nhey there",
+      r.conn.read
+  end
+  
+  def test_redirect
+    r = ServerSide::HTTP::Request.new(nil)
+    r.conn = StringIO.new
+    r.redirect('http://mau.com/132')
+    r.conn.rewind
+    assert_equal "HTTP/1.1 302\r\nConnection: close\r\nLocation: http://mau.com/132\r\n\r\n", r.conn.read
+
+    r.conn = StringIO.new
+    r.redirect('http://www.google.com/search?q=meaning%20of%20life', true)
+    r.conn.rewind
+    assert_equal "HTTP/1.1 301\r\nConnection: close\r\nLocation: http://www.google.com/search?q=meaning%20of%20life\r\n\r\n", r.conn.read
+  end
+  
+  def test_set_cookie
+    r = ServerSide::HTTP::Request.new(nil)
+    r.conn = StringIO.new
+    t = Time.now + 360
+    r.set_cookie(:session, "ABCDEFG", t)
+    assert_equal "Set-Cookie: session=ABCDEFG; path=/; expires=#{t.rfc2822}\r\n", r.response_cookies
+    r.send_response(200, 'text', 'Hi!')
+    r.conn.rewind
+    assert_equal "HTTP/1.1 200\r\nConnection: close\r\nContent-Type: text\r\nSet-Cookie: session=ABCDEFG; path=/; expires=#{t.rfc2822}\r\nContent-Length: 3\r\n\r\nHi!", r.conn.read
+  end
+  
+  def test_delete_cookie
+    r = ServerSide::HTTP::Request.new(nil)
+    r.conn = StringIO.new
+    r.delete_cookie(:session)
+    assert_equal "Set-Cookie: session=; path=/; expires=#{Time.at(0).rfc2822}\r\n", r.response_cookies
+    r.send_response(200, 'text', 'Hi!')
+    r.conn.rewind
+    assert_equal "HTTP/1.1 200\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.conn.read
+  end
+end

data/test/unit/routing_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'stringio'
 
-class ServerSide::Connection::Router
+class ServerSide::Router
   attr_accessor :t, :parameters
   
   def self.rules
@@ -22,7 +22,7 @@ class ServerSide::Connection::Router
 end
 
 class RoutingTest < Test::Unit::TestCase
-  R = ServerSide::Connection::Router
+  R = ServerSide::Router
   
   def test_has_routes?
     R.remove_rules
@@ -158,14 +158,14 @@ class RoutingTest < Test::Unit::TestCase
   
   def test_serverside_route
     R.reset_rules
-    ServerSide.route(:path => 'abc') {1 + 1}
+    ServerSide::Router.route(:path => 'abc') {1 + 1}
     assert_equal 1, R.rules.length
     assert_equal({:path => 'abc'}, R.rules[0][0])
     assert_equal 2, R.rules[0][1].call
   end
   
   def test_serverside_route_default
-    ServerSide.route_default {1234}
+    ServerSide::Router.route_default {1234}
     assert_equal 1234, R.new(StringIO.new).default_handler
   end
 end

data/test/unit/server_test.rb

@@ -2,19 +2,21 @@ require File.dirname(__FILE__) + '/../test_helper'
 require 'net/http'
 
 class ServerTest < Test::Unit::TestCase
-  class DummyConnection
-    attr_reader :conn
-    @@count = 0
-    def initialize(conn)
-      @@count += 1
-      @conn = conn
+  class DummyRequest < ServerSide::HTTP::Request
+    def respond
       @conn << "HTTP/1.1 200\r\nContent-Length: 9\r\n\r\nHi there!"
-      @conn.close
     end
   end
 
   def test_server_creation
-    t = Thread.new {ServerSide::Server.new('0.0.0.0', 17543, DummyConnection)}
+    t = Thread.new do
+      begin
+        ServerSide::HTTP::Server.new('0.0.0.0', 17543, DummyRequest)
+      rescue => e
+        puts e.message
+        puts e.backtrace.first
+      end
+    end
     sleep 0.1
 
     h = Net::HTTP.new('localhost', 17543)

data/test/unit/static_test.rb

@@ -3,7 +3,7 @@ require 'stringio'
 require 'fileutils'
 
 class ConnectionTest < Test::Unit::TestCase
-  class Dummy < ServerSide::Connection::Base
+  class Dummy < ServerSide::HTTP::Request
     def self.static_files
       @@static_files
     end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: serverside
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
-date: 2006-09-03 00:00:00 +03:00
+  version: 0.2.6
+date: 2006-09-30 00:00:00 +03:00
 summary: Performance-oriented web framework.
 require_paths: 
 - lib
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Sharon Rosner
 files: 
@@ -33,82 +34,86 @@ files:
 - Rakefile
 - bin/serverside
 - doc/rdoc
+- doc/rdoc/classes
 - doc/rdoc/created.rid
-- doc/rdoc/rdoc-style.css
 - doc/rdoc/files
-- doc/rdoc/classes
-- doc/rdoc/fr_file_index.html
 - doc/rdoc/fr_class_index.html
+- doc/rdoc/fr_file_index.html
 - doc/rdoc/fr_method_index.html
 - doc/rdoc/index.html
-- doc/rdoc/files/README.html
-- doc/rdoc/files/CHANGELOG.html
-- doc/rdoc/files/COPYING.html
-- doc/rdoc/files/lib
-- doc/rdoc/files/lib/serverside_rb.html
-- doc/rdoc/files/lib/serverside
-- doc/rdoc/files/lib/serverside/server_rb.html
-- doc/rdoc/files/lib/serverside/daemon_rb.html
-- doc/rdoc/files/lib/serverside/application_rb.html
-- doc/rdoc/files/lib/serverside/core_ext_rb.html
-- doc/rdoc/files/lib/serverside/connection_rb.html
-- doc/rdoc/files/lib/serverside/cluster_rb.html
-- doc/rdoc/files/lib/serverside/static_rb.html
-- doc/rdoc/files/lib/serverside/routing_rb.html
-- doc/rdoc/files/lib/serverside/template_rb.html
-- doc/rdoc/classes/Symbol.html
-- doc/rdoc/classes/Proc.html
-- doc/rdoc/classes/Object.html
-- doc/rdoc/classes/String.html
-- doc/rdoc/classes/Daemon.html
+- doc/rdoc/rdoc-style.css
 - doc/rdoc/classes/Daemon
-- doc/rdoc/classes/ServerSide.html
+- doc/rdoc/classes/Daemon.html
+- doc/rdoc/classes/Object.html
+- doc/rdoc/classes/Proc.html
 - doc/rdoc/classes/ServerSide
-- doc/rdoc/classes/Daemon/PidFile.html
+- doc/rdoc/classes/ServerSide.html
+- doc/rdoc/classes/String.html
+- doc/rdoc/classes/Symbol.html
 - doc/rdoc/classes/Daemon/Base.html
-- doc/rdoc/classes/Daemon/Cluster.html
 - doc/rdoc/classes/Daemon/Cluster
+- doc/rdoc/classes/Daemon/Cluster.html
+- doc/rdoc/classes/Daemon/PidFile.html
 - doc/rdoc/classes/Daemon/Cluster/PidFile.html
-- doc/rdoc/classes/ServerSide/StaticFiles.html
-- doc/rdoc/classes/ServerSide/StaticFiles
 - doc/rdoc/classes/ServerSide/Application.html
-- doc/rdoc/classes/ServerSide/Connection.html
-- doc/rdoc/classes/ServerSide/Connection
-- doc/rdoc/classes/ServerSide/Server.html
+- doc/rdoc/classes/ServerSide/HTTP
+- doc/rdoc/classes/ServerSide/HTTP.html
+- doc/rdoc/classes/ServerSide/Router.html
+- doc/rdoc/classes/ServerSide/StaticFiles
+- doc/rdoc/classes/ServerSide/StaticFiles.html
 - doc/rdoc/classes/ServerSide/Template.html
+- doc/rdoc/classes/ServerSide/HTTP/Connection.html
+- doc/rdoc/classes/ServerSide/HTTP/Const.html
+- doc/rdoc/classes/ServerSide/HTTP/Request.html
+- doc/rdoc/classes/ServerSide/HTTP/Server.html
 - doc/rdoc/classes/ServerSide/StaticFiles/Const.html
-- doc/rdoc/classes/ServerSide/Connection/Const.html
-- doc/rdoc/classes/ServerSide/Connection/Base.html
-- doc/rdoc/classes/ServerSide/Connection/Router.html
-- test/unit
-- test/test_helper.rb
+- doc/rdoc/files/CHANGELOG.html
+- doc/rdoc/files/COPYING.html
+- doc/rdoc/files/lib
+- doc/rdoc/files/README.html
+- doc/rdoc/files/lib/serverside
+- doc/rdoc/files/lib/serverside_rb.html
+- doc/rdoc/files/lib/serverside/application_rb.html
+- doc/rdoc/files/lib/serverside/cluster_rb.html
+- doc/rdoc/files/lib/serverside/connection_rb.html
+- doc/rdoc/files/lib/serverside/core_ext_rb.html
+- doc/rdoc/files/lib/serverside/daemon_rb.html
+- doc/rdoc/files/lib/serverside/request_rb.html
+- doc/rdoc/files/lib/serverside/routing_rb.html
+- doc/rdoc/files/lib/serverside/server_rb.html
+- doc/rdoc/files/lib/serverside/static_rb.html
+- doc/rdoc/files/lib/serverside/template_rb.html
 - test/functional
 - test/spec
-- test/unit/daemon_test.rb
-- test/unit/server_test.rb
-- test/unit/core_ext_test.rb
-- test/unit/connection_test.rb
-- test/unit/cluster_test.rb
-- test/unit/static_test.rb
-- test/unit/routing_test.rb
-- test/unit/template_test.rb
+- test/test_helper.rb
+- test/unit
 - test/functional/primitive_static_server_test.rb
-- test/functional/static_server_test.rb
-- test/functional/static_profile.rb
-- test/functional/static_rfuzz.rb
 - test/functional/routing_server.rb
 - test/functional/routing_server_test.rb
+- test/functional/static_profile.rb
+- test/functional/static_rfuzz.rb
+- test/functional/static_server_test.rb
 - test/spec/core_ext_spec.rb
-- lib/serverside.rb
+- test/unit/cluster_test.rb
+- test/unit/connection_test.rb
+- test/unit/core_ext_test.rb
+- test/unit/daemon_test.rb
+- test/unit/request_test.rb
+- test/unit/routing_test.rb
+- test/unit/server_test.rb
+- test/unit/static_test.rb
+- test/unit/template_test.rb
 - lib/serverside
-- lib/serverside/server.rb
-- lib/serverside/daemon.rb
+- lib/serverside.rb
 - lib/serverside/application.rb
-- lib/serverside/core_ext.rb
-- lib/serverside/connection.rb
 - lib/serverside/cluster.rb
-- lib/serverside/static.rb
+- lib/serverside/connection.rb
+- lib/serverside/core_ext.rb
+- lib/serverside/daemon.rb
+- lib/serverside/request.rb
 - lib/serverside/routing.rb
+- lib/serverside/server.rb
+- lib/serverside/static.rb
 - lib/serverside/template.rb
 - CHANGELOG
 test_files: []