serverside 0.3.1 → 0.4.1

data/spec/http_spec.rb

@@ -0,0 +1,259 @@
+require File.join(File.dirname(__FILE__), '../lib/serverside')
+
+include ServerSide::HTTP
+
+class SpecHTTPServer
+  include Server
+  
+  attr_accessor :in, :state, :request_headers, :request_header_count, 
+    :request_cookies, :response_headers
+  
+  attr_accessor :method, :uri, :query, :http_version
+  attr_accessor :params, :persistent, :content_length
+  
+  def initialize
+    reset
+  end
+  
+  def reset
+    post_init
+    @response = ''
+    @closed = false
+  end
+  
+  attr_reader :response, :closed
+  
+  def send_data(data)
+    @response << data
+  end
+  
+  def close_connection_after_writing
+    @closed = true
+  end
+  
+  def send_error_response(e)
+    raise e
+  end
+end
+
+context "An HTTP Request should be considered malformed" do
+  setup do
+    @server = SpecHTTPServer.new
+  end
+  
+  specify "if the request-line size is too big" do
+    l = "GET /#{'x' * (MAX_REQUEST_LINE_SIZE - 12)}"
+    proc {@server.receive_data(l)}.should_not raise_error(MalformedRequestError)
+
+    @server.reset
+    l = "GET /#{'x' * MAX_REQUEST_LINE_SIZE}"
+    proc {@server.receive_data(l)}.should raise_error(MalformedRequestError)
+  end
+  
+  specify "if the request-line is malformed" do
+    l = "abcde\r\n"
+    proc {@server.receive_data(l)}.should raise_error(MalformedRequestError)
+    
+    @server.reset
+    l = "GET /\r\n"
+    proc {@server.receive_data(l)}.should raise_error(MalformedRequestError)
+
+    @server.reset
+    l = "GET HTTP/\r\n"
+    proc {@server.receive_data(l)}.should raise_error(MalformedRequestError)
+  end
+  
+  specify "if the header count is too big" do
+    l = "GET / HTTP/1.1\r\n" + "Accept: *\r\n" * (MAX_HEADER_COUNT - 1)
+    proc {@server.receive_data(l)}.should_not raise_error(MalformedRequestError)
+
+    @server.reset
+    l = "GET / HTTP/1.1\r\n" + "Accept: *\r\n" * (MAX_HEADER_COUNT + 10)
+    proc {@server.receive_data(l)}.should raise_error(MalformedRequestError)
+  end
+  
+  specify "if a header is too big" do
+    l = "GET / HTTP/1.1\r\n#{'x' * MAX_HEADER_SIZE}: 1\r\n"
+    proc {@server.receive_data(l)}.should raise_error(MalformedRequestError)
+  end
+  
+  specify "if a header is malformed" do
+    l = %[GET / HTTP/1.1\r\ntest: 231\r\n]
+    proc {@server.receive_data(l)}.should_not raise_error(MalformedRequestError)
+
+    @server.reset
+    l = %[GET / HTTP/1.1\r\nmitchesunu no haha\r\n]
+    proc {@server.receive_data(l)}.should raise_error(MalformedRequestError)
+  end
+  
+  specify "if it contains a malformed cookie header" do
+    l = %[GET / HTTP/1.1\r\nCookie: a=b\r\n]
+    proc {@server.receive_data(l)}.should_not raise_error(MalformedRequestError)
+
+    @server.reset
+    l = %[GET / HTTP/1.1\r\nCookie: zzxxcc\r\n]
+    proc {@server.receive_data(l)}.should raise_error(MalformedRequestError)
+  end
+end
+
+context "A server in the initial state" do
+  setup do
+    @server = SpecHTTPServer.new
+  end
+  
+  specify "should initialize all header-related variables" do
+    @server.request_headers = {1 => 2}
+    @server.request_header_count = 20
+    @server.request_cookies = {:z => :y}
+    @server.response_headers = [1, 2, 3]
+
+    @server.set_state(:state_initial)
+    @server.request_headers.should == {}
+    @server.request_header_count.should == 0
+    @server.request_cookies.should == {}
+    @server.response_headers.should == []
+  end
+  
+  specify "should transition to state_request_line" do
+    @server.set_state(:state_initial)
+    @server.state.should == :state_request_line
+  end
+end
+
+context "A server in the request_line state" do
+  setup do
+    @server = SpecHTTPServer.new
+  end
+  
+  specify "should wait for a CRLF before parsing the request line" do
+    @server.receive_data("GET ")
+    @server.state.should == :state_request_line
+    @server.receive_data("/ ")
+    @server.state.should == :state_request_line
+    @server.receive_data("HTTP/1.1")
+    @server.state.should == :state_request_line
+    
+    @server.receive_data("\r\n")
+    @server.state.should_not == :state_request_line
+  end
+  
+  specify "should extract method, uri, query and http version from the request line" do
+    @server.receive_data("GET /abc?q=z HTTP/1.1\r\n")
+    @server.method.should == :get
+    @server.uri.should == '/abc'
+    @server.query.should == 'q=z'
+    @server.http_version.should == '1.1'
+  end
+  
+  specify "should set persistent to true if the http version is 1.1" do
+    @server.receive_data("GET / HTTP/1.1\r\n")
+    @server.persistent.should be_true
+
+    @server.reset
+    @server.receive_data("GET / HTTP/1.0\r\n")
+    @server.persistent.should be_false
+  end
+  
+  specify "should parse the query into params and unescape the values" do
+    @server.receive_data("GET /?x=1&y=2%203 HTTP/1.1\r\n")
+    @server.params.should == {:x => '1', :y => '2 3'}
+  end
+  
+  specify "should transition to state_request_headers" do
+    @server.state.should == :state_request_line
+    @server.receive_data("GET / HTTP/1.1\r\n")
+    @server.state.should == :state_request_headers
+  end
+  
+  specify "should raise MalformedRequestError on invalid request line size" do
+    proc {@server.receive_data("abc" * MAX_REQUEST_LINE_SIZE)}.should \
+      raise_error(MalformedRequestError)
+  end
+  
+  specify "should raise MalformedRequestError if the request line is invalid" do
+    proc {@server.receive_data("GET\r\n")}.should raise_error(MalformedRequestError)
+    
+    @server.reset
+    proc {@server.receive_data("GET /\r\n")}.should raise_error(MalformedRequestError)
+
+    @server.reset
+    proc {@server.receive_data("GET / 1.1\r\n")}.should raise_error(MalformedRequestError)
+
+    @server.reset
+    proc {@server.receive_data("GET ?q=1 HTTP/1.1\r\n")}.should raise_error(MalformedRequestError)
+
+    @server.reset
+    proc {@server.receive_data("GET / HTTP 1.1\r\n")}.should raise_error(MalformedRequestError)
+  end
+end
+
+context "A server in the request_headers state" do
+  setup do
+    @server = SpecHTTPServer.new
+    
+    m = Module.new do
+      define_method(:state_response) {}
+    end
+    @server.extend(m)
+    @server.receive_data("GET / HTTP/1.1\r\n")
+  end
+  
+  specify "should parse each header as it arrives" do
+    @server.receive_data("Accept: text/xml\r\n")
+    @server.request_headers.should == {'Accept' => 'text/xml'}
+    @server.request_header_count.should == 1
+    
+    @server.receive_data("Cookie: x=1\r\n")
+    @server.request_headers.should == {'Accept' => 'text/xml', 'Cookie' => 'x=1'}
+    @server.request_header_count.should == 2
+  end
+  
+  specify "should parse the Content-Length header into content_length" do
+    @server.receive_data("Content-Length: 1234\r\n")
+    @server.content_length.should == 1234
+  end
+  
+  specify "should set persistent if a Connection header is received" do
+    # HTTP 1.0 mode
+    @server.persistent = false
+    @server.receive_data("Connection: keep-alive\r\n")
+    @server.persistent.should be_true
+    
+    @server.reset
+    @server.receive_data("GET / HTTP/1.1\r\n")
+    @server.receive_data("Connection: close\r\n")
+    @server.persistent.should be_false
+
+    @server.reset
+    @server.receive_data("GET / HTTP/1.1\r\n")
+    @server.receive_data("Connection: xxxxzzzz\r\n")
+    @server.persistent.should be_false
+  end
+  
+  specify "Should parse the Cookie header" do
+    @server.receive_data("Cookie: x=1; y=2%203\r\n")
+    @server.request_cookies.should == {:x => '1', :y => '2 3'}
+  end
+  
+  specify "should transition to stat_response once an empty line is received" do
+    @server.receive_data("Connection: close\r\n")
+    @server.state.should == :state_request_headers
+    
+    @server.receive_data("\r\n")
+    @server.state.should == :state_response
+  end
+  
+  specify "should transition to state_request_body if content-length was given" do
+    @server.receive_data("Content-Length: 13\r\n\r\n")
+    @server.state.should == :state_request_body
+  end
+  
+  specify "should raise MalformedRequestError on invalid header size" do
+    proc {@server.receive_data("#{'x' * MAX_HEADER_SIZE}: 13\r\n\r\n")}.should \
+      raise_error(MalformedRequestError)
+  end
+  
+  specify "should raise MalformedRequestError on malformed header" do
+    proc {@server.receive_data("abc\r\n")}.should raise_error(MalformedRequestError)
+  end
+end

data/spec/template_spec.rb

@@ -1,3 +1,5 @@
+__END__
+
 require File.join(File.dirname(__FILE__), '../lib/serverside')
 require 'stringio'
 require 'fileutils'
@@ -31,7 +33,7 @@ context "ServerSide::Template.set" do
     a.should_be_a_kind_of Array
     a.size.should == 2
     a.first.should_be t
-    a.last.should_be_a_kind_of ERB
+    a.last.should_be_a_kind_of Erubis::Eruby
   end
   
   specify "should set stamp to nil by default" do
@@ -39,7 +41,7 @@ context "ServerSide::Template.set" do
     Template.templates['test'].first.should_be_nil
   end
   
-  specify "should construct a new ERB instance with the body" do
+  specify "should construct a new Erubis::Eruby instance with the body" do
     Template.set('test', 'yo')
     Template.templates['test'].last.result(binding).should == 'yo'
   end
@@ -55,18 +57,18 @@ context "ServerSide::Template.validate" do
   specify "should load a file as template if the name references a file" do
     Template.reset
     t = Template.validate(__FILE__)
-    t.should_be_a_kind_of ERB
+    t.should_be_a_kind_of Erubis::Eruby
     t.result(binding).should == IO.read(__FILE__)
     Template.templates.size.should == 1
     t = Template.templates[__FILE__]
     t.first.should == File.mtime(__FILE__)
-    t.last.should_be_a_kind_of ERB
+    t.last.should_be_a_kind_of Erubis::Eruby
   end
   
-  specify "should return the ERB instance for an existing template" do
+  specify "should return the Erubis::Eruby instance for an existing template" do
     Template.reset
     t = Template.validate(__FILE__)
-    t.should_be_a_kind_of ERB
+    t.should_be_a_kind_of Erubis::Eruby
     t.result(binding).should == IO.read(__FILE__)
   end
   
@@ -120,7 +122,7 @@ context "ServerSide::Template.render" do
     FileUtils.rm('tmp')
   end
   
-  specify "should pass the binding to the ERB instance for processing" do
+  specify "should pass the binding to the Erubis::Eruby instance for processing" do
     @x = 23
     Template.reset
     Template.set('test', '<' + '%= @x %' + '>')

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: serverside
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
-date: 2006-11-27 00:00:00 +02:00
-summary: Performance-oriented web framework.
+  version: 0.4.1
+date: 2007-08-09 00:00:00 +03:00
+summary: Fast Ruby HTTP Server.
 require_paths: 
 - lib
 email: ciconia@gmail.com
 homepage: http://code.google.com/p/serverside/
 rubyforge_project: 
-description: Performance-oriented web framework.
+description: Fast Ruby HTTP Server.
 autorequire: 
 default_executable: 
 bindir: bin
@@ -20,7 +20,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.8.2
+      version: 1.8.5
   version: 
 platform: ruby
 signing_key: 
@@ -33,38 +33,35 @@ files:
 - README
 - Rakefile
 - bin/serverside
+- doc/rdoc
+- spec/daemon_spec.rb
 - spec/core_ext_spec.rb
-- spec/connection_spec.rb
-- spec/caching_spec.rb
-- spec/request_spec.rb
 - spec/template_spec.rb
-- spec/static_spec.rb
-- spec/server_spec.rb
-- spec/routing_spec.rb
-- spec/controllers_spec.rb
-- spec/daemon_spec.rb
-- spec/cluster_spec.rb
-- lib/serverside.rb
+- spec/http_spec.rb
 - lib/serverside
-- lib/serverside/server.rb
+- lib/serverside/http
+- lib/serverside/http/caching.rb
+- lib/serverside/http/const.rb
+- lib/serverside/http/error.rb
+- lib/serverside/http/parsing.rb
+- lib/serverside/http/response.rb
+- lib/serverside/http/server.rb
+- lib/serverside/http/static.rb
+- lib/serverside/http.rb
+- lib/serverside/xml.rb
+- lib/serverside/cluster.rb
+- lib/serverside/log.rb
 - lib/serverside/daemon.rb
-- lib/serverside/application.rb
 - lib/serverside/core_ext.rb
-- lib/serverside/connection.rb
-- lib/serverside/cluster.rb
-- lib/serverside/static.rb
-- lib/serverside/routing.rb
 - lib/serverside/template.rb
-- lib/serverside/request.rb
-- lib/serverside/caching.rb
-- lib/serverside/controllers.rb
-- CHANGELOG
+- lib/serverside/js.rb
+- lib/serverside.rb
 test_files: []
 
 rdoc_options: 
 - --quiet
 - --title
-- ServerSide Documentation
+- "ServerSide: a Fast Ruby Web Framework"
 - --opname
 - index.html
 - --line-numbers
@@ -77,7 +74,6 @@ rdoc_options:
 - lib/serverside.rb
 extra_rdoc_files: 
 - README
-- CHANGELOG
 - COPYING
 executables: 
 - serverside
@@ -86,6 +82,24 @@ extensions: []
 requirements: []
 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: erubis
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: metaid
   version_requirement: 

data/CHANGELOG

@@ -1,261 +0,0 @@
-*0.3.1*
-
-* Removed application.rb file and fixed serverside script.
-
-* Fixed bug in Caching.validate_stamp where the expiry stamp would be the file stamp + max_age - leading to stale resources.
-
-*0.3.0*
-
-* Disabled cluster_spec and parts of daemon_spec for now due to strange forking behavior.
-
-* Removed static file cache from Static.
-
-* Fixed daemon_spec to work correctly.
-
-* Removed all tests, moved specs to /spec, and fixed rakefile.
-
-* Converted cluster_test to cluster_spec.
-
-* Converted daemon_test to daemon_spec.
-
-* Updated specs to work with RSpec 0.7.
-
-* Changed rake spec task to do coverage as well.
-
-* Renamed controller.rb to controllers.rb.
-
-* Added String.underscore method.
-
-* Renamed ServerSide::Controller.process to response.
-
-* Improved HTTP caching code to better conform to the HTTP spec. Also improved the validate_cache method to work without a block as well.
-
-* Removed unit tests that were converted to specs.
-
-* Router now expects handlers to return non-nil if the request was handled. Otherwise, the request goes to the next handler with an appropriate rule.
-
-* Improved spec coverage for caching.
-
-* Wrote Server spec.
-
-* Wrote Router spec.
-
-* Refactored HTTP::Server to allow creating instances without starting them.
-
-* Fixed Router.routes_defined? to return non-nil if default route is defined.
-
-* Renamed Router.has_routes? to routes_defined?.
-
-* Fixed Static.serve_template and Static.serve_static to work correctly (render templates.)
-
-* Removed deprecated code in Template.render.
-
-* Wrote Static spec.
-
-* Fixed bug in serverside script - wrong call to route_default instead of default_route.
-
-* Refactored ServerSide::Template and wrote template spec.
-
-* Added documentation to Controller.
-
-* Fixed Controller.mount to build a self.inherited method, and do the routing there.
-
-==0.2.9
-
-* Improved rake clean task.
-
-* Added HTTP::Request.send_file method.
-
-* Added basic rendering capabilities to ServerSide::Controller.
-
-* Added support for lambda rules in ServerSide::Controller.mount.
-
-* Start work on controller class.
-
-* Renamed Router.route_default to default_route.
-
-* Fixed small errors in documentation.
-
-* Changed ServerSide::Static.serve_static to look for index.html inside directory before serving the directory.
-
-* Added HTTP::Caching.cache_etags and cache_stamp methods.
-
-* Fixed bug in doc_rforge rake task.
-
-* Rewrote request unit test into request spec.
-
-==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.
-
-* Added spec files to rake stats reporting.
-
-* Changed @conn to @socket in both HTTP::Connection and HTTP::Request for better readability.
-
-* Wrote functional test for request body (but at least some of the testing should be in a unit test.)
-
-* Added request body parsing (both URL-encoded and multipart.)
-
-* Moved all HTTP::Const constants into HTTP::Request.
-
-* Added Date to response headers. This is needed for caching to work correctly.
-
-* Fixed bug in serverside script that caused an exception when specifying port number.
-
-==0.2.6
-
-* Refactored HTTP-related code into a new HTTP::Request class and a simplified HTTP::Connection.
-
-* Another small change to docs.
-
-* Fixed small error in Rakefile that prevented doc_rforge task from updating the docs.
-
-* Fixed minor documentation error.
-
-==0.2.5
-
-* Added template serving to static file module.
-
-* Wrote a simple ERB template system.
-
-* More documentation tweaks.
-
-* Changed how response cookies are formatted for somewhat better performance.
-
-* Updated documentation.
-
-* Removed deprecated code in lib/serverside/application.rb.
-
-* Added HTTP cookie functionality (parse, set and delete.)
-
-* Updated rakefile to include a spec task, as well as an rcov task. Updated test task to include spec and rcov tasks.
-
-* Started writing RSpec tests. This looks like a very interesting concept.
-
-* Added /test/spec directory.
-
-==0.2.0
-
-* Updated RFuzz script to work, but it doesn't still do anything interesting.
-
-* Added a serve command to serverside script.
-
-* Changed substition of embedded parameters from (.*) to (.+).
-
-* Added rule compilation after setting the default handler.
-
-* Added doc_rforge rake task (for updating the docs on rubyforge.org).
-
-* Added stats and svn_add rake tasks.
-
-* Fixed routing unit tests.
-
-* Added Router.has_routes? method.
-
-* Finished unit tests for routing.
-
-* Added Connection::Base.redirect.
-
-* Added routing code from /research/routing, implemented functional test.
-
-* Learned about the (?:) modifier and fixed the request parsing regexp.
-
-* Added a profiled version of a static server - /test/functional/static_profile.rb.
-
-* Added freezing of HTTP headers.
-
-* Small change to documentation.
- 
-* Changed filename for cluster pid file to serverside_cluster.pid.
-
-* Added documentation.
-
-* Fixed require in serverside script to load the gem.
-
-* Fixed the Daemon pid file for static file server mode.
-
-* Added directory listing to static file server.
-
-* Fixed request header parsing Regexp so a trailing slash would be ignored. 
-
-* Added static application. Using the binary script in static mode works.
-
-* Added cluster class with unit tests.
-
-* Added unit tests for static server.
-
-* Added static server functional test.
-
-* Added static file serving code.
-
-* Renamed ServerSide::Request to ServerSide::Connection. This is more appropriate.
-
-* Added functional static server test.
-
-* Added test/functional for functional tests. Updated Rakefile.
-
-* Added Request.send_response and stream.
-
-* Added faster Symbol.to_s to core_ext.
-
-* Added HTTP parsing code with unit tests.
-
-* More unit tests for application code.
-
-* Basic server code works with unit tests.
-
-* Added option parsing to serverside script.
-
-* Added daemon code and unit tests.
-
-==0.1
-
-* Added host attribute to Controller::Request.
-
-* Added ability to create rules on any request attribute, not just path.
-
-* Added ability to mount controllers with a block for a rule.
-
-* Wrote object extensions to create frozen constants on the fly.
-
-* Changed DirHandler to use frozen strings for cache header.
-
-* Hooked Mongrel server to Controller::Router.
-
-* Imported request code with unit tests.
-
-* Wrote unit tests for daemon module.
-
-* Wrote unit tests for controller routing code.
-
-* Refactored controller routing code.
-
-* Imported unit tests for extensions.
-
-* Created Rakefile.
-
-* Prototypical routing code.
-
-* Fixed location of daemon pid files.
-
-* Imported Mongrel code from Reality project.
-
-* Imported extensions from Reality project.
-
-* Implemented daemon and server cluster.