ruby-changes:8624
From: xibbar <ko1@a...>
Date: Sun, 9 Nov 2008 00:05:45 +0900 (JST)
Subject: [ruby-changes:8624] Ruby:r20158 (trunk): * lib/cgi/session/pstore.rb: fix indentation.
xibbar 2008-11-09 00:03:42 +0900 (Sun, 09 Nov 2008) New Revision: 20158 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20158 Log: * lib/cgi/session/pstore.rb: fix indentation. Modified files: trunk/ChangeLog trunk/lib/cgi/session/pstore.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 20157) +++ ChangeLog (revision 20158) @@ -1,3 +1,7 @@ +Sun Nov 9 00:02:01 2008 Takeyuki FUJIOKA <xibbar@r...> + + * lib/cgi/session/pstore.rb: fix indentation. + Sat Nov 8 23:47:45 2008 Takeyuki FUJIOKA <xibbar@r...> * lib/cgi/session.rb (FileStore): use marshalized data. Index: lib/cgi/session/pstore.rb =================================================================== --- lib/cgi/session/pstore.rb (revision 20157) +++ lib/cgi/session/pstore.rb (revision 20158) @@ -43,55 +43,55 @@ # This session's PStore file will be created if it does # not exist, or opened if it does. def initialize(session, option={}) - dir = option['tmpdir'] || Dir::tmpdir - prefix = option['prefix'] || '' - id = session.session_id + dir = option['tmpdir'] || Dir::tmpdir + prefix = option['prefix'] || '' + id = session.session_id require 'digest/md5' md5 = Digest::MD5.hexdigest(id)[0,16] - path = dir+"/"+prefix+md5 - path.untaint - if File::exist?(path) - @hash = nil - else + path = dir+"/"+prefix+md5 + path.untaint + if File::exist?(path) + @hash = nil + else unless session.new_session raise CGI::Session::NoSession, "uninitialized session" end - @hash = {} - end - @p = ::PStore.new(path) - @p.transaction do |p| - File.chmod(0600, p.path) - end + @hash = {} + end + @p = ::PStore.new(path) + @p.transaction do |p| + File.chmod(0600, p.path) + end end # Restore session state from the session's PStore file. # # Returns the session state as a hash. def restore - unless @hash - @p.transaction do + unless @hash + @p.transaction do @hash = @p['hash'] || {} - end - end - @hash + end + end + @hash end # Save session state to the session's PStore file. def update - @p.transaction do - @p['hash'] = @hash - end + @p.transaction do + @p['hash'] = @hash + end end # Update and close the session's PStore file. def close - update + update end # Close and delete the session's PStore file. def delete - path = @p.path - File::unlink path + path = @p.path + File::unlink path end end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/