pretty_diff 0.9.3 → 2.0.0

data/lib/pretty_diff/encoding.rb

@@ -0,0 +1,30 @@
+require 'charlock_holmes'
+
+module PrettyDiff
+  module Encoding
+    extend self
+
+    def enforce(encoding, text)
+      result = text
+      if (detected = detect(result)) && detected.downcase != encoding.downcase
+        result = convert(result, detected, encoding)
+      end
+      if RUBY_VERSION >= "2.0.0"
+        result.force_encoding(encoding)
+      else
+        result
+      end
+    end
+
+    def detect(str)
+      if detected = CharlockHolmes::EncodingDetector.detect(str)
+        detected[:encoding]
+      end
+    end
+
+    def convert(str, from, to)
+      CharlockHolmes::Converter.convert(str, from, to)
+    end
+
+  end
+end

data/lib/pretty_diff/line.rb

@@ -1,60 +1,39 @@
-#
-# 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.
-  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
+module PrettyDiff
+  class Line
+    attr_reader :chunk, :contents
+    attr_accessor :left_number, :right_number
+
+    def initialize(chunk, contents)
+      @chunk = chunk
+      @contents = contents
+    end
 
-  # Return status of the Line. Can be :added, :deleted or :not_modified.
-  def status
-    case input
-    when /^\+/
-      :added
-    when /^\-/
-      :deleted
-    else
-      :not_modified
+    def ignored?
+      contents =~ /\/
     end
-  end
 
-  def added?
-    status == :added
-  end
+    def status
+      case contents
+      when /^\+/
+        :added
+      when /^\-/
+        :deleted
+      else
+        :not_modified
+      end
+    end
 
-  def deleted?
-    status == :deleted
-  end
+    def added?
+      status == :added
+    end
 
-  def not_modified?
-    status == :not_modified
-  end
+    def deleted?
+      status == :deleted
+    end
 
-private
+    def not_modified?
+      status == :not_modified
+    end
 
-  def generator
-    @_generator ||= PrettyDiff::LineGenerator.new(self)
   end
-
 end

data/lib/pretty_diff/line_numbers.rb

@@ -1,84 +1,64 @@
-#
-# Represent 2 columns of numbers that will be displayed
-# on the left of the HTML presentation.
-#
-class PrettyDiff::LineNumbers #:nodoc:
+module PrettyDiff
+  class LineNumbers
 
-  attr_reader :diff, :meta_info
+    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
+    def initialize(diff, meta)
+      @diff = diff
+      @meta_info = meta
     end
-  end
 
-  # Generate HTML presentation for a both line numbers columns. Return a string.
-  def to_html
-    generator.generate
-  end
+    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 left_column
+      @left_column ||= []
+    end
 
-  def right_column
-    @right_column ||= []
-  end
+    def right_column
+      @right_column ||= []
+    end
 
-private
+  private
 
-  def generator
-    @_generator ||= PrettyDiff::LineNumbersGenerator.new(self)
-  end
+    def scan_meta(target)
+      meta_info.scan(target).flatten.first
+    end
 
-  # 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_starts_at
+      scan_meta(/^@@ -(\d+)/).to_i
+    end
 
-  # Return starting number for the left column according to unified diff information.
-  def left_starts_at
-    scan_meta(/^@@ -(\d+),/).to_i
-  end
+    def right_starts_at
+      scan_meta(/\+(\d+)(?:,\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
+    def increase_left
+      left_column  << increase_or_start(:left)
+      right_column << nil
+    end
 
-  # Increase left column line number by one.
-  def increase_left
-    left_column  << increase_or_start(:left)
-    right_column << nil
-  end
+    def increase_right
+      left_column  << nil
+      right_column << increase_or_start(:right)
+    end
 
-  # Increase right column line number by one.
-  def increase_right
-    left_column  << nil
-    right_column << increase_or_start(:right)
-  end
+    def increase_both
+      left_column  << increase_or_start(:left)
+      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
+    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
 
-  # 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/pretty_diff.gemspec

@@ -4,16 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{pretty_diff}
-  s.version = "0.9.3"
+  s.name = "pretty_diff"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilya Sabanin"]
-  s.date = %q{2013-04-05}
-  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.date = "2014-02-18"
+  s.description = "PrettyDiff is a highly customizable library for creating fully featured HTML\n                     listings out of unified diff format strings.\n                     Include copy/paste-safe line numbers and built-in syntax highlighting."
+  s.email = "ilya.sabanin@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -27,39 +25,56 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/pretty_diff.rb",
+    "lib/pretty_diff/abstract_generator.rb",
+    "lib/pretty_diff/basic_generator.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/encoding.rb",
     "lib/pretty_diff/line.rb",
     "lib/pretty_diff/line_numbers.rb",
     "pretty_diff.gemspec",
+    "test/abstract_generator_test.rb",
+    "test/basic_generator_test.rb",
     "test/chunk_test.rb",
-    "test/data/first.diff",
-    "test/data/second.diff",
     "test/diff_test.rb",
+    "test/encoding_test.rb",
+    "test/fixtures/blank.diff",
+    "test/fixtures/blank.diff.html",
+    "test/fixtures/chinese-gbk-crlf",
+    "test/fixtures/cp1251.diff",
+    "test/fixtures/csharp.diff",
+    "test/fixtures/csharp.diff.html",
+    "test/fixtures/first.diff",
+    "test/fixtures/first.diff.html",
+    "test/fixtures/second.diff",
+    "test/fixtures/single_line.diff",
+    "test/fixtures/single_line.diff.html",
+    "test/fixtures/text.diff",
+    "test/fixtures/text.diff.html",
+    "test/fixtures/windows-cp1251-lf",
     "test/helper.rb",
-    "test/html_generator_test.rb",
+    "test/line_numbers_test.rb",
     "test/line_test.rb"
   ]
-  s.homepage = %q{http://github.com/isabanin/pretty_diff}
+  s.homepage = "http://github.com/isabanin/pretty_diff"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Library for converting unified diff format into HTML listings.}
+  s.rubygems_version = "2.0.3"
+  s.summary = "Library for converting unified diff format into HTML listings."
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<charlock_holmes>, ["~> 0.6"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<builder>, [">= 0"])
     else
+      s.add_dependency(%q<charlock_holmes>, ["~> 0.6"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<builder>, [">= 0"])
     end
   else
+    s.add_dependency(%q<charlock_holmes>, ["~> 0.6"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<builder>, [">= 0"])
   end

data/test/abstract_generator_test.rb

@@ -0,0 +1,65 @@
+require File.join(File.dirname(__FILE__), 'helper')
+
+class AbstractGeneratorTest < MiniTest::Unit::TestCase
+
+  def setup
+    @diff = new_diff(fixture('first.diff'))
+  end
+
+  def test_target_accessor
+    generator = gen.new(@diff)
+    assert generator.respond_to?(:diff)
+    assert generator.instance_variables.include?(:@diff)
+  end
+
+  def test_stubbed_generate
+    assert_raises RuntimeError do
+      gen.new(@diff).generate
+    end
+  end
+
+  def test_tag_with_options
+    assert_equal '<img class="test" />',
+      gen.new(@diff).send(:tag, :img, :class => 'test')
+  end
+
+  def test_tag_without_options
+    assert_equal '<img />',
+      gen.new(@diff).send(:tag, :img)
+  end
+
+  def test_open_tag
+    assert_equal '<strong>',
+      gen.new(@diff).send(:tag, :strong, nil, true)
+  end
+
+  def test_content_tag_with_options
+    assert_equal '<div class="test">a</div>',
+      gen.new(@diff).send(:content_tag, :div, :class => 'test'){'a'}
+  end
+
+  def test_content_tag_without_options
+    assert_equal '<div>a</div>',
+      gen.new(@diff).send(:content_tag, :div){'a'}
+  end
+
+  def test_h
+    assert_equal '&lt;strong&gt;vasya&lt;/strong&gt;',
+      gen.new(@diff).send(:h, '<strong>vasya</strong>')
+  end
+
+  def test_class_to_target_name
+    assert_equal 'diff',
+      gen.new(@diff).send(:class_to_target_name, 'DiffGenerator') 
+
+    assert_equal 'line_numbers',
+      gen.new(@diff).send(:class_to_target_name, 'LineNumbersGen') 
+  end
+
+private
+
+  def gen
+    PrettyDiff::AbstractGenerator
+  end
+
+end

data/test/basic_generator_test.rb

@@ -0,0 +1,29 @@
+require 'helper'
+
+class BasicGeneratorTest < MiniTest::Unit::TestCase
+
+  def test_generated_html
+    diff = new_diff(fixture('first.diff'), :generator => PrettyDiff::BasicGenerator)
+    assert_equal fixture('first.diff.html'), diff.to_html
+  end
+
+  def test_more_generated_html
+    diff = new_diff(fixture('text.diff'), :generator => PrettyDiff::BasicGenerator)
+    assert_equal fixture('text.diff.html'), diff.to_html
+  end
+
+  def test_another_generated_html
+    diff = new_diff(fixture('csharp.diff'), :generator => PrettyDiff::BasicGenerator)
+    assert_equal fixture('csharp.diff.html'), diff.to_html
+  end
+
+  def test_generate_html_for_blank
+    diff = new_diff(fixture('blank.diff'), :generator => PrettyDiff::BasicGenerator)
+    assert_equal fixture('blank.diff.html'), diff.to_html
+  end
+
+  def test_generate_html_for_single_line_diffs
+    diff = new_diff(fixture('single_line.diff'), :generator => PrettyDiff::BasicGenerator)
+    assert_equal fixture('single_line.diff.html'), diff.to_html
+  end
+end

data/test/chunk_test.rb

@@ -1,37 +1,20 @@
-require File.dirname(__FILE__) + '/helper'
+require File.join(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 < MiniTest::Unit::TestCase
 
-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
+  def setup
+    @diff = new_diff(fixture('first.diff'))
+    @chunk = @diff.chunks.last 
+  end
 
-    should "find correct amount of lines" do
-      assert @chunk.lines.size == 8
+  def test_lines
+    assert_equal 20, @chunk.lines.size
+    @chunk.lines.each do |l|
+      assert l.kind_of?(PrettyDiff::Line)
     end
+  end
 
+  def test_line_numbers
+    assert @chunk.line_numbers.kind_of?(PrettyDiff::LineNumbers)
   end
 end