wcc 0.0.7 → 0.0.8

data/assets/template.d/mail-body.html.erb

@@ -32,21 +32,19 @@
 
 .diff .ins {
 	background: #dfd;
-/*	color: #080;*/
 }
 
-.diff .ins .hilite {
-	background: #afa;
+.diff .ins .x {
+	background: #8f8;
 	margin: 0;
 	padding: 0;
 }
 
 .diff .del {
 	background: #fdd;
-/*	color: #b00;*/
 }
 
-.diff .del .hilite {
+.diff .del .x {
 	background: #faa;
 	margin: 0;
 	padding: 0;
@@ -80,11 +78,11 @@
 <% elsif o.status == :range %>
 				<li class="range">@@<%= o.text %></li>
 <% elsif o.status == :ins %>
-				<li class="ins">+<%= o.html_hilite_text %></li>
+				<li class="ins">+<%= o.html_hilite_text('x') %></li>
 <% elsif o.status == :del %>
-				<li class="del">-<%= o.html_hilite_text %></li>
+				<li class="del">-<%= o.html_hilite_text('x') %></li>
 <% else %>
-				<li class="other"><%= o.text.gsub(/^ /, "&nbsp;") %></li>
+				<li class="other"><%= o.text == ' ' ? '&nbsp;' : o.text %></li>
 <% end %>
 <% end %>
 			</ul>

data/bin/wcc-upgrade

@@ -18,6 +18,8 @@ def traverse(root, dst_root, path)
 			rel = p.relative_path_from(root)
 			src = root + rel
 			dst = dst_root + rel
+			# make sure the dst directory exists
+			FileUtils.mkdir_p dst.dirname
 			if dst.exist?
 				# do compare
 				same = FileUtils.compare_file(src, dst)

data/lib/wcc/diff.rb

@@ -1,9 +1,12 @@
 
 module WCC
+	# TODO: Handle tabs/trailing whitespace in output
+
 	class DiffItem
 		attr_accessor :status, :text, :hilite
 		
 		def initialize(line)
+			# parse line
 			if line.start_with?('+++')
 				@status = :new
 				@text = line.substring(3)
@@ -15,13 +18,14 @@ module WCC
 				@text = line.substring(2)
 			elsif line.start_with?('+')
 				@status = :ins
-				@text = line.substring(1)
+				@text = line.substring(1).rstrip
 			elsif line.start_with?('-')
 				@status = :del
-				@text = line.substring(1)
+				@text = line.substring(1).rstrip
 			else
 				@status = :other
-				@text = line
+				@text = line.rstrip
+				@text = ' ' if @text.empty?
 			end
 			@text.gsub!(/\n/, '')
 			@hilite = nil
@@ -30,22 +34,22 @@ module WCC
 		def html_hilite_text(css_klass = 'hilite')
 			return @text if @hilite.nil?
 			
-			i = 1
+			i = 0
 			new_text = ''
 			in_span = false
 			@text.chars.to_a.each do |c|
 				if @hilite.include?(i)
 					if not in_span
 						new_text += "<span class=\"#{css_klass}\">"
+						in_span = true
 					end
-					new_text += c
-					in_span = true
+					new_text += (c == ' ' ? '&nbsp;' : c)
 				else
 					if in_span
 						new_text += "</span>"
+						in_span = false
 					end
 					new_text += c
-					in_span = false
 				end
 				i += 1
 			end
@@ -53,6 +57,8 @@ module WCC
 			new_text
 		end
 		
+		# Returns a representing character for the kind of this diff item.
+		# @return [String] single rep char
 		def rchar
 			case status
 			when :new
@@ -70,6 +76,8 @@ module WCC
 			end
 		end
 		
+		# Returns an unified diff line without trailing newline.
+		# @return [String] unified diff line
 		def to_s
 			case status
 			when :new
@@ -92,18 +100,14 @@ module WCC
 		attr_reader :di
 		
 		def initialize(dstring)
-			@di = []
-			dstring.lines.each do |line|
-				# parse line
-				@di << DiffItem.new(line)
-			end
-			# TODO: compute_hilite, wrong +/- detection
+			@di = dstring.lines.map { |line| DiffItem.new(line) }
+			compute_hilite
 		end
 		
 		def compute_hilite
+			# get representional string for the whole diff
 			s = rchar
-			puts s
-			
+			#puts s
 			mds = []
 			md = s.match(/(@|_)di(@|_)/)
 			while not md.nil?
@@ -116,19 +120,8 @@ module WCC
 			mds.each do |md|
 				i = offset+md.begin(1)+1
 				offset = md.begin(2)+1
-				ranges = Diff::LCS.diff(@di[i].text, @di[i+1].text)
-				@di[i].hilite = []
-				@di[i+1].hilite = []
-				ranges.each do |chg|
-					chg.each do |c|
-						if c.action == '-' and c.element != ''
-							@di[i].hilite << c.position
-						end
-						if c.action == '+' and c.element != ''
-							@di[i+1].hilite << c.position
-						end
-					end
-				end
+				# found a single insertion/deletion pair
+				InLineDiffer.new(@di[i], @di[i+1]).compute_hilite
 			end
 		end
 		
@@ -140,4 +133,38 @@ module WCC
 			@di.map { |o| o.to_s }.join("\n")
 		end
 	end
+	
+	# Calculates hilite based on per char side-by-side diff for two DiffItems.
+	class InLineDiffer
+		def initialize(a, b)
+			@a = a
+			@b = b
+			@a.hilite = []
+			@b.hilite = []
+		end
+		
+		def compute_hilite
+			#puts @a.text.chars.to_a.inspect
+			#puts @b.text.chars.to_a.inspect
+			# HACK: Diff::LCS with plain strings fails on Ruby 1.8 even with -Ku flag but not: <string>.chars.to_a
+			Diff::LCS.traverse_balanced(@a.text.chars.to_a, @b.text.chars.to_a, self)
+		end
+		
+		def match(e)
+			# don't care - this is called "diff" ;-)
+		end
+		
+		def discard_a(e)
+			@a.hilite << e.old_position if not @a.hilite.include?(e.old_position)
+		end
+		
+		def discard_b(e)
+			@b.hilite << e.new_position if not @b.hilite.include?(e.new_position)
+		end
+		
+		def change(e)
+			@a.hilite << e.old_position if not @a.hilite.include?(e.old_position)
+			@b.hilite << e.new_position if not @b.hilite.include?(e.new_position)
+		end
+	end
 end

data/lib/wcc.rb

@@ -16,7 +16,7 @@ require 'uri'
 require 'yaml'
 
 # ruby gem dependencies
-#require 'diff-lcs'
+require 'diff-lcs'
 require 'htmlentities'
 
 # wcc

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wcc
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Christian Nicolai
@@ -31,6 +31,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: diff-lcs
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: wcc tracks changes of websites and notifies you by email.
 email: chrnicolai@gmail.com
 executables: