diff options
Diffstat (limited to 'lib/forwardable.rb')
| -rw-r--r-- | lib/forwardable.rb | 104 |
1 files changed, 63 insertions, 41 deletions
diff --git a/lib/forwardable.rb b/lib/forwardable.rb index e2b210423f..175d6d9c6b 100644 --- a/lib/forwardable.rb +++ b/lib/forwardable.rb @@ -57,10 +57,9 @@ # # == Another example # -# We want to rely on what has come before obviously, but with delegation we can -# take just the methods we need and even rename them as appropriate. In many -# cases this is preferable to inheritance, which gives us the entire old -# interface, even if much of it isn't needed. +# You could use Forwardable as an alternative to inheritance, when you don't want +# to inherit all methods from the superclass. For instance, here is how you might +# add a range of +Array+ instance methods to a new class +Queue+: # # class Queue # extend Forwardable @@ -77,7 +76,7 @@ # def_delegators :@q, :clear, :first, :push, :shift, :size # end # -# q = Queue.new +# q = Thread::Queue.new # q.enq 1, 2, 3, 4, 5 # q.push 6 # @@ -111,7 +110,12 @@ # module Forwardable # Version of +forwardable.rb+ - FORWARDABLE_VERSION = "1.1.0" + VERSION = "1.4.0" + VERSION.freeze + + # Version for backward compatibility + FORWARDABLE_VERSION = VERSION + FORWARDABLE_VERSION.freeze @debug = nil class << self @@ -120,7 +124,8 @@ module Forwardable end # Takes a hash as its argument. The key is a symbol or an array of - # symbols. These symbols correspond to method names. The value is + # symbols. These symbols correspond to method names, instance variable + # names, or constant names (see def_delegator). The value is # the accessor to which the methods will be delegated. # # :call-seq: @@ -128,12 +133,13 @@ module Forwardable # delegate [method, method, ...] => accessor # def instance_delegate(hash) - hash.each{ |methods, accessor| - methods = [methods] unless methods.respond_to?(:each) - methods.each{ |method| - def_instance_delegator(accessor, method) - } - } + hash.each do |methods, accessor| + unless defined?(methods.each) + def_instance_delegator(accessor, methods) + else + methods.each {|method| def_instance_delegator(accessor, method)} + end + end end # @@ -148,18 +154,21 @@ module Forwardable # def_delegator :@records, :map # def def_instance_delegators(accessor, *methods) - methods.delete("__send__") - methods.delete("__id__") - for method in methods + methods.each do |method| + next if /\A__(?:send|id)__\z/ =~ method def_instance_delegator(accessor, method) end end # Define +method+ as delegator instance method with an optional # alias name +ali+. Method calls to +ali+ will be delegated to - # +accessor.method+. + # +accessor.method+. +accessor+ should be a method name, instance + # variable name, or constant name. Use the full path to the + # constant if providing the constant name. + # Returns the name of the method defined. # # class MyQueue + # CONST = 1 # extend Forwardable # attr_reader :queue # def initialize @@ -167,49 +176,61 @@ module Forwardable # end # # def_delegator :@queue, :push, :mypush + # def_delegator 'MyQueue::CONST', :to_i # end # # q = MyQueue.new # q.mypush 42 # q.queue #=> [42] # q.push 23 #=> NoMethodError + # q.to_i #=> 1 # def def_instance_delegator(accessor, method, ali = method) gen = Forwardable._delegator_method(self, accessor, method, ali) # If it's not a class or module, it's an instance - (Module === self ? self : singleton_class).module_eval(&gen) + mod = Module === self ? self : singleton_class + mod.module_eval(&gen) end alias delegate instance_delegate alias def_delegators def_instance_delegators alias def_delegator def_instance_delegator + # :nodoc: def self._delegator_method(obj, accessor, method, ali) accessor = accessor.to_s unless Symbol === accessor if Module === obj ? obj.method_defined?(accessor) || obj.private_method_defined?(accessor) : obj.respond_to?(accessor, true) - accessor = "#{accessor}()" + accessor = "(#{accessor}())" + end + + args = RUBY_VERSION >= '2.7' ? '...' : '*args, &block' + method_call = ".__send__(:#{method}, #{args})" + if method.match?(/\A[_a-zA-Z]\w*[?!]?\z/) + loc, = caller_locations(2,1) + pre = "_ =" + mesg = "#{Module === obj ? obj : obj.class}\##{ali} at #{loc.path}:#{loc.lineno} forwarding to private method " + method_call = <<~RUBY.chomp + if defined?(_.#{method}) + _.#{method}(#{args}) + else + ::Kernel.warn #{mesg.dump}"\#{_.class}"'##{method}', uplevel: 1 + _#{method_call} + end + RUBY end - line_no = __LINE__+1; str = "#{<<-"begin;"}\n#{<<-"end;"}" - begin; + eval(<<~RUBY, nil, __FILE__, __LINE__ + 1) proc do - def #{ali}(*args, &block) - begin - #{accessor} - end.__send__ :#{method}, *args, &block + def #{ali}(#{args}) + #{pre}#{accessor} + #{method_call} end end - end; - - RubyVM::InstructionSequence - .compile(str, __FILE__, __FILE__, line_no, - trace_instruction: false, - tailcall_optimization: true) - .eval + RUBY end end @@ -247,12 +268,13 @@ module SingleForwardable # delegate [method, method, ...] => accessor # def single_delegate(hash) - hash.each{ |methods, accessor| - methods = [methods] unless methods.respond_to?(:each) - methods.each{ |method| - def_single_delegator(accessor, method) - } - } + hash.each do |methods, accessor| + unless defined?(methods.each) + def_single_delegator(accessor, methods) + else + methods.each {|method| def_single_delegator(accessor, method)} + end + end end # @@ -267,9 +289,8 @@ module SingleForwardable # def_delegator :@records, :map # def def_single_delegators(accessor, *methods) - methods.delete("__send__") - methods.delete("__id__") - for method in methods + methods.each do |method| + next if /\A__(?:send|id)__\z/ =~ method def_single_delegator(accessor, method) end end @@ -280,6 +301,7 @@ module SingleForwardable # Defines a method _method_ which delegates to _accessor_ (i.e. it calls # the method of the same name in _accessor_). If _new_name_ is # provided, it is used as the name for the delegate method. + # Returns the name of the method defined. def def_single_delegator(accessor, method, ali = method) gen = Forwardable._delegator_method(self, accessor, method, ali) |