svnno****@sourc*****
svnno****@sourc*****
2009年 8月 27日 (木) 23:59:25 JST
Revision: 1010
http://sourceforge.jp/projects/hiki/svn/view?view=rev&revision=1010
Author: okkez
Date: 2009-08-27 23:59:25 +0900 (Thu, 27 Aug 2009)
Log Message:
-----------
be sure to use Rack (sometimes require 'cgi' when using Rack)
Modified Paths:
--------------
hiki/branches/rack/hiki/cookie.rb
hiki/branches/rack/hiki/request.rb
hiki/branches/rack/hiki/response.rb
Modified: hiki/branches/rack/hiki/cookie.rb
===================================================================
--- hiki/branches/rack/hiki/cookie.rb 2009-08-27 14:59:22 UTC (rev 1009)
+++ hiki/branches/rack/hiki/cookie.rb 2009-08-27 14:59:25 UTC (rev 1010)
@@ -1,11 +1,9 @@
module Hiki
- if Object.const_defined?(:CGI)
- Cookie = ::CGI::Cookie
- else
+ if Object.const_defined?(:Rack)
class Cookie
- attr_reader :name, :value
+ attr_reader :name, :value, :path, :expires
def initialize(options)
@name = options['name']
@value = options['value']
@@ -13,5 +11,7 @@
@expires = options['expires']
end
end
+ else
+ Cookie = ::CGI::Cookie
end
end
Modified: hiki/branches/rack/hiki/request.rb
===================================================================
--- hiki/branches/rack/hiki/request.rb 2009-08-27 14:59:22 UTC (rev 1009)
+++ hiki/branches/rack/hiki/request.rb 2009-08-27 14:59:25 UTC (rev 1010)
@@ -1,7 +1,12 @@
# -*- coding: utf-8 -*-
module Hiki
- if Object.const_defined?(:CGI)
+ if Object.const_defined?(:Rack)
+ Request = ::Rack::Request
+ class ::Rack::Request
+ alias remote_addr ip
+ end
+ else
raise RuntimeError, 'Do not use CGI class!' if Object.const_defined?(:Rack)
# CGI を Rack::Request っぽいインターフェイスに変換する
class Request
@@ -189,10 +194,5 @@
raise NameError, 'not implemented : values_at'
end
end
- else
- Request = ::Rack::Request
- class ::Rack::Request
- alias remote_addr ip
- end
end
end
Modified: hiki/branches/rack/hiki/response.rb
===================================================================
--- hiki/branches/rack/hiki/response.rb 2009-08-27 14:59:22 UTC (rev 1009)
+++ hiki/branches/rack/hiki/response.rb 2009-08-27 14:59:25 UTC (rev 1010)
@@ -1,7 +1,9 @@
module Hiki
- if Object.const_defined?(:CGI)
+ if Object.const_defined?(:Rack)
+ Response = ::Rack::Response
+ else
class Response
attr_reader :body, :status, :headers
def initialize(body = [], status = 200, headers = {}, &block)
@@ -16,7 +18,5 @@
@cgi.header(@headers)
end
end
- else
- Response = ::Rack::Response
end
end