RubyGems - smart_diff - Versions diffs - 0.0.1 - Mend

smart_diff 0.0.1

Files changed (33) hide show

data/README.md +38 -0
data/Rakefile +13 -0
data/bin/smart_diff +69 -0
data/doc/Htmlize.html +1209 -0
data/doc/SmartDiff.html +790 -0
data/doc/Tag.html +484 -0
data/doc/Utils.html +370 -0
data/doc/_index.html +149 -0
data/doc/class_list.html +53 -0
data/doc/css/common.css +1 -0
data/doc/css/full_list.css +57 -0
data/doc/css/style.css +338 -0
data/doc/file.README.html +127 -0
data/doc/file_list.html +55 -0
data/doc/frames.html +28 -0
data/doc/index.html +127 -0
data/doc/js/app.js +214 -0
data/doc/js/full_list.js +178 -0
data/doc/js/jquery.js +4 -0
data/doc/method_list.html +250 -0
data/doc/top-level-namespace.html +114 -0
data/example/bar.rb +52 -0
data/example/foo.rb +51 -0
data/foo.rb-bar.rb.html +498 -0
data/lib/smart_diff/htmlize.rb +181 -0
data/lib/smart_diff/utils.rb +29 -0
data/lib/smart_diff.rb +49 -0
data/spec/smart_diff/htmlize_spec.rb +33 -0
data/spec/smart_diff/utils_spec.rb +34 -0
data/spec/smart_diff_spec.rb +31 -0
data/web/diff.css +96 -0
data/web/nav.js +275 -0
metadata +133 -0

data/foo.rb-bar.rb.html ADDED Viewed

@@ -0,0 +1,498 @@
+<html>
+    <head>
+    <META http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <style>
+    .d {                            /* deleted */
+    border: solid 1px #CC929A;
+    border-radius: 3px;
+    background-color: #FCBFBA;
+}
+.i {                            /* inserted */
+    border: solid 1px #73BE73;
+    border-radius: 3px;
+    background-color: #98FB98;
+}
+.c {                            /* changed */
+    border: solid 1px #8AADB8;
+    background-color: LightBlue;
+    border-radius: 3px;
+    cursor: pointer;
+}
+.m {                            /* moved */
+    border: solid 1px #A9A9A9;
+    border-radius: 3px;
+    cursor: crosshair;
+}
+.mc {
+    border: solid 1px LightPink;
+    background-color: LightBlue;
+    cursor: pointer;
+}
+.u {                            /* unchanged */
+    border: solid 1px #A9A9A9;
+    border-radius: 4px;
+    cursor: crosshair;
+}
+span.lineno {
+    color: lightgrey;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+}
+span.keyword {
+    /* color: #007070; */
+    font-weight: 700;
+}
+div.line {
+}
+div.src {
+    width:48%;
+    height:98%;
+    overflow:scroll;
+    float:left;
+    padding:0.5%;
+    border: solid 2px LightGrey;
+    border-radius: 5px;
+}
+div.stats {
+    border: solid 1px grey;
+    z-index: 1000;
+    width: 80%;
+    padding-left: 5%;
+}
+pre.stats {
+    color: grey;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+}
+pre {
+    line-height: 200%;
+}
+p {
+    line-height: 200%;
+}
+::-webkit-scrollbar {
+    width: 10px;
+}
+::-webkit-scrollbar-track {
+    -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
+    border-radius: 10px;
+}
+::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5);
+}
+</style>
+    <script type="text/javascript">
+    // convenience function for document.getElementById().
+window['$']=function(a){return document.getElementById(a)};
+/////////////////////// debug flag ////////////////////////
+var debug = false;
+/////////////////////// adjustable parameters //////////////////
+var minStep = 10;
+var nSteps = 30;
+var stepInterval = 10;
+var blockRange = 5;                    // how far consider one page blocked
+var nodeHLColor = '#C9B0A9';
+var lineHLColor = '#FFFF66';
+var lineBlockedColor = '#E9AB17';
+var bgColor = '';
+var bodyBlockedColor = '#FAF0E6';
+///////////////////////// globals ////////////////////////
+var eventCount = { 'left' : 0, 'right' : 0};
+var moving = false;
+var matchId1 = 'leftstart';
+var matchId2 = 'rightstart';
+var matchLineId1 = -1;
+var matchLineId2 = -1;
+var cTimeout;
+///////////////////////// utilities ///////////////////////
+// No Math.sign() in JS?
+function sign(x) {
+    if (x > 0) {
+        return 1;
+    } else if (x < 0) {
+        return -1;
+    } else {
+        return 0;
+    }
+}
+function log(msg) {
+    if (debug) {
+        console.log(msg);
+    }
+}
+function elementPosition(id) {
+    obj = $(id);
+    var curleft = 0, curtop = 0;
+    if (obj && obj.offsetParent) {
+        curleft = obj.offsetLeft;
+        curtop = obj.offsetTop;
+        while (obj = obj.offsetParent) {
+            curleft += obj.offsetLeft;
+            curtop += obj.offsetTop;
+        }
+    }
+    return { x: curleft, y: curtop };
+}
+/*
+ * Scroll the window to relative position, detecting blocking positions.
+ */
+function scrollWithBlockCheck(container, distX, distY) {
+    var oldTop = container.scrollTop;
+    var oldLeft = container.scrollLeft;
+    container.scrollTop += distY;      // the ONLY place for actual scrolling
+    container.scrollLeft += distX;
+    var actualX = container.scrollLeft - oldLeft;
+    var actualY = container.scrollTop - oldTop;
+    log("distY=" + distY + ", actualY=" + actualY);
+    log("distX=" + distX + ", actualX=" + actualX);
+    // extra leewaw here because Chrome scrolling is horribly inacurate
+    if ((Math.abs(distX) > blockRange && actualX === 0)
+        || Math.abs(distY) > blockRange && actualY === 0) {
+        log("blocked");
+        container.style.backgroundColor = bodyBlockedColor;
+        return true;
+    } else {
+        eventCount[container.id] += 1;
+        container.style.backgroundColor = bgColor;
+        return false;
+    }
+}
+function getContainer(elm) {
+    while (elm && elm.tagName !== 'DIV') {
+        elm = elm.parentElement || elm.parentNode;
+    }
+    return elm;
+}
+/*
+ * timed animation function for scrolling the current window
+ */
+function matchWindow(linkId, targetId, n)
+{
+    moving = true;
+    var link = $(linkId);
+    var target = $(targetId);
+    var linkContainer = getContainer(link);
+    var targetContainer = getContainer(target);
+    var linkPos = elementPosition(linkId).y - linkContainer.scrollTop;
+    var targetPos = elementPosition(targetId).y - targetContainer.scrollTop;
+    var distY = targetPos - linkPos;
+    var distX = linkContainer.scrollLeft - targetContainer.scrollLeft;
+    log("matching window... " + n + " distY=" + distY + " distX=" + distX);
+    if (distY === 0 && distX === 0) {
+        clearTimeout(cTimeout);
+        moving = false;
+    } else if (n <= 1) {
+        scrollWithBlockCheck(targetContainer, distX, distY);
+        moving = false;
+    } else {
+        var stepSize = Math.floor(Math.abs(distY) / n);
+        actualMinStep = Math.min(minStep, Math.abs(distY));
+        if (Math.abs(stepSize) < minStep) {
+            var step = actualMinStep * sign(distY);
+        } else {
+            var step = stepSize * sign(distY);
+        }
+        var blocked = scrollWithBlockCheck(targetContainer, distX, step);
+        var rest = Math.floor(distY / step) - 1;
+        log("blocked?" + blocked + ", rest steps=" + rest);
+        if (!blocked) {
+            cTimeout = setTimeout(function () {
+                return matchWindow(linkId, targetId, rest);
+            }, stepInterval);
+        } else {
+            clearTimeout(cTimeout);
+            moving = false;
+        }
+    }
+}
+function showArrow(linkId, targetId)
+{
+    var link = $(linkId);
+    var target = $(targetId);
+    var linkContainer = getContainer(link);
+    var targetContainer = getContainer(target);
+    var linkPos = elementPosition(linkId).y - linkContainer.scrollTop;
+    var targetPos = elementPosition(targetId).y - targetContainer.scrollTop;
+    var distY = targetPos - linkPos;
+    var distX = linkContainer.scrollLeft - targetContainer.scrollLeft;
+    log("targetPos = " + targetPos);
+}
+////////////////////////// highlighting /////////////////////////////
+var highlighted = []
+function putHighlight(id, color) {
+    var elm = $(id);
+    if (elm !== null) {
+        elm.style.backgroundColor = color;
+        if (color !== bgColor) {
+            highlighted.push(id);
+        }
+    }
+}
+function clearHighlight() {
+    for (i = 0; i < highlighted.length; i += 1) {
+        putHighlight(highlighted[i], bgColor);
+    }
+    highlighted = [];
+}
+/*
+ * Highlight the link, target nodes and their lines,
+ * then start animation to move the other window to match.
+ */
+function highlight(me, linkId, targetId)
+{
+    if (me.id === 'left') {
+        matchId1 = linkId;
+        matchId2 = targetId;
+    } else {
+        matchId1 = targetId;
+        matchId2 = linkId;
+    }
+    clearHighlight();
+    putHighlight(linkId, nodeHLColor);
+    putHighlight(targetId, nodeHLColor);
+}
+function instantMoveOtherWindow (me) {
+    log("me=" + me.id + ", eventcount=" + eventCount[me.id]);
+    log("matchId1=" + matchId1 + ", matchId2=" + matchId2);
+    me.style.backgroundColor = bgColor;
+    if (!moving && eventCount[me.id] === 0) {
+        if (me.id === 'left') {
+            matchWindow(matchId1, matchId2, 1);
+        } else {
+            matchWindow(matchId2, matchId1, 1);
+        }
+    }
+    if (eventCount[me.id] > 0) {
+        eventCount[me.id] -= 1;
+    }
+}
+function getTarget(x){
+    x = x || window.event;
+    return x.target || x.srcElement;
+}
+window.onload =
+    function (e) {
+        var tags = document.getElementsByTagName("A")
+        for (var i = 0; i < tags.length; i++) {
+            tags[i].onmouseover =
+                function (e) {
+                    var t = getTarget(e)
+                    var lid = t.id
+                    var tid = t.getAttribute('tid')
+                    var container = getContainer(t)
+                    highlight(container, lid, tid)
+                    showArrow(lid, tid)
+                }
+            tags[i].onclick =
+                function (e) {
+                    var t = getTarget(e)
+                    var lid = t.id
+                    var tid = t.getAttribute('tid')
+                    var container = getContainer(t)
+                    highlight(container, lid, tid)
+                    matchWindow(lid, tid, nSteps)
+                }
+        }
+        tags = document.getElementsByTagName("DIV")
+        for (var i = 0; i < tags.length; i++) {
+            tags[i].onscroll =
+                function (e) {
+                    instantMoveOtherWindow(getTarget(e))
+                }
+        }
+    }
+</script>
+    </head>
+    <body>
+<div id="left" class="src"><pre><a id="leftstart" tid="rightstart"></a>require &quot;pathname&quot;
+require &quot;filetree/simple_tree&quot;
+class Pathname
+  alias :_parent :parent
+  alias :_children :children
+end
+class FileTree &lt; Pathname
+  include SimpleTree
+  attr_accessor :name, :id, :identifier
+  <a id='0' tid='1' class='c'>def name
+    @name ||= self.inspect
+  end</a>
+  <a id='2' tid='3' class='c'>def id
+    @id ||= self.inspect
+  end</a>
+  <a id='4' tid='5' class='c'>def identifier
+    @identifier ||= self.inspect
+  end</a>
+  #
+  # See {http://rubydoc.info/stdlib/pathname/Pathname:parent Pathname.parent}
+  #
+  # @return [FileTree] The directory immediately above self.
+  #
+  <a id='6' tid='7' class='c'>def parent
+    <span class='i'>puts <span class='i'>&quot;Here's Johnny!&quot;</span></span>
+    FileTree.new(_parent)
+  end</a>
+  #
+  # See {http://rubydoc.info/stdlib/pathname/Pathname:children Pathname.children}
+  #
+  # @return [Array] an Array of all entries contained in self.
+  #
+  <a id='8' tid='9' class='c'>def children(*args)
+    if self.directory?
+      _children(*args)
+    else
+      []
+    end
+  end</a>
+end
+puts <span class='i'>&quot;And now for something completely different&quot;</span>
+</pre></div><div id="right" class="src"><pre><a id="rightstart" tid="leftstart"></a>require &quot;pathname&quot;
+require &quot;filetree/simple_tree&quot;
+class Pathname
+  alias :_parent :parent
+  alias :_children :children
+end
+class FileTree &lt; Pathname
+  include SimpleTree
+  attr_accessor :name, :id, :identifier
+  #
+  # See {http://rubydoc.info/stdlib/pathname/Pathname:parent Pathname.parent}
+  #
+  # @return [FileTree] The directory immediately above self.
+  #
+  <a id='7' tid='6' class='c'>def parent
+    ft = FileTree.new(_parent)
+    <span class='d'><span class='d'>return ft</span></span>
+  end</a>
+  <a id='3' tid='2' class='c'>def id
+    @id ||= self.inspect
+    <span class='d'>puts <span class='d'>@id</span></span>
+  end</a>
+  <a id='1' tid='0' class='c'>def name
+    @name ||= self.inspect
+  end</a>
+  #
+  # See {http://rubydoc.info/stdlib/pathname/Pathname:children Pathname.children}
+  #
+  # @return [Array] an Array of all entries contained in self.
+  #
+  <a id='9' tid='8' class='c'>def children(*args)
+    if self.directory?
+      _children(*args)
+    else
+      []
+    end
+  end</a>
+  <a id='5' tid='4' class='c'>def identifier
+    @identifier ||= self.inspect
+  end</a>
+end
+puts <span class='d'>&quot;Some stuff&quot;</span>
+</pre></div></body>
+             </html>

data/lib/smart_diff/htmlize.rb ADDED Viewed

@@ -0,0 +1,181 @@
+require "cgi"
+require_relative "utils.rb"
+class Tag
+  attr_accessor :tag, :idx, :start
+  def initialize(tag, idx, start=-1)
+    @tag = tag
+    @idx = idx
+    @start = start
+  end
+  def to_s
+    "tag: #{@tag}, idx: #{@idx} start: #{@start}"
+  end
+end
+class Htmlize
+  include Utils
+  attr_accessor :uid_count, :uid_hash
+  def initialize
+    @uid_count = -1
+    @uid_hash = {}
+  end
+  def clear_uid()
+    @uid_count = -1
+    @uid_hash = {}
+  end
+  def uid(node)
+    if @uid_hash.has_key?(node)
+      return @uid_hash[node]
+    end
+    @uid_count = @uid_count + 1
+    @uid_hash[node] = @uid_count.to_s
+  end
+  def html_header
+    install_path = get_install_path
+    js_filename = Pathname.new(install_path).join('web/nav.js')
+    js_text = js_filename.read
+    css_filename = Pathname.new(install_path).join('web/diff.css')
+    css_text = css_filename.read
+    out = %Q{<html>\n
+    <head>\n
+    <META http-equiv="Content-Type" content="text/html; charset=utf-8">\n
+    <style>\n
+    #{css_text}
+    \n</style>\n
+    <script type="text/javascript">\n
+    #{js_text}
+    \n</script>\n
+    </head>\n
+    <body>\n}
+  end
+  def html_footer
+    out = %Q{</body>\n
+             </html>\n}
+  end
+  def write_html(text, side)
+    out = ""
+    out << '<div id="' + side + '" class="src">'
+    out << '<pre>'
+    if side == 'left'
+      out << '<a id="leftstart" tid="rightstart"></a>'
+    else
+      out << '<a id="rightstart" tid="leftstart"></a>'
+    end
+    out << text
+    out << '</pre>'
+    out << '</div>'
+  end
+  def create_html(changes, file1, file2, text1, text2)
+    tags1 = change_tags(changes, 'left')
+    tags2 = change_tags(changes, 'right')
+    tagged_text1 = apply_tags(text1, tags1)
+    tagged_text2 = apply_tags(text2, tags2)
+    output_filename = "#{Pathname.new(file1).basename}-#{Pathname.new(file2).basename}.html"
+    File.open(output_filename, "w") do |f|
+      f.write html_header
+      f.write write_html(tagged_text1, 'left')
+      f.write write_html(tagged_text2, 'right')
+      f.write html_footer
+    end
+    output_filename
+  end
+  def apply_tags(s, tags)
+    tags = tags.sort_by { |x| [x.idx, -x.start] }
+    curr = 0
+    out = ""
+    tags.each do |t|
+      while curr < t.idx && curr < s.length
+        out << CGI::escapeHTML(s[curr])
+        curr += 1
+      end
+      out << t.tag
+    end
+    while curr < s.length
+      out << CGI::escapeHTML(s[curr])
+      curr += 1
+    end
+    return out
+  end
+  def change_tags(changes, side)
+    tags = []
+    changes.each do |c|
+      key = side =~ /left/ ? c.old_node : c.new_node
+      if key
+        nd_start = node_start(key)
+        nd_end = node_end(key)
+        if c.old_node && c.new_node
+          if inside_anchor?(tags, nd_start, nd_end)
+            if change_class(c) =~ /c/
+              # no op
+            else
+              tags << Tag.new(span_start(c), nd_start)
+              tags << Tag.new('</span>', nd_end, nd_start)
+            end
+          else
+            tags << Tag.new(link_start(c, side), nd_start)
+            tags << Tag.new('</a>', nd_end, nd_start)
+          end
+        else
+          tags << Tag.new(span_start(c), nd_start)
+          tags << Tag.new('</span>', nd_end, nd_start)
+        end
+      end
+    end
+    return tags
+  end
+  def change_class(change)
+    if !change.old_node
+      return 'd'
+    elsif !change.new_node
+      return 'i'
+    else
+      return 'c'
+    end
+  end
+  def span_start(change)
+    "<span class=#{qs(change_class(change))}>"
+  end
+  def link_start(change, side)
+    cls = change_class(change)
+    if side == 'left'
+      me, other = change.old_node, change.new_node
+    else
+      me, other = change.new_node, change.old_node
+    end
+    "<a id=#{qs(uid(me))} tid=#{qs(uid(other))} class=#{qs(cls)}>"
+  end
+  def qs(s)
+    "'#{s}'"
+  end
+end

data/lib/smart_diff/utils.rb ADDED Viewed

@@ -0,0 +1,29 @@
+require "pathname"
+module Utils
+  module_function
+  def get_install_path
+    utils_path = Pathname.new(__FILE__).dirname
+    # There should be a more elegant way to do this
+    install_path = utils_path.parent.parent
+  end
+  def node_start(node)
+    node.position.start_offset
+  end
+  def node_end(node)
+    node.position.end_offset
+  end
+  def inside_anchor?(tags, nd_start, nd_end)
+      tags.each do |t|
+        if nd_end < t.idx && nd_start > t.start && t.start != -1
+          return true
+        end
+      end
+      return false
+  end
+end