rack 1.3.0.beta2 → 1.3.0

data/README

@@ -119,7 +119,7 @@ By default, the lobster is found at http://localhost:9292.
 
 == Installing with RubyGems
 
-A Gem of Rack is available at gemcutter.org.  You can install it with:
+A Gem of Rack is available at rubygems.org.  You can install it with:
 
     gem install rack
 
@@ -317,7 +317,7 @@ run on port 11211) and memcache-client installed.
   * Security fix in Rack::Auth::Digest::MD5: when authenticator
     returned nil, permission was granted on empty password.
 
-* unknown: Thirteenth? public release 1.3.0.beta
+* May 22nd, 2011: Thirteenth public release 1.3.0
   * Various performance optimizations
   * Various multipart fixes
   * Various multipart refactors
@@ -333,8 +333,9 @@ run on port 11211) and memcache-client installed.
   * Rack::Deflater now supports streaming
   * Improved Rack::Handler loading and searching
   * Support for the PATCH verb
-
-
+  * env['rack.session.options'] now contains session options
+  * Cookies respect renew
+  * Session middleware uses SecureRandom.hex
 
 == Contact
 
@@ -389,7 +390,7 @@ would like to thank:
 * Marcus Rückert, for help with configuring and debugging lighttpd.
 * The WSGI team for the well-done and documented work they've done and
   Rack builds up on.
-* All bug reporters and patch contributers not mentioned above.
+* All bug reporters and patch contributors not mentioned above.
 
 == Copyright
 
@@ -415,10 +416,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 == Links
 
 Rack:: <http://rack.rubyforge.org/>
-Rack's Rubyforge project:: <http://rubyforge.org/projects/rack>
 Official Rack repositories:: <http://github.com/rack>
-Rack Lighthouse Bug Tracking:: <http://rack.lighthouseapp.com/>
+Rack Bug Tracking:: <http://github.com/rack/rack/issues>
 rack-devel mailing list:: <http://groups.google.com/group/rack-devel>
+Rack's Rubyforge project:: <http://rubyforge.org/projects/rack>
 
 Christian Neukirchen:: <http://chneukirchen.org/>
 

data/Rakefile

@@ -1,5 +1,4 @@
 # Rakefile for Rack.  -*-ruby-*-
-require 'rake/rdoctask'
 
 desc "Run all the tests"
 task :default => [:test]

data/SPEC

@@ -3,7 +3,7 @@ can (and should) use Rack::Lint to enforce it.
 When you develop middleware, be sure to add a Lint before and
 after to catch all mistakes.
 = Rack applications
-A Rack application is an Ruby object (not a class) that
+A Rack application is a Ruby object (not a class) that
 responds to +call+.
 It takes exactly one argument, the *environment*
 and returns an Array of exactly three values:
@@ -106,7 +106,7 @@ The input stream must respond to +gets+, +each+, +read+ and +rewind+.
 * +gets+ must be called without arguments and return a string,
   or +nil+ on EOF.
 * +read+ behaves like IO#read. Its signature is <tt>read([length, [buffer]])</tt>.
-  If given, +length+ must be an non-negative Integer (>= 0) or +nil+, and +buffer+ must
+  If given, +length+ must be a non-negative Integer (>= 0) or +nil+, and +buffer+ must
   be a String and may not be nil. If +length+ is given and not nil, then this method
   reads at most +length+ bytes from the input stream. If +length+ is not given or nil,
   then this method reads all data until EOF.

data/lib/rack/content_length.rb

@@ -1,13 +1,13 @@
 require 'rack/utils'
 
 module Rack
+
   # Sets the Content-Length header on responses with fixed-length bodies.
   class ContentLength
     include Rack::Utils
 
-    def initialize(app, sendfile=nil)
+    def initialize(app)
       @app = app
-      @sendfile = sendfile
     end
 
     def call(env)
@@ -17,14 +17,13 @@ module Rack
       if !STATUS_WITH_NO_ENTITY_BODY.include?(status.to_i) &&
          !headers['Content-Length'] &&
          !headers['Transfer-Encoding'] &&
-         !(@sendfile && headers[@sendfile])
-
-        new_body, length = [], 0
-        body.each do |part|
-          new_body << part
-          length += bytesize(part)
-        end
-        body = new_body
+         body.respond_to?(:to_ary)
+
+        obody = body
+        body, length = [], 0
+        obody.each { |part| body << part; length += bytesize(part) }
+        obody.close if obody.respond_to?(:close)
+
         headers['Content-Length'] = length.to_s
       end
 

data/lib/rack/lint.rb

@@ -30,7 +30,7 @@ module Rack
 
     ## = Rack applications
 
-    ## A Rack application is an Ruby object (not a class) that
+    ## A Rack application is a Ruby object (not a class) that
     ## responds to +call+.
     def call(env=nil)
       dup._call(env)
@@ -302,7 +302,7 @@ module Rack
       end
 
       ## * +read+ behaves like IO#read. Its signature is <tt>read([length, [buffer]])</tt>.
-      ##   If given, +length+ must be an non-negative Integer (>= 0) or +nil+, and +buffer+ must
+      ##   If given, +length+ must be a non-negative Integer (>= 0) or +nil+, and +buffer+ must
       ##   be a String and may not be nil. If +length+ is given and not nil, then this method
       ##   reads at most +length+ bytes from the input stream. If +length+ is not given or nil,
       ##   then this method reads all data until EOF.

data/rack.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = "rack"
-  s.version         = "1.3.0.beta2"
+  s.version         = "1.3.0"
   s.platform        = Gem::Platform::RUBY
   s.summary         = "a modular Ruby webserver interface"
 

data/test/multipart/mixed_files

@@ -1,21 +1,21 @@
---AaB03x
-Content-Disposition: form-data; name="foo"
-
-bar
---AaB03x
-Content-Disposition: form-data; name="files"
-Content-Type: multipart/mixed, boundary=BbC04y
-
---BbC04y
-Content-Disposition: attachment; filename="file.txt"
-Content-Type: text/plain
-
-contents
---BbC04y
-Content-Disposition: attachment; filename="flowers.jpg"
-Content-Type: image/jpeg
-Content-Transfer-Encoding: binary
-
-contents
---BbC04y--
---AaB03x--
+--AaB03x
+Content-Disposition: form-data; name="foo"
+
+bar
+--AaB03x
+Content-Disposition: form-data; name="files"
+Content-Type: multipart/mixed, boundary=BbC04y
+
+--BbC04y
+Content-Disposition: attachment; filename="file.txt"
+Content-Type: text/plain
+
+contents
+--BbC04y
+Content-Disposition: attachment; filename="flowers.jpg"
+Content-Type: image/jpeg
+Content-Transfer-Encoding: binary
+
+contents
+--BbC04y--
+--AaB03x--

data/test/spec_content_length.rb

@@ -7,13 +7,13 @@ describe Rack::ContentLength do
     response[1]['Content-Length'].should.equal '13'
   end
 
-  should "set Content-Length even on variable length bodies" do
+  should "not set Content-Length on variable length bodies" do
     body = lambda { "Hello World!" }
     def body.each ; yield call ; end
 
     app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, body] }
     response = Rack::ContentLength.new(app).call({})
-    response[1]['Content-Length'].should.equal '12'
+    response[1]['Content-Length'].should.be.nil
   end
 
   should "not change Content-Length if it is already set" do
@@ -28,15 +28,46 @@ describe Rack::ContentLength do
     response[1]['Content-Length'].should.equal nil
   end
 
-  should "not set Content-Length on sendfile responses" do
-    app = lambda { |env| [200, {'Content-Type' => 'text/plain', 'X-Sendfile' => 'foo'}, %w(Hello World)] }
-    response = Rack::ContentLength.new(app, "X-Sendfile").call({})
-    response[1]['Content-Length'].should.equal nil
-  end
-
   should "not set Content-Length when Transfer-Encoding is chunked" do
     app = lambda { |env| [200, {'Transfer-Encoding' => 'chunked'}, []] }
     response = Rack::ContentLength.new(app).call({})
     response[1]['Content-Length'].should.equal nil
   end
+
+  # Using "Connection: close" for this is fairly contended. It might be useful
+  # to have some other way to signal this.
+  #
+  # should "not force a Content-Length when Connection:close" do
+  #   app = lambda { |env| [200, {'Connection' => 'close'}, []] }
+  #   response = Rack::ContentLength.new(app).call({})
+  #   response[1]['Content-Length'].should.equal nil
+  # end
+
+  should "close bodies that need to be closed" do
+    body = Struct.new(:body) do
+      attr_reader :closed
+      def each; body.join; end
+      def close; @closed = true; end
+      def to_ary; end
+    end.new(%w[one two three])
+
+    app = lambda { |env| [200, {}, body] }
+    response = Rack::ContentLength.new(app).call({})
+    body.closed.should.equal true
+  end
+
+  should "support single-execute bodies" do
+    body = Struct.new(:body) do
+      def each
+        yield body.shift until body.empty?
+      end
+      def to_ary; end
+    end.new(%w[one two three])
+
+    app = lambda { |env| [200, {}, body] }
+    response = Rack::ContentLength.new(app).call({})
+    expected = %w[one two three]
+    response[1]['Content-Length'].should.equal expected.join.size.to_s
+    response[2].should.equal expected
+  end
 end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack
 version: !ruby/object:Gem::Version 
-  hash: 62196407
-  prerelease: 6
+  hash: 27
+  prerelease: 
   segments: 
   - 1
   - 3
   - 0
-  - beta
-  - 2
-  version: 1.3.0.beta2
+  version: 1.3.0
 platform: ruby
 authors: 
 - Christian Neukirchen
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 -04:00
+date: 2011-05-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -294,18 +292,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: rack
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: a modular Ruby webserver interface