serverside 0.4.5.1 → 0.4.5.2

data/Rakefile

@@ -6,7 +6,7 @@ require 'fileutils'
 include FileUtils
 
 NAME = "serverside"
-VERS = "0.4.5.1"
+VERS = "0.4.5.2"
 CLEAN.include ['**/.*.sw?', 'pkg/*', '.config', 'doc/*', 'coverage/*']
 RDOC_OPTS = ['--quiet', '--title', "ServerSide: a Fast Ruby Web Framework",
   "--opname", "index.html",

data/lib/serverside/http/parsing.rb

@@ -93,7 +93,7 @@ module ServerSide::HTTP
     # Parses the request body.
     def parse_body(body)
       @body = body
-      case @headers[:content_type]
+      case content_type
       when MULTIPART_FORM_DATA_RE:
         parse_multi_part(body, BOUNDARY_FIX + $1) # body.dup so we keep the original request body?
       when FORM_URL_ENCODED:

data/lib/serverside/http/request.rb

@@ -71,7 +71,9 @@ module ServerSide::HTTP
     end
     
     def content_type
-      @headers[:content_type]
+      if t = @headers[:content_type]
+        t =~ /(.*);/ ? $1.strip : t
+      end
     end
   end
 end

data/spec/request_spec.rb

@@ -52,7 +52,6 @@ context "A Request" do
   end
   
   MOCK_GET_PARAMS = "GET /?q=state&f=xml HTTP/1.1\r\n\r\n"
-  MOCK_POST_PARAMS = "POST / HTTP/1.1\r\nContent-Type: application/x-www-form-urlencoded\r\nContent-Length: 12\r\n\r\nq=state&f=js"
   
   specify "should provide the parameters" do
     @server.receive_data(MOCK_GET1)
@@ -61,12 +60,25 @@ context "A Request" do
     @server.set_state(:state_initial)
     @server.receive_data(MOCK_GET_PARAMS)
     @server.request.params.should == {:q => 'state', :f => 'xml'}
+  end
+  
+  MOCK_POST_PARAMS = "POST / HTTP/1.1\r\nContent-Type: application/x-www-form-urlencoded\r\nContent-Length: 12\r\n\r\nq=state&f=js"
 
+  specify "should provide parameters for POST requests with URL-encoded parameters" do
     @server.set_state(:state_initial)
     @server.receive_data(MOCK_POST_PARAMS)
     @server.request.params.should == {:q => 'state', :f => 'js'}
   end
   
+  MOCK_POST_CHARSET_PARAMS = "POST / HTTP/1.1\r\nContent-Type: application/x-www-form-urlencoded; charset=UTF-8\r\nContent-Length: 12\r\n\r\nq=state&f=js"
+
+  specify "should provide parameters for POST requests with URL-encoded parameters and charset" do
+    @server.set_state(:state_initial)
+    @server.receive_data(MOCK_POST_CHARSET_PARAMS)
+    @server.request.content_type.should == 'application/x-www-form-urlencoded'
+    @server.request.params.should == {:q => 'state', :f => 'js'}
+  end
+
   MOCK_GET2 = "GET /xxx HTTP/1.0\r\nHost: reality-scada.net\r\n\r\n"
   MOCK_GET3 = "GET /xxx HTTP/1.0\r\nHost: abc.net:443\r\n\r\n"
   MOCK_GET4 = "GET /xxx HTTP/1.0\r\nHost: xyz.net:3321\r\n\r\n"

data/spec/response_spec.rb

@@ -163,6 +163,12 @@ context "Response.add_header" do
   end
 end
 
+class Time
+  def to_s_expiration
+    strftime(ServerSide::HTTP::Response::EXPIRATION_FORMAT)
+  end
+end
+
 context "Response.set_cookie" do
   setup do
     @res = Response.new
@@ -171,25 +177,25 @@ context "Response.set_cookie" do
   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.rfc2822}\r\n"]
+    @res.headers.should == ["Set-Cookie: abc=2+3+4; path=/; expires=#{t.to_s_expiration}\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.rfc2822}\r\n"]
+    @res.headers.should == ["Set-Cookie: abc=2+3+4; path=/def; expires=#{t.to_s_expiration}\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.rfc2822}; domain=test.net\r\n"]
+    @res.headers.should == ["Set-Cookie: abc=2+3+4; path=/; expires=#{t.to_s_expiration}; 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.rfc2822}\r\n"]
+    @res.headers.should == ["Set-Cookie: abc=2+3+4; path=/; expires=#{t.to_s_expiration}\r\n"]
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: serverside
 version: !ruby/object:Gem::Version 
-  version: 0.4.5.1
+  version: 0.4.5.2
 platform: ruby
 authors: 
 - Sharon Rosner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-18 00:00:00 +02:00
+date: 2008-03-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,33 +53,33 @@ files:
 - README
 - Rakefile
 - bin/serverside
-- spec/core_ext_spec.rb
 - spec/daemon_spec.rb
+- spec/core_ext_spec.rb
+- spec/template_spec.rb
 - spec/http_spec.rb
-- spec/js_spec.rb
 - spec/request_spec.rb
+- spec/js_spec.rb
 - spec/response_spec.rb
 - spec/spec_helper.rb
-- spec/template_spec.rb
 - spec/xml_spec.rb
 - lib/serverside
-- lib/serverside/cluster.rb
-- lib/serverside/core_ext.rb
-- lib/serverside/daemon.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/request.rb
 - lib/serverside/http/response.rb
 - lib/serverside/http/server.rb
 - lib/serverside/http/static.rb
+- lib/serverside/http/request.rb
 - lib/serverside/http.rb
-- lib/serverside/js.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/xml.rb
+- lib/serverside/js.rb
 - lib/serverside.rb
 has_rdoc: true
 homepage: http://code.google.com/p/serverside/