rack 1.5.5 → 1.6.0.beta

data/lib/rack/utils/okjson.rb

@@ -21,14 +21,16 @@
 # THE SOFTWARE.
 
 # See https://github.com/kr/okjson for updates.
+# Imported from the above repo @ d4e8643ad92e14b37d11326855499c7e4108ed17
+# Namespace modified for vendoring under Rack::Utils
 
 require 'stringio'
 
 # Some parts adapted from
-# https://golang.org/src/encoding/json/decode.go and
-# https://golang.org/src/unicode/utf8/utf8.go
+# http://golang.org/src/pkg/json/decode.go and
+# http://golang.org/src/pkg/utf8/utf8.go
 module Rack::Utils::OkJson
-  Upstream = '43'
+  Upstream = 'LTD7LBKLZWFF7OZK'
   extend self
 
 
@@ -50,49 +52,12 @@ module Rack::Utils::OkJson
   end
 
 
-  # Encodes x into a json text. It may contain only
-  # Array, Hash, String, Numeric, true, false, nil.
-  # (Note, this list excludes Symbol.)
-  # X itself must be an Array or a Hash.
-  # No other value can be encoded, and an error will
-  # be raised if x contains any other value, such as
-  # Nan, Infinity, Symbol, and Proc, or if a Hash key
-  # is not a String.
-  # Strings contained in x must be valid UTF-8.
-  def encode(x)
-    case x
-    when Hash    then objenc(x)
-    when Array   then arrenc(x)
-    else
-      raise Error, 'root value must be an Array or a Hash'
-    end
-  end
-
-
-  def valenc(x)
-    case x
-    when Hash    then objenc(x)
-    when Array   then arrenc(x)
-    when String  then strenc(x)
-    when Numeric then numenc(x)
-    when true    then "true"
-    when false   then "false"
-    when nil     then "null"
-    else
-      raise Error, "cannot encode #{x.class}: #{x.inspect}"
-    end
-  end
-
-
-private
-
-
   # Parses a "json text" in the sense of RFC 4627.
   # Returns the parsed value and any trailing tokens.
   # Note: this is almost the same as valparse,
   # except that it does not accept atomic values.
   def textparse(ts)
-    if ts.length <= 0
+    if ts.length < 0
       raise Error, 'empty'
     end
 
@@ -109,7 +74,7 @@ private
   # Parses a "value" in the sense of RFC 4627.
   # Returns the parsed value and any trailing tokens.
   def valparse(ts)
-    if ts.length <= 0
+    if ts.length < 0
       raise Error, 'empty'
     end
 
@@ -238,19 +203,21 @@ private
   # it is the lexeme.
   def tok(s)
     case s[0]
-    when ?{ then ['{', s[0,1], s[0,1]]
-    when ?} then ['}', s[0,1], s[0,1]]
-    when ?: then [':', s[0,1], s[0,1]]
-    when ?, then [',', s[0,1], s[0,1]]
-    when ?[ then ['[', s[0,1], s[0,1]]
-    when ?] then [']', s[0,1], s[0,1]]
-    when ?n then nulltok(s)
-    when ?t then truetok(s)
-    when ?f then falsetok(s)
-    when ?" then strtok(s)
-    when Spc, ?\t, ?\n, ?\r then [:space, s[0,1], s[0,1]]
-    else
-      numtok(s)
+    when ?{  then ['{', s[0,1], s[0,1]]
+    when ?}  then ['}', s[0,1], s[0,1]]
+    when ?:  then [':', s[0,1], s[0,1]]
+    when ?,  then [',', s[0,1], s[0,1]]
+    when ?[  then ['[', s[0,1], s[0,1]]
+    when ?]  then [']', s[0,1], s[0,1]]
+    when ?n  then nulltok(s)
+    when ?t  then truetok(s)
+    when ?f  then falsetok(s)
+    when ?"  then strtok(s)
+    when Spc then [:space, s[0,1], s[0,1]]
+    when ?\t then [:space, s[0,1], s[0,1]]
+    when ?\n then [:space, s[0,1], s[0,1]]
+    when ?\r then [:space, s[0,1], s[0,1]]
+    else          numtok(s)
     end
   end
 
@@ -263,12 +230,12 @@ private
   def numtok(s)
     m = /-?([1-9][0-9]+|[0-9])([.][0-9]+)?([eE][+-]?[0-9]+)?/.match(s)
     if m && m.begin(0) == 0
-      if !m[2] && !m[3]
-        [:val, m[0], Integer(m[0])]
+      if m[3] && !m[2]
+        [:val, m[0], Integer(m[1])*(10**Integer(m[3][1..-1]))]
       elsif m[2]
         [:val, m[0], Float(m[0])]
       else
-        [:val, m[0], Integer(m[1])*(10**m[3][1..-1].to_i(10))]
+        [:val, m[0], Integer(m[0])]
       end
     else
       []
@@ -300,14 +267,17 @@ private
   def unquote(q)
     q = q[1...-1]
     a = q.dup # allocate a big enough string
+    rubydoesenc = false
     # In ruby >= 1.9, a[w] is a codepoint, not a byte.
-    if rubydoesenc?
+    if a.class.method_defined?(:force_encoding)
       a.force_encoding('UTF-8')
+      rubydoesenc = true
     end
     r, w = 0, 0
     while r < q.length
       c = q[r]
-      if c == ?\\
+      case true
+      when c == ?\\
         r += 1
         if r >= q.length
           raise Error, "string literal ends with a \"\\\": \"#{q}\""
@@ -340,7 +310,7 @@ private
               end
             end
           end
-          if rubydoesenc?
+          if rubydoesenc
             a[w] = '' << uchar
             w += 1
           else
@@ -349,7 +319,7 @@ private
         else
           raise Error, "invalid escape char #{q[r]} in \"#{q}\""
         end
-      elsif c == ?" || c < Spc
+      when c == ?", c < Spc
         raise Error, "invalid character in string literal \"#{q}\""
       else
         # Copy anything else byte-for-byte.
@@ -370,14 +340,15 @@ private
   # bytes in string a at position i.
   # Returns the number of bytes written.
   def ucharenc(a, i, u)
-    if u <= Uchar1max
+    case true
+    when u <= Uchar1max
       a[i] = (u & 0xff).chr
       1
-    elsif u <= Uchar2max
+    when u <= Uchar2max
       a[i+0] = (Utag2 | ((u>>6)&0xff)).chr
       a[i+1] = (Utagx | (u&Umaskx)).chr
       2
-    elsif u <= Uchar3max
+    when u <= Uchar3max
       a[i+0] = (Utag3 | ((u>>12)&0xff)).chr
       a[i+1] = (Utagx | ((u>>6)&Umaskx)).chr
       a[i+2] = (Utagx | (u&Umaskx)).chr
@@ -414,15 +385,50 @@ private
 
 
   def nibble(c)
-    if ?0 <= c && c <= ?9 then c.ord - ?0.ord
-    elsif ?a <= c && c <= ?z then c.ord - ?a.ord + 10
-    elsif ?A <= c && c <= ?Z then c.ord - ?A.ord + 10
+    case true
+    when ?0 <= c && c <= ?9 then c.ord - ?0.ord
+    when ?a <= c && c <= ?z then c.ord - ?a.ord + 10
+    when ?A <= c && c <= ?Z then c.ord - ?A.ord + 10
     else
       raise Error, "invalid hex code #{c}"
     end
   end
 
 
+  # Encodes x into a json text. It may contain only
+  # Array, Hash, String, Numeric, true, false, nil.
+  # (Note, this list excludes Symbol.)
+  # X itself must be an Array or a Hash.
+  # No other value can be encoded, and an error will
+  # be raised if x contains any other value, such as
+  # Nan, Infinity, Symbol, and Proc, or if a Hash key
+  # is not a String.
+  # Strings contained in x must be valid UTF-8.
+  def encode(x)
+    case x
+    when Hash    then objenc(x)
+    when Array   then arrenc(x)
+    else
+      raise Error, 'root value must be an Array or a Hash'
+    end
+  end
+
+
+  def valenc(x)
+    case x
+    when Hash    then objenc(x)
+    when Array   then arrenc(x)
+    when String  then strenc(x)
+    when Numeric then numenc(x)
+    when true    then "true"
+    when false   then "false"
+    when nil     then "null"
+    else
+      raise Error, "cannot encode #{x.class}: #{x.inspect}"
+    end
+  end
+
+
   def objenc(x)
     '{' + x.map{|k,v| keyenc(k) + ':' + valenc(v)}.join(',') + '}'
   end
@@ -447,6 +453,9 @@ private
     t.putc(?")
     r = 0
 
+    # In ruby >= 1.9, s[r] is a codepoint, not a byte.
+    rubydoesenc = s.class.method_defined?(:encoding)
+
     while r < s.length
       case s[r]
       when ?"  then t.print('\\"')
@@ -458,20 +467,15 @@ private
       when ?\t then t.print('\\t')
       else
         c = s[r]
-        # In ruby >= 1.9, s[r] is a codepoint, not a byte.
-        if rubydoesenc?
+        case true
+        when rubydoesenc
           begin
-            # c.ord will raise an error if c is invalid UTF-8
-            if c.ord < Spc.ord
-              c = "\\u%04x" % [c.ord]
-            end
+            c.ord # will raise an error if c is invalid UTF-8
             t.write(c)
           rescue
             t.write(Ustrerr)
           end
-        elsif c < Spc
-          t.write("\\u%04x" % c)
-        elsif Spc <= c && c <= ?~
+        when Spc <= c && c <= ?~
           t.putc(c)
         else
           n = ucharcopy(t, s, r) # ensure valid UTF-8 output
@@ -563,11 +567,6 @@ private
   end
 
 
-  def rubydoesenc?
-    ::String.method_defined?(:force_encoding)
-  end
-
-
   class Utf8Error < ::StandardError
   end
 
@@ -576,15 +575,15 @@ private
   end
 
 
-  Utagx = 0b1000_0000
-  Utag2 = 0b1100_0000
-  Utag3 = 0b1110_0000
-  Utag4 = 0b1111_0000
-  Utag5 = 0b1111_1000
-  Umaskx = 0b0011_1111
-  Umask2 = 0b0001_1111
-  Umask3 = 0b0000_1111
-  Umask4 = 0b0000_0111
+  Utagx = 0x80 # 1000 0000
+  Utag2 = 0xc0 # 1100 0000
+  Utag3 = 0xe0 # 1110 0000
+  Utag4 = 0xf0 # 1111 0000
+  Utag5 = 0xF8 # 1111 1000
+  Umaskx = 0x3f # 0011 1111
+  Umask2 = 0x1f # 0001 1111
+  Umask3 = 0x0f # 0000 1111
+  Umask4 = 0x07 # 0000 0111
   Uchar1max = (1<<7) - 1
   Uchar2max = (1<<11) - 1
   Uchar3max = (1<<16) - 1

data/rack.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = "rack"
-  s.version         = "1.5.5"
+  s.version         = "1.6.0.beta"
   s.platform        = Gem::Platform::RUBY
   s.summary         = "a modular Ruby webserver interface"
   s.license         = "MIT"
@@ -12,7 +12,7 @@ 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.github.com/.
+Also see http://rack.github.io/.
 EOF
 
   s.files           = Dir['{bin/*,contrib/*,example/*,lib/**/*,test/**/*}'] +
@@ -25,7 +25,7 @@ EOF
 
   s.author          = 'Christian Neukirchen'
   s.email           = 'chneukirchen@gmail.com'
-  s.homepage        = 'http://rack.github.com/'
+  s.homepage        = 'http://rack.github.io/'
   s.rubyforge_project = 'rack'
 
   s.add_development_dependency 'bacon'

data/test/multipart/filename_and_no_name

@@ -0,0 +1,6 @@
+--AaB03x
+Content-Disposition: form-data; filename="file1.txt"
+Content-Type: text/plain
+
+contents
+--AaB03x--

data/test/multipart/invalid_character

@@ -0,0 +1,6 @@
+--AaB03x
+Content-Disposition: form-data; name="files"; filename="invalid�.txt"
+Content-Type: text/plain
+
+contents
+--AaB03x--

data/test/spec_builder.rb

@@ -130,6 +130,17 @@ describe Rack::Builder do
     Rack::MockRequest.new(app).get("/foo").should.be.server_error
   end
 
+  it "yields the generated app to a block for warmup" do
+    warmed_up_app = nil
+
+    app = Rack::Builder.new do
+      warmup { |a| warmed_up_app = a }
+      run lambda { |env| [200, {}, []] }
+    end.to_app
+
+    warmed_up_app.should.equal app
+  end
+
   should "initialize apps once" do
     app = builder do
       class AppClass
@@ -180,8 +191,7 @@ describe Rack::Builder do
     end
 
     it "removes __END__ before evaluating app" do
-      app, options = Rack::Builder.parse_file config_file('end.ru')
-      options = nil # ignored, prevents warning
+      app, _ = Rack::Builder.parse_file config_file('end.ru')
       Rack::MockRequest.new(app).get("/").body.to_s.should.equal 'OK'
     end
 
@@ -199,8 +209,7 @@ describe Rack::Builder do
     end
 
     it "sets __LINE__ correctly" do
-      app, options = Rack::Builder.parse_file config_file('line.ru')
-      options = nil # ignored, prevents warning
+      app, _ = Rack::Builder.parse_file config_file('line.ru')
       Rack::MockRequest.new(app).get("/").body.to_s.should.equal '1'
     end
   end

data/test/spec_chunked.rb

@@ -64,6 +64,22 @@ describe Rack::Chunked do
     body.join.should.equal 'Hello World!'
   end
 
+  should 'not modify response when client is ancient, pre-HTTP/1.0' do
+    app = lambda { |env| [200, {"Content-Type" => "text/plain"}, ['Hello', ' ', 'World!']] }
+    check = lambda do
+      status, headers, body = chunked(app).call(@env.dup)
+      status.should.equal 200
+      headers.should.not.include 'Transfer-Encoding'
+      body.join.should.equal 'Hello World!'
+    end
+
+    @env.delete('HTTP_VERSION') # unicorn will do this on pre-HTTP/1.0 requests
+    check.call
+
+    @env['HTTP_VERSION'] = 'HTTP/0.9' # not sure if this happens in practice
+    check.call
+  end
+
   should 'not modify response when Transfer-Encoding header already present' do
     app = lambda { |env|
       [200, {"Content-Type" => "text/plain", 'Transfer-Encoding' => 'identity'}, ['Hello', ' ', 'World!']]

data/test/spec_commonlogger.rb

@@ -2,6 +2,8 @@ require 'rack/commonlogger'
 require 'rack/lint'
 require 'rack/mock'
 
+require 'logger'
+
 describe Rack::CommonLogger do
   obj = 'foobar'
   length = obj.size
@@ -33,6 +35,14 @@ describe Rack::CommonLogger do
     log.string.should =~ /"GET \/ " 200 #{length} /
   end
 
+  should "work with standartd library logger" do
+    logdev = StringIO.new
+    log = Logger.new(logdev)
+    Rack::MockRequest.new(Rack::CommonLogger.new(app, log)).get("/")
+
+    logdev.string.should =~ /"GET \/ " 200 #{length} /
+  end
+
   should "log - content length if header is missing" do
     res = Rack::MockRequest.new(Rack::CommonLogger.new(app_without_length)).get("/")
 
@@ -47,6 +57,32 @@ describe Rack::CommonLogger do
     res.errors.should =~ /"GET \/ " 200 - /
   end
 
+  def with_mock_time(t = 0)
+    mc = class <<Time; self; end
+    mc.send :alias_method, :old_now, :now
+    mc.send :define_method, :now do
+      at(t)
+    end
+    yield
+  ensure
+    mc.send :alias_method, :now, :old_now
+  end
+
+  should "log in common log format" do
+    log = StringIO.new
+    with_mock_time do
+      Rack::MockRequest.new(Rack::CommonLogger.new(app, log)).get("/")
+    end
+
+    md = /- - - \[([^\]]+)\] "(\w+) \/ " (\d{3}) \d+ ([\d\.]+)/.match(log.string)
+    md.should.not.equal nil
+    time, method, status, duration = *md.captures
+    time.should.equal Time.at(0).strftime("%d/%b/%Y:%H:%M:%S %z")
+    method.should.equal "GET"
+    status.should.equal "200"
+    (0..1).should.include?(duration.to_f)
+  end
+
   def length
     123
   end