rexle-diff 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 489e76982a26a1bb358a790b197df680a962cdb2
-  data.tar.gz: 4798095f6d19019f78493890be2915ebc385e724
+  metadata.gz: 88246b98d185486495816ea3968ae31f34e0e9bd
+  data.tar.gz: 71b6beec583a2333d454609b92835b8413347624
 SHA512:
-  metadata.gz: ca9b81f46cebd5cd7b2a86e263b5f5318ce705f2fe335c79c9c6287d9f81d50f083bf2bfd6904244248db25dce6881756f28d8e09d871742d5e9434e86f6426d
-  data.tar.gz: 614b3c0afeb114c74419f3516fe6c0d55488bf9d00297ddb2aca179ca6bba3fce7e882bf2c92605f183d8c08e881c395f380b75afe95e101a84010dc18e8c00c
+  metadata.gz: b7ab590a834d4957672e1bd733f99960775065355b20372bc9e10c7fbae96bea845f35eaf535e74f9a513a8a923dcd519f53f551e3fc37c7c870d06a4249cfe6
+  data.tar.gz: 8f401301134668b32c7718c8325d7b55615f6eeb14fb20e6fe7d8dcc9ddda42df19e39f634141873b3b3ee47cf172025ef217dedc8772221658db1277979f2b2

data/lib/rexle-diff.rb

@@ -31,10 +31,10 @@ class RexleDiff
 
     values_added_or_changed = values2 - values
     names_added_or_changed = names - names2
-    added_or_changed = values_added_or_changed | names_added_or_changed
-
+    
     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
 
   end
@@ -45,7 +45,8 @@ class RexleDiff
   end
 
   def compare(a, a2)
-          _, _, _, *raw_c = a
+    
+    _, _, _, *raw_c = a
     c = raw_c.select{|x| x.is_a? Array}
     names, values = names_values(c)
         
@@ -64,20 +65,20 @@ class RexleDiff
     # we need to know the deleted index
     deleted_indexes = deleted(values, values2)
     
-    unchanged_indexes = unchanged(values, values2)
-    #puts 'c : ' + c.inspect
-    #puts 'added: ' + added_indexes.inspect
-    #puts 'deleted :'  + deleted_indexes.inspect
-    #puts 'unchanged : ' + unchanged_indexes.inspect
+    unchanged_indexes = unchanged(values, values2, names, names2)
 
     # check the child element if any
     
     unchanged_indexes.each do |i, i2|      
-          
-      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
+      
+      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
     end
 
   end
@@ -98,13 +99,18 @@ class RexleDiff
     return doc
   end
   
-  def unchanged(list, list2)
-
-    result = list &  list2
-    indexes = result.map {|x| list.index x}
-    indexes2 = result.map {|x| list2.index x}
+  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}
+    
     
-    indexes.zip(indexes2)
+    (indexes | name_indexes).zip(indexes2 | name_indexes2)
 
   end    
 

data.tar.gz.sig

@@ -1,4 +1,4 @@
-*�	�)�(?
-���K�]7�Y$�%Ri��o����WV2�ЮZm�%���{�ޮ�+�,�<j�}��;� �����^
-�<K��}`��\�q*�Ŷ0�uk��7��N��E�L�#�cH��td����"Z����A�	7#/������:F�-��P
-�\
�k��f�u��h]�[�#��F<'w䌰p3Q���#�v3ГFN��n>��K�}t	l��V���|����QH��1�fq]�*���f��o����k�Ld
+�	�l�ʰ��W&�C�	/�����!����� ��SW�(2L�M����F����n��5L��ڃ�Sې���LR��}��-��
+#��
i�E�������
+�N�w)��p"Jcl����ͦV��Ԧ�ݲH���M
+ͱ~��lC�b������W�]��K�[��ViC5���G�HJi+�"��������*b2��U�:[���=���9��y�u<���埙=��sTs�a�����R

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle-diff
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - James Robertson