deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update to Rails 2.3.9 and itextomml 1.3.27

Browse source
This commit is contained in:
Jacques Distler 2010-09-05 15:24:15 -05:00
parent 113e0af736
commit ef30cc22df
200 changed files with 3065 additions and 1204 deletions
Download patch file Download diff file Expand all files Collapse all files

21
vendor/rails/actionpack/lib/action_controller/integration.rb vendored
View file

@ -414,15 +414,25 @@ module ActionController
end
def multipart_requestify(params, first=true)
returning Hash.new do |p|
Array.new.tap do |p|
params.each do |key, value|
k = first ? key.to_s : "[#{key.to_s}]"
if Hash === value
multipart_requestify(value, false).each do |subkey, subvalue|
p[k + subkey] = subvalue
p << [k + subkey, subvalue]
end
elsif Array === value
value.each do |element|
if Hash === element || Array === element
multipart_requestify(element, false).each do |subkey, subvalue|
p << ["#{k}[]#{subkey}", subvalue]
end
else
p << ["#{k}[]", element]
end
end
else
p[k] = value
p << [k, value]
end
end
end
@ -453,6 +463,7 @@ EOF
end
end.join("")+"--#{boundary}--\r"
end
end
# A module used to extend ActionController::Base, so that integration tests
@ -500,7 +511,7 @@ EOF
reset! unless @integration_session
# reset the html_document variable, but only for new get/post calls
@html_document = nil unless %w(cookies assigns).include?(method)
returning @integration_session.__send__(method, *args) do
@integration_session.__send__(method, *args).tap do
copy_session_variables!
end
end
@ -556,7 +567,7 @@ EOF
def method_missing(sym, *args, &block)
reset! unless @integration_session
if @integration_session.respond_to?(sym)
returning @integration_session.__send__(sym, *args, &block) do
@integration_session.__send__(sym, *args, &block).tap do
copy_session_variables!
end
else