serverside 0.4.1 → 0.4.3

data/spec/response_spec.rb

@@ -0,0 +1,287 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+include ServerSide::HTTP
+
+context "Response.new" do
+  specify "should use a default status of 200 OK" do
+    @res = Response.new
+    @res.status.should == '200 OK'
+  end
+  
+  specify "should extract status from options" do
+    @res = Response.new(:status => 'aok')
+    @res.status.should == 'aok'
+  end
+  
+  specify "should extract body from options" do
+    @res = Response.new(:status => 200, :body => 'hello!')
+    @res.body.should == 'hello!'
+  end
+  
+  specify "should extract headers from options" do
+    @res = Response.new(:status => 200, :content_type => 'text/html')
+    @res.status.should == 200
+    @res.headers.size.should == 1
+    @res.headers[0].should == "Content-Type: text/html\r\n"
+  end
+  
+  specify "should default body to empty string" do
+    @res = Response.new
+    @res.body.should == ''
+    
+    @res = Response.new(:body => nil)
+    @res.body.should be_nil
+  end
+end
+
+context "Response.redirect" do
+  setup do
+    @res = Response.redirect('foobar.html')
+  end
+  
+  specify "should default to temporary redirect" do
+    @res.status.should == STATUS_FOUND
+  end
+  
+  specify "should support custom status" do
+    @res = Response.redirect('foobar.html', 'BBQ')
+    @res.status.should == 'BBQ'
+  end
+  
+  specify "should include a location header with the redirect url" do
+    @res.headers.should == ["Location: foobar.html\r\n"]
+  end
+end
+
+context "Response.static" do
+  setup do
+    @t = Time.now
+    @res = Response.static(__FILE__)
+  end
+  
+  specify "should have the file content as the body" do
+    @res.body.should == IO.read(__FILE__)
+  end
+  
+  specify "should raise not found error for an unknown file" do
+    proc {Response.static('xxx_yyy_zzz')}.should raise_error(NotFoundError)
+  end
+  
+  specify "should set cache headers correctly" do
+    s = @res.to_s
+    s.should =~ /\r\nETag: "#{Regexp.quote(File.etag(__FILE__))}"\r\n/
+    s.should =~ /\r\nLast-Modified: #{File.mtime(__FILE__).httpdate}\r\n/
+    s.should =~ /\r\nExpires: #{(@t + 86400).httpdate}\r\n/
+  end
+  
+  specify "should validate the client's cache" do
+    1.should == 1
+  end
+  
+  specify "should be able to serve directories" do
+    proc {Response.static('.')}.should_not raise_error
+  end
+end
+
+context "Response.to_s" do
+  specify "should render the status correctly" do
+    r = Response.new
+    s = r.to_s
+    s.should =~ /^HTTP\/1.1 200 OK\r\n/
+    
+    r = Response.new(:status => '400 Bad Request')
+    s = r.to_s
+    s.should =~ /^HTTP\/1.1 400 Bad Request\r\n/
+  end
+  
+  specify "should include a Date header" do
+    r = Response.new
+    s = r.to_s
+    s.should =~ /^HTTP\/1.1 200 OK\r\nDate: (.+)\r\n/
+    
+    # extract stamp
+    s =~ /^HTTP\/1.1 200 OK\r\nDate: (.+)\r\n/
+    proc {Time.parse($1)}.should_not raise_error
+  end
+  
+  specify "should include blank line before the body" do
+    r = Response.new
+    s = r.to_s
+    s.should =~ /(.+)\r\n\r\n$/
+
+    r = Response.new(:body => 'test')
+    s = r.to_s
+    s.should =~ /(.+)\r\n\r\ntest$/
+  end
+  
+  specify "should include a content_length unless body is nil" do
+    b = 'a' * (rand(30) + 30)
+    r = Response.new(:body => b)
+    s = r.to_s
+    s.should =~ /Content-Length: #{b.size}\r\n\r\n#{b}$/
+
+    r = Response.new(:body => nil)
+    s = r.to_s
+    s.should_not =~ /Content-Length/
+  end
+  
+  specify "should not include a content_length if streaming" do
+    r = Response.new(:body => 'test')
+    r.stream(1) {}
+    s = r.to_s
+    s.should_not =~ /Content-Length/
+    s.should =~ /\r\n\r\ntest$/
+  end
+  
+  specify "should include all headers in the response" do
+    r = Response.new(:body => nil)
+    r.add_header('ABC', 123)
+    r.add_header('DEF', 456)
+    s = r.to_s
+    
+    s.should =~ /\r\nABC: 123\r\nDEF: 456\r\n\r\n$/
+  end
+end
+
+context "Response.add_header" do
+  setup do
+    @res = Response.new
+  end
+  
+  specify "should a header to the response's headers" do
+    @res.add_header('ABC', '123')
+    @res.headers.should == ["ABC: 123\r\n"]
+    
+    @res.add_header('DEF', '456')
+    @res.headers.should == ["ABC: 123\r\n", "DEF: 456\r\n"]
+  end
+  
+  specify "should be always additive" do
+    @res.add_header('ABC', '123')
+    @res.add_header('ABC', '456')
+    @res.headers.should == ["ABC: 123\r\n", "ABC: 456\r\n"]
+  end
+end
+
+context "Response.set_cookie" do
+  setup do
+    @res = Response.new
+  end
+  
+  specify "should add a cookie header" do
+    t = Time.now + 1000
+    @res.set_cookie(:abc, '2 3 4', :expires => t)
+    @res.headers.should == ["Set-Cookie: abc=2+3+4; path=/; expires=#{t.httpdate}\r\n"]
+  end
+  
+  specify "should accept a path option" do
+    t = Time.now + 1000
+    @res.set_cookie(:abc, '2 3 4', :path => '/def', :expires => t)
+    @res.headers.should == ["Set-Cookie: abc=2+3+4; path=/def; expires=#{t.httpdate}\r\n"]
+  end
+
+  specify "should accept a domain option" do
+    t = Time.now + 1000
+    @res.set_cookie(:abc, '2 3 4', :domain => 'test.net', :expires => t)
+    @res.headers.should == ["Set-Cookie: abc=2+3+4; path=/; expires=#{t.httpdate}; domain=test.net\r\n"]
+  end
+  
+  specify "should accept a ttl option" do
+    t = Time.now + 1000
+    @res.set_cookie(:abc, '2 3 4', :ttl => 1000)
+    @res.headers.should == ["Set-Cookie: abc=2+3+4; path=/; expires=#{t.httpdate}\r\n"]
+  end
+end
+
+context "Response.cache" do
+  setup do
+    @res = Response.new
+  end
+  
+  specify "should support a :cache_control option" do
+    @res.cache(:cache_control => 'public')
+    @res.headers.should == ["Cache-Control: public\r\n"]
+  end
+  
+  specify "should support an :expires option" do
+    t = Time.now + 1000
+    @res.cache(:expires => t)
+    @res.headers.should == ["Expires: #{t.httpdate}\r\n"]
+  end
+  
+  specify "should support a :ttl option" do
+    t = Time.now + 1000
+    @res.cache(:ttl => 1000)
+    @res.headers.should == ["Expires: #{t.httpdate}\r\n"]
+  end
+  
+  specify "should remove the cache-control header if present" do
+    @res.add_header('Cache-Control', 'max-age=300')
+    @res.headers.should == ["Cache-Control: max-age=300\r\n"]
+    t = Time.now + 1000
+    @res.cache(:expires => t)
+    @res.headers.should == ["Expires: #{t.httpdate}\r\n"]
+  end
+end
+
+context "Response.validate_cache" do
+  setup do
+    @req = Request.new(nil)
+    @last_modified = Time.now - 300
+    @req.headers['If-None-Match'] = '"abcde"'
+    @req.headers['If-Modified-Since'] = @last_modified.httpdate
+    
+    @res = Response.new(:request => @req)
+  end
+  
+  specify "should validate against an etag validator" do
+    @res.validate_cache(:etag => 'abcde')
+    @res.status.should == '304 Not Modified'
+  end
+  
+  specify "should validate against a last-modified validator" do
+    @res.validate_cache(:last_modified => @last_modified)
+    @res.status.should == '304 Not Modified'
+  end
+  
+  specify "should yield to the supplied block if the cache is not validated" do
+    @res.validate_cache(:etag => 'defgh') do |r|
+      r.status = '204'
+      r.body = 'hey there hey'
+    end
+    
+    @res.status.should == '204'
+    @res.body.should == 'hey there hey'
+  end
+  
+  specify "should set cache-related headers" do
+    t = Time.now + 1000
+    @res.validate_cache(:etag => 'defgh', :expires => t) do |r|
+      r.status = '204'
+      r.body = 'hey there hey'
+    end
+    s = @res.to_s
+    s.should =~ /\r\nETag: "defgh"\r\n/
+    s.should =~ /\r\nExpires: #{t.httpdate}\r\n/
+    
+    @res = Response.new(:request => @req)
+    t = Time.now + 1000
+    @res.validate_cache(:etag => 'defgh', :ttl => 1000) do |r|
+      r.status = '204'
+      r.body = 'hey there hey'
+    end
+    s = @res.to_s
+    s.should =~ /\r\nETag: "defgh"\r\n/
+    s.should =~ /\r\nExpires: #{t.httpdate}\r\n/
+
+    @res = Response.new(:request => @req)
+    t = Time.now
+    @res.validate_cache(:last_modified => t, :cache_control => 'private') do |r|
+      r.status = '204'
+      r.body = 'hey there hey'
+    end
+    s = @res.to_s
+    s.should =~ /\r\nLast-Modified: #{t.httpdate}\r\n/
+    s.should =~ /\r\nCache-Control: private\r\n/
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,39 @@
+require File.join(File.dirname(__FILE__), '../lib/serverside')
+
+include ServerSide::HTTP
+
+class Request
+  attr_writer :persistent
+end
+
+class SpecHTTPServer
+  include Server
+  
+  attr_accessor :in, :state
+  
+  def initialize
+    reset
+  end
+  
+  def reset
+    post_init
+    @response = ''
+    @response_headers = []
+    @closed = false
+  end
+  
+  attr_accessor :response, :closed
+  
+  def send_data(data)
+    @response << data
+  end
+  
+  def close_connection_after_writing
+    @closed = true
+  end
+  
+  def handle_error(e)
+    raise e
+  end
+end
+

data/spec/template_spec.rb

@@ -1,6 +1,4 @@
-__END__
-
-require File.join(File.dirname(__FILE__), '../lib/serverside')
+require File.join(File.dirname(__FILE__), 'spec_helper')
 require 'stringio'
 require 'fileutils'
 
@@ -25,20 +23,20 @@ include ServerSide
 context "ServerSide::Template.set" do
   specify "should add an consisting of stamp and template to the templates hash" do
     Template.reset
-    Template.templates.should_be_empty
+    Template.templates.should be_empty
     t = Time.now
     Template.set('test', 'hello', t)
-    Template.templates.include?('test').should_be true
+    Template.templates.include?('test').should be_true
     a = Template.templates['test']
-    a.should_be_a_kind_of Array
+    a.should be_a_kind_of(Array)
     a.size.should == 2
-    a.first.should_be t
-    a.last.should_be_a_kind_of Erubis::Eruby
+    a.first.should be(t)
+    a.last.should be_a_kind_of(Erubis::Eruby)
   end
   
   specify "should set stamp to nil by default" do
     Template.set('test', 'hello')
-    Template.templates['test'].first.should_be_nil
+    Template.templates['test'].first.should be_nil
   end
   
   specify "should construct a new Erubis::Eruby instance with the body" do
@@ -50,25 +48,25 @@ end
 context "ServerSide::Template.validate" do
   specify "should return nil for a non-existant template" do
     Template.reset
-    Template.validate('test').should_be_nil
-    Template.validate('invalid_file_ref').should_be_nil
+    Template.validate('test').should be_nil
+    Template.validate('invalid_file_ref').should be_nil
   end
   
   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 Erubis::Eruby
+    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 Erubis::Eruby
+    t.last.should be_a_kind_of(Erubis::Eruby)
   end
   
   specify "should return the Erubis::Eruby instance for an existing template" do
     Template.reset
     t = Template.validate(__FILE__)
-    t.should_be_a_kind_of Erubis::Eruby
+    t.should be_a_kind_of(Erubis::Eruby)
     t.result(binding).should == IO.read(__FILE__)
   end
   
@@ -90,15 +88,15 @@ context "ServerSide::Template.validate" do
     Template.validate('tmp').result(binding).should == '1'
     Template.templates['tmp'].first.should == File.mtime('tmp')
     FileUtils.rm('tmp')
-    Template.validate('tmp').should_be_nil
-    Template.templates['tmp'].should_be_nil
+    Template.validate('tmp').should be_nil
+    Template.templates['tmp'].should be_nil
   end
 end
 
 context "ServerSide::Template.render" do
   specify "should raise a RuntimeError for an invalid template" do
     Template.reset
-    proc {Template.render('invalid', binding)}.should_raise RuntimeError
+    proc {Template.render('invalid', binding)}.should raise_error(RuntimeError)
   end
   
   specify "should render an existing ad-hoc template" do

data/spec/xml_spec.rb

@@ -0,0 +1,75 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+context "A new XML representation" do
+  specify "should work with no arguments" do
+    xml = ServerSide::XML.new
+    xml.to_s.should == ''
+    
+    xml.abc
+    xml.to_s.should == '<abc></abc>'
+  end
+  
+  specify "should accept a tag name" do
+    xml = ServerSide::XML.new('def')
+    xml.to_s.should == '<def></def>'
+  end
+
+  specify "should accept attributes" do
+    xml = ServerSide::XML.new('a', :href => '/hello/dolly')
+    xml.to_s.should == '<a href="/hello/dolly"></a>'
+  end
+  
+  specify "should accept a block and run it" do
+    xml = ServerSide::XML.new do |x|
+      x.abc do
+        x.def 123
+      end
+    end
+    xml.to_s.should == '<abc><def>123</def></abc>'
+  end
+end
+
+context "XML#instruct!" do
+  setup do
+    @xml = ServerSide::XML.new
+  end
+  
+  specify "should add an XML instruction" do
+    @xml.instruct!
+    @xml.to_s.should =~ /^\<\?xml(.+)\?\>$/
+
+    @xml.to_s.should =~ /\s#{'version="1.0"'}/
+    @xml.to_s.should =~ /\s#{'encoding="UTF-8"'}/
+  end
+  
+  specify "should accept attributes" do
+    @xml.instruct!(:something => 'XXX')
+    @xml.to_s.should == '<?xml something="XXX"?>'
+  end
+end
+
+context "XML instance methods" do
+  setup do
+    @xml = ServerSide::XML.new
+  end
+  
+  specify "should escape values" do
+    @xml.x "&\"><"
+    @xml.to_s.should == "<x>&amp;&quot;&gt;&lt;</x>"
+  end
+  
+  specify "should accept attributes" do
+    @xml.x({:z => '123'}, '')
+    @xml.to_s.should == '<x z="123"></x>'
+
+    @xml = ServerSide::XML.new
+    @xml.x({:z => '123'}, 'yyy')
+    @xml.to_s.should == '<x z="123">yyy</x>'
+  end
+  
+  specify "should support subtags" do
+    h = {:name => 'abc', :category => 'def'}
+    @xml.item [:category, :name], h
+    @xml.to_s.should == '<item><category>def</category><name>abc</name></item>'
+  end
+end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: serverside
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
-date: 2007-08-09 00:00:00 +03:00
+  version: 0.4.3
+date: 2007-09-16 00:00:00 +03:00
 summary: Fast Ruby HTTP Server.
 require_paths: 
 - lib
@@ -33,29 +33,34 @@ files:
 - README
 - Rakefile
 - bin/serverside
-- doc/rdoc
-- spec/daemon_spec.rb
 - spec/core_ext_spec.rb
-- spec/template_spec.rb
+- spec/daemon_spec.rb
 - spec/http_spec.rb
+- spec/js_spec.rb
+- spec/request_spec.rb
+- spec/response_spec.rb
+- spec/spec_helper.rb
+- spec/template_spec.rb
+- spec/xml_spec.rb
 - lib/serverside
+- lib/serverside.rb
+- lib/serverside/cluster.rb
+- lib/serverside/core_ext.rb
+- lib/serverside/daemon.rb
 - lib/serverside/http
+- lib/serverside/http.rb
+- lib/serverside/js.rb
+- lib/serverside/log.rb
+- lib/serverside/template.rb
+- lib/serverside/xml.rb
 - lib/serverside/http/caching.rb
 - lib/serverside/http/const.rb
 - lib/serverside/http/error.rb
 - lib/serverside/http/parsing.rb
+- lib/serverside/http/request.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/core_ext.rb
-- lib/serverside/template.rb
-- lib/serverside/js.rb
-- lib/serverside.rb
 test_files: []
 
 rdoc_options: