ruby-vpi 16.0.1 → 17.0.0

data/doc/lib/erb_proxy.rb

@@ -2,6 +2,7 @@
 # Copyright 2006 Suraj N. Kurapati
 # See the file named LICENSE for details.
 
+$: << File.basename(__FILE__)
 require 'erb_content'
 
 class ErbProxy
@@ -11,32 +12,31 @@ class ErbProxy
     @handlers = {}
   end
 
-  # Adds a new handler that can be invoked from a ERB template. The arguments
-  # passed to the handler are:
+  # Adds a new handler that can be invoked from a ERB
+  # template.  The arguments passed to the handler are:
   #
-  # 1. buffer containing the evaluated results of the ERB template thus far
+  # 1. unique identifier for the calling location in the ERB template
   #
-  # 2. content that was passed to the handler from the ERB template
+  # 2. buffer containing the evaluated results of the ERB template thus far
   #
-  # 3. variable number of method arguments passed from the ERB template
+  # 3. content that was passed to the handler from the ERB template
   #
-  def add_handler aName, &aHandler # :yields: buffer, content, *args
+  # 4. variable number of method arguments passed from the ERB template
+  #
+  def add_handler aName, &aHandler # :yields: caller, buffer, content, *args
     @handlers[aName] = aHandler
 
-    # XXX: define_method does not accept a block until Ruby 1.9
+    # XXX: using a string because define_method
+    #      does not accept a block until Ruby 1.9
     instance_eval %{
       def #{aName} *args, &block
-        raise ArgumentError unless block_given?
-
-        args.unshift(*ERB.buffer_and_content(&block))
-        @handlers[#{aName.inspect}].call(*args)
+        if block_given?
+          args = ERB.buffer_and_content(&block).concat(args)
+        else
+          args.unshift '', ''
+        end
+        @handlers[#{aName.inspect}].call(Kernel.caller.first, *args)
       end
     }
   end
-
-  # Evaluates the given ERB template. Used to dynamically include one template
-  # within another.
-  def import aErbFile
-    ERB.new(File.read(aErbFile)).result
-  end
 end