smart_diff 0.0.1

data/lib/smart_diff.rb

@@ -0,0 +1,49 @@
+require "jruby-parser"
+require "pathname"
+require "jruby-parser.jar"
+
+import org.jrubyparser.util.diff.NodeDiff
+
+class SmartDiff
+  attr_accessor :file_one, :file_two, :code_one, :code_two, :node_diff
+
+
+  #
+  # Create a SmartDiff object which will create diff of two source
+  # files based on AST generated by JRubyParser.
+  #
+  # @param  file_one [String] The path to the first source file.
+  # @param  file_two [String] The path to the second source file.
+  #
+  # @return [SmartDiff] A Ruby object which holds a reference to a diff.
+  def initialize(file_one, file_two)
+    @file_one = file_one
+    @file_two = file_two
+    @node_diff = diff()
+  end
+
+  def read(file_name)
+    path = Pathname.new(file_name).expand_path
+    if path.exist?
+      File.read path
+    else
+      raise "#{path} not found. Check the path."
+    end
+  end
+
+  def parse(code_to_parse, file_name)
+    JRubyParser.parse(code_to_parse, { :filename => file_name })
+  end
+
+  def diff()
+    @code_one = read(@file_one)
+    @code_two = read(@file_two)
+    if @code_one && @code_two
+      nodeA = parse(@code_one, @file_one)
+      nodeB = parse(@code_two, @file_two)
+      nd = org.jrubyparser.util.diff.NodeDiff.new(nodeA, @code_one, nodeB, @code_two)
+      nd.deep_diff
+    end
+  end
+end
+

data/spec/smart_diff/htmlize_spec.rb

@@ -0,0 +1,33 @@
+require "smart_diff/htmlize"
+
+describe "Htmlize" do
+
+  it "should clear the uid variables" do
+    html = Htmlize.new
+    html.uid_count = 10
+    html.uid_hash = { :foo => "bar", :baz => "qux" }
+    html.clear_uid()
+    html.uid_count.should == -1
+    html.uid_hash.should == {}
+  end
+
+  it "should increment the uid_count" do
+    html = Htmlize.new
+    html.uid_count = 5
+    html.uid("banana")
+    html.uid_count.should == 6
+  end
+
+  it "should set the hash if it wasn't previously set" do
+    html = Htmlize.new
+    html.uid(:cow)
+    html.uid_hash.should have_key(:cow)
+  end
+
+  it "should return the entry for a previously set hash" do
+    html = Htmlize.new
+    html.uid_hash = { banana: "cow" }
+    html.uid(:banana).should =~ /cow/
+  end
+
+end

data/spec/smart_diff/utils_spec.rb

@@ -0,0 +1,34 @@
+require "smart_diff/utils"
+
+class Position
+  def start_offset
+    600
+  end
+
+  def end_offset
+    750
+  end
+end
+
+class TestNode
+  def position
+    Position.new
+  end
+
+end
+
+describe "Utils" do
+  include Utils
+
+  it "should return a nodes start position" do
+    tn = TestNode.new
+    start = node_start(tn)
+    start.should == 600
+  end
+
+  it "should return a nodes end position" do
+    tn = TestNode.new
+    nd_end = node_end(tn)
+    nd_end.should == 750
+  end
+end

data/spec/smart_diff_spec.rb

@@ -0,0 +1,31 @@
+require "smart_diff"
+
+describe "SmartDiff" do
+  before(:each) do
+    @rd = SmartDiff.new 'example/foo.rb', 'example/bar.rb'
+  end
+
+  it "should take two filenames" do
+    @rd.file_one.should == 'example/foo.rb'
+    @rd.file_two.should == 'example/bar.rb'
+  end
+
+  it "should read two files in as strings" do
+    @rd.read(@rd.file_one).class.should == String
+  end
+
+  it "should raise an exception if the file does not exist" do
+    expect { @rd.read('foo/foofile.rb') }.to raise_error(StandardError)
+  end
+
+  it "should parse the files into ASTs" do
+    code_for_parse = @rd.read(@rd.file_one)
+    @rd.parse(code_for_parse, @rd.file_one).instance_of?(org.jrubyparser.ast.RootNode).should be(true)
+  end
+
+  it "should create a diff of the two ASTs" do
+    @rd.node_diff.size.should >= 1
+  end
+end
+
+

data/web/diff.css

@@ -0,0 +1,96 @@
+.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);
+}

data/web/nav.js

@@ -0,0 +1,275 @@
+// 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))
+                }
+        }
+
+    }

metadata

@@ -0,0 +1,133 @@
+--- !ruby/object:Gem::Specification
+name: smart_diff
+version: !ruby/object:Gem::Version
+  prerelease:
+  version: 0.0.1
+platform: ruby
+authors:
+- Eric West
+autorequire:
+bindir: bin
+cert_chain: []
+date: 2013-09-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: jruby-parser
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: yard
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  type: :development
+description: Create Semantic Diffs of Ruby source code based on the AST.
+email: esw9999@gmail.com
+executables:
+- smart_diff
+extensions: []
+extra_rdoc_files: []
+files:
+- doc/Htmlize.html
+- doc/SmartDiff.html
+- doc/Tag.html
+- doc/Utils.html
+- doc/_index.html
+- doc/class_list.html
+- doc/css/common.css
+- doc/css/full_list.css
+- doc/css/style.css
+- doc/file.README.html
+- doc/file_list.html
+- doc/frames.html
+- doc/index.html
+- doc/js/app.js
+- doc/js/full_list.js
+- doc/js/jquery.js
+- doc/method_list.html
+- doc/top-level-namespace.html
+- example/bar.rb
+- example/foo.rb
+- lib/smart_diff.rb
+- lib/smart_diff/htmlize.rb
+- lib/smart_diff/utils.rb
+- spec/smart_diff/htmlize_spec.rb
+- spec/smart_diff/utils_spec.rb
+- spec/smart_diff_spec.rb
+- web/diff.css
+- web/nav.js
+- bin/smart_diff
+- README.md
+- foo.rb-bar.rb.html
+- Rakefile
+homepage: http://github.com/edubkendo/smart_diff.git
+licenses:
+- GPL
+post_install_message:
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 2
+      version: '0'
+  none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+  none: false
+requirements: []
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
+specification_version: 3
+summary: Ruby clone of psydiff
+test_files:
+- spec/smart_diff/htmlize_spec.rb
+- spec/smart_diff/utils_spec.rb
+- spec/smart_diff_spec.rb
+has_rdoc: yard