rexle-diff 0.5.6 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93d8a79715998fce6b9f7e300eb1b2e5f134bacf
-  data.tar.gz: f205561be2a54dbc0854c383d54c9a5ee70af6b7
+  metadata.gz: b01a429faca38a0012c0fbacba964d73b8b446f0
+  data.tar.gz: 35abca30022f63e2050c08386ede1fadc1d3dc8e
 SHA512:
-  metadata.gz: c94950c599947b2631f7f0a7fdad6fd6531a2acb3e442b043bc2992ebf4a89df4037e232d8300c2762941b7c7e460d6e42713a285f672746cf58a4d6de226720
-  data.tar.gz: 2368abb03c64f4d6fac7a945c471e06291aaf5d67b199f271b4df28ed5d7452678997c965038970114d1168c31327ec83c8877fadd834669c6a8d676ea3ab8ac
+  metadata.gz: 2c9545684ed7caa9942949e001d86e9f48a951a377c348ee61a253f35b318555d8f185665f318cb850698fab9f81ef554726633bba672416d59fbd47a187ad3a
+  data.tar.gz: 3529f4691329569af9a02a13c69e8b0b2b0c783eed717770cf34997535d1a1bc5e1eeeefdf7fd63c3221d1302b8ca71286c9bdd39d31b1abbb8bd9794b4d009c

data.tar.gz.sig

@@ -1,3 +1,2 @@
-��d��կ�
-F5?Xv���'��ΈJL�����:k��!?�ů�SX}�+���g�%1�2�~���ڞhY��u|`��Fh�AI��������
-Lu(-u������2�z�9���i��άlj��ho�+���'�RUH�B�=����`D4�Q���7��ġ��G������0Α%��rc7a�a$(���]���zD��	!�
+�'�tg��(J��S�Љ�7m�a��nW*�GD�&��M�-�SȎ�r��+���^�6�
+�͎� �0$DDe�A��t]�.�
�z#��Ӄ��Oh���J�*�-A{W����k
�c���CpY`>��3L6q+�NH�,�=��Wb�9?B��5����[̾�e<�?X��]��*�ʮm�"�3]fڝ\d&֍���6��*o;nd?F��l;���ޤ�

data/lib/rexle-diff.rb

@@ -6,14 +6,69 @@ require 'rexle'
 require 'fuzzy_match'
 
 
+class Rexle::Element
+
+  def hashed()      @hash        end
+  def hashed=(num)  @hash = num  end  
+
+end
+
+
 class RexleDiff
+  
+  class HashedDoc
+
+    def initialize(node)
+
+      @node = node
+      @node.hashed = hash(node) + hashit(node).inject(:+)
+
+    end
+
+    def to_doc()
+      @node
+    end
+    
+    def hash(element)
+
+      attributes = element.attributes.clone    
+      %i(created last_modified).each {|x| attributes.delete x}
+      [element.name, attributes, element.text.to_s.strip].hash
+
+    end
+
+    def hashit(node)
+      
+      a = node.elements.map do |element|
+        
+        row = hash element
+
+        if element.has_elements?
+          r = hashit(element)
+          sum = row + r.inject(:+)
+          element.hashed = sum
+          sum
+        else
+          element.hashed = row
+          row
+        end  
+      end
+
+    end  
+
+  end
+
 
+  
   attr_reader :to_doc
 
   def initialize(source1, source2, fuzzy_match: false)    
 
     @fuzzy_match = fuzzy_match
-    doc1, doc2  = Rexle.new(source1), Rexle.new(source2)
+
+    doc1, doc2  = HashedDoc.new(Rexle.new(source1).root).to_doc, 
+        HashedDoc.new(Rexle.new(source2).root).to_doc
+
     compare(doc1.root, doc2.root)
 
     @to_doc = doc2
@@ -21,7 +76,6 @@ class RexleDiff
   
   private
 
-
   
   # Returns an array of indexes of the nodes from the newer document which 
   # have been added or changed
@@ -30,7 +84,7 @@ class RexleDiff
         
     list1 =  hxlist.map.with_index {|x,i| x + i}
     list2 =  hxlist2.map.with_index {|x,i| x + i}
-    
+        
     added_or_changed = list2 - list1
     indexes = added_or_changed.map {|x| list2.index x} 
     
@@ -48,6 +102,7 @@ class RexleDiff
     # elements which may have been modified are also 
     #                                         added to the added_indexes list    
     added_or_changed_indexes = added(hxlist, hxlist2)
+
     added_indexes, updated_indexes  = @fuzzy_match ? \
                    fuzzy_match(added_or_changed_indexes, node, node2) : \
                                                    [added_or_changed_indexes, []]
@@ -66,7 +121,7 @@ class RexleDiff
     deleted_indexes = deleted(hxlist, hxlist2)
     
     unchanged_indexes = unchanged(hxlist, hxlist2)
-
+    
     unchanged_indexes.each do |i, i2|      
 
       compare(node.elements[i+1], node2.elements[i2+1]) if node\
@@ -124,20 +179,8 @@ class RexleDiff
   #
   def hashedxml(node)
     
-    node.elements.map do |element|
-      
-      attributes = element.attributes.clone
-      
-      # Although attribute last_modified isn't used by rexle-diff it is 
-      # created by Dynarex whenever a record is created or updated. 
-      # This would of course cause the record to be flagged as changed even 
-      # when the element value itself hashn't changed.
-      #
-      %i(created last_modified).each {|x| attributes.delete x}
-      x = element.elements.length > 0 ? '' : 0
-      [element.name, attributes, element.text.to_s.strip, x].hash
-      
-    end
+    node.elements.map &:hashed
+            
   end  
   
   # Returns an array of indexes from both original and new nodes which 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle-diff
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.0
 platform: ruby
 authors:
 - James Robertson
@@ -39,20 +39,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.24
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.24
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: fuzzy_match
   requirement: !ruby/object:Gem::Requirement
@@ -103,5 +103,6 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: rexle-diff
+summary: Compares XML and returns the latest XML with changes identified by datetime
+  stamps in the attributes.
 test_files: []