pretty_diff 0.8.1 → 0.9.1

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.9.1

data/lib/pretty_diff/diff.rb

@@ -12,7 +12,7 @@ require 'cgi'
 # so that it doesn't interfere with the output.
 #
 class PrettyDiff::Diff
-  CHUNK_REGEXP = /@@ .+ @@\n/
+  CHUNK_REGEXP = /^@@ .+ @@\n?/
 
   attr_reader :input, :options
 

data/lib/pretty_diff/html_generators/diff_generator.rb

@@ -7,22 +7,7 @@ class PrettyDiff::DiffGenerator
   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[]
-  end
-
-  def chunk_separator_html
-    %Q[]
-  end
-
-  def outro_html
-    %Q[]
+    diff.chunks.map{|c| c.to_html}.to_s
   end
 
 end

data/lib/pretty_diff/html_generators/line_generator.rb

@@ -7,7 +7,9 @@ class PrettyDiff::LineGenerator
   end
 
   def generate
-    if line.added?
+    if line.modified?
+      modified_html(content)
+    elsif line.added?
       added_html(content)
     elsif line.deleted?
       deleted_html(content)
@@ -30,6 +32,10 @@ private
     end
   end
 
+  def modified_html(text)
+    wrapper_html { %Q[<span class="gm">#{text}</span>] }
+  end
+
   def added_html(text)
     wrapper_html { %Q[<span class="gi">#{text}</span>] }
   end

data/lib/pretty_diff/html_generators/line_numbers_generator.rb

@@ -30,8 +30,7 @@ private
 
   def column_html(text)
     %Q[<div class="code-lines"><pre>
-#{text}
-</pre></div>]
+#{text}</pre></div>]
   end
 
 end

data/lib/pretty_diff/line.rb

@@ -3,6 +3,11 @@
 #
 class PrettyDiff::Line #:nodoc:
 
+  INLINE_INSERT_START = /\{\+/
+  INLINE_INSERT_END = /\+\}/
+  INLINE_DELETE_START = /\[-/
+  INLINE_DELETE_END = /-\]/
+
   attr_reader :diff, :input
 
   def initialize(diff, input)
@@ -16,10 +21,12 @@ class PrettyDiff::Line #:nodoc:
   end
 
   # Prepare Line contents for injection into HTML structure.
-  # Currently used for replacing Tab symbols with spaces.
-  # Return a string.
   def format
-    input.gsub("\t", '  ')
+    input.gsub(INLINE_INSERT_START, '<ins>') \
+      .gsub(INLINE_INSERT_END, '</ins>') \
+      .gsub(INLINE_DELETE_START, '<del>') \
+      .gsub(INLINE_DELETE_END, '</del>') \
+      .gsub("\t", '  ')
   end
 
   # Unified Diff sometimes emit a special line at the end of the file
@@ -29,9 +36,11 @@ class PrettyDiff::Line #:nodoc:
     input =~ /\/
   end
 
-  # Return status of the Line. Can be :added, :deleted or :not_modified.
+  # Return status of the Line. Can be :modified (for per-word diffing), :added, :deleted or :not_modified.
   def status
     case input
+    when /(#{ INLINE_DELETE_START }|#{ INLINE_INSERT_START })/
+      :modified
     when /^\+/
       :added
     when /^\-/
@@ -41,6 +50,10 @@ class PrettyDiff::Line #:nodoc:
     end
   end
 
+  def modified?
+    status == :modified
+  end
+
   def added?
     status == :added
   end

data/pretty_diff.gemspec

@@ -1,59 +1,57 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{pretty_diff}
-  s.version = "0.8.1"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilya Sabanin"]
-  s.date = %q{2011-01-27}
+  s.date = %q{2012-04-18}
   s.description = %q{PrettyDiff is a highly customizable library for creating fully featured HTML
                        listings out of unified diff format strings.
                        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"
+    "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_generators/chunk_generator.rb",
-     "lib/pretty_diff/html_generators/diff_generator.rb",
-     "lib/pretty_diff/html_generators/line_generator.rb",
-     "lib/pretty_diff/html_generators/line_numbers_generator.rb",
-     "lib/pretty_diff/line.rb",
-     "lib/pretty_diff/line_numbers.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"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/pretty_diff.rb",
+    "lib/pretty_diff/chunk.rb",
+    "lib/pretty_diff/diff.rb",
+    "lib/pretty_diff/html_generators/chunk_generator.rb",
+    "lib/pretty_diff/html_generators/diff_generator.rb",
+    "lib/pretty_diff/html_generators/line_generator.rb",
+    "lib/pretty_diff/html_generators/line_numbers_generator.rb",
+    "lib/pretty_diff/line.rb",
+    "lib/pretty_diff/line_numbers.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.7}
   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"
+    "test/diff_test.rb",
+    "test/helper.rb",
+    "test/html_generator_test.rb",
+    "test/line_test.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pretty_diff
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 57
   prerelease: false
   segments: 
   - 0
-  - 8
+  - 9
   - 1
-  version: 0.8.1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Ilya Sabanin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 +07:00
+date: 2012-04-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -73,8 +72,8 @@ homepage: http://github.com/isabanin/pretty_diff
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

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