rexle-diff 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 001ec36394b57727b838ce4baf166ff74ffed624
-  data.tar.gz: 2af7396aea078de89284c0ab6e94a4c02d74816a
+  metadata.gz: 29374bab7b8b1f1a56d26f25227809b43c817ff6
+  data.tar.gz: 03b5815ca6d1c9fb2c1f1b4966e556b09ad86510
 SHA512:
-  metadata.gz: 0d30e6217e40dc88f8214608b45a61e4f9e960f6fa18a1818d549fe2e14f3703a4be22fffdf644fd01be8cb405daa386b0c54e2717d182a6ab867a872149b05e
-  data.tar.gz: 190b118c745cf16b0d3e54598c3ea54fdc5d0baa04f4a36a318042a0f77fd4bfb19bf3f45fa1661e072c91fda7d8184fb3044d7fa7e10dd1e3f5ef3f331500db
+  metadata.gz: 53a8debbe17451b8cb20dd85b9a342787b923758ba55e27850d9026bd562645f240c235fcfdc90acab4f1b2e24100a7425ba569f26820e868f27a183814a3c0c
+  data.tar.gz: ac71487a7823a562c1f834ca693370d933bb2c5b77575ce756f988f6343f14595ce571513db15e4e51a1e867e3ee2baea45023071a55a35788de8f5d890e8d36

data/lib/rexle-diff.rb

@@ -3,84 +3,60 @@
 # file: rexle-diff.rb
 
 require 'rexle'
+require 'digest/md5'
 
 
 class RexleDiff
 
   attr_reader :to_doc
 
-  def initialize(source1, source2, ignore_removed: true)    
+  def initialize(source1, source2)    
 
-    a = timestamp(Rexle.new(source1)).to_a
-    a2 = RexleParser.new(source2).to_a
+    doc1, doc2  = Rexle.new(source1), Rexle.new(source2)
+    compare(doc1.root, doc2.root)
 
-    compare(a, a2)
-
-    @to_doc = Rexle.new(a2)
+    @to_doc = doc2
   end
   
   private
 
-  def names_values(c)
+  
+  def hashedxml(node)
     
-    c.inject([[],[]]) {|r, x|  r.first << x[0];  r.last << x[2]; r }
-
+    node.elements.map do |element|
+      h = Digest::MD5.new << element.xml
+      h.to_s
+    end
   end
 
-  def added(values, values2, names, names2)
-
-    values_added_or_changed = values2 - values
-    names_added_or_changed = names - names2
-    
-    values_indexes = values_added_or_changed.map {|x| values2.index x}
-    names_indexes = names_added_or_changed.map {|x| names.index x}
-    
-    values_indexes | names_indexes
+  def added(hxlist, hxlist2)
+   
+    added_or_changed = hxlist2 - hxlist    
+    indexes = added_or_changed.map {|x| hxlist2.index x}    
+    indexes
 
-  end
+  end  
   
-  def array_index(a,i)
-    a2 = a.select{|x| x.is_a? Array}
-    a.index a2[i]
-  end
-
-  def compare(a, a2)
+  def compare(node, node2)
     
-    _, _, _, *raw_c = a
-    c = raw_c.select{|x| x.is_a? Array}
-    names, values = names_values(c)
-        
-    _, _, _, *raw_c2 = a2
-    c2 = raw_c2.select{|x| x.is_a? Array}
-    names2, values2 = names_values(c2)
-
-    added_indexes = added(values, values2, names, names2)
+    hxlist, hxlist2 = hashedxml(node), hashedxml(node2)   
+    
+    added_indexes = added(hxlist, hxlist2)
 
     added_indexes.each do |i|
-
-      offset = array_index(a2, i)
-      next unless offset
-
-      a2[offset][1].merge!(created: Time.now.to_s, last_modified: Time.now.to_s)
+      node2.elements[i+1].attributes\
+                .merge!(created: Time.now.to_s, last_modified: Time.now.to_s)
     end
     
-    # we need to know the deleted index
-    deleted_indexes = deleted(values, values2)
+    deleted_indexes = deleted(hxlist, hxlist2)
     
-    unchanged_indexes = unchanged(values, values2, names, names2)
+    unchanged_indexes = unchanged(hxlist, hxlist2)
 
-    # check the child element if any
-    
     unchanged_indexes.each do |i, i2|      
-      
-      names.each do |name|    
-        
-        offset = array_index(a, i)
-        offset2 = array_index(a2, i2)
-        a2[offset2][1].merge!(a[offset][1])
-        
-        compare(c[i],c2[i2]) if c[i].length > 3
-      end
+
+      node2.elements[i2+1].attributes[:created] ||= Time.now.to_s        
+      compare(node.elements[i+1], node2.elements[i2+1]) if node.elements[i+1].has_elements?
+
     end
 
   end
@@ -91,28 +67,14 @@ class RexleDiff
     indexes = result.map {|x| list.index x}
 
   end  
-
-  def timestamp(doc)
-
-    doc.root.traverse do |x|
-      x.attributes[:created] = Time.now.to_s unless x.attributes[:created]
-    end
-
-    return doc
-  end
   
-  def unchanged(values, values2, names, names2)
-    
-    result = values &  values2
-    indexes = result.map {|x| values.index x}
-    indexes2 = result.map {|x| values2.index x}
-    
-    names_result = names &  names2
-    name_indexes = names_result.map {|x| names.index x}
-    name_indexes2 = names_result.map {|x| names2.index x}
+  def unchanged(list, list2)
     
+    result = list &  list2
+    indexes = result.map {|x| list.index x}
+    indexes2 = result.map {|x| list2.index x}
     
-    (indexes | name_indexes).zip(indexes2 | name_indexes2)
+    indexes.zip(indexes2)
 
   end    
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle-diff
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -42,7 +42,7 @@ dependencies:
         version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.23
+        version: 1.2.24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
         version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.23
+        version: 1.2.24
 description: 
 email: james@r0bertson.co.uk
 executables: []