serverside 0.4.3 → 0.4.4

data/Rakefile

@@ -6,7 +6,7 @@ require 'fileutils'
 include FileUtils
 
 NAME = "serverside"
-VERS = "0.4.3"
+VERS = "0.4.4"
 CLEAN.include ['**/.*.sw?', 'pkg/*', '.config', 'doc/*', 'coverage/*']
 RDOC_OPTS = ['--quiet', '--title', "ServerSide: a Fast Ruby Web Framework",
   "--opname", "index.html",
@@ -109,11 +109,10 @@ task :stats do
 end
 
 ##############################################################################
-# SVN
+# gem and rdoc release
 ##############################################################################
-
-desc "Add new files to subversion"
-task :svn_add do
-   system "svn status | grep '^\?' | sed -e 's/? *//' | sed -e 's/ /\ /g' | xargs svn add"
-end
-
+task :release => [:package] do
+  sh %{rubyforge login}
+  sh %{rubyforge add_release #{NAME} #{NAME} #{VERS} pkg/#{NAME}-#{VERS}.tgz}
+  sh %{rubyforge add_file #{NAME} #{NAME} #{VERS} pkg/#{NAME}-#{VERS}.gem}
+end

data/lib/serverside/http/parsing.rb

@@ -7,7 +7,7 @@ module ServerSide::HTTP
     def parse_request_line(line)
       if line =~ REQUEST_LINE_RE
         @request_line = line
-        @method, @path, @query, @http_version = $1.downcase.to_sym, $2, $3, $4
+        @method, @path, @query, @http_version = $1.downcase.to_sym, $2.uri_unescape, $3, $4
         @params = @query ? parse_query_parameters(@query) : {}
         
         # HTTP 1.1 connections are persistent by default.

data/lib/serverside/http/request.rb

@@ -1,3 +1,5 @@
+require 'socket'
+
 module ServerSide::HTTP
   class Request
     include ServerSide::HTTP::Parsing

data/lib/serverside/http/response.rb

@@ -24,14 +24,6 @@ module ServerSide::HTTP
       end
     end
     
-    def disable_response
-      @disable_response = true
-    end
-    
-    def enable_response
-      @disable_response = false
-    end
-    
     def persistent?
       !@close && !@stream_proc && @body
     end
@@ -50,7 +42,7 @@ module ServerSide::HTTP
       expires = opts[:expires] || (opts[:ttl] && (Time.now + opts[:ttl])) || \
         (Time.now + 86400) # if no expiry is specified we assume one day
 
-      v = "#{name}=#{value.to_s.uri_escape}; path=#{path}; expires=#{expires.httpdate}"
+      v = "#{name}=#{value.to_s.uri_escape}; path=#{path}; expires=#{expires.rfc2822}"
       if domain = opts[:domain]
         v << "; domain=#{domain}"
       end
@@ -62,20 +54,19 @@ module ServerSide::HTTP
       set_cookie(name, nil, opts.merge(:expires => COOKIE_EXPIRED_TIME))
     end
 
-    EMPTY = ''.freeze
-    
     def to_s
-      if @disable_response
-        EMPTY
-      else
-        if !streaming? && (content_length = @body && @body.size)
-          add_header(CONTENT_LENGTH, content_length)
-        end
-        "HTTP/1.1 #{@status}\r\nDate: #{Time.now.httpdate}\r\n#{@headers.join}\r\n#{@body}"
+      if @body && (content_length =  @body.size) && !streaming?
+        add_header(CONTENT_LENGTH, content_length)
       end
+      "HTTP/1.1 #{@status}\r\nDate: #{Time.now.httpdate}\r\n#{@headers.join}\r\n#{@body}"
+    end
+    
+    def should_render?
+      !@stream_proc || @stream_render_upfront
     end
     
-    def stream(period, &block)
+    def stream(period, render_upfront = false, &block)
+      @stream_render_upfront = render_upfront
       @stream_period = period
       @stream_proc = block
       self

data/lib/serverside/http/server.rb

@@ -138,16 +138,16 @@ module ServerSide::HTTP
     end
     
     def send_response(resp)
-      persistent = @request.persistent && resp.persistent?
-      if !persistent
+      unless persist = @request.persistent && resp.persistent?
         resp.headers << CONNECTION_CLOSE
       end
-      send_data(resp.to_s)
-      @response_sent = true
+      if resp.should_render?
+        send_data(resp.to_s)
+      end
       if resp.streaming?
         start_stream_loop(resp.stream_period, resp.stream_proc)
       else
-        set_state(persistent ? :state_initial : :state_done)
+        set_state(persist ? :state_initial : :state_done)
       end
     end
     

data/lib/serverside/js.rb

@@ -29,7 +29,12 @@ module ServerSide
         value = args.first
         value = value.__content if value.respond_to?(:__content)
       end
-      @stack.last.__add_hash_value(key, value)
+      
+      if key == :__item
+        @stack.last.__add_array_value(value)
+      else
+        @stack.last.__add_hash_value(key, value)
+      end
       self
     end
     

data/spec/response_spec.rb

@@ -171,25 +171,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.httpdate}\r\n"]
+    @res.headers.should == ["Set-Cookie: abc=2+3+4; path=/; expires=#{t.rfc2822}\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"]
+    @res.headers.should == ["Set-Cookie: abc=2+3+4; path=/def; expires=#{t.rfc2822}\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"]
+    @res.headers.should == ["Set-Cookie: abc=2+3+4; path=/; expires=#{t.rfc2822}; 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"]
+    @res.headers.should == ["Set-Cookie: abc=2+3+4; path=/; expires=#{t.rfc2822}\r\n"]
   end
 end
 

metadata

@@ -1,68 +1,89 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: serverside
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
-date: 2007-09-16 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: Fast Ruby HTTP Server.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.8.5
-  version: 
+  version: 0.4.4
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Sharon Rosner
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-01-20 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: erubis
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: metaid
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: Fast Ruby HTTP Server.
+email: ciconia@gmail.com
+executables: 
+- serverside
+extensions: []
+
+extra_rdoc_files: 
+- README
+- COPYING
 files: 
 - COPYING
 - 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.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
-test_files: []
-
+- lib/serverside/http/request.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
+has_rdoc: true
+homepage: http://code.google.com/p/serverside/
+post_install_message: 
 rdoc_options: 
 - --quiet
 - --title
@@ -77,40 +98,26 @@ rdoc_options:
 - ^(examples|extras)\/
 - --exclude
 - lib/serverside.rb
-extra_rdoc_files: 
-- README
-- COPYING
-executables: 
-- serverside
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: 1.8.5
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 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: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
+rubyforge_project: 
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Fast Ruby HTTP Server.
+test_files: []
+