From 7c3d700c00d13e0dead8f110a95606fd1332c5a2 Mon Sep 17 00:00:00 2001 From: Sean Griffin Date: Wed, 4 May 2016 12:09:25 -0500 Subject: Move `Request#[]` and `Request#[]=` to `Helpers` and deprecate them --- lib/rack/request.rb | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/lib/rack/request.rb b/lib/rack/request.rb index a76f15cd..0a64f69e 100644 --- a/lib/rack/request.rb +++ b/lib/rack/request.rb @@ -16,18 +16,6 @@ module Rack super(env) end - # shortcut for request.params[key] - def [](key) - params[key.to_s] - end - - # shortcut for request.params[key] = value - # - # Note that modifications will not be persisted in the env. Use update_param or delete_param if you want to destructively modify params. - def []=(key, value) - params[key.to_s] = value - end - # like Hash#values_at def values_at(*keys) keys.map{|key| params[key] } @@ -437,6 +425,26 @@ module Rack ip =~ /\A127\.0\.0\.1\Z|\A(10|172\.(1[6-9]|2[0-9]|30|31)|192\.168)\.|\A::1\Z|\Afd[0-9a-f]{2}:.+|\Alocalhost\Z|\Aunix\Z|\Aunix:/i end + # shortcut for request.params[key] + def [](key) + if $verbose + warn("Request#[] is deprecated and will be removed in a future version of Rack. Please use request.params[] instead") + end + + params[key.to_s] + end + + # shortcut for request.params[key] = value + # + # Note that modifications will not be persisted in the env. Use update_param or delete_param if you want to destructively modify params. + def []=(key, value) + if $verbose + warn("Request#[]= is deprecated and will be removed in a future version of Rack. Please use request.params[]= instead") + end + + params[key.to_s] = value + end + private def default_session; {}; end -- cgit v1.2.3-24-ge0c7