xmatch 0.1.2 → 0.1.3

data/README.markdown

@@ -26,10 +26,10 @@ A matcher provides access to the match information by xpath values:
 
 Custom matchers
 ---------------
-The actual value of some xml elements are hard to know in advance, timestamps and ids being typical examples. XMatch allows custom matches to be applied
-to provide a good guess at a match in advance of the match being run. Custom matchers are Ruby procs.
+The actual values of some xml elements are hard to know in advance (timestamps and ids being typical examples). XMatch allows custom matchers to be applied
+to provide a good guess at a match in advance of the match being run. Custom matchers are Ruby Procs that take the element to match as an argument. They are  identified by the xpath of the element they should be applied to.
 
-	custom_matchers = "/bookstore/@id" => lambda {|elem| elem.value == '2'} 
+	custom_matchers = { "/bookstore/@id" => lambda {|elem| elem.value =~ /\d+/} }
 	xml = Matcher::Xml.new("<bookstore id='1'></bookstore>", custom_matchers)
 	xml.match("<bookstore id='2'></bookstore>") # ==> true
 

data/lib/matcher/html_formatter.rb

@@ -20,6 +20,7 @@ module Matcher
         match_data << match_info_for(elem)
         elem.attributes.values.each { | attr | match_data << match_info_for(attr) }
       end
+      match_data.sort! {|a, b| a.line <=> b.line}
       
       FileUtils.mkdir_p(@report_dir)
       File.open(File.join(@report_dir, "xmatch.html"), 'w') { |f|  f.write(generate_html(match_data)) }
@@ -29,7 +30,8 @@ module Matcher
       
       def match_info_for(elem)
         result = @matcher.result_for(elem.path)
-        OpenStruct.new(:result => result, :line => elem.line, :path => elem.path, :message => @matcher.mismatches[elem.path])
+        message = result == "unmatched" ? "Unmatched" : @matcher.mismatches[elem.path]
+        OpenStruct.new(:result => result, :line => elem.line, :path => elem.path, :message => message)
       end
     
       def generate_html(data)

data/lib/matcher/nokogiri_extensions.rb

@@ -5,10 +5,10 @@ module Nokogiri
   module XML
 
     class Node
-
+      
       def matching(other, matcher)
         other_elem = other.at_xpath(path)
-        matcher.record(self, false, "not found") unless other_elem
+        matcher.record(self, false, Matcher::Xml::NOT_FOUND) unless other_elem
         other_elem
       end
     end

data/lib/matcher/version.rb

@@ -1,3 +1,3 @@
 module Representative
-  VERSION = "0.1.2".freeze
+  VERSION = "0.1.3".freeze
 end

data/lib/matcher/xml.rb

@@ -4,6 +4,8 @@ require 'ostruct'
 module Matcher
 
   class Xml
+    
+    NOT_FOUND = "Not found compared document"
 
     attr_reader :lhs, :rhs, :custom_matchers
 

data/spec/matcher/xml_spec.rb

@@ -101,7 +101,7 @@ describe Matcher::Xml do
         </book>
         </bookstore>
         eos
-        verify_mismatch("/bookstore/book/title", "not found", 2)
+        verify_mismatch("/bookstore/book/title", Matcher::Xml::NOT_FOUND, 2)
       end
 
     end
@@ -116,7 +116,7 @@ describe Matcher::Xml do
         </bookx>
         </bookstore>
         eos
-        verify_mismatch("/bookstore/book", "not found", 3)
+        verify_mismatch("/bookstore/book", Matcher::Xml::NOT_FOUND, 3)
       end
 
     end
@@ -131,7 +131,7 @@ describe Matcher::Xml do
         </book>
         </bookstore>
         eos
-        verify_mismatch("/bookstore/book/@category", "not found")
+        verify_mismatch("/bookstore/book/@category", Matcher::Xml::NOT_FOUND)
       end
 
       it "should not match when an attribute value doesn't match" do
@@ -253,7 +253,7 @@ describe Matcher::Xml do
       eos
 
       @xml = Matcher::Xml.new(lhs)
-      verify_mismatch("/bookstore/book[2]/@category", "not found")
+      verify_mismatch("/bookstore/book[2]/@category", Matcher::Xml::NOT_FOUND)
     end
 
     context 'matches' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: xmatch
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Peter Moran