@@ -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 lib/rack/commonlogger.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 lib/rack/file.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 lib/rack/handler/cgi.rb @@ -11,31 +11,31 @@ module Rack 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 lib/rack/handler/mongrel.rb @@ -11,27 +11,27 @@ module Rack 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"] ||= "/" lib/rack/handler/webrick.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) lib/rack/lint.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>" lib/rack/lobster.rb @@ -17,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 lib/rack/mock.rb @@ -28,7 +28,7 @@ module Rack # include data from other applications (by using # <tt>rack['rack.recursive.include'][...]</tt> or raise a # ForwardRequest to redirect internally. - + class Recursive def initialize(app) @app = app lib/rack/recursive.rb @@ -6,7 +6,7 @@ module Rack # rack.errors. # # It is recommended you use ShowExceptions to catch SyntaxErrors etc. - + class Reloader def initialize(app, secs=10) @app = app lib/rack/reloader.rb @@ -8,11 +8,11 @@ module Rack # req = Rack::Request.new(env) # req.post? # req.params["data"] - + class Request # The environment of the request. attr_reader :env - + def initialize(env) @env = env end @@ -59,7 +59,7 @@ module Rack else @env["rack.request.form_input"] = @env["rack.input"] unless @env["rack.request.form_hash"] = - Utils::Multipart.parse_multipart(env) + Utils::Multipart.parse_multipart(env) @env["rack.request.form_vars"] = @env["rack.input"].read @env["rack.request.form_hash"] = Utils.parse_query(@env["rack.request.form_vars"]) end lib/rack/request.rb @@ -120,36 +120,36 @@ module Rack module Helpers 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 content_type headers["Content-Type"] end - + def content_length cl = headers["Content-Length"] cl ? cl.to_i : cl end - + def location headers["Location"] end lib/rack/response.rb @@ -2,10 +2,10 @@ require 'base64' module Rack - module Session + module Session # Rack::Session::Cookie provides simple cookie based session management. - # The session is a Ruby Hash stored as base64 encoded marshalled data + # The session is a Ruby Hash stored as base64 encoded marshalled data # set to :key (default: rack.session). # # Example: @@ -22,54 +22,52 @@ module Rack def initialize(app, options={}) @app = app @key = options[:key] || "rack.session" - @default_options = {:domain => nil, - :path => "/", + @default_options = {:domain => nil, + :path => "/", :expire_after => nil}.merge(options) - end - - def call(env) - load_session(env) - status, headers, body = @app.call(env) - commit_session(env, status, headers, body) - end + end - private + def call(env) + load_session(env) + status, headers, body = @app.call(env) + commit_session(env, status, headers, body) + end - def load_session(env) - request = Rack::Request.new(env) - session_data = request.cookies[@key] + private - begin - session_data = Base64.decode64(session_data) - session_data = Marshal.load(session_data) - env["rack.session"] = session_data - rescue - env["rack.session"] = Hash.new - end + def load_session(env) + request = Rack::Request.new(env) + session_data = request.cookies[@key] - env["rack.session.options"] = @default_options.dup + begin + session_data = Base64.decode64(session_data) + session_data = Marshal.load(session_data) + env["rack.session"] = session_data + rescue + env["rack.session"] = Hash.new end - def commit_session(env, status, headers, body) - session_data = Marshal.dump(env["rack.session"]) - session_data = Base64.encode64(session_data) + env["rack.session.options"] = @default_options.dup + end - if session_data.size > (4096 - @key.size) - env["rack.errors"].puts("Warning! Rack::Session::Cookie data size exceeds 4K. Content dropped.") - [status, headers, body] - else - options = env["rack.session.options"] - cookie = Hash.new - cookie[:value] = session_data - cookie[:expires] = Time.now + options[:expire_after] unless options[:expire_after].nil? - response = Rack::Response.new(body, status, headers) - response.set_cookie(@key, cookie.merge(options)) - response.to_a - end - end + def commit_session(env, status, headers, body) + session_data = Marshal.dump(env["rack.session"]) + session_data = Base64.encode64(session_data) + if session_data.size > (4096 - @key.size) + env["rack.errors"].puts("Warning! Rack::Session::Cookie data size exceeds 4K. Content dropped.") + [status, headers, body] + else + options = env["rack.session.options"] + cookie = Hash.new + cookie[:value] = session_data + cookie[:expires] = Time.now + options[:expire_after] unless options[:expire_after].nil? + response = Rack::Response.new(body, status, headers) + response.set_cookie(@key, cookie.merge(options)) + response.to_a + end end - end - + end end +end lib/rack/session/cookie.rb @@ -10,7 +10,7 @@ module Rack # # Be careful when you use this on public-facing sites as it could # reveal information helpful to attackers. - + class ShowExceptions CONTEXT = 7 lib/rack/showexceptions.rb @@ -9,7 +9,7 @@ module Rack # Additional details can be put into <tt>rack.showstatus.detail</tt> # and will be shown as HTML. If such details exist, the error page # is always rendered, even if the reply was not empty. - + class ShowStatus def initialize(app) @app = app lib/rack/showstatus.rb @@ -10,7 +10,7 @@ module Rack # # URLMap dispatches in such a way that the longest paths are tried # first, since they are most specific. - + class URLMap def initialize(map) @mapping = map.map { |location, app| lib/rack/urlmap.rb @@ -3,7 +3,7 @@ require 'tempfile' module Rack # Rack::Utils contains a grab-bag of useful methods for writing web # applications adopted from all kinds of Ruby libraries. - + module Utils # Performs URI escaping so that you can construct proper # query strings faster. Use this rather than the cgi.rb lib/rack/utils.rb e256ec6f3ac9eba66d1a82af595a33c981596aaa Christian Neukirchen chneukirchen@gmail.com http://github.com/chneukirchen/rack/commit/230d62c722ee24202a29b017c59d3229bc6e1e89 230d62c722ee24202a29b017c59d3229bc6e1e89 2007-05-16T07:53:00-07:00 2007-05-16T07:53:00-07:00 Fix trailing whitespace. Sigh. darcs-hash:20070516145358-4fc50-4b716d93f0cc24d1e988443228312c6bcdfc1e7b.gz 5c09fc735910023aad211052ac01c3b5593a21d5 Christian Neukirchen chneukirchen@gmail.com