kastner-rack 0.3.171 → 0.3.186

data/lib/rack.rb

@@ -23,7 +23,7 @@ module Rack
 
   # Return the Rack release as a dotted string.
   def self.release
-    "0.4"
+    "0.4.2"
   end
 
   autoload :Builder, "rack/builder"

data/lib/rack/adapter/camping.rb

@@ -15,7 +15,7 @@ module Rack
             h[k] = v.to_s
           end
         end
-        [controller.status, controller.headers, controller.body]
+        [controller.status, controller.headers, [controller.body.to_s]]
       end
     end
   end

data/lib/rack/builder.rb

@@ -47,7 +47,7 @@ module Rack
 
     def map(path, &block)
       if @ins.last.kind_of? Hash
-        @ins.last[path] = Rack::Builder.new(&block).to_app
+        @ins.last[path] = self.class.new(&block).to_app
       else
         @ins << {}
         map(path, &block)

data/lib/rack/handler/mongrel.rb

@@ -60,15 +60,19 @@ module Rack
 
         begin
           response.status = status.to_i
+          response.send_status(nil)
+
           headers.each { |k, vs|
             vs.each { |v|
               response.header[k] = v
             }
           }
+          response.send_header
+
           body.each { |part|
-            response.body << part
+            response.write part
+            response.socket.flush
           }
-          response.finished
         ensure
           body.close  if body.respond_to? :close
         end

data/lib/rack/request.rb

@@ -122,7 +122,7 @@ module Rack
 
     # The union of GET and POST data.
     def params
-      self.GET.update(self.POST)
+      self.put? ? self.GET : self.GET.update(self.POST)
     rescue EOFError => e
       self.GET
     end

data/lib/rack/session/abstract/id.rb

@@ -26,7 +26,10 @@ module Rack
           :key =>           'rack.session',
           :path =>          '/',
           :domain =>        nil,
-          :expire_after =>  nil
+          :expire_after =>  nil,
+          :secure =>        false,
+          :httponly =>      true,
+          :sidbits =>       128
         }
 
         def initialize(app, options={})
@@ -50,6 +53,14 @@ module Rack
 
         private
 
+        # Generate a new session id using Ruby #rand.  The size of the
+        # session id is controlled by the :sidbits option.
+        # Monkey patch this to use custom methods for session id generation.
+        def generate_sid
+          "%0#{@default_options[:sidbits] / 4}x" %
+            rand(2**@default_options[:sidbits] - 1)
+        end
+
         # Extracts the session id from provided cookies and passes it and the
         # environment to #get_session. It then sets the resulting session into
         # 'rack.session', and places options and session metadata into
@@ -110,6 +121,8 @@ module Rack
             expiry = time + options[:expire_after]
             cookie<< "; expires=#{expiry.httpdate}"
           end
+          cookie<< "; Secure" if options[:secure]
+          cookie<< "; HttpOnly" if options[:httponly]
 
           case a = (h = response[1])['Set-Cookie']
           when Array then  a << cookie

data/lib/rack/session/memcache.rb

@@ -45,7 +45,7 @@ module Rack
           @mutex.synchronize do
             begin
               raise RuntimeError, 'Unique id finding looping excessively' if (lc+=1) > 1000
-              sid = "%08x" % rand(0xffffffff)
+              sid = generate_sid
               ret = @pool.add(sid, session)
             end until /^STORED/ =~ ret
           end

data/lib/rack/session/pool.rb

@@ -40,7 +40,7 @@ module Rack
           unless sess = @pool[sid] and ((expires = sess[:expire_at]).nil? or expires > Time.now)
             @pool.delete_if{|k,v| expiry = v[:expire_at] and expiry < Time.now }
             begin
-              sid = "%08x" % rand(0xffffffff)
+              sid = generate_sid
             end while @pool.has_key?(sid)
           end
           @pool[sid] ||= {}

data/rack.gemspec

@@ -1,10 +1,12 @@
+# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
   s.name = %q{rack}
-  s.version = "0.3.171"
+  s.version = "0.3.186"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Christian Neukirchen"]
-  s.date = %q{2008-11-28}
+  s.date = %q{2008-12-02}
   s.default_executable = %q{rackup}
   s.description = %q{Rack provides minimal, modular and adaptable interface for developing web applications in Ruby.  By wrapping HTTP requests and responses in the simplest way possible, it unifies and distills the API for web servers, web frameworks, and software in between (the so-called middleware) into a single method call.  Also see http://rack.rubyforge.org.}
   s.email = %q{chneukirchen@gmail.com}
@@ -15,7 +17,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://rack.rubyforge.org}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rack}
-  s.rubygems_version = %q{1.2.0}
+  s.rubygems_version = %q{1.3.1}
   s.summary = %q{a modular Ruby webserver interface}
   s.test_files = ["test/spec_rack_auth_basic.rb", "test/spec_rack_auth_digest.rb", "test/spec_rack_auth_openid.rb", "test/spec_rack_builder.rb", "test/spec_rack_camping.rb", "test/spec_rack_cascade.rb", "test/spec_rack_cgi.rb", "test/spec_rack_commonlogger.rb", "test/spec_rack_conditionalget.rb", "test/spec_rack_deflater.rb", "test/spec_rack_directory.rb", "test/spec_rack_fastcgi.rb", "test/spec_rack_file.rb", "test/spec_rack_handler.rb", "test/spec_rack_head.rb", "test/spec_rack_lint.rb", "test/spec_rack_lobster.rb", "test/spec_rack_methodoverride.rb", "test/spec_rack_mock.rb", "test/spec_rack_mongrel.rb", "test/spec_rack_recursive.rb", "test/spec_rack_request.rb", "test/spec_rack_response.rb", "test/spec_rack_session_cookie.rb", "test/spec_rack_session_memcache.rb", "test/spec_rack_session_pool.rb", "test/spec_rack_showexceptions.rb", "test/spec_rack_showstatus.rb", "test/spec_rack_static.rb", "test/spec_rack_urlmap.rb", "test/spec_rack_utils.rb", "test/spec_rack_webrick.rb"]
 
@@ -23,9 +25,10 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
-    if current_version >= 3 then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
     else
     end
   else
   end
 end
+ 

data/test/cgi/lighttpd.conf

@@ -3,7 +3,7 @@ server.document-root = "."
 server.errorlog = "lighttpd.errors"
 server.port = 9203
 
-server.event-handler = "freebsd-kqueue"
+server.event-handler = "select"
 
 cgi.assign = ("/test" => "",
 #              ".ru" => ""

data/test/spec_rack_mongrel.rb

@@ -5,7 +5,8 @@ require 'rack/handler/mongrel'
 require 'rack/urlmap'
 require 'rack/lint'
 require 'testrequest'
-
+require 'timeout'
+  
 Thread.abort_on_exception = true
 $tcp_defer_accept_opts = nil
 $tcp_cork_opts = nil
@@ -17,6 +18,8 @@ context "Rack::Handler::Mongrel" do
     server = Mongrel::HttpServer.new(@host='0.0.0.0', @port=9201)
     server.register('/test',
                     Rack::Handler::Mongrel.new(Rack::Lint.new(TestRequest.new)))
+    server.register('/stream',
+                    Rack::Handler::Mongrel.new(Rack::Lint.new(StreamingRequest)))
     @acc = server.run
   end
 
@@ -160,6 +163,22 @@ context "Rack::Handler::Mongrel" do
     block_ran.should.be true
   end
 
+  specify "should stream #each part of the response" do
+    body = ''
+    begin
+      Timeout.timeout(1) do
+        Net::HTTP.start(@host, @port) do |http|
+          get = Net::HTTP::Get.new('/stream')
+          http.request(get) do |response|
+            response.read_body { |part| body << part }
+          end
+        end
+      end
+    rescue Timeout::Error
+    end
+    body.should.not.be.empty
+  end
+
   teardown do
     @acc.raise Mongrel::StopServer
   end

data/test/spec_rack_webrick.rb

@@ -94,7 +94,7 @@ context "Rack::Handler::WEBrick" do
                    })
 
     Net::HTTP.start(@host, @port) { |http|
-      res, body = http.get("/cookie-test")
+      res = http.get("/cookie-test")
       res.code.to_i.should.equal 200
       res.get_fields("set-cookie").should.equal ["one=1", "two=2"]
     }

data/test/testrequest.rb

@@ -43,3 +43,15 @@ class TestRequest
     end
   end
 end
+
+class StreamingRequest
+  def self.call(env)
+    [200, {"Content-Type" => "text/plain"}, new]
+  end
+
+  def each
+    yield "hello there!\n"
+    sleep 5
+    yield "that is all.\n"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kastner-rack
 version: !ruby/object:Gem::Version 
-  version: 0.3.171
+  version: 0.3.186
 platform: ruby
 authors: 
 - Christian Neukirchen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-28 00:00:00 -08:00
+date: 2008-12-02 00:00:00 -08:00
 default_executable: rackup
 dependencies: []