pretty_diff 0.3.0

data/.document

@@ -0,0 +1,5 @@
+README.rdoc
+lib/**/*.rb
+bin/*
+features/**/*.feature
+LICENSE

data/.gitignore

@@ -0,0 +1,21 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2010 Ilya Sabanin
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -0,0 +1,41 @@
+= Pretty Diff
+
+A tiny library for generating pretty HTML listings for unified Diff format. Heavily used in Beanstalk (http://beanstalkapp.com) application.
+
+== Installation
+
+ gem install pretty_diff
+
+== Example
+
+A quick example will tell it all:
+
+ udiff = File.read("awesome.diff")
+ pretty = PrettyDiff::Diff.new(udiff)
+ pretty.to_html
+
+Wrap it with HTML, add some styles and you will get something like this:
+
+http://ilya.sabanin.ru/projects/pretty_diff_example.html
+
+== Features
+
+The library is really easy to read and change. All HTML is concentrated in a single place -- HtmlGenerator; so it's very easy to customize the output to suit your needs.
+
+By default PrettyDiff will generate HTML that can be easily colored with the CSS that you can find in the example above.
+
+PrettyDiff will generate 2 columns of line numbers, as it's usually done for diffs. These columns are copy & paste safe, means that line numbers won't be copied when you copy diff contents.
+
+Tabs will be automatically converted to double spaces.
+
+HTML tags will be automatically escaped from the input string.
+
+== To Do
+
+The test suit can be somewhat improved.
+
+== History
+
+The library was extracted from Beanstalk during the awesome Wildbit Open Source Fridays.
+
+Copyright (c) 2010 Ilya Sabanin, Wildbit; see LICENSE for details.

data/Rakefile

@@ -0,0 +1,55 @@
+require 'rubygems'
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "pretty_diff"
+    gem.summary = "Library for converting unified diff format into HTML listings."
+    gem.description = "PrettyDiff is easily customizable library for creating full featured HTML
+                       listings out of unified diff format. Include copy&paste-safe line numbers
+                       and built-in syntax highlighting."
+    gem.email = "ilya.sabanin@gmail.com"
+    gem.homepage = "http://github.com/isabanin/pretty_diff"
+    gem.authors = ["Ilya Sabanin"]
+    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = true
+end
+
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/test_*.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
+end
+
+task :test => :check_dependencies
+
+task :default => :test
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "pretty_diff #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -0,0 +1 @@
+0.3.0

data/lib/pretty_diff.rb

@@ -0,0 +1,9 @@
+module PrettyDiff #:nodoc:
+end
+
+require 'pretty_diff/support'
+require 'pretty_diff/diff'
+require 'pretty_diff/chunk'
+require 'pretty_diff/line'
+require 'pretty_diff/line_numbers'
+require 'pretty_diff/html_generator'

data/lib/pretty_diff/chunk.rb

@@ -0,0 +1,43 @@
+#
+# Represent a single piece of a diff.
+# 
+class PrettyDiff::Chunk #:nodoc:
+  attr_reader :meta_info, :input, :lines
+  
+  def initialize(meta_info, input)
+    @meta_info = meta_info
+    @input = input
+  end
+  
+  # Generate HTML presentation for a Chunk. Return a string.
+  def to_html
+    # We have to find lines before we can call line numbers methods.
+    find_lines!
+    PrettyDiff::HtmlGenerator.generate_chunk(line_numbers, lines)
+  end
+  
+private
+
+  # Return LineNumbers object that represents two columns of numbers
+  # that will be displayed on the left of the HTML presentation.
+  #
+  # IMPORTANT! Before calling this method it's essential to call "find_lines!" first,
+  # otherwise the array will be empty.
+  def line_numbers
+    @_line_numbers ||= PrettyDiff::LineNumbers.new(meta_info)
+  end
+
+  # Parse the input searching for lines. Initialize Line object for every line.
+  # Return an array of Line objects.
+  def find_lines!
+    returning(@lines = []) do
+      input.split(/\r?\n/).each do |line_str|
+        line = PrettyDiff::Line.new(line_str)
+        next if line.ignore?
+        @lines << line
+        line_numbers.act_on_line(line)
+      end
+    end
+  end
+
+end

data/lib/pretty_diff/diff.rb

@@ -0,0 +1,58 @@
+require 'cgi'
+
+#
+# Main class to interact with. In fact this is the only class you should interact with
+# when using the library.
+# 
+# === Usage example:
+#  pretty = PrettyDiff::Diff.new(udiff)
+#  pretty.to_html
+#
+# Keep in mind that Diff will automatically escape all HTML tags from the intput string
+# so that it doesn't interfere with the output.
+#
+# === Behind The Scenes:
+# The Diff class is parsing input string and searching for Chunks.
+# It's then asking HtmlGenerator to generate HTML for those chunks. 
+#
+class PrettyDiff::Diff
+  CHUNK_REGEXP = /@@ .+ @@\n/
+
+  attr_reader :input
+
+  # Create new Diff object. Accept a String in unified diff format.
+  # Will automatically escape HTML tags from it.
+  def initialize(unified_diff)
+    @input = escape_html(unified_diff)
+  end
+
+  # Generate HTML presentation. Return a string.
+  def to_html    
+    PrettyDiff::HtmlGenerator.generate_diff(chunks)
+  end
+
+private
+
+  # Return an array of Chunk objects that Diff found in the input.
+  def chunks
+    @_chunks ||= find_chunks(input)
+  end
+
+  # Parse the input for diff chunks and initialize a Chunk object for each of them.
+  # Return an array of Chunks.
+  def find_chunks(text)
+    meta_info = text.scan(CHUNK_REGEXP)
+    returning(chunks = []) do
+      split = text.split(CHUNK_REGEXP)
+      split.shift
+      split.each_with_index do |lines, idx|        
+        chunks << PrettyDiff::Chunk.new(meta_info[idx], lines)
+      end
+    end
+  end
+  
+  def escape_html(input_text)
+    CGI.escapeHTML(input_text)
+  end
+
+end

data/lib/pretty_diff/html_generator.rb

@@ -0,0 +1,86 @@
+#
+# This is where all HTML stuff is kept. The module is responsible for converting
+# various PrettyDiff classes into HTML.
+# 
+# By customizing this file you can suit the output precisely to your needs.
+#
+# By default all HTML is generated with a built-in support for coloring using a
+# CSS file that's available here:
+#
+# http://ilya.sabanin.ru/projects/pretty_diff_example.html
+#
+module PrettyDiff::HtmlGenerator #:nodoc:
+  extend self
+  
+  def intro
+    %Q[<table class="highlighttable">]
+  end
+
+  def chunk_start
+    %Q[<tr>]
+  end
+  
+  def line_numbers_column(text)
+    %Q[<td class="linenos"><pre>
+#{text}</pre></td>]
+  end
+  
+  def code(text)
+    %Q[<td class="code"><div class="highlight"><pre>
+#{text}</pre></div></td>]
+  end
+  
+  def added_line(text)
+    %Q[<span class="gi">#{text}</span>]
+  end
+
+  def deleted_line(text)
+    %Q[<span class="gd">#{text}</span>]
+  end
+
+  def not_modified_line(text)
+    text
+  end
+
+  def chunk_end
+    %Q[</tr>]
+  end
+  
+  def chunk_separator
+    %Q[<tr class="chunk_separator"><td colspan="3"></td></tr>]
+  end
+  
+  def outro
+    %Q[</table>]
+  end
+  
+  def generate_diff(chunks)
+    chunks_html = chunks.map{|c| c.to_html}.join(chunk_separator).to_s
+    intro + chunks_html + outro
+  end
+  
+  def generate_chunk(numbers, lines)
+    lines_html = lines.map{|l| l.to_html }.join("\n")
+    chunk_start +
+    numbers.to_html +
+    code(lines_html) +
+    chunk_end
+  end
+  
+  def generate_line_numbers(left, right)
+    line_numbers_column(left.join("\n")) +
+    line_numbers_column(right.join("\n"))
+  end
+  
+  def generate_line(obj)
+    content = obj.rendered
+    if obj.added?
+      added_line(content)
+    elsif obj.deleted?
+      deleted_line(content)
+    else
+      not_modified_line(content)
+    end
+  end
+  
+end

data/lib/pretty_diff/line.rb

@@ -0,0 +1,53 @@
+#
+# Represent a single line of the diff.
+#
+class PrettyDiff::Line #:nodoc:
+  attr_reader :input
+  
+  def initialize(input)
+    @input = input
+  end
+  
+  # Generate HTML presentation for a Line. Return a string.
+  def to_html
+    PrettyDiff::HtmlGenerator.generate_line(self)
+  end
+  
+  # Prepare Line contents for injection into HTML structure.
+  # Currently used for replacing Tab symbols with spaces.
+  # Return a string.
+  def rendered
+    input.gsub("\t", '  ')
+  end
+  
+  # Unified Diff sometimes emit a special line at the end of the file
+  # that we should not display in the output.
+  # Return true or false.
+  def ignore?
+    input =~ /\/
+  end
+  
+  # Return status of the Line. Can be :added, :deleted or :not_modified.
+  def status
+    case input
+    when /^\+/
+      :added
+    when /^\-/
+      :deleted
+    else
+      :not_modified
+    end
+  end
+  
+  def added?
+    status == :added
+  end
+  
+  def deleted?
+    status == :deleted
+  end
+  
+  def not_modified?
+    status == :not_modified
+  end
+end

data/lib/pretty_diff/line_numbers.rb

@@ -0,0 +1,79 @@
+#
+# Represent 2 columns of numbers that will be displayed
+# on the left of the HTML presentation.
+#
+class PrettyDiff::LineNumbers #:nodoc:
+  
+  attr_reader :meta_info
+  
+  def initialize(meta)
+    @meta_info = meta
+  end
+  
+  # Increase either left column of numbers, right or both of them; depending on the Line status.
+  def act_on_line(line)
+    if line.added?
+      increase_right
+    elsif line.deleted?
+      increase_left
+    else
+      increase_both
+    end
+  end
+  
+  # Generate HTML presentation for a both line numbers columns. Return a string.
+  def to_html
+    PrettyDiff::HtmlGenerator.generate_line_numbers(left_column, right_column)
+  end
+  
+private
+  
+  # Search for information about line numbers changes provided by unified diff format.
+  def scan_meta(target)
+    meta_info.scan(target).flatten.first
+  end
+  
+  def left_column
+    @left_column ||= []
+  end
+  
+  def right_column
+    @right_column ||= []
+  end
+  
+  # Return starting number for the left column according to unified diff information.
+  def left_starts_at
+    scan_meta(/^@@ -(\d+),/).to_i
+  end
+  
+  # Return starting number for the right column according to unified diff information.
+  def right_starts_at
+    scan_meta(/\+(\d+),\d+ @@$/).to_i
+  end
+
+  # Increase left column line number by one.
+  def increase_left
+    left_column  << increase_or_start(:left)
+    right_column << nil    
+  end
+  
+  # Increase right column line number by one.
+  def increase_right
+    left_column  << nil
+    right_column << increase_or_start(:right)
+  end
+  
+  # Increase both columns line numbers by one.
+  def increase_both
+    left_column  << increase_or_start(:left)
+    right_column << increase_or_start(:right)
+  end
+  
+  # Either increasing existing line number by one or using the initial number provided by
+  # unified diff format.
+  def increase_or_start(which)
+    previous = send("#{which}_column").reverse.find{|e| !e.nil?}
+    if previous then previous + 1 else send("#{which}_starts_at") end
+  end
+  
+end

data/lib/pretty_diff/support.rb

@@ -0,0 +1,8 @@
+class Object #:nodoc:
+  
+  def returning(value)
+    yield(value)
+    value
+  end
+  
+end

data/pretty_diff.gemspec

@@ -0,0 +1,70 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{pretty_diff}
+  s.version = "0.3.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Ilya Sabanin"]
+  s.date = %q{2010-01-15}
+  s.description = %q{PrettyDiff is easily customizable library for creating full featured HTML
+                       listings out of unified diff format. Include copy&paste-safe line numbers
+                       and built-in syntax highlighting.}
+  s.email = %q{ilya.sabanin@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "lib/pretty_diff.rb",
+     "lib/pretty_diff/chunk.rb",
+     "lib/pretty_diff/diff.rb",
+     "lib/pretty_diff/html_generator.rb",
+     "lib/pretty_diff/line.rb",
+     "lib/pretty_diff/line_numbers.rb",
+     "lib/pretty_diff/support.rb",
+     "pretty_diff.gemspec",
+     "test/chunk_test.rb",
+     "test/data/first.diff",
+     "test/data/second.diff",
+     "test/diff_test.rb",
+     "test/helper.rb",
+     "test/html_generator_test.rb",
+     "test/line_test.rb"
+  ]
+  s.homepage = %q{http://github.com/isabanin/pretty_diff}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Library for converting unified diff format into HTML listings.}
+  s.test_files = [
+    "test/chunk_test.rb",
+     "test/diff_test.rb",
+     "test/helper.rb",
+     "test/html_generator_test.rb",
+     "test/line_test.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    else
+      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+  end
+end
+

data/test/chunk_test.rb

@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + '/helper'
+
+# 	<link rel="stylesheet" href="../stylesheets/codecolorer.css" type="text/css" media="screen, projection" />
+# 	<link rel="stylesheet" href="../stylesheets/modalbox.css" type="text/css" media="screen, projection" />
+# 	<link rel="stylesheet" href="../stylesheets/print.css" type="text/css" media="print" />
+#+	<link rel="shortcut icon" href="../images/favicon.ico" type="image/x-icon" />
+#+	<link rel="apple-touch-icon" href="../images/apple-touch-icon.png"/>
+# 	<script type="text/javascript" src="../javascripts/prototype.js" charset="utf-8"></script>
+# 	<script type="text/javascript" src="../javascripts/scriptaculous.js" charset="utf-8"></script>
+# 	<script type="text/javascript" src="../javascripts/application.js" charset="utf-8"></script>
+
+class ChunkTest < Test::Unit::TestCase
+  context "Diff Chunk" do
+    setup do
+      @diff = PrettyDiff::Diff.new read_diff('second.diff')
+      @chunk = @diff.send(:chunks).first
+      @chunk.send(:find_lines!)
+    end
+    
+    should "generate HTML without errors" do
+      assert @chunk.to_html
+    end
+    
+    should "find correct amount of left line numbers" do
+      assert @chunk.send(:line_numbers).send(:left_column).compact.size == 6
+    end
+    
+    should "find correct amount of right line numbers" do
+      assert @chunk.send(:line_numbers).send(:right_column).compact.size == 8
+    end
+    
+    should "find correct amount of lines" do
+      assert @chunk.lines.size == 8
+    end
+  end
+end

data/test/data/first.diff

@@ -0,0 +1,34 @@
+--- Revision 1945
++++ Revision 1995
+@@ -8,6 +8,10 @@
+   border: 0;
+ }
+ 
++.sep {
++  color: #AAA;
++}
++
+ /* Short statistic */
+ 
+ .short-stat dl {
+@@ -59,12 +63,18 @@
+     color: #999;
+   }
+   
+-  table.account-overview td .status {
++  table.account-overview td.label.top {
++    vertical-align: top;
++  }
++  
++  table.account-overview td .status,
++  table.repos-table td .status {
+     padding-left: 1.75em;
+   	background: url(../images/i_error_light.gif) 0 0 no-repeat;
+   }
+   
+-  table.account-overview td .status.active {
++  table.account-overview td .status.active,
++  table.repos-table td .status.success {
+     padding-left: 1.75em;
+   	background: url(../images/i-yes.gif) 0 0 no-repeat;
+   }

data/test/data/second.diff

@@ -0,0 +1,308 @@
+--- Revision 1053
++++ Revision 2195
+@@ -11,6 +11,8 @@
+ 	<link rel="stylesheet" href="../stylesheets/codecolorer.css" type="text/css" media="screen, projection" />
+ 	<link rel="stylesheet" href="../stylesheets/modalbox.css" type="text/css" media="screen, projection" />
+ 	<link rel="stylesheet" href="../stylesheets/print.css" type="text/css" media="print" />
++	<link rel="shortcut icon" href="../images/favicon.ico" type="image/x-icon" />
++	<link rel="apple-touch-icon" href="../images/apple-touch-icon.png"/>
+ 	<script type="text/javascript" src="../javascripts/prototype.js" charset="utf-8"></script>
+ 	<script type="text/javascript" src="../javascripts/scriptaculous.js" charset="utf-8"></script>
+ 	<script type="text/javascript" src="../javascripts/application.js" charset="utf-8"></script>
+@@ -19,12 +21,10 @@
+ <body>
+ <div id="container">
+ 	<div id="header">
+-		<ul class="metanav">
+-			<li class="active"><a href="hq-dashboard.html" title="Dashboard"><span>Dashboard</span></a></li>
+-			<li><a href="hq-profile.html" title="My Profile"><span>My Profile</span></a></li>
+-			<li><a href="help.html" title="Help"><span>Help</span></a></li>
+-			<li><a href="logout.html" title="Logout"><span>Logout</span></a></li>
+-		</ul>
++		<div class="metanav">
++			<p class="meta-global"><a href="hq-dashboard.html" title="Dashboard">Dashboard</a> &bull; <a href="help-overview.html" title="Help">Help</a></p>
++			<p class="meta-personal"><em>Andrew Okonetschnikow</em> &bull; <a href="hq-profile.html" title="My Profile">My Profile</a> &bull; <a href="logout.html" title="Logout">Logout</a></p>
++		</div>
+ 		
+ 		<h1>Wildbit</h1>
+ 		<ul class="mainnav">
+@@ -49,175 +49,141 @@
+ 
+ 			<form action="search-results.html" method="get" class="search-form">
+ 				<fieldset>
+-					<legend><b>Search in all repositories</b></legend>
+ 					<div class="form-row">
+-						<input type="search" name="search" id="search" size="50" value="keyword" style="width: 90%" /> <input type="submit" value="Go!" style="width: 5% " />
++						<input type="search" name="search" id="search" size="50" value="keyword" />
++						<select>
++							<option>All repositories</option>
++							<option disabled="disabled"></option>
++							<option>Beanstalk</option>
++							<option>Newsberry</option>
++							<option>Wildbit Public</option>
++						</select>
++						<input type="submit" value="Search" />
+ 					</div>
+ 				</fieldset>
+ 			</form>
+ 
+ 
+-			<h2><b>In comments <span class="light">(9)</span></b></h2>
+-
+ 			<div class="activity-timeline search-results">
++
+ 				<div class="rev-item">
+ 					<h3><a href="repo-activity-changeset.html" title="See revision changeset">765</a></h3>
+-					<p class="rev-repo label-red"><a href="repo-activity.html">Newsberry</a></p>
+-					<p class="rev-user">eugene, <span class="rev-date">10/21/07</span></p>
+-
++					<p class="rev-repo label-red"><a href="adm-repo-activity.html">Newsberry</a></p>
++					<p class="rev-user"><img src="../images/users/default.gif" alt="Default" /></p>
+ 					<div class="rev-comment">
+-						<p>
+-							<a href="repo-activity-changeset.html" title="See revision changeset">BugzID: 762 (Green <span class="marked">arrow</span> in Vibe Meter helper)</a>
+-						</p>
++						<p><a href="repo-activity-changeset.html" title="See revision changeset">BugzID: 762 (Green <span class="highlight">arrow</span> in Vibe Meter helper)</a></p>
++						<p class="rev-meta-info">by Eugene Fedorenko (eugene) <span class="time">Feb 06, 2009 15:30:00 GMT</span></p>
+ 					</div>
+ 				</div>
+ 
+ 				<div class="rev-item">
+ 					<h3><a href="repo-activity-changeset.html" title="See revision changeset">1062</a></h3>
+-					<p class="rev-repo label-orange"><a href="repo-activity.html">Nuzizo</a></p>
+-					<p class="rev-user">andrew, <span class="rev-date">10/27/07</span></p>
+-
++					<p class="rev-repo label-orange"><a href="adm-repo-activity.html">Nuzizo</a></p>
++					<p class="rev-user"><img src="../images/users/andrew.gif" width="32" height="32" alt="Andrew" /></p>
+ 					<div class="rev-comment">
+-						<p>
+-							<a href="repo-activity-changeset.html" title="See revision changeset">BugzID:689 Dashboard: removed stats box, added hint to profile meter; My <span class="marked">friends updates</span> redesigned; Added colors for profile filling small meters;</a>
+-						</p>
++						<p><a href="repo-activity-changeset.html" title="See revision changeset">BugzID:689 Dashboard: removed stats box, added hint to <span class="highlight">profile meter</span>; My friends updates redesigned; Added colors for profile filling small meters;</a></p>
++						<p class="rev-meta-info">by Andrew Okonetchnikow (andrew) <span class="time">Feb 05, 2009 10:30:00 GMT</span></p>
+ 					</div>
+ 				</div>
+ 
+ 				<div class="rev-item">
+-					<h3><a href="repo-activity-changeset.html" title="See revision changeset">343</a></h3>
+-					<p class="rev-repo label-yellow"><a href="repo-activity.html">Project Alpha</a></p>
+-					<p class="rev-user">dmitry, <span class="rev-date">10/17/07</span></p>
+-
++					<h3><a href="repo-activity-changeset.html" title="See revision changeset">3</a></h3>
++					<p class="rev-repo label-yellow"><a href="adm-repo-activity.html">Project Alpha</a></p>
++					<p class="rev-user"><img src="../images/users/dmitry.gif" alt="Dmitry" /></p>
+ 					<div class="rev-comment">
+-						<p>
+-							<a href="repo-activity-changeset.html" title="See revision changeset">Updated copy in minor areas. After speaking with <span class="marked">Darren</span>, there should be a second revision.</a>
+-						</p>
++						<p><a href="repo-activity-changeset.html" title="See revision changeset">Updated copy in minor areas. After speaking with Darren, there should be a <span class="highlight">second revision</span>.</a></p>
++						<p class="rev-meta-info">by Dmitry Sabanin (dmitry) <span class="time">Jan 01, 2008 11:00:00 GMT</span></p>
+ 					</div>
+ 				</div>
+ 
+ 				<div class="rev-item">
+-					<h3><a href="repo-activity-changeset.html" title="See revision changeset">1060</a></h3>
+-					<p class="rev-repo label-red"><a href="repo-activity.html">Newsberry</a></p>
+-					<p class="rev-user">eugene, <span class="rev-date">09/13/07</span></p>
+-
++					<h3><a href="repo-activity-changeset.html" title="See revision changeset">765</a></h3>
++					<p class="rev-repo label-red"><a href="adm-repo-activity.html">Newsberry</a></p>
++					<p class="rev-user"><img src="../images/users/default.gif" alt="Default" /></p>
+ 					<div class="rev-comment">
+-						<p>
+-							<a href="repo-activity-changeset.html" title="See revision changeset">BugzID: 762 (Green arrow in <span class="marked">Vibe Meter</span> helper)</a>
+-						</p>
++						<p><a href="repo-activity-changeset.html" title="See revision changeset">BugzID: 762 (Green <span class="highlight">arrow</span> in Vibe Meter helper)</a></p>
++						<p class="rev-meta-info">by Eugene Fedorenko (eugene) <span class="time">Feb 06, 2009 15:30:00 GMT</span></p>
+ 					</div>
+ 				</div>
+ 
+ 				<div class="rev-item">
+-					<h3><a href="repo-activity-changeset.html" title="See revision changeset">1059</a></h3>
+-					<p class="rev-repo label-green"><a href="repo-activity.html">PodcastPeople</a></p>
+-					<p class="rev-user">andrew, <span class="rev-date">11/27/07</span></p>
+-
++					<h3><a href="repo-activity-changeset.html" title="See revision changeset">1062</a></h3>
++					<p class="rev-repo label-orange"><a href="adm-repo-activity.html">Nuzizo</a></p>
++					<p class="rev-user"><img src="../images/users/andrew.gif" width="32" height="32" alt="Andrew" /></p>
+ 					<div class="rev-comment">
+-						<p>
+-							<a href="repo-activity-changeset.html" title="See revision changeset">BugzID: 762 (Green arrow in <span class="marked">Vibe Meter</span> helper)</a>
+-						</p>
++						<p><a href="repo-activity-changeset.html" title="See revision changeset">BugzID:689 Dashboard: removed stats box, added hint to <span class="highlight">profile meter</span>; My friends updates redesigned; Added colors for profile filling small meters;</a></p>
++						<p class="rev-meta-info">by Andrew Okonetchnikow (andrew) <span class="time">Feb 05, 2009 10:30:00 GMT</span></p>
+ 					</div>
+ 				</div>
+-				<p class="more"><a href="#">See more results in comments&hellip;</a></p>
+-			</div>
+ 
+-
+-			<h2><b>In files <span class="light">(7)</span></b></h2>
+-
+-			<div class="activity-timeline search-results">
+ 				<div class="rev-item">
+-					<h3><a href="repo-activity-changeset.html" title="See revision changeset">765</a></h3>
+-					<p class="rev-repo label-red"><a href="repo-activity.html">Newsberry</a></p>
+-					<p class="rev-user">eugene, <span class="rev-date">10/21/07</span></p>
+-
+-					<div class="file-desc">
+-						<h3 class="diff-title" id="diff01">trunk/application/app/controllers/logs_controller.rb</h3>
+-						<div class="codecolorer-container javascript">
+-							<div class="codecolorer">
+-								<ol start="21">
+-									<li class="li1"><div class="de1">getWidth: <span class="kw2">function</span><span class="br0">&#40;</span><span class="marked">element</span><span class="br0">&#41;</span> <span class="br0">&#123;</span></div></li>
+-									<li class="li1"><div class="de1">&nbsp; &nbsp; <span class="kw1">return</span> $<span class="br0">&#40;</span>element<span class="br0">&#41;</span>.<span class="me1">getDimensions</span><span class="br0">&#40;</span><span class="br0">&#41;</span>.<span class="me1">width</span>;</div></li>
+-								</ol>
+-							</div>
+-						</div>
++					<h3><a href="repo-activity-changeset.html" title="See revision changeset">3</a></h3>
++					<p class="rev-repo label-yellow"><a href="adm-repo-activity.html">Project Alpha</a></p>
++					<p class="rev-user"><img src="../images/users/dmitry.gif" alt="Dmitry" /></p>
++					<div class="rev-comment">
++						<p><a href="repo-activity-changeset.html" title="See revision changeset">Updated copy in minor areas. After speaking with Darren, there should be a <span class="highlight">second revision</span>.</a></p>
++						<p class="rev-meta-info">by Dmitry Sabanin (dmitry) <span class="time">Jan 01, 2008 11:00:00 GMT</span></p>
+ 					</div>
+ 				</div>
+ 
+ 				<div class="rev-item">
+-					<h3><a href="repo-activity-changeset.html" title="See revision changeset">1062</a></h3>
+-					<p class="rev-repo label-orange"><a href="repo-activity.html">Nuzizo</a></p>
+-					<p class="rev-user">andrew, <span class="rev-date">10/27/07</span></p>
+-
+-					<div class="file-desc">
+-						<h3 class="diff-title" id="diff01">trunk/application/app/controllers/logs_controller.rb</h3>
+-						<div class="codecolorer-container javascript">
+-							<div class="codecolorer">
+-								<ol start="623">
+-									<li class="li1"><div class="de1">&nbsp; &nbsp; els.<span class="me1">display</span> = <span class="st0">'block'</span>;</div></li>
+-									<li class="li1"><div class="de1">&nbsp; &nbsp; <span class="kw2">var</span> original<span class="marked">Width</span> = element.<span class="me1">clientWidth</span>;</div></li>
+-								</ol>
+-							</div>
+-						</div>
++					<h3><a href="repo-activity-changeset.html" title="See revision changeset">765</a></h3>
++					<p class="rev-repo label-red"><a href="adm-repo-activity.html">Newsberry</a></p>
++					<p class="rev-user"><img src="../images/users/default.gif" alt="Default" /></p>
++					<div class="rev-comment">
++						<p><a href="repo-activity-changeset.html" title="See revision changeset">BugzID: 762 (Green <span class="highlight">arrow</span> in Vibe Meter helper)</a></p>
++						<p class="rev-meta-info">by Eugene Fedorenko (eugene) <span class="time">Feb 06, 2009 15:30:00 GMT</span></p>
+ 					</div>
+ 				</div>
+ 
+ 				<div class="rev-item">
+-					<h3><a href="repo-activity-changeset.html" title="See revision changeset">343</a></h3>
+-					<p class="rev-repo label-yellow"><a href="repo-activity.html">Project Alpha</a></p>
+-					<p class="rev-user">dmitry, <span class="rev-date">10/17/07</span></p>
+-
+-					<div class="file-desc">
+-						<h3 class="diff-title" id="diff01">trunk/application/app/controllers/logs_controller.rb</h3>
+-						<div class="codecolorer-container javascript">
+-							<div class="codecolorer">
+-								<ol start="73">
+-									<li class="li1"><div class="de1">&nbsp; &nbsp; <span class="kw1">if</span> <span class="br0">&#40;</span>display != <span class="st0">'none'</span> &amp;&amp; display != <span class="kw2">null</span><span class="br0">&#41;</span> <span class="co1">// Safari bug</span></div></li>
+-									<li class="li1"><div class="de1">&nbsp; &nbsp; &nbsp; <span class="kw1">return</span> <span class="br0">&#123;</span>width: <span class="marked">element</span>.<span class="me1">offsetWidth</span>, height: element.<span class="me1">offsetHeight</span><span class="br0">&#125;</span>;</div></li>
+-								</ol>
+-							</div>
+-						</div>
++					<h3><a href="repo-activity-changeset.html" title="See revision changeset">1062</a></h3>
++					<p class="rev-repo label-orange"><a href="adm-repo-activity.html">Nuzizo</a></p>
++					<p class="rev-user"><img src="../images/users/andrew.gif" width="32" height="32" alt="Andrew" /></p>
++					<div class="rev-comment">
++						<p><a href="repo-activity-changeset.html" title="See revision changeset">BugzID:689 Dashboard: removed stats box, added hint to <span class="highlight">profile meter</span>; My friends updates redesigned; Added colors for profile filling small meters;</a></p>
++						<p class="rev-meta-info">by Andrew Okonetchnikow (andrew) <span class="time">Feb 05, 2009 10:30:00 GMT</span></p>
+ 					</div>
+ 				</div>
+ 
+ 				<div class="rev-item">
+-					<h3><a href="repo-activity-changeset.html" title="See revision changeset">1060</a></h3>
+-					<p class="rev-repo label-red"><a href="repo-activity.html">Newsberry</a></p>
+-					<p class="rev-user">eugene, <span class="rev-date">09/13/07</span></p>
+-
+-					<div class="file-desc">
+-						<h3 class="diff-title" id="diff01">trunk/application/app/controllers/logs_controller.rb</h3>
+-						<div class="codecolorer-container javascript">
+-							<div class="codecolorer">
+-								<ol start="145">
+-									<li class="li1"><div class="de1">&nbsp; &nbsp; els.<span class="me1"><span class="marked">visibility</span></span> = <span class="st0">'hidden'</span>;</div></li>
+-									<li class="li1"><div class="de1">&nbsp; &nbsp; els.<span class="me1">position</span> = <span class="st0">'absolute'</span>;</div></li>
+-								</ol>
+-							</div>
+-						</div>
++					<h3><a href="repo-activity-changeset.html" title="See revision changeset">3</a></h3>
++					<p class="rev-repo label-yellow"><a href="adm-repo-activity.html">Project Alpha</a></p>
++					<p class="rev-user"><img src="../images/users/dmitry.gif" alt="Dmitry" /></p>
++					<div class="rev-comment">
++						<p><a href="repo-activity-changeset.html" title="See revision changeset">Updated copy in minor areas. After speaking with Darren, there should be a <span class="highlight">second revision</span>.</a></p>
++						<p class="rev-meta-info">by Dmitry Sabanin (dmitry) <span class="time">Jan 01, 2008 11:00:00 GMT</span></p>
+ 					</div>
+ 				</div>
+ 
+ 				<div class="rev-item">
+-					<h3><a href="repo-activity-changeset.html" title="See revision changeset">1059</a></h3>
+-					<p class="rev-repo label-green"><a href="repo-activity.html">PodcastPeople</a></p>
+-					<p class="rev-user">andrew, <span class="rev-date">11/27/07</span></p>
+-
+-					<div class="file-desc">
+-						<h3 class="diff-title" id="diff01">trunk/application/app/controllers/logs_controller.rb</h3>
+-						<div class="codecolorer-container javascript">
+-							<div class="codecolorer">
+-								<ol start="572">
+-									<li class="li1"><div class="de1">&nbsp; &nbsp; els.<span class="me1">display</span> = <span class="st0">'block'</span>;</div></li>
+-									<li class="li1"><div class="de1">&nbsp; &nbsp; <span class="kw2">var</span> original<span class="marked">Width</span> = element.<span class="me1">clientWidth</span>;</div></li>
+-								</ol>
+-							</div>
+-						</div>
++					<h3><a href="repo-activity-changeset.html" title="See revision changeset">765</a></h3>
++					<p class="rev-repo label-red"><a href="adm-repo-activity.html">Newsberry</a></p>
++					<p class="rev-user"><img src="../images/users/default.gif" alt="Default" /></p>
++					<div class="rev-comment">
++						<p><a href="repo-activity-changeset.html" title="See revision changeset">BugzID: 762 (Green <span class="highlight">arrow</span> in Vibe Meter helper)</a></p>
++						<p class="rev-meta-info">by Eugene Fedorenko (eugene) <span class="time">Feb 06, 2009 15:30:00 GMT</span></p>
+ 					</div>
+ 				</div>
+ 
+-				<p class="more"><a href="#">See more results in files&hellip;</a></p>
++			</div>
+ 
++			<div class="paginator">
++				<p class="status">Showing <strong>1&ndash;20</strong> of 2532 commits</p>
++				<div class="pageList">
++					<span class="disabled">&larr;&nbsp;Previous</span>
++					<span class="current">1</span>
++					<a class="page" href="/page2/">2</a>
++					<a class="page" href="/page3/">3</a>
++					<a class="page" href="/page4/">4</a>
++					<a class="page" href="/page5/">5</a>
++					<a class="page" href="/page6/">6</a>
++					<a class="page" href="/page7/">7</a>
++					<span class="break">...</span>
++					<a class="page" href="/page57/">57</a>
++					<a class="page end" href="/page58/">58</a>
++					<a class="link" href="#2">Next&nbsp;&rarr;</a>
++				</div>
+ 			</div>
+ 
+ 		</div>
+@@ -225,10 +191,18 @@
+ 	</div>
+ 
+ 	<div id="footer">
+-		<a class="beanstalk-logo" href="../../public/" title="Beanstalk &nbsp; version control for team leads">Beanstalk &nbsp; version control for team leads</a>
+-		<p class="vcard">&copy; 2007, <a href="http://www.wildbit.com/" class="fn org url">Wildbit LLC</a>. All rights reserved.</p>
+-		<p><a href="textpage-privacy.html">Privacy Policy</a> <span class="sep">&bull;</span> <a href="textpage-terms.html">Terms of Use</a></p>
++	  <div class="wildbit">
++		  <a class="beanstalk-logo" href="../../public/" title="Beanstalk &nbsp; version control for team leads">&nbsp;</a>
++		  <p class="vcard">&copy; 2007, <a href="http://www.wildbit.com/" class="fn org url">Wildbit LLC</a>. All rights reserved.</p>
++		  <p><a href="textpage-privacy.html">Privacy Policy</a> <span class="sep">&bull;</span> <a href="textpage-terms.html">Terms of Use</a></p>
++	  </div>
++	  
++	  <div class="engine-yard">
++	    <a class="ey-logo" href="http://engineyard.com" title="Engine Yard: Fully-Managed Ruby &amp; Rails Hosting and Deployment">&nbsp;</a>
++	    <p>Hosting provided by our</p>
++	    <p>partners at <a href="http://engineyard.com" title="Engine Yard: Fully-Managed Ruby &amp; Rails Hosting and Deployment">Engine Yard</a></p>
++	  </div>
+ 	</div>
+-
++</div>
+ </body>
+ </html>
+

data/test/diff_test.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/helper'
+require 'cgi'
+
+class DiffTest < Test::Unit::TestCase
+  context "Pretty Diff" do
+  
+    setup do
+      @small_diff = PrettyDiff::Diff.new read_diff('first.diff')
+      @big_diff   = PrettyDiff::Diff.new read_diff('second.diff')
+    end
+    
+    should "generate correct amount of chunks for each diff" do
+      assert_equal 2, @small_diff.send(:chunks).size
+      assert_equal 4, @big_diff.send(:chunks).size
+    end
+    
+    should "generate HTML representation without errors" do
+      assert @small_diff.to_html
+      assert @big_diff.to_html
+    end
+    
+    should "escape HTML from the input string" do
+      text = "<b>Funky HTML</b>"
+      diff = PrettyDiff::Diff.new(text)
+      assert_equal "&lt;b&gt;Funky HTML&lt;/b&gt;", diff.input
+    end
+  
+  end
+end

data/test/helper.rb

@@ -0,0 +1,15 @@
+require 'rubygems'
+require 'test/unit'
+require 'shoulda'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'pretty_diff'
+
+class Test::Unit::TestCase
+  
+  def read_diff(name)
+    File.read(File.join(File.dirname(__FILE__), "data", name))
+  end
+  
+end

data/test/html_generator_test.rb

@@ -0,0 +1,39 @@
+require File.dirname(__FILE__) + '/helper'
+
+class HtmlGeneratorTest < Test::Unit::TestCase
+  
+  context "Html Generator" do
+
+    context "for lines" do      
+      should "generate correct HTML for added line" do
+        text = "+package chiro.methods.new.ones;"
+        expected_html = %Q[<span class="gi">#{text}</span>]
+        assert_equal expected_html, line_to_html(text)      
+      end
+    
+      should "generate correct HTML for deleted line" do
+        text = '-			browser.setTimeout("50000");'
+        expected_html = %Q[<span class="gd">-      browser.setTimeout("50000");</span>]
+        assert_equal expected_html, line_to_html(text)      
+      end
+    
+      should "generate correct HTML for not modified line" do
+        text = ' 	public static void close() {'
+        expected_html = "   public static void close() {"
+        assert_equal expected_html, line_to_html(text)
+      end      
+    end
+    
+  end
+  
+private
+
+  def new_line(text)
+    PrettyDiff::Line.new(text)
+  end
+
+  def line_to_html(text)
+    new_line(text).to_html
+  end
+  
+end

data/test/line_test.rb

@@ -0,0 +1,45 @@
+require File.dirname(__FILE__) + '/helper'
+
+class LineTest < Test::Unit::TestCase
+  context "PrettyDiff's Line" do
+
+    should "indicate :added status correctly" do
+      added_line = new_diff("+package chiro.methods.new.ones;")
+      assert_equal :added, added_line.status
+    end
+    
+    should "indicate :deleted status correctly" do
+      deleted_line = new_diff('-browser.setTimeout("50000");')
+      assert_equal :deleted, deleted_line.status
+    end
+    
+    should "indicate :not_modified status correctly" do
+      not_modified_line = new_diff("class User < ActiveRecord::Base")
+      assert_equal :not_modified, not_modified_line.status
+    end
+    
+    should "ignore trailing 'no newline' text" do
+      text = ''
+      line = new_diff(text)
+      assert line.ignore?
+    end
+  
+    should "replace tabs with spaces" do
+      text = "		hello eptut {1, 2, 3}"
+      expected_output = "    hello eptut {1, 2, 3}"
+      line = new_diff(text)
+      assert_equal expected_output, line.rendered
+    end
+  
+  end
+  
+private
+
+  def new_diff(text)
+    PrettyDiff::Line.new(text)
+  end
+
+  def line_to_html(text)
+    new_diff(text).to_html
+  end
+end

metadata

@@ -0,0 +1,92 @@
+--- !ruby/object:Gem::Specification 
+name: pretty_diff
+version: !ruby/object:Gem::Version 
+  version: 0.3.0
+platform: ruby
+authors: 
+- Ilya Sabanin
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2010-01-15 00:00:00 +07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: thoughtbot-shoulda
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: |-
+  PrettyDiff is easily customizable library for creating full featured HTML
+                         listings out of unified diff format. Include copy&paste-safe line numbers
+                         and built-in syntax highlighting.
+email: ilya.sabanin@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- LICENSE
+- README.rdoc
+files: 
+- .document
+- .gitignore
+- LICENSE
+- README.rdoc
+- Rakefile
+- VERSION
+- lib/pretty_diff.rb
+- lib/pretty_diff/chunk.rb
+- lib/pretty_diff/diff.rb
+- lib/pretty_diff/html_generator.rb
+- lib/pretty_diff/line.rb
+- lib/pretty_diff/line_numbers.rb
+- lib/pretty_diff/support.rb
+- pretty_diff.gemspec
+- test/chunk_test.rb
+- test/data/first.diff
+- test/data/second.diff
+- test/diff_test.rb
+- test/helper.rb
+- test/html_generator_test.rb
+- test/line_test.rb
+has_rdoc: true
+homepage: http://github.com/isabanin/pretty_diff
+licenses: []
+
+post_install_message: 
+rdoc_options: 
+- --charset=UTF-8
+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.3.5
+signing_key: 
+specification_version: 3
+summary: Library for converting unified diff format into HTML listings.
+test_files: 
+- test/chunk_test.rb
+- test/diff_test.rb
+- test/helper.rb
+- test/html_generator_test.rb
+- test/line_test.rb