pretty_diff 0.9.3 → 2.0.0

data/test/diff_test.rb

@@ -1,29 +1,60 @@
-require File.dirname(__FILE__) + '/helper'
-require 'cgi'
+require File.join(File.dirname(__FILE__), 'helper')
 
-class DiffTest < Test::Unit::TestCase
-  context "Pretty Diff" do
+class DiffTest < MiniTest::Unit::TestCase
+  class SuperGenerator < PrettyDiff::AbstractGenerator; def generate;end; end
+  class UberGenerator < SuperGenerator; end
 
-    setup do
-      @small_diff = PrettyDiff::Diff.new read_diff('first.diff')
-      @big_diff   = PrettyDiff::Diff.new read_diff('second.diff')
-    end
+  class NotAGenerator; 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
+  def setup
+    @diff = new_diff(fixture('first.diff'))
+  end
 
-    should "generate HTML representation without errors" do
-      assert @small_diff.to_html
-      assert @big_diff.to_html
+  def test_chunks
+    assert_equal 2, @diff.chunks.size
+    @diff.chunks.each do |c|
+      assert c.kind_of?(PrettyDiff::Chunk)
     end
+  end
+
+  def test_metadata
+    assert_equal "--- Revision 1945\n+++ Revision 1995\n", @diff.metadata
+  end
+
+  def test_contents
+    assert_equal 32, @diff.contents.lines.size
+    assert_equal "@@ -8,6 +8,10 @@\n", @diff.contents.lines.first
+    assert_equal "   }\n", @diff.contents.lines.last
+  end
+
+  def test_default_generator
+    assert_equal 'PrettyDiff::BasicGenerator', new_diff('bla').generator.to_s
+  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
+  def test_custom_generator
+    assert_equal 'DiffTest::SuperGenerator', new_diff('bla', :generator => SuperGenerator).generator.to_s
+  end
+
+  def test_invalid_custom_generator
+    assert_raises PrettyDiff::InvalidGenerator do
+      new_diff('bla', :generator => NotAGenerator)
     end
 
+    assert new_diff('bla', :generator => UberGenerator)
   end
+
+  def test_default_encoding
+    assert_equal 'utf-8', new_diff('bla').out_encoding.downcase
+  end
+
+  def test_custom_encoding
+    assert_equal 'cp1251', new_diff('bla', :out_encoding => 'cp1251').out_encoding
+  end
+
+  def test_encoding_cp1251_diff
+    diff = new_diff(fixture('cp1251.diff'))
+    assert_equal 1, diff.chunks.size
+    assert diff.contents.include?('Сенат США')
+  end
+
 end

data/test/encoding_test.rb

@@ -0,0 +1,35 @@
+require File.join(File.dirname(__FILE__), 'helper')
+
+class EncodingTest < MiniTest::Unit::TestCase
+
+  def test_detect
+    assert_equal 'windows-1251', enc.detect(fixture('windows-cp1251-lf'))
+  end
+
+  def test_convert_cp1251_to_utf8
+    text = enc.convert(fixture('windows-cp1251-lf'), 'windows-1251', 'utf-8')
+    assert text.include?('Сенат США')
+  end
+
+  def test_keep_utf8
+    text = enc.convert('Вася молодец', 'utf-8', 'utf-8')
+    assert_equal 'Вася молодец', text
+  end
+
+  if RUBY_VERSION >= '2.0.0'
+    def test_force_encoding_on_ruby2
+      text = enc.enforce('utf-8', fixture('windows-cp1251-lf'))
+      assert_equal 'utf-8', text.encoding.to_s.downcase
+
+      text = enc.enforce('windows-1251', fixture('windows-cp1251-lf'))
+      assert_equal 'windows-1251', text.encoding.to_s.downcase
+    end
+  end
+
+private
+
+  def enc
+    PrettyDiff::Encoding
+  end
+
+end

data/test/fixtures/blank.diff.html

@@ -0,0 +1 @@
+<div class="diff"></div>

data/test/fixtures/chinese-gbk-crlf

@@ -0,0 +1,5 @@
+GBK �����ּ��Ϥ� 1993��� GB 2312-80 �Β����Ȥ��ƶ��x���줿����GB 2312
+��δʹ�äΥ��`�ɥݥ���Ȥ����ä��� GB 13000.1-93 �����֤⺬��Ǥ��������Τ���
+GBK �� GB 2312 �ˌ�������λ���Q�Ǥ��롣
+
+Chinese GBK LF

data/test/fixtures/cp1251.diff

@@ -0,0 +1,13 @@
+diff --git a/windows-cp1251-lf b/windows-cp1251-lf
+deleted file mode 100644
+index 9604f79..0000000
+--- a/windows-cp1251-lf
++++ /dev/null
+@@ -1,6 +0,0 @@
+-����� ��� 10 ������ �������� �� ���� �������� ���������� ��� �����������
+-����� ������, ���������� � ������������ ���������� REI, ������� ����������
+-�������� ���������� �������. �� ����� �������� ���������� ��� ����� ������
+-������� ���� ��������, ������� ���������� ������������ � 2009 ����.
+-
+-Windows CP1251 LF
+

data/test/fixtures/csharp.diff

@@ -0,0 +1,12 @@
+diff --git a/src/Data/ServiceMail/ServiceEmailBase.cs b/src/Data/ServiceMail/ServiceEmailBase.cs
+index a93dedb..5cb1240 100644
+--- a/src/Data/ServiceMail/ServiceEmailBase.cs
++++ b/src/Data/ServiceMail/ServiceEmailBase.cs
+@@ -21,7 +21,7 @@ namespace PostalService.Data.ServiceMail
+         public abstract string GenerateSubject();
+         public abstract string GenerateTextBody();
+         public abstract string GenerateHtmlBody();
+-        public abstract string GenerateTag();
++        public abstract string GenerateTag(); change on line 24
+ 
+         private readonly SystemSettings _systemSettings;

data/test/fixtures/csharp.diff.html

@@ -0,0 +1,19 @@
+<div class="diff"><div class="diff-chunk"><div class="diff-line-nums"><pre>21
+22
+23
+24
+&nbsp;
+25
+26</pre></div><div class="diff-line-nums"><pre>21
+22
+23
+&nbsp;
+24
+25
+26</pre></div><div class="diff-code"><pre>         public abstract string GenerateSubject();
+         public abstract string GenerateTextBody();
+         public abstract string GenerateHtmlBody();
+<span class="diff-line-del">-        public abstract string GenerateTag();</span>
+<span class="diff-line-add">+        public abstract string GenerateTag(); change on line 24</span>
+ 
+         private readonly SystemSettings _systemSettings;</pre></div></div></div>

data/test/fixtures/first.diff.html

@@ -0,0 +1,85 @@
+<div class="diff"><div class="diff-chunk"><div class="diff-line-nums"><pre>8
+9
+10
+&nbsp;
+&nbsp;
+&nbsp;
+&nbsp;
+11
+12
+13</pre></div><div class="diff-line-nums"><pre>8
+9
+10
+11
+12
+13
+14
+15
+16
+17</pre></div><div class="diff-code"><pre>   border: 0;
+ }
+ 
+<span class="diff-line-add">+.sep {</span>
+<span class="diff-line-add">+  color: #AAA;</span>
+<span class="diff-line-add">+}</span>
+<span class="diff-line-add">+</span>
+ /* Short statistic */
+ 
+ .short-stat dl {</pre></div></div><div class="diff-chunk"><div class="diff-line-nums"><pre>59
+60
+61
+62
+&nbsp;
+&nbsp;
+&nbsp;
+&nbsp;
+&nbsp;
+&nbsp;
+63
+64
+65
+66
+67
+&nbsp;
+&nbsp;
+68
+69
+70</pre></div><div class="diff-line-nums"><pre>63
+64
+65
+&nbsp;
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+&nbsp;
+76
+77
+78
+79
+80</pre></div><div class="diff-code"><pre>     color: #999;
+   }
+   
+<span class="diff-line-del">-  table.account-overview td .status {</span>
+<span class="diff-line-add">+  table.account-overview td.label.top {</span>
+<span class="diff-line-add">+    vertical-align: top;</span>
+<span class="diff-line-add">+  }</span>
+<span class="diff-line-add">+  </span>
+<span class="diff-line-add">+  table.account-overview td .status,</span>
+<span class="diff-line-add">+  table.repos-table td .status {</span>
+     padding-left: 1.75em;
+   	background: url(../images/i_error_light.gif) 0 0 no-repeat;
+   }
+   
+<span class="diff-line-del">-  table.account-overview td .status.active {</span>
+<span class="diff-line-add">+  table.account-overview td .status.active,</span>
+<span class="diff-line-add">+  table.repos-table td .status.success {</span>
+     padding-left: 1.75em;
+   	background: url(../images/i-yes.gif) 0 0 no-repeat;
+   }</pre></div></div></div>

data/test/fixtures/single_line.diff

@@ -0,0 +1,7 @@
+diff --git a/html/exp2.txt b/html/exp2.txt
+index a78cb18..e2274ae 100644
+--- a/html/exp2.txt
++++ b/html/exp2.txt
+@@ -1 +1 @@
+-assome example text
++asassome example text

data/test/fixtures/single_line.diff.html

@@ -0,0 +1,4 @@
+<div class="diff"><div class="diff-chunk"><div class="diff-line-nums"><pre>1
+&nbsp;</pre></div><div class="diff-line-nums"><pre>&nbsp;
+1</pre></div><div class="diff-code"><pre><span class="diff-line-del">-assome example text</span>
+<span class="diff-line-add">+asassome example text</span></pre></div></div></div>

data/test/fixtures/text.diff

@@ -0,0 +1,8 @@
+--- a/selenium.txt
++++ b/selenium.txt
+@@ -3,4 +3,4 @@ line2
+ line3
+ line4 new
+ line5
+-line6 change seleniunm
++line6 change

data/test/fixtures/text.diff.html

@@ -0,0 +1,13 @@
+<div class="diff"><div class="diff-chunk"><div class="diff-line-nums"><pre>3
+4
+5
+6
+&nbsp;</pre></div><div class="diff-line-nums"><pre>3
+4
+5
+&nbsp;
+6</pre></div><div class="diff-code"><pre> line3
+ line4 new
+ line5
+<span class="diff-line-del">-line6 change seleniunm</span>
+<span class="diff-line-add">+line6 change</span></pre></div></div></div>

data/test/fixtures/windows-cp1251-lf

@@ -0,0 +1,6 @@
+����� ��� 10 ������ �������� �� ���� �������� ���������� ��� �����������
+����� ������, ���������� � ������������ ���������� REI, ������� ����������
+�������� ���������� �������. �� ����� �������� ���������� ��� ����� ������
+������� ���� ��������, ������� ���������� ������������ � 2009 ����.
+
+Windows CP1251 LF

data/test/helper.rb

@@ -1,15 +1,17 @@
 require 'rubygems'
-require 'test/unit'
-require 'shoulda'
+require 'bundler/setup'
+require 'minitest/autorun'
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'pretty_diff'
+require File.join(File.dirname(__FILE__), '..', 'lib', 'pretty_diff')
 
-class Test::Unit::TestCase
+class MiniTest::Unit::TestCase
 
-  def read_diff(name)
-    File.read(File.join(File.dirname(__FILE__), "data", name))
+  def new_diff(*args)
+    PrettyDiff::Diff.new(*args)
+  end
+
+  def fixture(name)
+    File.read(File.join(File.dirname(__FILE__), "fixtures", name))
   end
 
 end

data/test/line_numbers_test.rb

@@ -0,0 +1,25 @@
+require 'helper'
+
+class LineNumbersTest < MiniTest::Unit::TestCase
+
+  def setup
+    @diff = new_diff(fixture('first.diff'))
+    @numbers = @diff.chunks.last.line_numbers
+  end
+
+  def test_left_column
+    assert_equal [59, 60, 61, 62, nil, nil, nil, nil, nil, nil, 63, 64, 65, 66, 67, nil, nil, 68, 69, 70],
+      @numbers.left_column
+  end
+
+  def test_right_column
+    assert_equal [63, 64, 65, nil, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, nil, 76, 77, 78, 79, 80],
+      @numbers.right_column
+  end
+
+  def test_line_numbers
+    @diff = new_diff fixture('single_line.diff')
+    assert_equal [1, nil], @diff.chunks.last.line_numbers.left_column
+    assert_equal [nil, 1], @diff.chunks.last.line_numbers.right_column
+  end
+end

data/test/line_test.rb

@@ -1,45 +1,34 @@
-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
+require File.join(File.dirname(__FILE__), 'helper')
 
+class LineTest < MiniTest::Unit::TestCase
+
+  def setup
+    @diff = new_diff(fixture('first.diff'))
+    @lines = @diff.chunks.last.lines
+  end
+
+  def test_contents
+    assert_equal "     color: #999;", @lines[0].contents
+    assert_equal "-  table.account-overview td .status {", @lines[3].contents
+    assert_equal "+  table.account-overview td.label.top {", @lines[4].contents
+    assert_equal "   }", @lines.last.contents
   end
 
-private
+  def test_ignored
+    line = PrettyDiff::Line.new(@diff, '')
+    assert line.ignored?
+  end
 
-  def new_diff(text)
-    PrettyDiff::Line.new(text)
+  def test_status_added
+    assert_equal :added, @lines[4].status
   end
 
-  def line_to_html(text)
-    new_diff(text).to_html
+  def test_status_deleted
+    assert_equal :deleted, @lines[3].status
   end
+
+  def test_status_not_modified
+    assert_equal :not_modified, @lines[0].status
+  end
+
 end