artemv-diff_to_html 1.0.2 → 1.0.3

data/examples/diff.svn

@@ -0,0 +1,175 @@
+Index: app/models/issue.rb
+===================================================================
+--- app/models/issue.rb	(revision 1693)
++++ app/models/issue.rb	(working copy)
+@@ -254,4 +254,9 @@
+   def to_s
+     "#{tracker} ##{id}: #{subject}"
+   end
++
++  def active_versions
++    project.active_versions(:for => self)
++  end
++
+ end
+Index: app/models/project.rb
+===================================================================
+--- app/models/project.rb	(revision 1693)
++++ app/models/project.rb	(working copy)
+@@ -239,6 +239,14 @@
+     end
+   end
+ 
++  def active_versions(options = {})
++    issue = options[:for] if options[:for].is_a?(Issue)
++    versions.select do |v| 
++      !v.completed? || issue && issue.fixed_version && 
++        v.id == issue.fixed_version.id
++    end
++  end
++  
+ protected
+   def validate
+     errors.add(parent_id, " must be a root project") if parent and parent.parent
+Index: app/views/issues/_form.rhtml
+===================================================================
+--- app/views/issues/_form.rhtml	(revision 1693)
++++ app/views/issues/_form.rhtml	(working copy)
+@@ -30,7 +30,7 @@
+                      {:controller => 'projects', :action => 'add_issue_category', :id => @project},
+                      :class => 'small', :tabindex => 199) if authorize_for('projects', 'add_issue_category') %></p>
+ <%= content_tag('p', f.select(:fixed_version_id, 
+-                              (@project.versions.sort.collect {|v| [v.name, v.id]}),
++                              (@issue.active_versions.sort.collect {|v| [v.name, v.id]}),
+                               { :include_blank => true })) unless @project.versions.empty? %>
+ </div>
+ 
+Index: app/views/issues/_form_update.rhtml
+===================================================================
+--- app/views/issues/_form_update.rhtml	(revision 1693)
++++ app/views/issues/_form_update.rhtml	(working copy)
+@@ -5,6 +5,6 @@
+ <div class="splitcontentright">
+ <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
+ <%= content_tag('p', f.select(:fixed_version_id, 
+-                          (@project.versions.sort.collect {|v| [v.name, v.id]}),
++                          (@issue.active_versions.sort.collect {|v| [v.name, v.id]}),
+                           { :include_blank => true })) unless @project.versions.empty? %>
+ </div>
+Index: app/views/issues/bulk_edit.rhtml
+===================================================================
+--- app/views/issues/bulk_edit.rhtml	(revision 1693)
++++ app/views/issues/bulk_edit.rhtml	(working copy)
+@@ -27,7 +27,7 @@
+ <label><%= l(:field_fixed_version) %>: 
+ <%= select_tag('fixed_version_id', content_tag('option', l(:label_no_change_option), :value => '') +
+                                    content_tag('option', l(:label_none), :value => 'none') +
+-                                   options_from_collection_for_select(@project.versions, :id, :name)) %></label>
++                                   options_from_collection_for_select(@project.active_versions, :id, :name)) %></label>
+ </p>
+ 
+ <p>
+Index: app/views/issues/context_menu.rhtml
+===================================================================
+--- app/views/issues/context_menu.rhtml	(revision 1693)
++++ app/views/issues/context_menu.rhtml	(working copy)
+@@ -20,11 +20,11 @@
+ 		<% end -%>
+ 		</ul>
+ 	</li>
+-	<% unless @project.versions.empty? -%>
++	<% unless @issue.active_versions.empty? -%>
+ 	<li class="folder">			
+ 		<a href="#" class="submenu"><%= l(:field_fixed_version) %></a>
+ 		<ul>
+-		<% @project.versions.sort.each do |v| -%>
++		<% @issue.active_versions.sort.each do |v| -%>
+ 		    <li><%= context_menu_link v.name, {:controller => 'issues', :action => 'edit', :id => @issue, 'issue[fixed_version_id]' => v, :back_to => @back}, :method => :post,
+ 		                              :selected => (v == @issue.fixed_version), :disabled => !@can[:update] %></li>
+ 		<% end -%>
+Index: test/fixtures/issues.yml
+===================================================================
+--- test/fixtures/issues.yml	(revision 1693)
++++ test/fixtures/issues.yml	(working copy)
+@@ -91,4 +91,19 @@
+   status_id: 1
+   start_date: <%= Date.today.to_s(:db) %>
+   due_date: <%= 1.days.from_now.to_date.to_s(:db) %>
+-  
+
++issues_007: 
++  created_on: 2006-07-19 21:04:21 +02:00
++  project_id: 1
++  updated_on: 2006-07-19 21:09:50 +02:00
++  priority_id: 5
++  subject: Some closed issue
++  id: 7
++  fixed_version_id: 1
++  category_id: 
++  description: Some closed issue
++  tracker_id: 2
++  assigned_to_id: 3
++  author_id: 2
++  status_id: 5
++  start_date: <%= 2.day.ago.to_date.to_s(:db) %>
++  due_date: 
+Index: test/unit/issue_test.rb
+===================================================================
+--- test/unit/issue_test.rb	(revision 1693)
++++ test/unit/issue_test.rb	(working copy)
+@@ -181,4 +181,16 @@
+     assert_nil Issue.find_by_id(1)
+     assert_nil TimeEntry.find_by_issue_id(1)
+   end
++
++  def test_active_versions_have_current_even_if_completed
++    issue = issues(:issues_007)
++    assert issue.fixed_version.completed?
++    assert issue.active_versions.include?(issue.fixed_version), 
++      'Even if version is completed it should be considered active for issue assigned to it'
++  end
++
++  def test_active_versions_work_for_new_issue
++    issue = Issue.new(:project_id => projects(:projects_001).id)
++    assert !issue.active_versions.empty?, 'there should be active versions for new issue'
++  end
+ end
+Index: test/unit/project_test.rb
+===================================================================
+--- test/unit/project_test.rb	(revision 1693)
++++ test/unit/project_test.rb	(working copy)
+@@ -18,7 +18,7 @@
+ require File.dirname(__FILE__) + '/../test_helper'
+ 
+ class ProjectTest < Test::Unit::TestCase
+-  fixtures :projects, :issues, :issue_statuses, :journals, :journal_details, :users, :members, :roles, :projects_trackers, :trackers, :boards
++  fixtures :all
+ 
+   def setup
+     @ecookbook = Project.find(1)
+@@ -130,4 +130,25 @@
+     assert_equal [1, 2, 3], parent.rolled_up_trackers.collect(&:id)
+     assert_equal [2, 3], child.rolled_up_trackers.collect(&:id)
+   end
++  
++  def test_active_versions_have_future_versions
++    version = versions(:versions_003)
++    assert !version.completed?
++    assert projects(:projects_001).active_versions.include?(version), 
++      'Future version (or one without effective date) should be included'
++  end  
++
++  def test_active_versions_have_incomplete_versions
++    version = versions(:versions_002)
++    assert !version.completed?
++    assert projects(:projects_001).active_versions.include?(version), 
++      'Incomplete versions should be included'
++  end  
++
++  def test_active_versions_dont_have_completed
++    version = versions(:versions_001)
++    assert version.completed?
++    assert !projects(:projects_001).active_versions.include?(version), 
++      'Completed versions shouldn\'t be included'
++  end  
+ end

data/examples/test.rb

@@ -1,18 +1,94 @@
-require 'rubygems'
-gem 'artemv-diff_to_html'
-require 'diff_to_html'
-#require '../lib/diff_to_html.rb'
-diff = `svn diff -r 46:47 svn://hamptoncatlin.com/haml --diff-cmd diff -x "-U 2"`
-#diff = `cat diff`
-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
+def out(diff, converter, title)
+  puts <<-EOF
+  <?xml version="1.0" encoding="UTF-8"?>
+  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
+  <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>#{title}</title>
+    <style type="text/css">
+      <!-- 
+      body, p, ol, ul, td {
+        font-family:verdana,arial,helvetica,sans-serif;
+        font-size:13px;
+      }
+
+      a, a:link, a:visited {
+      color:#507EC0;
+      text-decoration:none;
+      }
+
+      ul.diff {
+        padding:0;
+      }
+
+      .diff table col.lineno {
+        width:4em;
+      }
+
+      .diff h2 {
+        color:#333333;
+        font-size:14px;
+        letter-spacing:normal;
+        margin:0pt auto;
+        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;
+      }
+      --> 
+    </style>
+  </head>
+  <body>
+  #{converter.composite_to_html(diff)}
+  </body>
+  </html>
+  EOF
+end

data/examples/test_git_diff.rb

@@ -0,0 +1,5 @@
+require File.join(File.dirname(__FILE__), '../lib/diff_to_html.rb')
+require 'test.rb'
+diff = `cat diff.git`
+converter = GitDiffToHtml.new
+out(diff, converter)

data/examples/test_svn_diff.rb

@@ -0,0 +1,8 @@
+#require File.join(File.dirname(__FILE__), '../lib/diff_to_html.rb')
+require 'rubygems'
+require 'diff_to_html'
+require File.join(File.dirname(__FILE__), 'test.rb')
+filename = ARGV[0]
+diff = `cat #{filename}`
+converter = SvnDiffToHtml.new
+out(diff, converter, filename)

data/lib/diff_to_html.rb

@@ -3,10 +3,6 @@ require 'cgi'
 class DiffToHtml
 
   attr_accessor :file_prefix
-  
-  #
-  # globals
-  #
 
   def ln_cell(ln, side = nil)
     anchor = "f#{@filenum}#{side}#{ln}"
@@ -17,10 +13,10 @@ class DiffToHtml
     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
@@ -56,10 +52,6 @@ class DiffToHtml
     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
@@ -72,16 +64,14 @@ class DiffToHtml
   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'>
+<li><h2><a name="F#{@filenum}" href="#F#{@filenum}">#{file}</a></h2><table class='diff'>
 <colgroup>
 <col class="lineno"/>
 <col class="lineno"/>
 <col class="content"/>
 </colgroup>
 EOF
-  @filenum += 1
   result
   end
   
@@ -93,7 +83,7 @@ EOF
     return left_ln, right_ln
   end
   
-  def get_diff(diff_file)
+  def get_single_file_diff(file_name, diff_file)
     @last_op = ' '
     @left = []
     @right = []
@@ -102,61 +92,118 @@ EOF
 
     diff = diff_file.split("\n")
     
-    index = diff.shift
-    file = index[7..-1]
-    diff.shift #equals
-    header1 = diff.shift
-    if header1 =~ /^---/
-      diff.shift
+    diff.shift #index
+    line = nil
+    while line !~ /^---/ && !diff.empty?
+      line = diff.shift
+    end
+    header_old = line
+    if line =~ /^---/
+      diff.shift #+++
       
-      result << "<ul class='diff'>#{begin_file(file)}"
+      result << begin_file(file_name)
       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
+        op = line[0,1]
+        line = line[1..-1] || ''
+        if op == '\\'
+          line = op + line
+          op = ' '
+        end
+        
+        if ((@last_op != ' ' and op == ' ') or (@last_op == ' ' and op != ' '))
+          left_ln, right_ln = 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)
         else
-          op = line[0,1]
-          line = line[1..-1]
-          
-          if ((@last_op != ' ' and op == ' ') or (@last_op == ' ' and op != ' '))
-            left_ln, right_ln = 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
+          flush_changes(result, left_ln, right_ln)
+          result << "</table></li>"
+          break
         end
+        @last_op = op
       end
 
       flush_changes(result, left_ln, right_ln)
-      result << "</table></li></ul>"      
+      result << "</table></li>"      
     else
-      result = "<div class='error'>#{header1}</div>"
+      #"<div class='error'>#{header_old}</div>"
+      result =%Q{<li><h2><a name="F#{@filenum}" href="#F#{@filenum}">#{file_name}</a></h2>#{header_old}</li>}
     end
 
     result
   end
 
+  def file_header_pattern
+    raise "Method to be implemented in VCS-specific class"
+  end
+  
+  def get_diffs(composite_diff)
+    pattern = file_header_pattern
+    files = composite_diff.split(pattern)
+    headers = composite_diff.scan(pattern) #huh can't find a way to get both at once
+    files.shift if files[0] == '' #first one is junk usually
+    result = []
+    i = 0
+    files.each do |file|
+      result << {:filename => "#{file_prefix}#{get_filename(headers[i])}", :file => file}
+      i += 1
+    end
+    result
+  end
+
+  def diffs_to_html(diffs)
+    result = '<ul class="diff">'
+    @filenum = 0
+    diffs.each do |file_map|
+      result << get_single_file_diff(file_map[:filename], file_map[:file])
+      @filenum += 1
+    end
+    result << '</ul>'
+    result    
+  end
+  
+  def composite_to_html(composite_diff)
+    diffs_to_html get_diffs(composite_diff)
+  end
+end
+
+class GitDiffToHtml < DiffToHtml
+  def file_header_pattern
+    /^diff --git.+/
+  end
+
+  def get_filename(file_diff)
+    match = (file_diff =~ / b\/(.+)/)
+    raise "not matched!" if !match
+    $1
+  end  
+end
+
+class SvnDiffToHtml < DiffToHtml
+  def file_header_pattern
+    /^Index: .+/
+  end
+
+  def get_filename(header)
+    match = (header =~ /^Index: (.+)/) #if we use this pattern file_header_pattern files split doesn't work
+    raise "header '#{header}' not matched!" if !match
+    $1
+  end  
 end