html-dom-diff 0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c64fe7c87ae9884bf398b8c8699ee352deaa766ef92c078a1a8789badf0ad8ac
-  data.tar.gz: cebe07112a9f6ec7b2e573d59e95037bbec4af6fc8937afac112124730fa9bbe
+  metadata.gz: 0d731a32d076bd3fc64436c74dff88fa653349a1dc35fd7dfe1598bb7210b001
+  data.tar.gz: 79e7466f13f022fd357dd4997d5f168aa6a68b56e9e4f78f494b645658d1fbb5
 SHA512:
-  metadata.gz: 76f6659021fbdf482dcf640c9211fbd814a6c21cb92aba508ab24a20e6be79af5b9fd1dbe349a46dec00a198e8aeacb8ed74a5ec1e8362df1e8a16c4dc027c8a
-  data.tar.gz: 97222b9c82eff526515ce3e2040478e0890202c3fb91d45678461ae58ebd331825109276b8dff33eec971032a00a5d8e6b21ea3ca7606becbff151890d2879b5
+  metadata.gz: ca5d8dcc3952fff8d1b4f03cad348b178f23b1b7c27de085117fce57eba4596fd8e05875f7fc84d9608cbb0c4d4c0ad7665d7d62bfdf1c513d336b0bfa7cdb2d
+  data.tar.gz: 1590f4c2fc8325396d07c2483d2f59f82348c4485132653ca966662a3e62456e9da93ebd687b65858365479b34313d26341dcb4e5edb2de325302e0a910afc3b

data/lib/html-dom-diff/delta_tree_builder.rb

@@ -1,22 +1,55 @@
 module HTMLDOMDiff
   class DeltaTreeBuilder
     attr_reader :ldoc, :rdoc
-    def initialize(ldoc, rdoc, weights, forward, backward)
+    def initialize(ldoc, rdoc)
       @ldoc     = ldoc
       @rdoc     = rdoc
-      @weights  = weights
-      @forward  = forward
-      @backward = backward
+      @weights  = {}
+      @forward  = {}
+      @backward = {}
     end
 
-    def build
+    def root
       wrap @rdoc
     end
 
+    def total_weight
+      @weights[ldoc].to_f + @weights[rdoc].to_f
+    end
+
+    def add_weight(element, weight)
+      @weights[element] = weight
+    end
+
+    def weight(element)
+      @weights[element]
+    end
+
+    def match(left, right)
+      @forward[left]   = right
+      @backward[right] = left
+    end
+
+    def left_matches?(lnode, rnode)
+      @forward[lnode] == rnode
+    end
+
+    def left_match(lnode)
+      @forward[lnode]
+    end
+
+    def left_matched?(lnode)
+      @forward.has_key?(lnode)
+    end
+
+    def right_matched?(rnode)
+      @backward.has_key?(rnode)
+    end
+
     private
 
     def wrap(rnode, parent=nil)
-      result = Node.new rnode, @backward[rnode], parent
+      result = Node.new rnode, @backward[rnode], @weights[rnode], parent
       rnode.children.each do |child|
         wrap child, result
       end
@@ -33,7 +66,7 @@ module HTMLDOMDiff
 
     def reverse_wrap(lnode, parent)
       return if @forward[lnode]
-      result = Node.new nil, lnode
+      result = Node.new nil, lnode, @weights[lnode]
       lnode.children.each { |c| reverse_wrap c, result }
       parent.add_child result
     end

data/lib/html-dom-diff/differ.rb

@@ -13,7 +13,7 @@ module HTMLDOMDiff
     end
 
     def diff(ldoc, rdoc)
-      reset
+      reset ldoc, rdoc
 
       match_by_ids ldoc, rdoc
       prep_with @lsignatures, ldoc
@@ -27,11 +27,17 @@ module HTMLDOMDiff
       match_bottom_up ldoc
       match_top_down  ldoc
 
-      DeltaTreeBuilder.new(ldoc, rdoc, @weights, @forward, @backward).build
+      @builder
     end
 
     private
 
+    [:left_matches?, :left_match, :left_matched?, :right_matched?].each do |m|
+      define_method m do |*args|
+        @builder.send m, *args
+      end
+    end
+
     def parse(string)
       Nokogiri::HTML(string, nil, nil, (Nokogiri::XML::ParseOptions::DEFAULT_HTML & Nokogiri::XML::ParseOptions::NOBLANKS))
     end
@@ -40,14 +46,12 @@ module HTMLDOMDiff
       Nokogiri::HTML::DocumentFragment.parse(string)
     end
 
-    def reset
-      @forward     = {}
-      @backward    = {}
-      @weights     = {}
+    def reset(ldoc, rdoc)
+      @builder     = DeltaTreeBuilder.new(ldoc, rdoc)
       @depths      = {}
       @lsignatures = {}
       @rsignatures = {}
-      @matchqueue  = PQueue.new() { |a, b| @weights[a] > @weights[b] }
+      @matchqueue  = PQueue.new() { |a, b| @builder.weight(a) > @builder.weight(b) }
     end
 
     def match_by_ids(ldoc, rdoc)
@@ -70,11 +74,11 @@ module HTMLDOMDiff
         signatures << signature
       end
 
-      @weights[element] = weights
+      @builder.add_weight(element, weights)
       sig_hash[element] = hash_for(signatures)
       @depths[element]  = level
 
-      [ @weights[element], sig_hash[element] ]
+      [ weights, sig_hash[element] ]
     end
 
     def weight_for(element)
@@ -98,8 +102,7 @@ module HTMLDOMDiff
     end
 
     def record_matching(left, right)
-      @forward[left]   = right
-      @backward[right] = left
+      @builder.match(left, right)
     end
 
     def perform_initial_top_down_matching(lnodes, rnodes)
@@ -119,7 +122,7 @@ module HTMLDOMDiff
     def perform_initial_matching
       while @matchqueue.size > 0
         element = @matchqueue.pop
-        if @backward[element].nil? && (match = find_best_match(element))
+        if !right_matched?(element) && (match = find_best_match(element))
           match_all_children match, element
           match_parents match, element
         else
@@ -131,7 +134,7 @@ module HTMLDOMDiff
     def find_best_match(element)
       candidates = []
       @lsignatures.each do |left, sig|
-        if @forward[left].nil? && sig == @rsignatures[element]
+        if !left_matched?(left) && sig == @rsignatures[element]
           candidates << left
         end
       end
@@ -142,7 +145,7 @@ module HTMLDOMDiff
         return candidates.first
       else
         matching_parents = candidates.select do |left|
-          @forward[left.parent] == element.parent
+          left_matches?(left.parent, element.parent)
         end
 
         if matching_parents.size == 1
@@ -162,9 +165,9 @@ module HTMLDOMDiff
 
     def match_parents(left, right)
       # TODO implement multi-ancestor matching
-      return if @forward[left.parent] || @backward[right.parent]
+      return if left_matched?(left.parent) || right_matched?(right.parent)
       if left.parent.name == right.parent.name
-        record_matching left, right
+        record_matching left.parent, right.parent
       end
     end
 
@@ -173,16 +176,17 @@ module HTMLDOMDiff
         match_bottom_up child
       end
 
-      if element.respond_to?(:parent) && @forward[element.parent]
-        match = @forward[element.parent].children.find { |c| @backward[c].nil? && c.name == element.name }
+      if !left_matched?(element) && element.respond_to?(:parent) && left_matched?(element.parent)
+        children = left_match(element.parent).children.reject { |c| right_matched?(c) }
+        match    = children.find { |c| c.name == element.name }
         record_matching(element, match) if match
       end
     end
 
     def match_top_down(element)
-      if @forward[element].nil?
-        childmatches = element.children.map { |c| @forward[c] && @forward[c].parent }.compact.uniq
-        childmatches.reject! { |e| @backward[e] }
+      unless left_matched?(element)
+        childmatches = element.children.select { |c| left_matched?(c) }.map { |c| left_match(c).parent }.uniq
+        childmatches.reject! { |e| right_matched?(e) }
         if childmatches.size == 1 && childmatches.first.name == element.name
           record_matching(element, childmatches.first)
         end

data/lib/html-dom-diff/node.rb

@@ -1,12 +1,13 @@
 module HTMLDOMDiff
   class Node
-    attr_reader :parent, :children
+    attr_reader :parent, :children, :weight
 
     attr_reader :rnode
 
-    def initialize(rnode, lnode, parent=nil)
+    def initialize(rnode, lnode, weight, parent=nil)
       @rnode    = rnode
       @lnode    = lnode
+      @weight   = weight
       @parent   = parent
       @children = []
     end
@@ -71,6 +72,7 @@ module HTMLDOMDiff
 
     # states
     def changed?
+      return false unless @rnode && @lnode
       if @rnode.text?
         text != original_text
       else

data/lib/html-dom-diff/version.rb

@@ -1,3 +1,3 @@
 module HTMLDOMDiff
-  VERSION = "0.1"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html-dom-diff
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
 platform: ruby
 authors:
 - Frederik Fix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-07 00:00:00.000000000 Z
+date: 2018-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri