rcov 0.8.1.1.0 → 0.8.1.2.0

data/CHANGES

@@ -1,6 +1,15 @@
 
 User-visible changes.
 
+Since 0.8.1.1 (2007-11-20)
+==========================
+Bugfixes
+--------
+* REXML from 1.8.6-p11[01] is more broken than anticipated; more invasive
+  workarounds. Tested on 1.8.6-p110 and 1.8.5. Note that code using REXML to
+  generate XML will behave differently under rcov in 1.8.6-p11[01] (to begin
+  with, it won't crash in REXML::Document#write).
+
 Since 0.8.1 (2007-11-19)
 ========================
 Bugfixes

data/THANKS

@@ -91,3 +91,6 @@ Kosmas Schütz, Daniel Berger, François Beausoleil, Bil Kleb:
 
 Chad Humphries:
 * indicated that Spec::DSL::Example has changed in RSpec trunk
+
+Jeremy Hinegardner:
+* more info about REXML's bugs in 1.8.6-p11[01]

data/lib/rcov/report.rb

@@ -4,27 +4,63 @@
 require 'pathname'
 module Rcov
 
-# Try to fix bug in the REXML shipped with Ruby 1.8.6
-# This affects Mac OSX 10.5.1 users and motivates endless bug reports.
-if RUBY_VERSION == "1.8.6" && defined? REXML::Formatters::Transitive &&
-   RUBY_RELEASE_DATE < "2007-11-04"
+# Try to fix bugs in the REXML shipped with Ruby 1.8.6
+# They affect Mac OSX 10.5.1 users and motivates endless bug reports.
+begin 
+    require 'rexml/formatters/transitive'
+    require 'rexml/formatter/pretty'
+rescue LoadError
+end
+
+if RUBY_VERSION == "1.8.6" && defined? REXML::Formatters::Transitive
     class REXML::Document
+        remove_method :write rescue nil
         def write( output=$stdout, indent=-1, trans=false, ie_hack=false )
             if xml_decl.encoding != "UTF-8" && !output.kind_of?(Output)
                 output = Output.new( output, xml_decl.encoding )
             end
             formatter = if indent > -1
-                if trans
-                    REXML::Formatters::Transitive.new( indent, ie_hack )
-                else
-                    REXML::Formatters::Pretty.new( indent, ie_hack )
-                end
+                #if trans
+                    REXML::Formatters::Transitive.new( indent )
+                #else
+                #    REXML::Formatters::Pretty.new( indent, ie_hack )
+                #end
             else
                 REXML::Formatters::Default.new( ie_hack )
             end
             formatter.write( self, output )
         end
     end
+
+    class REXML::Formatters::Transitive
+        remove_method :write_element rescue nil
+        def write_element( node, output )
+            output << "<#{node.expanded_name}"
+
+            node.attributes.each_attribute do |attr|
+                output << " "
+                attr.write( output )
+            end unless node.attributes.empty?
+
+            if node.children.empty?
+                output << "/>" 
+            else
+                output << ">"
+                # If compact and all children are text, and if the formatted output
+                # is less than the specified width, then try to print everything on
+                # one line
+                skip = false
+                @level += @indentation
+                node.children.each { |child|
+                    write( child, output )
+                }
+                @level -= @indentation
+                output << "</#{node.expanded_name}>"
+            end
+            output << "\n"
+            output << ' '*@level
+        end
+    end
 end
 
 class Formatter # :nodoc:

data/lib/rcov/version.rb

@@ -4,8 +4,8 @@
 
 module Rcov
 
-VERSION = "0.8.1.1"
-RELEASE_DATE = "2007-11-20"
+VERSION = "0.8.1.2"
+RELEASE_DATE = "2007-11-22"
 RCOVRT_ABI = [2,0,0]
 UPSTREAM_URL = "http://eigenclass.org/hiki/rcov"
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.1
 specification_version: 1
 name: rcov
 version: !ruby/object:Gem::Version 
-  version: 0.8.1.1.0
-date: 2007-11-20 00:00:00 +01:00
+  version: 0.8.1.2.0
+date: 2007-11-22 00:00:00 +01:00
 summary: Code coverage analysis tool for Ruby
 require_paths: 
 - lib