diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cgi.rb | 12 | ||||
| -rw-r--r-- | lib/delegate.rb | 13 |
2 files changed, 16 insertions, 9 deletions
diff --git a/lib/cgi.rb b/lib/cgi.rb index 103452a762..772696068b 100644 --- a/lib/cgi.rb +++ b/lib/cgi.rb @@ -1141,14 +1141,18 @@ class CGI @multipart end - class Value < String # :nodoc: + class Value < DelegateClass(String) # :nodoc: def initialize(str, params) @params = params super(str) end - def [](idx) - warn "#{caller(1)[0]}:CAUTION! cgi['key'] == cgi.params['key'][0]; if want Array, use cgi.params['key']" - self + def [](idx, *args) + if args.size == 0 + warn "#{caller(1)[0]}:CAUTION! cgi['key'] == cgi.params['key'][0]; if want Array, use cgi.params['key']" + self + else + self.to_s[idx,*args] + end end def first warn "#{caller(1)[0]}:CAUTION! cgi['key'] == cgi.params['key'][0]; if want Array, use cgi.params['key']" diff --git a/lib/delegate.rb b/lib/delegate.rb index 41d35477e4..1ba4cf1e1b 100644 --- a/lib/delegate.rb +++ b/lib/delegate.rb @@ -64,15 +64,15 @@ class SimpleDelegator<Delegator def initialize(obj) super - @obj = obj + @_sd_obj = obj end def __getobj__ - @obj + @_sd_obj end def __setobj__(obj) - @obj = obj + @_sd_obj = obj end end @@ -88,7 +88,7 @@ def DelegateClass(superclass) methods |= ["to_s","to_a","inspect","==","=~","==="] klass.module_eval <<-EOS def initialize(obj) - @obj = obj + @_dc_obj = obj end EOS for method in methods @@ -96,7 +96,7 @@ def DelegateClass(superclass) klass.module_eval <<-EOS def #{method}(*args, &block) begin - @obj.__send__(:#{method}, *args, &block) + @_dc_obj.__send__(:#{method}, *args, &block) rescue $@[0,2] = nil raise @@ -107,6 +107,9 @@ def DelegateClass(superclass) raise NameError, "invalid identifier %s" % method, caller(3) end end + def __getobj__ + @_dc_obj + end return klass; end |