lib/class_extensions.rb in rspreadsheet-0.0.5 vs lib/class_extensions.rb in rspreadsheet-0.0.6

@@ -1,36 +1,48 @@
 class LibXML::XML::Node
+  def new_with_ns(namespace,name)
+    ns = self.namespaces.find_by_prefix('table') || LibXML::XML::Namespace.new(self, 'table', 'urn:oasis:names:tc:opendocument:xmlns:table:1.0')
+    self.namespaces.namespace = ns
+    self
+    LibXML::XML::Node.new('table-row')
+  end
   def elements
     result = []
     each_element { |e| result << e }
     return result
   end
   # if node2 contains at least all that I do
-  def simpifation_of?(node2)
-    return false if (self.name != node2.name)
+  def simplification_of?(node2)
+    first_diff(node2).nil?
+  end
+  # return first difference where self has something more than node2 does
+  def first_diff(node2)
+    where = self.path.split('/').last
+    
+    return "#{where}> Equivalent node does not exist: #{self.name} != NOTHING" if node2.nil?
+    return "#{where}> Names are different: #{self.name} != #{node2.name}" if (self.name != node2.name)
     self.attributes.each do |attr|
-      return false unless node2.attributes[attr.name] == attr.value
+      return "#{where}> Attribute #{attr} have diffent values: #{attr.value} != #{node2.attributes[attr.name]}" unless node2.attributes[attr.name] == attr.value
     end
     
     elems1 = self.elements
     elems2 = node2.elements
-    return false if (elems1.length != elems2.length) 
+#     return "#{where}> elements have different number of subelements #{elems1.length} !=  #{elems2.length}" if (elems1.length != elems2.length) 
     elems1.length.times do |i|
-      unless 
-        case elems1[i].node_type_name
-          when 'text' 
-            (elems1[i].to_s == elems2[i].to_s) 
-          when 'element' 
-            elems1[i].simpifation_of?(elems2[i])
-          else true 
-        end
-      then 
-        return false 
+      if (elems1[i].node_type_name == 'text') && ((elems1[i].to_s != elems2[i].to_s) )
+        return  "#{where}> #{i+1}th text subelements are different: #{elems1[i].to_s} != #{elems2[i].to_s}"
+      elsif (elems1[i].node_type_name == 'element') && (!elems1[i].simplification_of?(elems2[i]))
+        return "#{where}/[#{i+1}]#{elems1[i].first_diff(elems2[i])}"
       end
     end
        
-    return true
+    return nil
   end
-  def equals?(node2)
-    simpifation_of?(node2) and node2.simpifation_of?(self)
+  def equals?(node2)  #TODO redefine == with this
+    self.simplification_of?(node2) and node2.simplification_of?(self)
+  end
+  def add_table_namesepace
+    ns = self.namespaces.find_by_prefix('table') || LibXML::XML::Namespace.new(self, 'table', 'urn:oasis:names:tc:opendocument:xmlns:table:1.0')
+    self.namespaces.namespace = ns
+    self
   end
 end
\ No newline at end of file