diffxml 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71975698b2c8d3b61efb8c93560bf39dbb3cfd7b
-  data.tar.gz: 718b47df978f4567339ec45b8ba8c133e06eb359
+  metadata.gz: 0bc5b49cdc00aac5a186f09b7bed579aeedb2524
+  data.tar.gz: f599cb2acaab4a4b6ce4272e07ac0186248edbbd
 SHA512:
-  metadata.gz: cbce23d4c5d51e50917d25342c42657302fe73b6b62df099ba710f639ca56a4051d08fe1dcfbc93a513aeb6035182cc7e96330b1be84f07c3cbb8503bdf4e130
-  data.tar.gz: 4d5de49aef324f97e1fcb7184f1c4e94ab977cf3bd9261740fe480304493d21fe849cbe26595f62d9a63f93c0206c3370ea51ce9f9b0753e5164ae126fe1b8cb
+  metadata.gz: 2679443da271df1d7163e534d79cca89a9af9b11f089b28affa9af4ee166fe5c75fefe914c0ea52444236ef9681b7dd97f3f79eda98f4941bcb73cfa8d626020
+  data.tar.gz: 97efd9818fb4986b6b4c05365a50532bd71719a0328cdddc50652751abcba447e6f0a0bd1f84070561d0681e6abc5b4d33271c3416be2ba932420da2f3a34707

data/README.md

@@ -35,20 +35,31 @@ DiffXML.compareXML(doc1, doc2)
 ```
 the returned value will be an array with the XPaths of all nodes that were not matched.
 
+If you are interested in ignoring specific children you can pass in css selectors or XPaths with the same method
+CSS with:
+```ruby
+DiffXML.compareXML(doc1, doc2, ArrayOfIgnores, true)
+```
+XPath with:
+```ruby
+DiffXML.compareXML(doc1, doc2, ArrayOfIgnores)
+```
+
 ## To Do
 * Plans to return the values of both nodes that are at the XPath in the array, as well as the XPath location are in the works.
 * General upkeep and a more rigorous test set are also planned.
 * RDoc implementation for documentation.
 * optimize searches: the memory handling has been improved, however, the search still does not differentiate between nodes with the same path, meaning xmls in different orders may report false negatives(untested)
 because it just compares the string of the node set as opposed to comparing each node in the set individually.
-* Add ignore capabilities for XPaths
-* Refactor Utility methods into seperate file
+* Add attribute comparison
 
 ## Known Issues
-* ~~With large XML documents, specifically with tested documents over 1500 elements, but possibly fewer, the gem will reach a point where it cannot allocate memory.~~
-  * Fixed in latest commit, will be applied with version 0.2.0 release, optimization of the compare is still needed. HUGE increase in speed when only collecting namespaces once 5500 seconds to 55 seconds!
 
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/pbubnar/diffxml.
 
+## Sources
+
+The test xml data for the wikimedia xml came from http://dumps.wikimedia.your.org/backups-of-old-wikis.html
+

data/diffxml.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "diffxml"
-  spec.version       = '0.2.1'
+  spec.version       = '0.3.0'
   spec.authors       = ["Jake Bubnar"]
   spec.email         = ["jake@pjbapps.com"]
   spec.licenses       = ["MIT"]

data/lib/diffxml.rb

@@ -3,13 +3,24 @@ require 'DiffXML/utils'
 
 module DiffXML
   @xpathArray = []
-  def self.compareXML(doc1, doc2)
+  def self.compareXML(doc1, doc2, ignores = [], css = false)
+    raise "Expected true or false for css parameter, got #{css}"  unless css.is_a? TrueClass or css.is_a? FalseClass
     @namespaces = doc1.collect_namespaces
+    cssClass = Nokogiri::CSS
     if doc1.class == Nokogiri::XML::Document
       DiffXML::Utils.collectXPaths(doc1.root, @xpathArray)
     else
       DiffXML::Utils.collectXPaths(doc1, @xpathArray)
     end
+    if !ignores.empty?
+      ignores.each do |ignore|
+        if css
+          @xpathArray.delete(cssClass.xpath_for(ignore)[0])
+        else
+        @xpathArray.delete(ignore)
+        end
+      end
+    end
     @xpathArray.delete_if do |element|
       compareToPath(element, doc1, doc2)
     end

data/rspec/diffXML_spec.rb

@@ -29,7 +29,7 @@ describe DiffXML do
   end
 
   it 'should retrieve and compare a node from a second document using a Path' do
-    expect(DiffXML::Utils.compareToPath('doc/first',xml1,xml2)).to eql true
+    expect(DiffXML.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