rack 0.1.0 → 0.2.0

data/lib/rack/auth/digest/nonce.rb

@@ -0,0 +1,52 @@
+require 'base64'
+require 'digest/md5'
+
+module Rack
+  module Auth
+    module Digest
+      # Rack::Auth::Digest::Nonce is the default nonce generator for the
+      # Rack::Auth::Digest::MD5 authentication handler.
+      #
+      # +private_key+ needs to set to a constant string.
+      #
+      # +time_limit+ can be optionally set to an integer (number of seconds),
+      # to limit the validity of the generated nonces.
+
+      class Nonce
+
+        class << self
+          attr_accessor :private_key, :time_limit
+        end
+
+        def self.parse(string)
+          new(*Base64.decode64(string).split(' ', 2))
+        end
+
+        def initialize(timestamp = Time.now, given_digest = nil)
+          @timestamp, @given_digest = timestamp.to_i, given_digest
+        end
+
+        def to_s
+          Base64.encode64([ @timestamp, digest ] * ' ').strip
+        end
+
+        def digest
+          ::Digest::MD5.hexdigest([ @timestamp, self.class.private_key ] * ':')
+        end
+
+        def valid?
+          digest == @given_digest
+        end
+
+        def stale?
+          !self.class.time_limit.nil? && (@timestamp - Time.now.to_i) < self.class.time_limit
+        end
+
+        def fresh?
+          !stale?
+        end
+
+      end
+    end
+  end
+end

data/lib/rack/auth/digest/params.rb

@@ -0,0 +1,55 @@
+module Rack
+  module Auth
+    module Digest
+      class Params < Hash
+
+        def self.parse(str)
+          split_header_value(str).inject(new) do |header, param|
+            k, v = param.split('=', 2)
+            header[k] = dequote(v)
+            header
+          end
+        end
+
+        def self.dequote(str) # From WEBrick::HTTPUtils
+          ret = (/\A"(.*)"\Z/ =~ str) ? $1 : str.dup
+          ret.gsub!(/\\(.)/, "\\1")
+          ret
+        end
+
+        def self.split_header_value(str) # From WEBrick::HTTPUtils
+          str.scan(/((?:"(?:\\.|[^"])+?"|[^",]+)+)(?:,\s*|\Z)/n).collect{ |v| v[0] }
+        end
+
+        def initialize
+          super
+
+          yield self if block_given?
+        end
+
+        def [](k)
+          super k.to_s
+        end
+
+        def []=(k, v)
+          super k.to_s, v.to_s
+        end
+
+        UNQUOTED = ['qop', 'nc', 'stale']
+
+        def to_s
+          inject([]) do |parts, (k, v)|
+            parts << "#{k}=" + (UNQUOTED.include?(k) ? v.to_s : quote(v))
+            parts
+          end.join(', ')
+        end
+
+        def quote(str) # From WEBrick::HTTPUtils
+          '"' << str.gsub(/[\\\"]/o, "\\\1") << '"'
+        end
+
+      end
+    end
+  end
+end
+

data/lib/rack/auth/digest/request.rb

@@ -0,0 +1,40 @@
+require 'rack/auth/abstract/request'
+require 'rack/auth/digest/params'
+require 'rack/auth/digest/nonce'
+
+module Rack
+  module Auth
+    module Digest
+      class Request < Auth::AbstractRequest
+
+        def method
+          @env['REQUEST_METHOD']
+        end
+
+        def digest?
+          :digest == scheme
+        end
+
+        def correct_uri?
+          @env['PATH_INFO'] == uri
+        end
+
+        def nonce
+          @nonce ||= Nonce.parse(params['nonce'])
+        end
+
+        def params
+          @params ||= Params.parse(parts.last)
+        end
+
+        def method_missing(sym)
+          if params.has_key? key = sym.to_s
+            return params[key]
+          end
+          super
+        end
+
+      end
+    end
+  end
+end

data/lib/rack/commonlogger.rb

@@ -2,7 +2,7 @@ module Rack
   # Rack::CommonLogger forwards every request to an +app+ given, and
   # logs a line in the Apache common log format to the +logger+, or
   # rack.errors by default.
-  
+
   class CommonLogger
     def initialize(app, logger=nil)
       @app = app

data/lib/rack/file.rb

@@ -4,7 +4,7 @@ module Rack
   #
   # Handlers can detect if bodies are a Rack::File, and use mechanisms
   # like sendfile on the +path+.
-  
+
   class File
     attr_accessor :root
     attr_accessor :path

data/lib/rack/handler/cgi.rb

@@ -4,7 +4,7 @@ module Rack
       def self.run(app, options=nil)
         serve app
       end
-      
+
       def self.serve(app)
         env = ENV.to_hash
         env.delete "HTTP_CONTENT_LENGTH"
@@ -14,18 +14,18 @@ module Rack
         env.update({"rack.version" => [0,1],
                      "rack.input" => STDIN,
                      "rack.errors" => STDERR,
-                     
+
                      "rack.multithread" => false,
                      "rack.multiprocess" => true,
                      "rack.run_once" => true,
-                     
+
                      "rack.url_scheme" => ["yes", "on", "1"].include?(ENV["HTTPS"]) ? "https" : "http"
                    })
-        
+
         env["QUERY_STRING"] ||= ""
         env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
         env["REQUEST_PATH"] ||= "/"
-        
+
         status, headers, body = app.call(env)
         begin
           send_headers status, headers
@@ -34,7 +34,7 @@ module Rack
           body.close  if body.respond_to? :close
         end
       end
-      
+
       def self.send_headers(status, headers)
         STDOUT.print "Status: #{status}\r\n"
         headers.each { |k, vs|
@@ -45,7 +45,7 @@ module Rack
         STDOUT.print "\r\n"
         STDOUT.flush
       end
-      
+
       def self.send_body(body)
         body.each { |part|
           STDOUT.print part

data/lib/rack/handler/fastcgi.rb

@@ -9,7 +9,7 @@ module Rack
         }
       end
 
-      module ProperStream
+      module ProperStream       # :nodoc:
         def each                # This is missing by default.
           while line = gets
             yield line

data/lib/rack/handler/mongrel.rb

@@ -4,37 +4,38 @@ require 'stringio'
 module Rack
   module Handler
     class Mongrel < ::Mongrel::HttpHandler
-      def self.run(app, options)
+      def self.run(app, options={})
         server = ::Mongrel::HttpServer.new(options[:Host] || '0.0.0.0',
                                            options[:Port] || 8080)
         server.register('/', Rack::Handler::Mongrel.new(app))
+        yield server  if block_given?
         server.run.join
       end
-      
+
       def initialize(app)
         @app = app
       end
-      
+
       def process(request, response)
         env = {}.replace(request.params)
         env.delete "HTTP_CONTENT_TYPE"
         env.delete "HTTP_CONTENT_LENGTH"
 
         env["SCRIPT_NAME"] = ""  if env["SCRIPT_NAME"] == "/"
-        
+
         env.update({"rack.version" => [0,1],
                      "rack.input" => request.body || StringIO.new(""),
                      "rack.errors" => STDERR,
-                     
+
                      "rack.multithread" => true,
                      "rack.multiprocess" => false, # ???
                      "rack.run_once" => false,
-                     
+
                      "rack.url_scheme" => "http",
                    })
         env["QUERY_STRING"] ||= ""
         env.delete "PATH_INFO"  if env["PATH_INFO"] == ""
-        
+
         status, headers, body = @app.call(env)
 
         begin

data/lib/rack/handler/webrick.rb

@@ -8,29 +8,30 @@ module Rack
         server = ::WEBrick::HTTPServer.new(options)
         server.mount "/", Rack::Handler::WEBrick, app
         trap(:INT) { server.shutdown }
+        yield server  if block_given?
         server.start
       end
-      
+
       def initialize(server, app)
         super server
         @app = app
       end
-      
+
       def service(req, res)
         env = req.meta_vars
         env.delete_if { |k, v| v.nil? }
-        
+
         env.update({"rack.version" => [0,1],
                      "rack.input" => StringIO.new(req.body.to_s),
                      "rack.errors" => STDERR,
-                     
+
                      "rack.multithread" => true,
                      "rack.multiprocess" => false,
                      "rack.run_once" => false,
-                     
+
                      "rack.url_scheme" => ["yes", "on", "1"].include?(ENV["HTTPS"]) ? "https" : "http"
                    })
-        
+
         env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"]
         env["QUERY_STRING"] ||= ""
         env["REQUEST_PATH"] ||= "/"

data/lib/rack/lint.rb

@@ -1,7 +1,7 @@
 module Rack
   # Rack::Lint validates your application and the requests and
   # responses according to the Rack spec.
-  
+
   class Lint
     def initialize(app)
       @app = app
@@ -47,7 +47,7 @@ module Rack
       check_content_type status, headers
       [status, headers, self]
     end
-    
+
     ## == The Environment
     def check_env(env)
       ## The environment must be an true instance of Hash (no
@@ -210,7 +210,7 @@ module Rack
       def initialize(input)
         @input = input
       end
-      
+
       ## * +gets+ must be called without arguments and return a string,
       ##   or +nil+ on EOF.
       def gets(*args)

data/lib/rack/lobster.rb

@@ -21,14 +21,14 @@ module Rack
         lobster = LobsterString
         href = "?flip"
       end
-      
+
       [200, {"Content-Type" => "text/html"},
        ["<title>Lobstericious!</title>",
         "<pre>", lobster, "</pre>",
         "<a href='#{href}'>flip!</a>"]
       ]
     }
-    
+
     def call(env)
       req = Request.new(env)
       if req.GET["flip"] == "left"
@@ -42,7 +42,7 @@ module Rack
         lobster = LobsterString
         href = "?flip=left"
       end
-      
+
       Response.new.finish do |res|
         res.write "<title>Lobstericious!</title>"
         res.write "<pre>"
@@ -61,5 +61,5 @@ if $0 == __FILE__
   require 'rack/showexceptions'
   Rack::Handler::WEBrick.run \
     Rack::ShowExceptions.new(Rack::Lint.new(Rack::Lobster.new)),
-    :Port => 9202
+    :Port => 9292
 end

data/lib/rack/mock.rb

@@ -2,6 +2,7 @@ require 'uri'
 require 'stringio'
 require 'rack/lint'
 require 'rack/utils'
+require 'rack/response'
 
 module Rack
   # Rack::MockRequest helps testing your Rack application without
@@ -16,7 +17,7 @@ module Rack
   # <tt>:input</tt>:: A String or IO-like to be used as rack.input.
   # <tt>:fatal</tt>:: Raise a FatalWarning if the app writes to rack.errors.
   # <tt>:lint</tt>:: If true, wrap the application in a Rack::Lint.
-  
+
   class MockRequest
     class FatalWarning < RuntimeError
     end
@@ -32,6 +33,10 @@ module Rack
 
       def flush
       end
+
+      def string
+        ""
+      end
     end
 
     DEFAULT_ENV = {
@@ -125,45 +130,13 @@ module Rack
     # Status
     attr_reader :status
 
-    def invalid?;       @status < 100 || @status >= 600;       end
-
-    def informational?; @status >= 100 && @status < 200;       end
-    def successful?;    @status >= 200 && @status < 300;       end
-    def redirection?;   @status >= 300 && @status < 400;       end
-    def client_error?;  @status >= 400 && @status < 500;       end
-    def server_error?;  @status >= 500 && @status < 600;       end
-
-    def ok?;            @status == 200;                        end
-    def forbidden?;     @status == 403;                        end
-    def not_found?;     @status == 404;                        end
-
-    def redirect?;      [301, 302, 303, 307].include? @status; end
-    def empty?;         [201, 204, 304].include?      @status; end
-
     # Headers
     attr_reader :headers, :original_headers
 
-    def include?(header)
-      !!headers[header]
-    end
-
     def [](field)
       headers[field]
     end
 
-    def content_type
-      headers["Content-Type"]
-    end
-
-    def content_length
-      cl = headers["Content-Length"]
-      cl ? cl.to_i : cl
-    end
-
-    def location
-      headers["Location"]
-    end
-
 
     # Body
     attr_reader :body
@@ -179,5 +152,8 @@ module Rack
 
     # Errors
     attr_accessor :errors
+
+
+    include Response::Helpers
   end
 end