spicycode-rcov 0.8.1.5.7 → 0.8.2

data/lib/rcov/binding_of_caller.rb

@@ -0,0 +1,83 @@
+unless(defined?(Continuation) and Continuation.respond_to?('create'))
+  # to satisfy rdoc
+  class Continuation #:nodoc:
+  end
+  def Continuation.create(*args, &block) # :nodoc:
+    cc = nil; result = callcc {|c| cc = c; block.call(cc) if block and args.empty?}
+    result ||= args
+    return *[cc, *result]
+  end
+end
+
+class Binding; end # for RDoc
+# This method returns the binding of the method that called your
+# method. It will raise an Exception when you're not inside a method.
+#
+# It's used like this:
+#   def inc_counter(amount = 1)
+#     Binding.of_caller do |binding|
+#       # Create a lambda that will increase the variable 'counter'
+#       # in the caller of this method when called.
+#       inc = eval("lambda { |arg| counter += arg }", binding)
+#       # We can refer to amount from inside this block safely.
+#       inc.call(amount)
+#     end
+#     # No other statements can go here. Put them inside the block.
+#   end
+#   counter = 0
+#   2.times { inc_counter }
+#   counter # => 2
+#
+# Binding.of_caller must be the last statement in the method.
+# This means that you will have to put everything you want to
+# do after the call to Binding.of_caller into the block of it.
+# This should be no problem however, because Ruby has closures.
+# If you don't do this an Exception will be raised. Because of
+# the way that Binding.of_caller is implemented it has to be
+# done this way.
+def Binding.of_caller(&block)
+  old_critical = Thread.critical
+  Thread.critical = true
+  count = 0
+  cc, result, error, extra_data = Continuation.create(nil, nil)
+  error.call if error
+
+  tracer = lambda do |*args|
+    type, context, extra_data = args[0], args[4], args
+    if type == "return"
+      count += 1
+      # First this method and then calling one will return --
+      # the trace event of the second event gets the context
+      # of the method which called the method that called this
+      # method.
+      if count == 2
+        # It would be nice if we could restore the trace_func
+        # that was set before we swapped in our own one, but
+        # this is impossible without overloading set_trace_func
+        # in current Ruby.
+        set_trace_func(nil)
+        cc.call(eval("binding", context), nil, extra_data)
+      end
+    elsif type == "line" then
+      nil
+    elsif type == "c-return" and extra_data[3] == :set_trace_func then
+      nil
+    else
+      set_trace_func(nil)
+      error_msg = "Binding.of_caller used in non-method context or " +
+        "trailing statements of method using it aren't in the block."
+      cc.call(nil, lambda { raise(ArgumentError, error_msg) }, nil)
+    end
+  end
+
+  unless result
+    set_trace_func(tracer)
+    return nil
+  else
+    Thread.critical = old_critical
+    case block.arity
+      when 1 then yield(result)
+      else yield(result, extra_data)
+    end
+  end
+end

data/lib/rcov/report.rb

@@ -25,8 +25,6 @@ begin
 rescue LoadError
 end
 
-require 'rcov/rexml_extensions' # TODO it would be nice to move the below hacks into this rexml_extensions module
-
 if (RUBY_VERSION == "1.8.6" || RUBY_VERSION == "1.8.7") && defined? REXML::Formatters::Transitive
     class REXML::Document
         remove_method :write rescue nil
@@ -76,7 +74,6 @@ if (RUBY_VERSION == "1.8.6" || RUBY_VERSION == "1.8.7") && defined? REXML::Forma
             output << ' '*@level
         end
     end
-    
 end
 
 class Formatter # :nodoc:
@@ -88,11 +85,11 @@ class Formatter # :nodoc:
         /\btest\//,
         /\bvendor\//,
         /\A#{Regexp.escape(__FILE__)}\z/]
-        
+
     DEFAULT_OPTS = {:ignore => ignore_files, :sort => :name, :sort_reverse => false,
                     :output_threshold => 101, :dont_ignore => [],
                     :callsite_analyzer => nil, :comments_run_by_default => false}
-                    
+
     def initialize(opts = {})
         options = DEFAULT_OPTS.clone.update(opts)
         @files = {}
@@ -538,7 +535,7 @@ class HTMLCoverage < Formatter # :nodoc:
     require 'fileutils'
     JAVASCRIPT_PROLOG = <<-EOS
 
-// <![CDATA[
+// \<![CDATA[
   function toggleCode( id ) {
     if ( document.getElementById )
       elem = document.getElementById( id );
@@ -559,7 +556,7 @@ class HTMLCoverage < Formatter # :nodoc:
   }
 
   // Make cross-references hidden by default
-  document.writeln( "<style type=\\"text/css\\">span.cross-ref { display: none }</style>" )
+  document.writeln( "\<style type=\\"text/css\\">span.cross-ref { display: none }</style>" )
   // ]]>
     EOS
 
@@ -721,7 +718,7 @@ EOS
       return if @files.empty?
       FileUtils.mkdir_p @dest
       create_index(File.join(@dest, "index.html"))
-      
+
       each_file_pair_sorted do |filename, fileinfo|
         create_file(File.join(@dest, mangle_filename(filename)), fileinfo)
       end
@@ -816,29 +813,29 @@ EOS
     end
 
     class SummaryFileInfo  # :nodoc:
-        
+
       def initialize(obj)
-        @o = obj 
+        @o = obj
       end
-      
+
       def num_lines
         @o.num_lines
       end
-      
+
       def num_code_lines
         @o.num_code_lines
       end
-      
+
       def code_coverage
         @o.code_coverage
       end
-      
+
       def total_coverage
         @o.total_coverage
       end
-      
+
       def name
-        "TOTAL" 
+        "TOTAL"
       end
 
     end
@@ -886,7 +883,11 @@ EOS
                 end
             }
         } }
-        lines = output.pretty.to_a
+        if String.new.respond_to?(:lines) then
+          lines = output.pretty.lines.to_a
+        else
+          lines = output.pretty.to_a
+        end
         lines.unshift lines.pop if /DOCTYPE/ =~ lines[-1]
         File.open(destname, "w") do |f|
             f.puts lines
@@ -1038,7 +1039,11 @@ EOS
             }
         } }
         # .pretty needed to make sure DOCTYPE is in a separate line
-        lines = output.pretty.to_a
+        if String.new.respond_to?(:lines)
+          lines = output.pretty.lines.to_a
+        else
+          lines = output.pretty.to_a
+        end
         lines.unshift lines.pop if /DOCTYPE/ =~ lines[-1]
         File.open(destfile, "w") do |f|
             f.puts lines
@@ -1153,7 +1158,7 @@ class HTMLProfiling < HTMLCoverage # :nodoc:
             nil
         end
     end
-    
+
 end
 
 class RubyAnnotation < Formatter # :nodoc:

data/lib/rcov/rexml_extensions.rb

@@ -0,0 +1,44 @@
+require 'rexml/document'
+require 'rexml/formatters/pretty'
+
+module Rcov
+  module REXMLExtensions
+  
+    def self.fix_pretty_formatter_wrap
+      REXML::Formatters::Pretty.class_eval do
+        include PrettyFormatterWrapFix
+      end
+    end
+
+    # Fix for this bug: http://clint-hill.com/2008/10/02/a-bug-in-ruby-did-i-just-find-that/
+    # Also known from this fun exception:
+    #
+    #    /usr/local/ruby/lib/ruby/1.8/rexml/formatters/pretty.rb:131:in
+    #    `[]': no implicit conversion from nil to integer (TypeError)
+    #
+    # This bug was fixed in Ruby with this changeset http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19487
+    # ...which should mean that this bug only affects Ruby 1.8.6.  The latest stable version of 1.8.7 (and up) should be fine.
+    module PrettyFormatterWrapFix
+
+      def self.included(base)
+        base.class_eval do
+          def wrap(string, width)
+            # Recursively wrap string at width.
+            return string if string.length <= width
+            place = string.rindex(' ', width) # Position in string with last ' ' before cutoff
+            return string if place.nil?
+            return string[0,place] + "\n" + wrap(string[place+1..-1], width)
+          end
+        end
+      end
+    
+    end
+  
+    def self.init!
+      if RUBY_VERSION == "1.8.6"
+        fix_pretty_formatter_wrap
+      end
+    end
+  end
+  
+end

data/lib/rcov/version.rb

@@ -4,8 +4,8 @@
 
 module Rcov
 
-VERSION = "0.8.1.5.6"
-RELEASE_DATE = "2008-10-29"
+VERSION = "0.8.1.5.7"
+RELEASE_DATE = "2009-03-17"
 RCOVRT_ABI = [2,0,0]
 UPSTREAM_URL = "http://github.com/spicycode/rcov"
 

data/lib/rcov/xx.rb

@@ -1,7 +1,7 @@
 # xx can be redistributed and used under the following conditions
 # (just keep the following copyright notice, list of conditions and disclaimer
 # in order to satisfy rcov's "Ruby license" and xx's license simultaneously).
-# 
+#
 #ePark Labs Public License version 1
 #Copyright (c) 2005, ePark Labs, Inc. and contributors
 #All rights reserved.
@@ -29,14 +29,19 @@
 #(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 #SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-unless defined? $__xx_rb__
+unless(defined?($__xx_rb__) or defined?(XX))
 
 require "rexml/document"
 
-
 module XX
 #--{{{
-  VERSION = "0.1.0"
+  VERSION = "2.1.0"
+  def self.version() VERSION end
+
+  LIBDIR = File.dirname(File.expand_path(__FILE__)) << File::SEPARATOR
+  def self.libdir() LIBDIR end
+
+  require libdir + "binding_of_caller"
 
   %w(
     CRAZY_LIKE_A_HELL
@@ -50,11 +55,13 @@ module XX
     attr "doc"
     attr "stack"
     attr "size"
+    attr_accessor "xmldecl"
 
     def initialize *a, &b
 #--{{{
-      @doc = ::REXML::Document::new(*a, &b)
+      @doc = ::REXML::Document::new *a, &b
       @stack = [@doc]
+      @xmldecl = nil
       @size = 0
 #--}}}
     end
@@ -82,17 +89,23 @@ module XX
     end
     def to_str port = ""
 #--{{{
-      @doc.write port, indent=-1, transitive=false, ie_hack=true
-      port
+      xmldecl ? ugly(port) : pretty(port)
 #--}}}
     end
     alias_method "to_s", "to_str"
-    def pretty port = '' 
+    def pretty port = ""
 #--{{{
-      @doc.write port, indent=2, transitive=false, ie_hack=true
+      @doc.write port, indent=0, transitive=false, ie_hack=true
       port
 #--}}}
     end
+    def ugly port = ''
+#--{{{
+      @doc.write port, indent=-1, transitive=false, ie_hack=true
+      port
+#--}}}
+    end
+    alias_method "compact", "ugly"
     def create element
 #--{{{
       push element
@@ -174,7 +187,7 @@ module XX
                   x.to_s
               end
 
-          else # other - try anyhow 
+          else # other - try anyhow
             t <<
               case x
                 when ::REXML::Document
@@ -204,67 +217,34 @@ module XX
 
     module InstanceMethods
 #--{{{
-      def method_missing m, *a, &b
+      def _ tag_name, *a, &b
 #--{{{
-        m = m.to_s
+        hashes, nothashes = a.partition{|x| Hash === x}
 
-        tag_method, tag_name = xx_class::xx_tag_method_name m
-
-        c_method_missing = xx_class::xx_config_for "method_missing", xx_which
-        c_tags = xx_class::xx_config_for "tags", xx_which
-
-        pat =
-          case c_method_missing
-            when ::XX::CRAZY_LIKE_A_HELL
-              %r/.*/
-            when ::XX::PERMISSIVE
-              %r/_$/o
-            when ::XX::STRICT
-              %r/_$/o
-            else
-              super(m.to_sym, *a, &b)
-          end
-
-        super(m.to_sym, *a, &b) unless m =~ pat
-
-        if c_method_missing == ::XX::STRICT
-          super(m.to_sym, *a, &b) unless c_tags.include? tag_name
-        end
-
-        ret, defined = nil
+        doc = xx_doc
+        element = ::REXML::Element::new "#{ tag_name }"
 
-        begin
-          xx_class::xx_define_tmp_method tag_method
-          xx_class::xx_define_tag_method tag_method, tag_name
-          ret = send tag_method, *a, &b
-          defined = true
-        ensure
-          xx_class::xx_remove_tag_method tag_method unless defined
-        end
+        hashes.each{|h| h.each{|k,v| element.add_attribute k.to_s, v}}
+        nothashes.each{|nh| element << ::REXML::Text::new(nh.to_s)}
 
-        ret
+        doc.create element, &b
 #--}}}
       end
-      def xx_tag_ tag_name, *a, &b
+      alias_method "xx_tag" , "_"
+      alias_method "__"      , "_"
+      alias_method "g__"      , "_"
+      def method_missing m, *a, &b
 #--{{{
-        tag_method, tag_name = xx_class::xx_tag_method_name tag_name 
+        m = m.to_s
 
-        ret, defined = nil
+        tag_name = m.sub! %r/_+$/, ''
 
-        begin
-          xx_class::xx_define_tmp_method tag_method
-          xx_class::xx_define_tag_method tag_method, tag_name
-          ret = send tag_method, *a, &b
-          defined = true
-        ensure
-          xx_class::xx_remove_tag_method tag_method unless defined
-        end
+        super unless tag_name
 
-        ret
+        __ tag_name, *a, &b
 #--}}}
       end
-      alias_method "g_", "xx_tag_"
-      def xx_which *argv 
+      def xx_which *argv
 #--{{{
         @xx_which = nil unless defined? @xx_which
         if argv.empty?
@@ -272,7 +252,7 @@ module XX
         else
           xx_which = @xx_which
           begin
-            @xx_which = argv.shift 
+            @xx_which = argv.shift
             return yield
           ensure
             @xx_which = xx_which
@@ -283,16 +263,15 @@ module XX
       def xx_with_doc_in_effect *a, &b
 #--{{{
         @xx_docs ||= []
-        doc = ::XX::Document::new(*a)
+        doc = ::XX::Document::new *a
         ddoc = doc.doc
         begin
           @xx_docs.push doc
-          b.call doc if b
 
           doctype = xx_config_for "doctype", xx_which
           if doctype
             unless ddoc.doctype
-              doctype = ::REXML::DocType::new doctype unless 
+              doctype = ::REXML::DocType::new doctype unless
                 ::REXML::DocType === doctype
               ddoc << doctype
             end
@@ -304,9 +283,12 @@ module XX
               xmldecl = ::REXML::XMLDecl::new xmldecl unless
                 ::REXML::XMLDecl === xmldecl
               ddoc << xmldecl
+              doc.xmldecl = ::REXML::XMLDecl
             end
           end
 
+          b.call doc if b
+
           return doc
         ensure
           @xx_docs.pop
@@ -323,26 +305,26 @@ module XX
         doc = xx_doc
 
         text =
-          ::REXML::Text::new("", 
+          ::REXML::Text::new("",
             respect_whitespace=true, parent=nil
           )
 
-        objects.each do |object| 
+        objects.each do |object|
           text << object.to_s if object
         end
 
         doc.create text, &b
 #--}}}
       end
-      alias_method "text_", "xx_text_"
-      alias_method "t_", "xx_text_"
+      alias_method "t__", "xx_text_"
+      alias_method "text__", "xx_text_"
       def xx_markup_ *objects, &b
 #--{{{
         doc = xx_doc
 
         doc2 = ::REXML::Document::new ""
 
-        objects.each do |object| 
+        objects.each do |object|
           (doc2.root ? doc2.root : doc2) << ::REXML::Document::new(object.to_s)
         end
 
@@ -353,41 +335,43 @@ module XX
         ret
 #--}}}
       end
-      alias_method "x_", "xx_markup_"
+      alias_method "x__", "xx_markup_"
+      alias_method "markup__", "xx_markup_"
       def xx_any_ *objects, &b
 #--{{{
         doc = xx_doc
         nothing = %r/.^/m
 
         text =
-          ::REXML::Text::new("", 
+          ::REXML::Text::new("",
             respect_whitespace=true, parent=nil, raw=true, entity_filter=nil, illegal=nothing
           )
 
-        objects.each do |object| 
+        objects.each do |object|
           text << object.to_s if object
         end
 
         doc.create text, &b
 #--}}}
       end
-      alias_method "h_", "xx_any_"
-      remove_method "x_" if instance_methods.include? "x_"
-      alias_method "x_", "xx_any_" # supplant for now
+      alias_method "any__", "xx_any_"
+      alias_method "h__", "xx_any_"
+      alias_method "x__", "xx_any_" # supplant for now
       def xx_cdata_ *objects, &b
 #--{{{
         doc = xx_doc
 
         cdata = ::REXML::CData::new ""
 
-        objects.each do |object| 
+        objects.each do |object|
           cdata << object.to_s if object
         end
 
         doc.create cdata, &b
 #--}}}
       end
-      alias_method "c_", "xx_cdata_"
+      alias_method "cdata__", "xx_cdata_"
+      alias_method "c__", "xx_cdata_"
       def xx_parse_attributes string
 #--{{{
         string = string.to_s
@@ -396,7 +380,7 @@ module XX
         xx_parse_yaml_attributes(tokens.join(','))
 #--}}}
       end
-      alias_method "att_", "xx_parse_attributes"
+      alias_method "a__", "xx_parse_attributes"
       def xx_parse_yaml_attributes string
 #--{{{
         require "yaml"
@@ -408,31 +392,30 @@ module XX
         obj
 #--}}}
       end
-      alias_method "at_", "xx_parse_yaml_attributes"
-      alias_method "yat_", "xx_parse_yaml_attributes"
+      alias_method "y__", "xx_parse_yaml_attributes"
       def xx_class
 #--{{{
         @xx_class ||= self.class
 #--}}}
       end
-      def xx_tag_method_name *a, &b 
+      def xx_tag_method_name *a, &b
 #--{{{
-        xx_class.xx_tag_method_name(*a, &b)
+        xx_class.xx_tag_method_name *a, &b
 #--}}}
       end
-      def xx_define_tmp_method *a, &b 
+      def xx_define_tmp_method *a, &b
 #--{{{
-        xx_class.xx_define_tmp_methodr(*a, &b)
+        xx_class.xx_define_tmp_method *a, &b
 #--}}}
       end
-      def xx_define_tag_method *a, &b 
+      def xx_define_tag_method *a, &b
 #--{{{
-        xx_class.xx_define_tag_method(*a, &b)
+        xx_class.xx_define_tag_method *a, &b
 #--}}}
       end
-      def xx_remove_tag_method *a, &b 
+      def xx_remove_tag_method *a, &b
 #--{{{
-        xx_class.xx_tag_remove_method(*a, &b)
+        xx_class.xx_tag_remove_method *a, &b
 #--}}}
       end
       def xx_ancestors
@@ -448,12 +431,12 @@ module XX
       end
       def xx_config_for *a, &b
 #--{{{
-        xx_class.xx_config_for(*a, &b)
+        xx_class.xx_config_for *a, &b
 #--}}}
       end
       def xx_configure *a, &b
 #--{{{
-        xx_class.xx_configure(*a, &b)
+        xx_class.xx_configure *a, &b
 #--}}}
       end
 #--}}}
@@ -468,7 +451,7 @@ module XX
         [ tag_method, tag_name ]
 #--}}}
       end
-      def xx_define_tmp_method m 
+      def xx_define_tmp_method m
 #--{{{
         define_method(m){ raise NotImplementedError, m.to_s }
 #--}}}
@@ -476,10 +459,9 @@ module XX
       def xx_define_tag_method tag_method, tag_name = nil
 #--{{{
         tag_method = tag_method.to_s
-        tag_name ||= tag_method.gsub %r/_+$/, ""
+        tag_name ||= tag_method.sub(%r/_$/, '')
 
-        remove_method tag_method if instance_methods.include? tag_method
-        module_eval <<-code, __FILE__, __LINE__+1
+        module_eval <<-code
           def #{ tag_method } *a, &b
             hashes, nothashes = a.partition{|x| Hash === x}
 
@@ -517,9 +499,9 @@ module XX
         @@xx_config ||= Hash::new{|h,k| h[k] = {}}
 #--}}}
       end
-      def xx_config_for key, xx_which = nil 
+      def xx_config_for key, xx_which = nil
 #--{{{
-        key = key.to_s 
+        key = key.to_s
         xx_which ||= self
         xx_ancestors(xx_which).each do |a|
           if xx_config[a].has_key? key
@@ -529,7 +511,7 @@ module XX
         nil
 #--}}}
       end
-      def xx_configure key, value, xx_which = nil 
+      def xx_configure key, value, xx_which = nil
 #--{{{
         key = key.to_s
         xx_which ||= self
@@ -572,10 +554,10 @@ module XX
     def xhtml_ which = XHTML, *a, &b
 #--{{{
       xx_which(which) do
-        doc = xx_with_doc_in_effect(*a, &b)
+        doc = xx_with_doc_in_effect *a, &b
         ddoc = doc.doc
         root = ddoc.root
-        if root and root.name and root.name =~ %r/^html$/i 
+        if root and root.name and root.name =~ %r/^html$/i
           if root.attribute("lang",nil).nil? or root.attribute("lang",nil).to_s.empty?
             root.add_attribute "lang", "en"
           end
@@ -590,6 +572,7 @@ module XX
       end
 #--}}}
     end
+    alias_method "xhtml__", "xhtml_"
 
     module Strict
 #--{{{
@@ -611,6 +594,7 @@ module XX
         super(which, *a, &b)
 #--}}}
       end
+      alias_method "xhtml__", "xhtml_"
 #--}}}
     end
 
@@ -623,6 +607,7 @@ module XX
         super(which, *a, &b)
 #--}}}
       end
+      alias_method "xhtml__", "xhtml_"
 #--}}}
     end
 #--}}}
@@ -632,12 +617,13 @@ module XX
 #--{{{
     include Markup
     xx_configure "doctype", %(html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN")
- 
+
     def html4_ which = HTML4, *a, &b
 #--{{{
-      xx_which(which){ xx_with_doc_in_effect(*a, &b) }
+      xx_which(which){ xx_with_doc_in_effect *a, &b }
 #--}}}
     end
+    alias_method "html4__", "html4_"
 
     module Strict
 #--{{{
@@ -658,6 +644,7 @@ module XX
         super(which, *a, &b)
 #--}}}
       end
+      alias_method "html4__", "html4_"
 #--}}}
     end
 
@@ -670,6 +657,7 @@ module XX
         super(which, *a, &b)
 #--}}}
       end
+      alias_method "html4__", "html4_"
 #--}}}
     end
 #--}}}
@@ -683,11 +671,218 @@ module XX
 
     def xml_ *a, &b
 #--{{{
-      xx_which(XML){ xx_with_doc_in_effect(*a, &b)}
+      xx_which(XML){ xx_with_doc_in_effect *a, &b }
 #--}}}
     end
+    alias_method "xml__", "xml_"
 #--}}}
   end
+
+  module Template
+#--{{{
+    class Basic
+#--{{{
+      %w( path inline type object template port pretty ).each{|a| attr_accessor a}
+      def initialize opts = {}, &b
+#--{{{
+        @path = opts['path'] || opts[:path]
+        @inline = opts['inline'] || opts[:inline]
+        @type = opts['type'] || opts[:type]
+        @object = opts['object'] || opts[:object]
+        @pretty = opts['pretty'] || opts[:pretty]
+        @port = opts['port'] || opts[:port] || STDOUT
+
+        bool = lambda{|value| value ? true : false}
+        raise ArgumentError unless(bool[@path] ^ bool[@inline])
+
+        path_init(&b) if @path
+        inline_init(&b) if @inline
+
+        @type =
+          case @type.to_s.downcase.strip
+            when /^xhtml$/
+              XHTML
+            when /^xml$/
+              XML
+            when /^html4$/
+              HTML4
+            else
+              XHTML
+          end
+#--}}}
+      end
+      def path_init &b
+#--{{{
+        @template = IO.read @path
+        @type = @path[%r/\.[^\.]+$/o] || XHTML unless @type
+#--}}}
+      end
+      def inline_init &b
+#--{{{
+        @template = (@inline || b.call).to_s
+        @type ||= XHTML
+#--}}}
+      end
+      def expand binding, opts = {}
+#--{{{
+        port = opts['port'] || opts[:port] || STDOUT
+        pretty = opts['pretty'] || opts[:pretty]
+
+        object = eval 'self', binding
+
+        unless type === object
+          __m = type
+          klass = object.class
+          klass.module_eval{ include __m }
+        end
+
+        doc = eval @template, binding
+
+        display = pretty ? 'pretty' : 'to_str'
+
+        doc.send display, port
+#--}}}
+      end
+      alias_method "result", "expand"
+#--}}}
+    end
+
+    class File < Basic
+#--{{{
+      def initialize *argv, &b
+#--{{{
+        opts, argv = argv.partition{|arg| Hash === arg}
+        opts = opts.inject{|a,b| a.update b}
+        path = argv.shift
+        raise ArgumentError, "no path" unless path
+        raise ArgumentError, "bad opts" unless Hash === opts or opts.nil?
+        opts ||= {}
+        opts['path'] = opts[:path] = path.to_s
+        super opts, &b
+#--}}}
+      end
+#--}}}
+    end
+
+    class Inline < Basic
+#--{{{
+      def initialize *argv, &b
+#--{{{
+        opts, argv = argv.partition{|arg| Hash === arg}
+        opts = opts.inject{|a,b| a.update b}
+        inline = argv.shift || b.call
+        raise ArgumentError, "no inline" unless inline
+        raise ArgumentError, "bad opts" unless Hash === opts or opts.nil?
+        opts ||= {}
+        opts['inline'] = opts[:inline] = inline.to_s
+        super opts, &b
+#--}}}
+      end
+#--}}}
+    end
+#--}}}
+  end
+
+  module Expandable
+#--{{{
+    module InstanceMethods
+#--{{{
+      def xx_template_file *a, &b
+#--{{{
+        template = XX::Template::File.new *a, &b
+        template.object ||= self
+        template
+#--}}}
+      end
+      def xx_template_inline *a, &b
+#--{{{
+        template = XX::Template::Inline.new *a, &b
+        template.object ||= self
+        template
+#--}}}
+      end
+      def xx_expand template, opts = {}
+#--{{{
+        port = opts['port'] || opts[:port] || STDOUT
+        pretty = opts['pretty'] || opts[:pretty]
+        binding = opts['binding'] || opts[:binding]
+
+        type = template.type
+
+        unless type === self
+          klass = self.class
+          klass.module_eval{ include type }
+        end
+
+        display = pretty ? 'pretty' : 'to_str'
+
+        Binding.of_caller do |scope|
+          binding ||= eval('binding', scope)
+          doc = eval template.template, binding
+          doc.send display, port
+        end
+#--}}}
+      end
+      def xx_expand_file *a, &b
+#--{{{
+        template = xx_template_file *a, &b
+
+        type = template.type
+        pretty = template.pretty
+        port = template.port
+
+        unless type === self
+          klass = self.class
+          klass.module_eval{ include type }
+        end
+
+        display = pretty ? 'pretty' : 'to_str'
+
+        Binding.of_caller do |scope|
+          binding ||= eval('binding', scope)
+          doc = eval template.template, binding
+          doc.send display, port
+        end
+#--}}}
+      end
+      alias_method "xx_expand_path", "xx_expand_file"
+      alias_method "xx_expand_template", "xx_expand_file"
+      def xx_expand_inline *a, &b
+#--{{{
+        template = xx_template_inline *a, &b
+
+        type = template.type
+        pretty = template.pretty
+        port = template.port
+
+        unless type === self
+          klass = self.class
+          klass.module_eval{ include type }
+        end
+
+        display = pretty ? 'pretty' : 'to_str'
+
+        Binding.of_caller do |scope|
+          binding ||= eval('binding', scope)
+          doc = eval template.template, binding
+          doc.send display, port
+        end
+#--}}}
+      end
+      alias_method "xx_expand_string", "xx_expand_inline"
+#--}}}
+    end
+    module ClassMethods
+    end
+    def self.included other
+#--{{{
+      other.instance_eval{ include InstanceMethods }
+      other.extend ClassMethods
+#--}}}
+    end
+#--}}}
+  end
+
 #--}}}
 end
 
@@ -714,7 +909,7 @@ if __FILE__ == $0
     include XX::HTML4::Strict
     include XX::XML
 
-    def doc 
+    def doc
       html_{
         head_{ title_{ "xhtml/html4/xml demo" } }
 
@@ -726,7 +921,7 @@ if __FILE__ == $0
 
         x_{ "<any_valid> xml </any_valid>" }
 
-        div_(:style => :sweet){ 
+        div_(:style => :sweet){
           em_ "this is a table"
 
           table_(:width => 42, :height => 42){
@@ -749,7 +944,7 @@ if __FILE__ == $0
   end
 
   table = Table[ %w( 0 1 2 ), %w( a b c ) ]
-  
+
   methods = %w( to_xhtml to_html4 to_xml )
 
   methods.each do |method|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spicycode-rcov
 version: !ruby/object:Gem::Version 
-  version: 0.8.1.5.7
+  version: 0.8.2
 platform: ruby
 authors: 
 - Mauricio Fernandez
@@ -33,7 +33,9 @@ files:
 - lib/rcov/version.rb
 - lib/rcov/rant.rb
 - lib/rcov/report.rb
+- lib/rcov/binding_of_caller.rb
 - lib/rcov/rcovtask.rb
+- lib/rcov/rexml_extensions.rb
 - ext/rcovrt/extconf.rb
 - ext/rcovrt/1.8/rcovrt.c
 - ext/rcovrt/1.9/rcovrt.c