mail_diff 0.1.1

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 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,27 @@
+= Mail Diff
+
+Similar to PrettyDiff (http://github.com/iSabanin/pretty_diff) but for email messages. Contains a lot of hours of markup tuning to make diffs viewable in almost all known browsers.
+
+Heavily used in Beanstalk (http://beanstalkapp.com) application.
+
+== Installation
+
+ gem install mail_diff
+
+== Example
+
+A quick example will tell it all:
+
+ udiff = File.read("awesome.diff")
+ mail_diff = MailDiff::Diff.new(udiff)
+ mail_diff.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
+
+Same as in PrettyDiff (http://github.com/iSabanin/pretty_diff).
+
+Copyright (c) 2011 Ilya Sabanin and Eugene Fedorenko, Wildbit; see LICENSE for details.

data/Rakefile

@@ -0,0 +1,53 @@
+require 'rubygems'
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "mail_diff"
+    gem.summary = %Q{Unified Diff to HTML converter for emails}
+    gem.description = %Q{Version of PrettyDiff that generate markup that works in most email clients}
+    gem.email = "ilya.sabanin@gmail.com"
+    gem.homepage = "http://github.com/iSabanin/mail_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 = "mail_diff #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -0,0 +1 @@
+0.1.1

data/lib/mail_diff/chunk.rb

@@ -0,0 +1,51 @@
+#
+# Represent a single piece of a diff.
+# 
+class MailDiff::Chunk #:nodoc:
+  attr_reader :diff, :meta_info, :content, :lines
+  
+  def initialize(diff, meta_info, content)
+    @diff = diff
+    @meta_info = meta_info
+    @content = content
+  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!
+    generator.generate
+  end
+  
+  # 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 ||= MailDiff::LineNumbers.new(diff, meta_info)
+  end
+  
+private
+
+  def generator
+    @_generator ||= MailDiff::ChunkGenerator.new(self)
+  end
+
+  # Parse the content searching for lines. Initialize Line object for every line.
+  # Return an array of Line objects.
+  def find_lines!
+    @lines = []
+    @lines.tap do
+      content.split(/\r?\n/).each do |line_str|
+        line = MailDiff::Line.new(diff, line_str)
+        next if line.ignore?
+        @lines << line
+        line_numbers.act_on_line(line)
+        line.left_number = line_numbers.left_column.last
+        line.right_number = line_numbers.right_column.last
+      end
+    end
+  end
+
+end

data/lib/mail_diff/diff.rb

@@ -0,0 +1,60 @@
+require 'cgi'
+
+#
+# Main class to interact with. In fact this is the only class you should interact with
+# when using the library.
+# 
+# === Usage example
+#  mail_diff = MailDiff::Diff.new(udiff)
+#  mail_diff.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.
+#
+class MailDiff::Diff
+  CHUNK_REGEXP = /@@ .+ @@\n/
+
+  attr_reader :input, :options
+
+  # Create new Diff object.
+  # Accept a String in unified diff format and options hash.
+  def initialize(unified_diff, options={})
+    @input = escape_html(unified_diff)
+    @options = options
+  end
+
+  # Generate HTML presentation. Return a string.
+  def to_html    
+    generator.generate
+  end
+  
+  # Return an array of Chunk objects that Diff found in the input.
+  def chunks
+    @_chunks ||= find_chunks(input)
+  end
+
+private
+
+  def generator
+    @_generator ||= MailDiff::DiffGenerator.new(self)
+  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)
+    chunks = []
+    chunks.tap do
+      split = text.split(CHUNK_REGEXP)
+      split.shift
+      split.each_with_index do |lines, idx|        
+        chunks << MailDiff::Chunk.new(self, meta_info[idx], lines)
+      end
+    end
+  end
+  
+  def escape_html(input_text)
+    CGI.escapeHTML(input_text)
+  end
+
+end

data/lib/mail_diff/html_generators/chunk_generator.rb

@@ -0,0 +1,19 @@
+class MailDiff::ChunkGenerator
+  
+  attr_reader :chunk
+  
+  def initialize(chunk)
+    @chunk = chunk
+  end
+  
+  def generate
+    content
+  end
+  
+private
+
+  def content
+    chunk.lines.map{|l| l.to_html }.join("\n")
+  end
+  
+end

data/lib/mail_diff/html_generators/diff_generator.rb

@@ -0,0 +1,41 @@
+class MailDiff::DiffGenerator
+  
+  attr_reader :diff
+  
+  def initialize(diff)
+    @diff = diff
+  end
+  
+  def generate
+    chunks_html = diff.chunks.map{|c| c.to_html}.join(chunk_separator_html).to_s
+    intro_html + chunks_html + outro_html
+  end
+
+private
+
+  def intro_html
+    %Q[<div style="padding: 0 0 1em; overflow:auto; overflow-y: hidden;">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" bgcolor="#F9F9F9" style="margin: 0; border: 1px solid #E5E5E5; border-collapse: collapse; padding: 0; font: 11px Monaco, 'Lucida Console', Consolas, 'Courier New', monospace;">]
+  end
+  
+  def chunk_separator_html
+%Q[<tr>
+	<td bgcolor="#F3F3F3" style="border-right: 1px solid #E5E5E5; padding: 0 .75em;">&nbsp;</td>
+	<td bgcolor="#F3F3F3" style="border-right: 1px solid #E5E5E5; padding: 0 .75em;">&nbsp;</td>
+	<td style="padding: 0 1em;">&nbsp;</td>
+</tr>
+<tr>
+	<td colspan="3" height="2" bgcolor="#E5E5E5"></td>
+</tr>
+<tr>
+	<td bgcolor="#F3F3F3" style="border-right: 1px solid #E5E5E5; padding: 0 .75em;">&nbsp;</td>
+	<td bgcolor="#F3F3F3" style="border-right: 1px solid #E5E5E5; padding: 0 .75em;">&nbsp;</td>
+	<td style="padding: 0 1em;">&nbsp;</td>
+</tr>]
+  end
+  
+  def outro_html
+    %Q[</table></div>]
+  end
+  
+end

data/lib/mail_diff/html_generators/line_generator.rb

@@ -0,0 +1,69 @@
+class MailDiff::LineGenerator
+  
+  attr_reader :line
+  
+  def initialize(line)
+    @line = line
+  end
+  
+  def generate
+    if line.added?
+      added_html
+    elsif line.deleted?
+      deleted_html
+    else
+      not_modified_html
+    end
+  end
+  
+private
+
+  def wrapper(&block)
+    line_start +
+    line_numbers +
+    yield +
+    line_end
+  end
+  
+  def line_start
+    %Q[<tr>]
+  end
+  
+  def line_end
+    %Q[</tr>]
+  end
+  
+  def line_numbers
+    %Q[<td width="4%" align="right" valign="top" bgcolor="#F3F3F3" style="border-right: 1px solid #E5E5E5; padding: .3em .75em; color: #BBB;">
+<pre style="width:auto; margin: 0; border: 0; padding: 0; font: 11px Monaco, 'Lucida Console', Consolas, 'Courier New', monospace;">#{ line.left_number }</pre>
+	  </td>
+	  <td width="4%" align="right" valign="top" bgcolor="#F3F3F3" style="border-right: 1px solid #E5E5E5; padding: .3em .75em; color: #BBB;">
+<pre style="width:auto; margin: 0; border: 0; padding: 0; font: 11px Monaco, 'Lucida Console', Consolas, 'Courier New', monospace;">#{ line.right_number }</pre>
+    </td>]
+  end
+  
+  def added_html
+    wrapper do
+      %Q[<td valign="top" style="padding: .3em 1em;">
+<pre style="width:auto; margin: 0; border: 0; padding: 0; white-space: pre-wrap; font: 11px Monaco, 'Lucida Console', Consolas, 'Courier New', monospace;"><span class="gi">#{ line.format }</span></pre>
+      </td>]
+    end
+  end
+
+  def deleted_html
+    wrapper do
+      %Q[<td valign="top" style="padding: .3em 1em;">
+<pre style="width:auto; margin: 0; border: 0; padding: 0; white-space: pre-wrap; font: 11px Monaco, 'Lucida Console', Consolas, 'Courier New', monospace;"><span class="gd">#{ line.format }</span></pre>
+      </td>]
+    end
+  end
+
+  def not_modified_html
+    wrapper do
+      %Q[<td valign="top" style="padding: .3em 1em;">
+<pre style="width:auto; margin: 0; border: 0; padding: 0; white-space: pre-wrap; font: 11px Monaco, 'Lucida Console', Consolas, 'Courier New', monospace;">#{ line.format }</pre>
+		  </td>]
+		end
+  end
+  
+end

data/lib/mail_diff/line.rb

@@ -0,0 +1,63 @@
+#
+# Represent a single line of the diff.
+#
+class MailDiff::Line #:nodoc:
+  
+  attr_reader :diff, :content
+  attr_accessor :left_number, :right_number
+  
+  def initialize(diff, content)
+    @diff = diff
+    @content = content
+  end
+  
+  # Generate HTML presentation for a Line. Return a string.
+  def to_html
+    generator.generate
+  end
+  
+  # Prepare Line contents for injection into HTML structure.
+  # Currently used for replacing Tab symbols with spaces.
+  # Return a string.
+  def format
+    content.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?
+    content =~ /\/
+  end
+  
+  # Return status of the Line. Can be :added, :deleted or :not_modified.
+  def status
+    case content
+    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
+  
+private
+
+  def generator
+    @_generator ||= MailDiff::LineGenerator.new(self)
+  end
+  
+end

data/lib/mail_diff/line_numbers.rb

@@ -0,0 +1,75 @@
+#
+# Represent 2 columns of numbers that will be displayed
+# on the left of the HTML presentation.
+#
+class MailDiff::LineNumbers #:nodoc:
+  
+  attr_reader :diff, :meta_info
+  
+  def initialize(diff, meta)
+    @diff = diff
+    @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
+  
+  def left_column
+    @left_column ||= []
+  end
+  
+  def right_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
+  
+  # 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/mail_diff.rb

@@ -0,0 +1,15 @@
+module MailDiff #:nodoc:
+end
+
+def require_local(suffix)
+  require(File.expand_path(File.join(File.dirname(__FILE__), suffix)))
+end
+
+require_local 'mail_diff/diff'
+require_local 'mail_diff/chunk'
+require_local 'mail_diff/line_numbers'
+require_local 'mail_diff/line'
+
+require_local 'mail_diff/html_generators/diff_generator'
+require_local 'mail_diff/html_generators/chunk_generator'
+require_local 'mail_diff/html_generators/line_generator'

data/mail_diff.gemspec

@@ -0,0 +1,59 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{mail_diff}
+  s.version = "0.1.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Ilya Sabanin"]
+  s.date = %q{2011-04-18}
+  s.description = %q{Version of PrettyDiff that generate markup that works in most email clients}
+  s.email = %q{ilya.sabanin@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.rdoc"
+  ]
+  s.files = [
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/mail_diff.rb",
+    "lib/mail_diff/.DS_Store",
+    "lib/mail_diff/chunk.rb",
+    "lib/mail_diff/diff.rb",
+    "lib/mail_diff/html_generators/chunk_generator.rb",
+    "lib/mail_diff/html_generators/diff_generator.rb",
+    "lib/mail_diff/html_generators/line_generator.rb",
+    "lib/mail_diff/line.rb",
+    "lib/mail_diff/line_numbers.rb",
+    "mail_diff.gemspec",
+    "test/dummy_mail_diff_test.rb",
+    "test/example.udiff",
+    "test/stylesheet.css"
+  ]
+  s.homepage = %q{http://github.com/iSabanin/mail_diff}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Unified Diff to HTML converter for emails}
+  s.test_files = [
+    "test/dummy_mail_diff_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::VERSION) >= 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/dummy_mail_diff_test.rb

@@ -0,0 +1,11 @@
+require File.join(File.dirname(__FILE__), '..', 'lib', 'mail_diff')
+
+file = File.read("example.udiff")
+diff = MailDiff::Diff.new(file)
+
+File.open("test_result.html", 'w') do |f|
+  f << File.read("stylesheet.css")
+  f << diff.to_html
+end
+
+`open test_result.html`

data/test/example.udiff

@@ -0,0 +1,212 @@
+--- Revision 12
++++ Revision 17
+@@ -4,7 +4,7 @@
+ <head>
+   <meta charset="utf-8">
+   <title>Team Schedules</title>
+-	<style type="text/css"> article,aside,dialog,figure,footer,header,hgroup,nav,section{display:block}html,body,div,span,object,iframe,h1,h2,h3,h4,h5,h6,hr,p,blockquote,pre,abbr,address,cite,code,del,dfn,em,img,ins,kbd,q,samp,small,strong,sub,sup,var,b,i,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,dialog,figure,footer,header,hgroup,menu,nav,section,time,mark,audio,video{margin:0;border:0;padding:0;outline:0;font-size:1em;vertical-align:baseline;background-color:transparent}html,body{height:100%}body{background-color:#FFF;color:#333;font:normal .8em/1.4 'Helvetica Neue',Arial,Helvetica,sans-serif}select{width:160px}table{width:100%;height:100%;border-collapse:collapse;border-spacing:0}table th,table td{border-bottom:1px solid rgba(0,0,0,.02);vertical-align:middle}table thead th{width:10%;padding:1em 0}table tbody th{padding-right:1em;border-color:#DDD;background-color:#EEE;color:#AAA;font-size:.85em;font-weight:normal;text-align:right}table th.now{background-color:#FFFFD5;color:#908E00}table td.working{background-color:#D5F4FF} </style>
++	<style type="text/css"> article,aside,dialog,figure,footer,header,hgroup,nav,section{display:block}html,body,div,span,object,iframe,h1,h2,h3,h4,h5,h6,hr,p,blockquote,pre,abbr,address,cite,code,del,dfn,em,img,ins,kbd,q,samp,small,strong,sub,sup,var,b,i,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,dialog,figure,footer,header,hgroup,menu,nav,section,time,mark,audio,video{margin:0;border:0;padding:0;outline:0;font-size:1em;vertical-align:baseline;background-color:transparent}html,body{height:100%}body{background-color:#FFF;color:#333;font:normal .8em/1.4 'Helvetica Neue',Arial,Helvetica,sans-serif}select{width:160px}table{width:100%;height:100%;border-collapse:collapse;border-spacing:0}table th,table td{border-bottom:1px solid rgba(0,0,0,.02);vertical-align:middle}table thead th{width:10%;padding:1em 0}table thead th span{color:#AAA;font-size:.85em;font-weight:normal;vertical-align:top;}table tbody th{padding-right:1em;border-color:#DDD;background-color:#EEE;color:#AAA;font-size:.85em;font-weight:normal;text-align:right}table th.now{background-color:#FFFFD5;color:#908E00}table td.working{background-color:#D5F4FF} </style>
+ </head>
+ 
+ <body>
+@@ -31,7 +31,7 @@
+ 				<td></td> 	<!-- Eugene -->
+ 				<td></td> 	<!-- Gilbert -->
+ 				<td></td> 	<!-- Ilya -->
+-				<td></td> 	<!-- Dima -->
++				<td>*</td> 	<!-- Dima -->
+ 				<td></td> 	<!-- Hristo -->
+ 				<td></td> 	<!-- Igor -->
+ 			</tr>
+@@ -42,7 +42,7 @@
+ 				<td></td> 	<!-- Eugene -->
+ 				<td></td> 	<!-- Gilbert -->
+ 				<td>*</td> 	<!-- Ilya -->
+-				<td></td> 	<!-- Dima -->
++				<td>*</td> 	<!-- Dima -->
+ 				<td></td> 	<!-- Hristo -->
+ 				<td></td> 	<!-- Igor -->
+ 			</tr>
+@@ -53,7 +53,7 @@
+ 				<td>*</td> 	<!-- Eugene -->
+ 				<td>*</td> 	<!-- Gilbert -->
+ 				<td>*</td> 	<!-- Ilya -->
+-				<td></td> 	<!-- Dima -->
++				<td>*</td> 	<!-- Dima -->
+ 				<td>*</td> 	<!-- Hristo -->
+ 				<td>*</td> 	<!-- Igor -->
+ 			</tr>
+@@ -64,7 +64,7 @@
+ 				<td>*</td> 	<!-- Eugene -->
+ 				<td>*</td> 	<!-- Gilbert -->
+ 				<td>*</td> 	<!-- Ilya -->
+-				<td></td> 	<!-- Dima -->
++				<td>*</td> 	<!-- Dima -->
+ 				<td>*</td> 	<!-- Hristo -->
+ 				<td>*</td> 	<!-- Igor -->
+ 			</tr>
+@@ -125,8 +125,8 @@
+ 			</tr>
+ 			<tr>
+ 				<th>10 AM</th>
+-				<td></td> 	<!-- Chris -->
+-				<td></td> 	<!-- Natalie -->
++				<td>*</td> 	<!-- Chris -->
++				<td>*</td> 	<!-- Natalie -->
+ 				<td>*</td> 	<!-- Eugene -->
+ 				<td>*</td> 	<!-- Gilbert -->
+ 				<td>*</td> 	<!-- Ilya -->
+@@ -136,8 +136,8 @@
+ 			</tr>
+ 			<tr>
+ 				<th>11 AM</th>
+-				<td></td> 	<!-- Chris -->
+-				<td></td> 	<!-- Natalie -->
++				<td>*</td> 	<!-- Chris -->
++				<td>*</td> 	<!-- Natalie -->
+ 				<td>*</td> 	<!-- Eugene -->
+ 				<td>*</td> 	<!-- Gilbert -->
+ 				<td>*</td> 	<!-- Ilya -->
+@@ -147,10 +147,10 @@
+ 			</tr>
+ 			<tr>
+ 				<th>Noon</th>
+-				<td></td> 	<!-- Chris -->
+-				<td></td> 	<!-- Natalie -->
++				<td>*</td> 	<!-- Chris -->
++				<td>*</td> 	<!-- Natalie -->
+ 				<td>*</td> 	<!-- Eugene -->
+-				<td>*</td> 	<!-- Gilbert -->
++				<td></td> 	<!-- Gilbert -->
+ 				<td></td> 	<!-- Ilya -->
+ 				<td></td> 	<!-- Dima -->
+ 				<td>*</td> 	<!-- Hristo -->
+@@ -158,20 +158,20 @@
+ 			</tr>
+ 			<tr>
+ 				<th>1 PM</th>
+-				<td></td> 	<!-- Chris -->
+-				<td></td> 	<!-- Natalie -->
+-				<td>*</td> 	<!-- Eugene -->
+-				<td>*</td> 	<!-- Gilbert -->
++				<td>*</td> 	<!-- Chris -->
++				<td>*</td> 	<!-- Natalie -->
++				<td></td> 	<!-- Eugene -->
++				<td></td> 	<!-- Gilbert -->
+ 				<td></td> 	<!-- Ilya -->
+ 				<td></td> 	<!-- Dima -->
+-				<td>*</td> 	<!-- Hristo -->
+-				<td>*</td> 	<!-- Igor -->
++				<td></td> 	<!-- Hristo -->
++				<td></td> 	<!-- Igor -->
+ 			</tr>
+ 			<tr>
+ 				<th>2 PM</th>
+-				<td></td> 	<!-- Chris -->
+-				<td></td> 	<!-- Natalie -->
+-				<td>*</td> 	<!-- Eugene -->
++				<td>*</td> 	<!-- Chris -->
++				<td>*</td> 	<!-- Natalie -->
++				<td></td> 	<!-- Eugene -->
+ 				<td></td> 	<!-- Gilbert -->
+ 				<td></td> 	<!-- Ilya -->
+ 				<td></td> 	<!-- Dima -->
+@@ -180,8 +180,8 @@
+ 			</tr>
+ 			<tr>
+ 				<th>3 PM</th>
+-				<td></td> 	<!-- Chris -->
+-				<td></td> 	<!-- Natalie -->
++				<td>*</td> 	<!-- Chris -->
++				<td>*</td> 	<!-- Natalie -->
+ 				<td></td> 	<!-- Eugene -->
+ 				<td></td> 	<!-- Gilbert -->
+ 				<td></td> 	<!-- Ilya -->
+@@ -191,8 +191,8 @@
+ 			</tr>
+ 			<tr>
+ 				<th>4 PM</th>
+-				<td></td> 	<!-- Chris -->
+-				<td></td> 	<!-- Natalie -->
++				<td>*</td> 	<!-- Chris -->
++				<td>*</td> 	<!-- Natalie -->
+ 				<td></td> 	<!-- Eugene -->
+ 				<td></td> 	<!-- Gilbert -->
+ 				<td></td> 	<!-- Ilya -->
+@@ -202,8 +202,8 @@
+ 			</tr>
+ 			<tr>
+ 				<th>5 PM</th>
+-				<td></td> 	<!-- Chris -->
+-				<td></td> 	<!-- Natalie -->
++				<td>*</td> 	<!-- Chris -->
++				<td>*</td> 	<!-- Natalie -->
+ 				<td></td> 	<!-- Eugene -->
+ 				<td></td> 	<!-- Gilbert -->
+ 				<td></td> 	<!-- Ilya -->
+@@ -240,7 +240,7 @@
+ 				<td></td> 	<!-- Eugene -->
+ 				<td></td> 	<!-- Gilbert -->
+ 				<td></td> 	<!-- Ilya -->
+-				<td></td> 	<!-- Dima -->
++				<td>*</td> 	<!-- Dima -->
+ 				<td></td> 	<!-- Hristo -->
+ 				<td></td> 	<!-- Igor -->
+ 			</tr>
+@@ -251,7 +251,7 @@
+ 				<td></td> 	<!-- Eugene -->
+ 				<td></td> 	<!-- Gilbert -->
+ 				<td></td> 	<!-- Ilya -->
+-				<td></td> 	<!-- Dima -->
++				<td>*</td> 	<!-- Dima -->
+ 				<td></td> 	<!-- Hristo -->
+ 				<td></td> 	<!-- Igor -->
+ 			</tr>
+@@ -262,7 +262,7 @@
+ 				<td></td> 	<!-- Eugene -->
+ 				<td></td> 	<!-- Gilbert -->
+ 				<td>*</td> 	<!-- Ilya -->
+-				<td></td> 	<!-- Dima -->
++				<td>*</td> 	<!-- Dima -->
+ 				<td></td> 	<!-- Hristo -->
+ 				<td></td> 	<!-- Igor -->
+ 			</tr>
+@@ -273,7 +273,7 @@
+ 				<td></td> 	<!-- Eugene -->
+ 				<td></td> 	<!-- Gilbert -->
+ 				<td>*</td> 	<!-- Ilya -->
+-				<td></td> 	<!-- Dima -->
++				<td>*</td> 	<!-- Dima -->
+ 				<td></td> 	<!-- Hristo -->
+ 				<td></td> 	<!-- Igor -->
+ 			</tr>
+@@ -284,7 +284,7 @@
+ 				<td></td> 	<!-- Eugene -->
+ 				<td></td> 	<!-- Gilbert -->
+ 				<td></td> 	<!-- Ilya -->
+-				<td></td> 	<!-- Dima -->
++				<td>*</td> 	<!-- Dima -->
+ 				<td></td> 	<!-- Hristo -->
+ 				<td></td> 	<!-- Igor -->
+ 			</tr>
+@@ -299,8 +299,19 @@
+ 			var now = new Date();
+ 
+ 			$("td:contains('*')").addClass('working').text('');
+-			$('table tbody tr:eq(' + (now.getHours() - 7) + ') th').addClass('now')
+ 			
++			$('table tbody tr:eq(' + (now.getHours() - 7) + ') th').addClass('now');
++			
++			$('table thead th:gt(0)').each(function(i){
++				var hours = 0;
++				
++				$('table tbody tr').find('td:eq(' + i + ')').each(function(){
++					if ($(this).hasClass('working')) hours++;
++				});
++				
++				$(this).append(' <span>' + hours + '</span>');
++			});
++						
+ 		});
+ 	
+ 	</script>

data/test/stylesheet.css

@@ -0,0 +1,65 @@
+<style type="text/css">
+
+	/* Syntax Coloring */
+
+	pre span.lineno { background-color: #F0F0F0; }
+	pre .hll { background-color: #FFC; }
+	pre .c   { color: #AAA; }												/* Comment */
+	pre .err { color: #F00000; background-color: #F0A0A0; }				/* Error */
+	pre .k   { color: #00A; }												/* Keyword */
+	pre .cm  { color: #AAA; }												/* Comment.Multiline */
+	pre .cp  { color: #4C8317; }											/* Comment.Preproc */
+	pre .c1  { color: #AAA; }												/* Comment.Single */
+	pre .cs  { color: #00A; }												/* Comment.Special */
+	pre .gd  { background-color: #FDD; color: #300; }						/* Generic.Deleted */
+	pre .ge  { }															/* Generic.Emph */
+	pre .gr  { color: #A00 }												/* Generic.Error */
+	pre .gh  { color: #000080; }											/* Generic.Heading */
+	pre .gi  { background-color: #E0F2CE; color: #030; }					/* Generic.Inserted */
+	pre .go  { color: #888 }												/* Generic.Output */
+	pre .gp  { color: #555 }												/* Generic.Prompt */
+	pre .gs  { }															/* Generic.Strong */
+	pre .gu  { color: #800080; }											/* Generic.Subheading */
+	pre .gt  { color: #A00 }												/* Generic.Traceback */
+	pre .kc  { color: #00A }												/* Keyword.Constant */
+	pre .kd  { color: #00A }												/* Keyword.Declaration */
+	pre .kn  { color: #00A }												/* Keyword.Namespace */
+	pre .kp  { color: #00A }												/* Keyword.Pseudo */
+	pre .kr  { color: #00A }												/* Keyword.Reserved */
+	pre .kt  { color: #0AA }												/* Keyword.Type */
+	pre .m   { color: #099 }												/* Literal.Number */
+	pre .s   { color: #A50 }												/* Literal.String */
+	pre .na  { color: #1E90FF }											/* Name.Attribute */
+	pre .nb  { color: #0AA }												/* Name.Builtin */
+	pre .nc  { color: #0A0; text-decoration: underline }					/* Name.Class */
+	pre .no  { color: #A00 }												/* Name.Constant */
+	pre .nd  { color: #888 }												/* Name.Decorator */
+	pre .ni  { color: #800000; }											/* Name.Entity */
+	pre .nf  { color: #0A0 }												/* Name.Function */
+	pre .nn  { color: #0AA; text-decoration: underline }					/* Name.Namespace */
+	pre .nt  { color: #1E90FF; }											/* Name.Tag */
+	pre .nv  { color: #A00 }												/* Name.Variable */
+	pre .ow  { color: #00A }												/* Operator.Word */
+	pre .w   { color: #BBB }												/* Text.Whitespace */
+	pre .mf  { color: #099 }												/* Literal.Number.Float */
+	pre .mh  { color: #099 }												/* Literal.Number.Hex */
+	pre .mi  { color: #099 }												/* Literal.Number.Integer */
+	pre .mo  { color: #099 }												/* Literal.Number.Oct */
+	pre .sb  { color: #A50 }												/* Literal.String.Backtick */
+	pre .sc  { color: #A50 }												/* Literal.String.Char */
+	pre .sd  { color: #A50 }												/* Literal.String.Doc */
+	pre .s2  { color: #A50 }												/* Literal.String.Double */
+	pre .se  { color: #A50 }												/* Literal.String.Escape */
+	pre .sh  { color: #A50 }												/* Literal.String.Heredoc */
+	pre .si  { color: #A50 }												/* Literal.String.Interpol */
+	pre .sx  { color: #A50 }												/* Literal.String.Other */
+	pre .sr  { color: #099 }												/* Literal.String.Regex */
+	pre .s1  { color: #A50 }												/* Literal.String.Single */
+	pre .ss  { color: #00A }												/* Literal.String.Symbol */
+	pre .bp  { color: #0AA }												/* Name.Builtin.Pseudo */
+	pre .vc  { color: #A00 }												/* Name.Variable.Class */
+	pre .vg  { color: #A00 }												/* Name.Variable.Global */
+	pre .vi  { color: #A00 }												/* Name.Variable.Instance */
+	pre .il  { color: #099 }												/* Literal.Number.Integer.Long */
+
+</style>

metadata

@@ -0,0 +1,97 @@
+--- !ruby/object:Gem::Specification 
+name: mail_diff
+version: !ruby/object:Gem::Version 
+  hash: 25
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 1
+  version: 0.1.1
+platform: ruby
+authors: 
+- Ilya Sabanin
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2011-04-18 00:00:00 +08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: thoughtbot-shoulda
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+description: Version of PrettyDiff that generate markup that works in most email clients
+email: ilya.sabanin@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- LICENSE
+- README.rdoc
+files: 
+- LICENSE
+- README.rdoc
+- Rakefile
+- VERSION
+- lib/mail_diff.rb
+- lib/mail_diff/.DS_Store
+- lib/mail_diff/chunk.rb
+- lib/mail_diff/diff.rb
+- lib/mail_diff/html_generators/chunk_generator.rb
+- lib/mail_diff/html_generators/diff_generator.rb
+- lib/mail_diff/html_generators/line_generator.rb
+- lib/mail_diff/line.rb
+- lib/mail_diff/line_numbers.rb
+- mail_diff.gemspec
+- test/dummy_mail_diff_test.rb
+- test/example.udiff
+- test/stylesheet.css
+has_rdoc: true
+homepage: http://github.com/iSabanin/mail_diff
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.3.7
+signing_key: 
+specification_version: 3
+summary: Unified Diff to HTML converter for emails
+test_files: 
+- test/dummy_mail_diff_test.rb