diffxml 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26d733a1a7c9f08ef8c081456aacb00972a54558
-  data.tar.gz: a8d24b26f97175818bd199436c3df76b2dbc962a
+  metadata.gz: 71975698b2c8d3b61efb8c93560bf39dbb3cfd7b
+  data.tar.gz: 718b47df978f4567339ec45b8ba8c133e06eb359
 SHA512:
-  metadata.gz: f5578ee34dd1776e2dcdc9ab9b1afacba42208702b6f858edd7d7de3be98f274627640289cb2e691f490a9d1cf46e1ed757aaca049b34a246ac136d2502b59fc
-  data.tar.gz: 4ba3c68fba21b859e1985445b826cb093685926998eb32fc9da3fa0e0d18b5a146baa4a5da028001218d9e9d4e22078491e733672d3cda8a2ac603c0b4eb0d4f
+  metadata.gz: cbce23d4c5d51e50917d25342c42657302fe73b6b62df099ba710f639ca56a4051d08fe1dcfbc93a513aeb6035182cc7e96330b1be84f07c3cbb8503bdf4e130
+  data.tar.gz: 4d5de49aef324f97e1fcb7184f1c4e94ab977cf3bd9261740fe480304493d21fe849cbe26595f62d9a63f93c0206c3370ea51ce9f9b0753e5164ae126fe1b8cb

data/README.md

@@ -1,4 +1,4 @@
-# diff-xml [![Gem Version](https://badge.fury.io/rb/diffxml.svg)](https://rubygems.org/gems/diffxml)
+# diffxml [![Gem Version](https://badge.fury.io/rb/diffxml.svg)](https://rubygems.org/gems/diffxml)
 
 Inspired by the equivalent-xml gem, I wanted a way to get the differences between the two xmls, instead of just checking to see that there were differences, this is an alternative method I came up with, and I will add as I work on it, as it is still in its infancy.
 

data/diffxml.gemspec

@@ -4,12 +4,12 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "diffxml"
-  spec.version       = '0.2.0'
+  spec.version       = '0.2.1'
   spec.authors       = ["Jake Bubnar"]
   spec.email         = ["jake@pjbapps.com"]
   spec.licenses       = ["MIT"]
   spec.summary       = 'A simple xml comparison tool to get a list of diffs between two files passed to it'
-  spec.description   = 'Goes through each child to find the XPaths of each final child, and compares them to the path in the second file'
+  spec.description   = 'Goes through each child to find the XPaths of each final child, and compares them to the path in the second file, returning the differences.'
   spec.homepage      = 'https://github.com/pbubnar/diff-xml'
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or

data/lib/diffXML/utils.rb

@@ -0,0 +1,27 @@
+require 'DiffXML'
+module DiffXML
+
+  class Utils
+    def self.collectXPaths(doc, xpArray)
+      doc.element_children.each do |child|
+        if child.element_children.empty?
+          xpArray.push(getPath(child,child.name)) unless child.content.empty?
+        else
+          collectXPaths(child, xpArray)
+        end
+      end
+    end
+
+    def self.getPath(node, path = nil)
+      if node.parent.name.eql? 'document'
+        return path
+      else
+        if path.nil?
+          getPath(node, node.name)
+        else
+          getPath(node.parent, "#{node.parent.name}/#{path}")
+        end
+      end
+    end
+  end
+end

data/lib/diffxml.rb

@@ -1,46 +1,24 @@
 require 'Nokogiri'
+require 'DiffXML/utils'
 
 module DiffXML
   @xpathArray = []
   def self.compareXML(doc1, doc2)
     @namespaces = doc1.collect_namespaces
     if doc1.class == Nokogiri::XML::Document
-      collectXPaths(doc1.root)
+      DiffXML::Utils.collectXPaths(doc1.root, @xpathArray)
     else
-      collectXPaths(doc1)
+      DiffXML::Utils.collectXPaths(doc1, @xpathArray)
     end
-    @xpathArray.delete_if.with_index do |element, i|
-      puts "iteration #{i} and #{element}"
+    @xpathArray.delete_if do |element|
       compareToPath(element, doc1, doc2)
     end
   end
 
-  def self.getPath(node, path = nil)
-    if node.parent.name.eql? 'document'
-      return path
-    else
-      if path.nil?
-        getPath(node, node.name)
-      else
-        getPath(node.parent, "#{node.parent.name}/#{path}")
-      end
-    end
-  end
-
   def self.compareToPath(path, doc1, doc2)
     doc2.search(path, @namespaces).to_s == doc1.search(path, @namespaces).to_s
   end
 
-  def self.collectXPaths(doc)
-    doc.element_children.each do |child|
-      if child.element_children.empty?
-        @xpathArray.push(getPath(child,child.name)) unless child.content.empty?
-      else
-        collectXPaths(child)
-      end
-    end
-  end
-
   def self.getXPathArray
     @xpathArray
   end

data/rspec/diffXML_spec.rb

@@ -14,22 +14,22 @@ describe DiffXML do
 
   it 'should return an XPath for a given node' do
     node = xml1.element_children[0].element_children[2].element_children[0].element_children[0]
-    expect(DiffXML.getPath(node, node.name)).to eql 'doc/third/firstthird/finalChild'
+    expect(DiffXML::Utils.getPath(node, node.name)).to eql 'doc/third/firstthird/finalChild'
   end
 
   it 'should return an XPath for a given node when no name is passed in' do
     node = xml1.element_children[0].element_children[2].element_children[0].element_children[0]
-    expect(DiffXML.getPath(node)).to eql 'doc/third/firstthird/finalChild'
+    expect(DiffXML::Utils.getPath(node)).to eql 'doc/third/firstthird/finalChild'
   end
 
   it 'should Collect all XPaths of the children into an array' do
-   DiffXML.collectXPaths(xml1)
+   DiffXML::Utils.collectXPaths(xml1, DiffXML.getXPathArray)
    expect(DiffXML.getXPathArray.size).to be 3
    expect(DiffXML.getXPathArray).to eql %w[doc/first doc/second doc/third/firstthird/finalChild]
   end
 
   it 'should retrieve and compare a node from a second document using a Path' do
-    expect(DiffXML.compareToPath('doc/first',xml1,xml2)).to eql true
+    expect(DiffXML::Utils.compareToPath('doc/first',xml1,xml2)).to eql true
   end
 
   it 'should go through 2 XMLs removing XPaths from the array as they are found' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffxml
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jake Bubnar
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 description: Goes through each child to find the XPaths of each final child, and compares
-  them to the path in the second file
+  them to the path in the second file, returning the differences.
 email:
 - jake@pjbapps.com
 executables: []