artemv-diff_to_html 1.0.0

data/diff_to_html.rb

@@ -0,0 +1,162 @@
+require 'cgi'
+
+class DiffToHtml
+
+  attr_accessor :file_prefix
+  
+  #
+  # globals
+  #
+
+  def ln_cell(ln, side = nil)
+    anchor = "f#{@filenum}#{side}#{ln}"
+    result = "<td class = 'ln'>"
+    result += "<a name='#{anchor}' href='##{anchor}'>" if ln
+    result += "#{ln}"
+    result += "</a>" if ln
+    result += "</td>"
+    result
+  end
+  #
+  # helper for building the next row in the diff
+  #
+
+  def get_diff_row(left_ln, right_ln)
+    result = []
+    if @left.length > 0 or @right.length > 0
+      modified = (@last_op != ' ')
+      if modified
+        left_class = " class='r'"
+        right_class = " class='a'"
+        result << "<tbody class='mod'>"
+      else
+        left_class = right_class = ''
+      end
+      result << @left.map do |line| 
+        x = "<tr#{left_class}>#{ln_cell(left_ln, 'l')}"
+        if modified
+          x += ln_cell(nil)
+        else
+          x += ln_cell(right_ln, 'r')
+          right_ln += 1
+        end
+        x += "<td>#{line}</td></tr>"
+        left_ln += 1
+        x
+      end
+      if modified
+        result << @right.map do |line| 
+          x = "<tr#{right_class}>#{ln_cell(nil)}#{ln_cell(right_ln, 'r')}<td>#{line}</td></tr>"
+          right_ln += 1
+          x
+        end
+        result << "</tbody>"
+      end
+    end
+    return result.join("\n"), left_ln, right_ln
+  end
+
+  #
+  # build the diff
+  #
+
+  def range_row(range)
+    "<tr class='range'><td>...</td<td>...</td><td>#{range}</td></tr>"
+  end
+
+  def range_info(range)
+    range.match(/^@@ \-(\d+),\d+ \+(\d+),\d+ @@/)
+    left_ln = Integer($1)
+    right_ln = Integer($2)
+    return left_ln, right_ln
+  end
+
+  def begin_file(file)
+    @filenum ||=0
+    result = <<EOF 
+<li><h2><a name="F#{@filenum}" href="#F#{@filenum}">#{@file_prefix}#{file}</a></h2><table class='diff'>
+<colgroup>
+<col class="lineno"/>
+<col class="lineno"/>
+<col class="content"/>
+</colgroup>
+EOF
+  @filenum += 1
+  result
+  end
+  
+  def flush_changes(result, left_ln, right_ln)
+    x, left_ln, right_ln = get_diff_row(left_ln, right_ln)
+    result << x
+    @left.clear
+    @right.clear    
+    return left_ln, right_ln
+  end
+  
+  def get_diff(diff_file)
+    @last_op = ' '
+    @left = []
+    @right = []
+  
+    result = ""
+
+    diff = diff_file.split("\n")
+    
+    index = diff.shift
+    file = index[7..-1]
+    diff.shift #equals
+    header1 = diff.shift
+    if header1 =~ /^---/
+      diff.shift
+      
+      result << "<ul class='diff'>#{begin_file(file)}"
+      range = diff.shift
+      left_ln, right_ln = range_info(range)
+      result << range_row(range)
+      
+      skip = 0
+      diff.each do |line|
+        if skip > 0
+          skip -= 1
+        else
+          op = line[0,1]
+          line = line[1..-1]
+          
+          if ((@last_op != ' ' and op == ' ') or (@last_op == ' ' and op != ' '))
+            flush_changes(result, left_ln, right_ln)
+          end
+          
+          # truncate and escape
+          line = CGI.escapeHTML(line)
+
+          case op
+          when ' '
+            @left.push(line)
+            @right.push(line)
+          when '-' then @left.push(line)
+          when '+' then @right.push(line)
+          when '@' 
+            range = '@' + line
+            flush_changes(result, left_ln, right_ln)
+            left_ln, right_ln = range_info(range)
+            result << range_row(range)
+          when 'I'
+            file = line[6..-1]
+            flush_changes(result, left_ln, right_ln)
+            result << "</table></li>#{begin_file(file)}"
+            skip = 3
+          end
+          @last_op = op
+        end
+      end
+
+      flush_changes(result, left_ln, right_ln)
+      result << "</table></li></ul>"      
+    else
+      result = "<div class='error'>#{header1}</div>"
+    end
+
+    result
+  end
+
+end

data/examples/diff.css

@@ -0,0 +1,68 @@
+ul.diff {
+  padding:0;
+}
+
+.diff table col.lineno {
+  width:4em;
+}
+
+.diff h2, .diff h2 a {
+  color:#333333;
+  font-size:14px;
+  letter-spacing:normal;
+  margin:0pt auto;
+}
+
+.diff h2 {
+  padding:0.1em 0pt 0.25em 0.5em;
+}
+
+table.diff {
+  font-size : 9pt;
+  font-family : "lucida console", "courier new", monospace;
+  white-space : pre;
+  border : 1px solid #D7D7D7;
+  border-collapse : collapse;
+  line-height : 110%;
+  width: 100%;  
+}  
+
+.diff tr {
+  background: white;
+}
+
+.diff td {
+  border : none;
+  padding : 0px 10px;
+  margin : 0px;
+}
+
+.diff td a {
+  text-decoration: none;
+}
+
+tr.a { background : #ddffdd; }
+
+tr.r { background : #ffdddd; }
+
+tr.range { background : #EAF2F5; color : #999; }
+
+td.ln {
+  background : #ECECEC; 
+  color : #aaa;
+  border-top:1px solid #999988;
+  border-bottom:1px solid #999988;
+  border-right:1px solid #D7D7D7;
+}
+
+.diff li {
+  background:#F7F7F7 none repeat scroll 0%;
+  border:1px solid #D7D7D7;
+  list-style-type:none;
+  margin:0pt 0pt 2em;
+  padding:2px;
+}
+
+.ln a {
+  color: #aaa;
+}

data/examples/test.rb

@@ -0,0 +1,15 @@
+require 'diff_to_html'
+diff = `svn diff -r 46:47 svn://hamptoncatlin.com/haml --diff-cmd diff -x "-w -U 2"`
+
+puts <<EOF
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+      <link type="text/css" rel="stylesheet" href="diff.css">
+      <title>diff of HAML revision 47</title>
+    </head>
+    <body>
+    #{DiffToHtml.new.get_diff(diff)}
+    </body>
+</html>
+EOF

data/examples/test.sh

@@ -0,0 +1 @@
+ruby test.rb >out.html

data/init.rb

@@ -0,0 +1 @@
+require 'diff_to_html'

metadata

@@ -0,0 +1,59 @@
+--- !ruby/object:Gem::Specification 
+name: artemv-diff_to_html
+version: !ruby/object:Gem::Version 
+  version: 1.0.0
+platform: ruby
+authors: 
+- Artem Vasiliev
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-05-23 00:00:00 -07:00
+default_executable: 
+dependencies: []
+
+description: Generates HTML view of given unified diff
+email: abublic@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: []
+
+files: 
+- diff_to_html.rb
+- examples/diff.css
+- examples/test.rb
+- examples/test.sh
+- init.rb
+- lib
+- README
+has_rdoc: false
+homepage: http://github.com/artemv/diff_to_html.rb
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Unified diff to HTML converter
+test_files: []
+