pretty_diff 0.6.0 → 0.7.0

data/README.rdoc

@@ -42,4 +42,8 @@ Read more about Open Source Fridays here:
 
 http://wildbit.com/blog/2010/01/15/open-source-fridays-at-wildbit/
 
-Copyright (c) 2010 Ilya Sabanin, Wildbit; see LICENSE for details.
+== Contributors
+
+1. mrsimo
+
+Copyright (c) 2010 Ilya Sabanin, Wildbit; see LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/lib/pretty_diff.rb

@@ -5,7 +5,6 @@ def require_local(suffix)
   require(File.expand_path(File.join(File.dirname(__FILE__), suffix)))
 end
 
-require_local 'pretty_diff/support'
 require_local 'pretty_diff/diff'
 require_local 'pretty_diff/chunk'
 require_local 'pretty_diff/line_numbers'
@@ -14,4 +13,4 @@ require_local 'pretty_diff/line'
 require_local 'pretty_diff/html_generators/diff_generator'
 require_local 'pretty_diff/html_generators/chunk_generator'
 require_local 'pretty_diff/html_generators/line_generator'
-require_local 'pretty_diff/html_generators/line_numbers_generator'
+require_local 'pretty_diff/html_generators/line_numbers_generator'

data/lib/pretty_diff/chunk.rb

@@ -1,22 +1,22 @@
 #
 # Represent a single piece of a diff.
-# 
+#
 class PrettyDiff::Chunk #:nodoc:
   attr_reader :diff, :meta_info, :input, :lines
-  
+
   def initialize(diff, meta_info, input)
     @diff = diff
     @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!
     generator.generate
   end
-  
+
   # Return LineNumbers object that represents two columns of numbers
   # that will be displayed on the left of the HTML presentation.
   #
@@ -25,7 +25,7 @@ class PrettyDiff::Chunk #:nodoc:
   def line_numbers
     @_line_numbers ||= PrettyDiff::LineNumbers.new(diff, meta_info)
   end
-  
+
 private
 
   def generator
@@ -35,7 +35,8 @@ private
   # Parse the input searching for lines. Initialize Line object for every line.
   # Return an array of Line objects.
   def find_lines!
-    returning(@lines = []) do
+    @lines = []
+    @lines.tap do
       input.split(/\r?\n/).each do |line_str|
         line = PrettyDiff::Line.new(diff, line_str)
         next if line.ignore?
@@ -45,4 +46,4 @@ private
     end
   end
 
-end
+end

data/lib/pretty_diff/diff.rb

@@ -3,7 +3,7 @@ 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
@@ -26,10 +26,10 @@ class PrettyDiff::Diff
   end
 
   # Generate HTML presentation. Return a string.
-  def to_html    
+  def to_html
     generator.generate
   end
-  
+
   # Return an array of Chunk objects that Diff found in the input.
   def chunks
     @_chunks ||= find_chunks(input)
@@ -45,17 +45,18 @@ private
   # Return an array of Chunks.
   def find_chunks(text)
     meta_info = text.scan(CHUNK_REGEXP)
-    returning(chunks = []) do
+    chunks = []
+    chunks.tap do
       split = text.split(CHUNK_REGEXP)
       split.shift
-      split.each_with_index do |lines, idx|        
+      split.each_with_index do |lines, idx|
         chunks << PrettyDiff::Chunk.new(self, meta_info[idx], lines)
       end
     end
   end
-  
+
   def escape_html(input_text)
     CGI.escapeHTML(input_text)
   end
 
-end
+end

data/lib/pretty_diff/html_generators/chunk_generator.rb

@@ -1,18 +1,18 @@
 class PrettyDiff::ChunkGenerator
-  
+
   attr_reader :chunk
-  
+
   def initialize(chunk)
     @chunk = chunk
   end
-  
+
   def generate
     start_html +
     chunk.line_numbers.to_html +
     code_html(content) +
     end_html
   end
-  
+
 private
 
   def content
@@ -22,14 +22,14 @@ private
   def start_html
     %Q[<tr>]
   end
-  
+
   def code_html(text)
     %Q[<td class="code"><div class="highlight"><pre>
 #{text}</pre></div></td>]
   end
-  
+
   def end_html
     %Q[</tr>]
   end
-  
-end
+
+end

data/lib/pretty_diff/html_generators/diff_generator.rb

@@ -1,11 +1,11 @@
 class PrettyDiff::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
@@ -16,13 +16,13 @@ private
   def intro_html
     %Q[<table class="highlighttable">]
   end
-  
+
   def chunk_separator_html
     %Q[<tr class="chunk_separator"><td colspan="3"></td></tr>]
   end
-  
+
   def outro_html
     %Q[</table>]
   end
-  
-end
+
+end

data/lib/pretty_diff/html_generators/line_generator.rb

@@ -1,11 +1,11 @@
 class PrettyDiff::LineGenerator
-  
+
   attr_reader :line
-  
+
   def initialize(line)
     @line = line
   end
-  
+
   def generate
     if line.added?
       added_html(content)
@@ -15,13 +15,13 @@ class PrettyDiff::LineGenerator
       not_modified_html(content)
     end
   end
-  
+
 private
 
   def content
     @_content ||= line.format
   end
-  
+
   def wrapper_html
     if line.diff.options[:wrap_lines]
       "<div> #{yield} </div>"
@@ -41,5 +41,5 @@ private
   def not_modified_html(text)
     wrapper_html { %Q[#{text}] }
   end
-  
-end
+
+end

data/lib/pretty_diff/html_generators/line_numbers_generator.rb

@@ -1,28 +1,28 @@
 class PrettyDiff::LineNumbersGenerator
-  
+
   attr_reader :line_numbers
-  
+
   def initialize(line_numbers)
     @line_numbers = line_numbers
   end
-  
+
   def generate
     column_html(left_column) + column_html(right_column)
   end
-  
+
 private
 
   def left_column
     line_numbers.left_column.join("\n")
   end
-  
+
   def right_column
     line_numbers.right_column.join("\n")
   end
-  
+
   def column_html(text)
     %Q[<td width="2%" class="linenos"><pre>
 #{text}</pre></td>]
   end
-  
-end
+
+end

data/lib/pretty_diff/line.rb

@@ -2,33 +2,33 @@
 # Represent a single line of the diff.
 #
 class PrettyDiff::Line #:nodoc:
-  
+
   attr_reader :diff, :input
-  
+
   def initialize(diff, input)
     @diff = diff
     @input = input
   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
     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
@@ -40,23 +40,23 @@ class PrettyDiff::Line #:nodoc:
       :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 ||= PrettyDiff::LineGenerator.new(self)
   end
-  
-end
+
+end

data/lib/pretty_diff/line_numbers.rb

@@ -3,14 +3,14 @@
 # on the left of the HTML presentation.
 #
 class PrettyDiff::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?
@@ -21,36 +21,36 @@ class PrettyDiff::LineNumbers #:nodoc:
       increase_both
     end
   end
-  
+
   # Generate HTML presentation for a both line numbers columns. Return a string.
   def to_html
     generator.generate
   end
-  
+
   def left_column
     @left_column ||= []
   end
-  
+
   def right_column
     @right_column ||= []
   end
-  
+
 private
 
   def generator
     @_generator ||= PrettyDiff::LineNumbersGenerator.new(self)
   end
-  
+
   # 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
@@ -61,24 +61,24 @@ private
     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
+
+end

data/pretty_diff.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pretty_diff}
-  s.version = "0.6.0"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilya Sabanin"]
-  s.date = %q{2010-03-03}
+  s.date = %q{2010-09-09}
   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.}
@@ -34,7 +34,6 @@ Gem::Specification.new do |s|
      "lib/pretty_diff/html_generators/line_numbers_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",

data/test/chunk_test.rb

@@ -16,22 +16,22 @@ class ChunkTest < Test::Unit::TestCase
       @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
+end

data/test/diff_test.rb

@@ -3,27 +3,27 @@ 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
+end

data/test/helper.rb

@@ -7,9 +7,9 @@ $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

@@ -1,31 +1,31 @@
 require File.dirname(__FILE__) + '/helper'
 
 class HtmlGeneratorTest < Test::Unit::TestCase
-  
+
   context "Html Generator" do
 
-    context "for lines" 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)      
+        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)      
+        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
-    
+
   end
-  
+
 private
 
   def new_line(text)
@@ -35,5 +35,5 @@ private
   def line_to_html(text)
     new_line(text).to_html
   end
-  
-end
+
+end

data/test/line_test.rb

@@ -7,32 +7,32 @@ class LineTest < Test::Unit::TestCase
       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)
@@ -42,4 +42,4 @@ private
   def line_to_html(text)
     new_diff(text).to_html
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pretty_diff
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Ilya Sabanin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-03 00:00:00 +07:00
+date: 2010-09-09 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,6 @@ files:
 - lib/pretty_diff/html_generators/line_numbers_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

data/lib/pretty_diff/support.rb

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