rexle-diff 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d5b70c7254facf4a001b1b3289b8c17763e071e
-  data.tar.gz: 083a67e79eb662d53d54c75a628dff685c48f1e5
+  metadata.gz: 0cacd13616e246a126d280ddd34ff167a474332c
+  data.tar.gz: 622523d2364cb42d517f715f8c754c6e96595016
 SHA512:
-  metadata.gz: d548ba5c5ba92a04d332482edb1f6acc6fe78296e0ec7e2533ed2f68cf8140c81cd65c47ebe5019aa97953f4798264dbe414625397215bdf433e1924b5b9fddc
-  data.tar.gz: 8a07843aaec45a1bd28ee99ffafb8f074c2699bb3cd19f84d773fc05fa19aeccdfb1e19b39f64e6ba2e23acc58a220185d44af41dc0397be2b5be44edb21f6b7
+  metadata.gz: fc4d7c3b59cdebd84711c0c2431a3e8e14c9efa2edc5d877ca6968c2bebb722ef3ba27f69cf888b56b65326039dd01e5a3eabf910834acca18d8414298612517
+  data.tar.gz: db785ddb56d09026f7f30078d5ae7e70c94102ab8a0b0ec6cdf09d4c7cb68a643247b87d5fcb76cd2b60c05f4145896761cf2472d52c9b1d69674f73f76fa57b

data/lib/rexle-diff.rb

@@ -10,8 +10,9 @@ class RexleDiff
 
   attr_reader :to_doc
 
-  def initialize(source1, source2)    
+  def initialize(source1, source2, fuzzy_match: false)    
 
+    @fuzzy_match = fuzzy_match
     doc1, doc2  = Rexle.new(source1), Rexle.new(source2)
     compare(doc1.root, doc2.root)
 
@@ -62,31 +63,9 @@ class RexleDiff
     # elements which may have been modified are also 
     #                                         added to the added_indexes list    
     added_or_changed_indexes = added(hxlist, hxlist2)
-    
-    # is the added index item a new entry or an entry modification?
-    updated_indexes, added_indexes = added_or_changed_indexes.partition do |i|
-
-      e1 = node.elements[i+1]
-      next unless e1
-
-      fm = FuzzyMatch.new [e1.text]
-      result, score1, score2 = fm.find_with_score node2.elements[i+1].text
-      #puts "result: %s score1: %s score2: %s" % [result, score1, score2]
-      
-      result and score1 >= 0.5 
-      
-    end
-
-    
-    updated_indexes.each do |i|
-      
-      attributes2 = node2.elements[i+1].attributes
-      attributes2[:last_modified] = Time.now.to_s      
-      
-      attributes = node.elements[i+1].attributes
-      attributes2[:created] = attributes[:created] if attributes[:created]      
-    end
-    
+    added_indexes, updated_indexes  = @fuzzy_match ? \
+                   fuzzy_match(added_or_changed_indexes, node, node2) : \
+                                                   [added_or_changed_indexes, []]
     added_indexes.each do |i|
       
       attributes = node2.elements[i+1].attributes
@@ -125,7 +104,35 @@ class RexleDiff
     result = list -  list2
     indexes = result.map {|x| list.index x}
 
-  end  
+  end
+  
+  def fuzzy_match(added_or_changed_indexes, node, node2)
+
+        # is the added index item a new entry or an entry modification?
+    updated_indexes, added_indexes = added_or_changed_indexes.partition do |i|
+
+      e1 = node.elements[i+1]
+      next unless e1
+
+      fm = FuzzyMatch.new [e1.text]
+      result, score1, score2 = fm.find_with_score node2.elements[i+1].text
+      #puts "result: %s score1: %s score2: %s" % [result, score1, score2]
+      
+      result and score1 >= 0.5 
+      
+    end
+    
+    updated_indexes.each do |i|
+      
+      attributes2 = node2.elements[i+1].attributes
+      attributes2[:last_modified] = Time.now.to_s      
+      
+      attributes = node.elements[i+1].attributes
+      attributes2[:created] = attributes[:created] if attributes[:created]      
+    end
+
+    [added_indexes, updated_indexes]
+  end
   
   # Returns an array of indexes from both original and new nodes which 
   # identifies which nodes did not change.

data.tar.gz.sig

@@ -1,6 +1,2 @@
-
-~�Ù_ ���\�S�:[
2V��Ckˆ����}�,T���0Iq���K��}J2��<6%�3eA^
-f��@G��Z���
-����̀ �чv�nۡN�6��	��.7P���R�"kr"���ۊd�?�������p�|��"�|�:�omчIh�E�	5j���K��T��2����� �߲�ն�����i
-��vkN}(C
-̹�M?׶��a_��c�`�.ƻeٶ��6�Zੑ�8it����Rn�����
+}4z��3@7��.H�u��X9��q�=Ψ[�'�yi��䣁\����+z3\H�����;q��fw��/�dl��)ė�t�G�Bc c�	I@'�;k���{ڐ�iȈT��� �#�s��V�zB����.~
+n������1��ߺsg�U�]������eU�Hñ��o�]���92��aȍi�!��s�rf�v�߭3Eu�/��EעC=��A�	���w����E	��P���~�J���q*z?ע(���x

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle-diff
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.4
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   1dtvoSgugum4cZlSFYiRyLXuJz4nZeMJGod1r8cOFR0dwx7yOdvKZybPd4FXWVjG
   EozQjWbvhzsspQ==
   -----END CERTIFICATE-----
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle