diffy 2.0.0 → 2.0.1

data/README.md

@@ -2,9 +2,9 @@ Diffy - Easy Diffing With Ruby
 ============================
 
 Need diffs in your ruby app?  Diffy has you covered.  It provides a convenient
-way to generate a diff from two strings.  Instead of reimplementing the LCS diff
-algorithm Diffy uses battle tested Unix diff to generate diffs, and focuses on
-providing a convenient interface, and getting out of your way.
+way to generate a diff from two strings or files.  Instead of reimplementing
+the LCS diff algorithm Diffy uses battle tested Unix diff to generate diffs,
+and focuses on providing a convenient interface, and getting out of your way.
 
 Supported Formats
 -----------------
@@ -66,13 +66,14 @@ Then try adding this css to your stylesheets:
     .diff{overflow:auto;}
     .diff ul{background:#fff;overflow:auto;font-size:13px;list-style:none;margin:0;padding:0;display:table;width:100%;}
     .diff del, .diff ins{display:block;text-decoration:none;}
-    .diff li{padding:0; display:table-row;margin: 0;}
+    .diff li{padding:0; display:table-row;margin: 0;height:1em;}
+    .diff li.ins{background:#dfd; color:#080}
+    .diff li.del{background:#fee; color:#b00}
+    .diff li:hover{background:#ffc}
     /* try 'whitespace:pre;' if you don't want lines to wrap */
     .diff del, .diff ins, .diff span{white-space:pre-wrap;font-family:courier;}
-    .diff li.ins{background:#9f9;}
-    .diff li.del{background:#fcc;}
-    .diff li.ins strong{font-weight:normal; background: #6f6 }
-    .diff li.del strong{font-weight:normal; background: #f99 }
+    .diff del strong{font-weight:normal;background:#fcc;}
+    .diff ins strong{font-weight:normal;background:#9f9;}
 
 You can also diff files instead of strings
 

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

data/{dirb.gemspec → diffy.gemspec}

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{diffy}
-  s.version = "2.0.0"
+  s.version = "2.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Goldstein"]
-  s.date = %q{2010-11-20}
+  s.date = %q{2010-12-07}
   s.description = %q{Convenient diffing in ruby}
   s.email = %q{sgrock@gmail.com}
   s.extra_rdoc_files = [

data/lib/diffy/html_formatter.rb

@@ -39,9 +39,8 @@ module Diffy
         chunk1 = chunk1
         chunk2 = chunks[index + 1]
         if not chunk2
-          next chunk1
+          next ERB::Util.h(chunk1)
         end
-
         chunk1 = ERB::Util.h(chunk1)
         chunk2 = ERB::Util.h(chunk2)
 
@@ -68,23 +67,32 @@ module Diffy
     def split_characters(chunk)
       chunk.gsub(/^./, '').each_line.map do |line|
         line.chomp.split('') + ['\n']
-      end.flatten.join("\n")
+      end.flatten.join("\n") + "\n"
     end
 
     def reconstruct_characters(line_diff, type)
-      line_diff.each_chunk.map do |l|
+      enum = line_diff.each_chunk
+      enum.each_with_index.map do |l, i|
         re = /(^|\\n)#{Regexp.escape(type)}/
         case l
         when re
-          "<strong>" + l.gsub(re, '').gsub("\n", '').
-            gsub('\n', "</strong>\n<strong>") + "</strong>"
+          highlight(l)
         when /^ /
-          l.gsub(/^./, '').gsub("\n", '').
-            gsub('\r', "\r").gsub('\n', "\n")
+          if i > 1 and enum.to_a[i+1] and l.each_line.to_a.size < 4
+            highlight(l)
+          else
+            l.gsub(/^./, '').gsub("\n", '').
+              gsub('\r', "\r").gsub('\n', "\n")
+          end
         end
       end.join('').split("\n").map do |l|
-        type + l
+        type + l.gsub('</strong><strong>' , '')
       end
     end
+
+    def highlight(lines)
+      "<strong>" + lines.gsub(/(^|\\n)./, '').gsub("\n", '').
+        gsub('\n', "</strong>\n<strong>") + "</strong>"
+    end
   end
 end

data/spec/{dirb_spec.rb → diffy_spec.rb}

@@ -174,6 +174,24 @@ baz
     end
 
     describe "html" do
+      it "should not allow html injection on the last line" do
+        @string1 = "hahaha\ntime flies like an arrow\nfoo bar\nbang baz\n<script>\n"
+        @string2 = "hahaha\nfruit flies like a banana\nbang baz\n<script>\n"
+        @diff = Diffy::Diff.new(@string1, @string2)
+        html = <<-HTML
+<div class="diff">
+  <ul>
+    <li class="unchanged"><span>hahaha</span></li>
+    <li class="del"><del><strong>time</strong> flies like a<strong>n arrow</strong></del></li>
+    <li class="del"><del><strong>foo bar</strong></del></li>
+    <li class="ins"><ins><strong>fruit</strong> flies like a<strong> banana</strong></ins></li>
+    <li class="unchanged"><span>bang baz</span></li>
+    <li class="unchanged"><span>&lt;script&gt;</span></li>
+  </ul>
+</div>
+        HTML
+        @diff.to_s(:html).should ==  html
+      end
 
       it "should highlight the changes within the line" do
         @string1 = "hahaha\ntime flies like an arrow\nfoo bar\nbang baz\n"
@@ -183,9 +201,9 @@ baz
 <div class="diff">
   <ul>
     <li class="unchanged"><span>hahaha</span></li>
-    <li class="del"><del><strong>t</strong>i<strong>me</strong> flies like a<strong>n arrow</strong></del></li>
-    <li class="del"><del><strong>foo</strong> ba<strong>r</strong></del></li>
-    <li class="ins"><ins><strong>fru</strong>i<strong>t</strong> flies like a ba<strong>nana</strong></ins></li>
+    <li class="del"><del><strong>time</strong> flies like a<strong>n arrow</strong></del></li>
+    <li class="del"><del><strong>foo bar</strong></del></li>
+    <li class="ins"><ins><strong>fruit</strong> flies like a<strong> banana</strong></ins></li>
     <li class="unchanged"><span>bang baz</span></li>
   </ul>
 </div>
@@ -201,9 +219,9 @@ baz
 <div class="diff">
   <ul>
     <li class="unchanged"><span>hahaha</span></li>
-    <li class="del"><del><strong>t</strong>i<strong>me</strong> flies like an a<strong>rrow</strong></del></li>
-    <li class="ins"><ins><strong>fru</strong>i<strong>t</strong> flies like a<strong> ba</strong>n<strong>ana</strong></ins></li>
-    <li class="ins"><ins><strong>bang</strong> <strong>b</strong>a<strong>z</strong></ins></li>
+    <li class="del"><del><strong>time</strong> flies like a<strong>n arrow</strong></del></li>
+    <li class="ins"><ins><strong>fruit</strong> flies like a<strong> banana</strong></ins></li>
+    <li class="ins"><ins><strong>bang baz</strong></ins></li>
   </ul>
 </div>
         HTML
@@ -218,9 +236,9 @@ baz
 <div class="diff">
   <ul>
     <li class="unchanged"><span>ha&lt;br&gt;haha</span></li>
-    <li class="del"><del><strong>t</strong>i<strong>me</strong> flies like an a<strong>rrow</strong></del></li>
-    <li class="ins"><ins><strong>fru</strong>i<strong>t</strong> flies like a<strong> ba</strong>n<strong>ana</strong></ins></li>
-    <li class="ins"><ins><strong>bang</strong> <strong>b</strong>a<strong>z</strong></ins></li>
+    <li class="del"><del><strong>time</strong> flies like a<strong>n arrow</strong></del></li>
+    <li class="ins"><ins><strong>fruit</strong> flies like a<strong> banana</strong></ins></li>
+    <li class="ins"><ins><strong>bang baz</strong></ins></li>
   </ul>
 </div>
         HTML
@@ -235,9 +253,9 @@ baz
 <div class="diff">
   <ul>
     <li class="unchanged"><span>hahaha</span></li>
-    <li class="del"><del><strong>t</strong>i<strong>me</strong> flies like a<strong>n arrow</strong></del></li>
-    <li class="del"><del><strong>foo</strong> ba<strong>r</strong></del></li>
-    <li class="ins"><ins><strong>fru</strong>i<strong>t</strong> flies like a ba<strong>nana</strong></ins></li>
+    <li class="del"><del><strong>time</strong> flies like a<strong>n arrow</strong></del></li>
+    <li class="del"><del><strong>foo bar</strong></del></li>
+    <li class="ins"><ins><strong>fruit</strong> flies like a<strong> banana</strong></ins></li>
     <li class="unchanged"><span>bang baz</span></li>
   </ul>
 </div>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: diffy
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Sam Goldstein
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-22 00:00:00 -08:00
+date: 2010-12-07 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -35,12 +35,12 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- dirb.gemspec
+- diffy.gemspec
 - lib/diffy.rb
 - lib/diffy/diff.rb
 - lib/diffy/format.rb
 - lib/diffy/html_formatter.rb
-- spec/dirb_spec.rb
+- spec/diffy_spec.rb
 has_rdoc: true
 homepage: http://github.com/samg/diffy/tree/master
 licenses: []
@@ -77,4 +77,4 @@ signing_key:
 specification_version: 3
 summary: A convenient way to diff string in ruby
 test_files: 
-- spec/dirb_spec.rb
+- spec/diffy_spec.rb