7 files changed, 328 insertions, 87 deletions
@@ -14,8 +14,11 @@ cgi
 cgi.rb
 complex.rb
 date.rb
 fileutils.rb
 find.rb
 generator.rb
 logger.rb
 matrix.rb
@@ -1,21 +1,119 @@
-# Delegation class that delegates even methods defined in super class,
-# which can not be covered with normal method_missing hack.
-#
-# Delegator is the abstract delegation class. Need to redefine
-# `__getobj__' method in the subclass. SimpleDelegator is the
-# concrete subclass for simple delegation.
 #
-# Usage:
-# foo = Object.new
-# foo2 = SimpleDelegator.new(foo)
-# foo.hash == foo2.hash # => false
 #
-# Foo = DelegateClass(Array)
 #
-# class ExtArray<DelegateClass(Array)
-# ...
-# end
 class Delegator
 preserved = ["__id__", "object_id", "__send__", "respond_to?"]
 instance_methods.each do |m|
@@ -23,10 +121,15 @@ class Delegator
 undef_method m
 end
 def initialize(obj)
 __setobj__(obj)
 end
 def method_missing(m, *args)
 begin
 target = self.__getobj__
@@ -40,42 +143,79 @@ class Delegator
 end
 end
 def respond_to?(m)
 return true if super
 return self.__getobj__.respond_to?(m)
 end
 def __getobj__
 raise NotImplementedError, "need to define `__getobj__'"
 end
 def __setobj__(obj)
 raise NotImplementedError, "need to define `__setobj__'"
 end
 def marshal_dump
 __getobj__
 end
 def marshal_load(obj)
 __setobj__(obj)
 end
 end
 class SimpleDelegator<Delegator
 def __getobj__
 @_sd_obj
 end
 def __setobj__(obj)
 raise ArgumentError, "cannot delegate to self" if self.equal?(obj)
 @_sd_obj = obj
 end
 def clone
 copy = super
 copy.__setobj__(__getobj__.clone)
 copy
 end
 def dup
 copy = super
 copy.__setobj__(__getobj__.dup)
@@ -83,11 +223,22 @@ class SimpleDelegator<Delegator
 end
 end
 # backward compatibility ^_^;;;
 Delegater = Delegator
 SimpleDelegater = SimpleDelegator
 #
 def DelegateClass(superclass)
 klass = Class.new
 methods = superclass.public_instance_methods(true)
@@ -97,31 +248,31 @@ def DelegateClass(superclass)
 "clone", "dup", "marshal_dump", "marshal_load",
 ]
 klass.module_eval {
- def initialize(obj)
 @_dc_obj = obj
 end
- def method_missing(m, *args)
 unless @_dc_obj.respond_to?(m)
 super(m, *args)
 end
 @_dc_obj.__send__(m, *args)
 end
- def respond_to?(m)
 return true if super
 return @_dc_obj.respond_to?(m)
 end
- def __getobj__
 @_dc_obj
 end
- def __setobj__(obj)
 raise ArgumentError, "cannot delegate to self" if self.equal?(obj)
 @_dc_obj = obj
 end
- def clone
 super
 __setobj__(__getobj__.clone)
 end
- def dup
 super
 __setobj__(__getobj__.dup)
 end
@@ -145,6 +296,8 @@ def DelegateClass(superclass)
 return klass
 end
 if __FILE__ == $0
 class ExtArray<DelegateClass(Array)
 def initialize()
@@ -5,90 +5,174 @@
 # $Date$
 # by Keiju ISHITSUKA([email protected])
 #	original definition by delegator.rb
-# --
-# Usage:
 #
-# class Foo
 # extend Forwardable
 #
-# def_delegators("@out", "printf", "print")
-# def_delegators(:@in, :gets)
-# def_delegator(:@contents, :[], "content_at")
 # end
 # f = Foo.new
 # f.printf ...
 # f.gets
 # f.content_at(1)
 #
-# g = Goo.new
-# g.extend SingleForwardable
-# g.def_delegator("@out", :puts)
-# g.puts ...
-#
-#
 module Forwardable
-
- @debug = nil
- class<<self
- attr_accessor :debug
 end
 def def_instance_delegators(accessor, *methods)
- for method in methods
 def_instance_delegator(accessor, method)
- end
 end
 def def_instance_delegator(accessor, method, ali = method)
- accessor = accessor.id2name if accessor.kind_of?(Integer)
- method = method.id2name if method.kind_of?(Integer)
- ali = ali.id2name if ali.kind_of?(Integer)
-
- module_eval(<<-EOS, "(__FORWARDABLE__)", 1)
 def #{ali}(*args, &block)
-	begin
- #{accessor}.__send__(:#{method}, *args, &block)
-	rescue Exception
- [email protected]_if{|s| /^\\(__FORWARDABLE__\\):/ =~ s} unless Forwardable::debug
- Kernel::raise
-	end
 end
- EOS
- end
-
- alias def_delegators def_instance_delegators
- alias def_delegator def_instance_delegator
-end
-module SingleForwardable
- def def_singleton_delegators(accessor, *methods)
- for method in methods
- def_singleton_delegator(accessor, method)
 end
 end
- def def_singleton_delegator(accessor, method, ali = method)
- accessor = accessor.id2name if accessor.kind_of?(Integer)
- method = method.id2name if method.kind_of?(Integer)
- ali = ali.id2name if ali.kind_of?(Integer)
-
- instance_eval(<<-EOS, "(__FORWARDABLE__)", 1)
- def #{ali}(*args, &block)
- begin
- #{accessor}.__send__(:#{method}, *args,&block)
- rescue Exception
- [email protected]_if{|s| /^\\(__FORWARDABLE__\\):/ =~ s} unless Forwardable::debug
- Kernel::raise
- end
- end
- EOS
- end
-
- alias def_delegators def_singleton_delegators
- alias def_delegator def_singleton_delegator
 end
-
-
-
@@ -352,7 +352,7 @@ class OptionParser
 # : (({block}))
 # (({yields})) at semi-error condition, instead of raises exception.
 #
- def conv_arg(arg, val = nil)
 if block
 if conv
 val = conv.call(*val)
@@ -500,7 +500,7 @@ module XMLRPC
 def do_rpc(request, async=false)
 header = {
 "User-Agent" => USER_AGENT,
- "Content-Type" => "text/xml",
 "Content-Length" => request.size.to_s,
 "Connection" => (async ? "close" : "keep-alive")
 }
@@ -456,7 +456,7 @@ class CGIServer < BasicServer
 http_error(400, "Bad Request") if data.nil? or data.size != length
- http_write(process(data), "Content-type" => "text/xml")
 }
 end
@@ -531,7 +531,7 @@ class ModRubyServer < BasicServer
 http_error(400, "Bad Request") if data.nil? or data.size != length
- http_write(process(data), 200, "Content-type" => "text/xml")
 }
 end
@@ -764,7 +764,7 @@ class WEBrickServlet < BasicServer
 response.status = 200
 response['Content-Length'] = resp.size
- response['Content-Type'] = "text/xml"
 response.body = resp
 end
 end
@@ -11,6 +11,7 @@ require 'yaml/error'
 require 'yaml/syck'
 require 'yaml/tag'
 require 'yaml/stream'
 # == YAML
 #