xmatch 0.1.5 → 0.2.0

data/README.markdown

@@ -29,8 +29,8 @@ Custom matchers
 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 predicates provided as Ruby Procs, identified by the xpath of the element they should be applied to.
 
-	custom_matchers = { "/bookstore/@id" => lambda {|elem| elem.value.match(/\d+/) }
-	xml = Matcher::Xml.new("<bookstore id='1'></bookstore>", custom_matchers)
+	xml = Matcher::Xml.new("<bookstore id='1'></bookstore>")
+	xml.match_on("/bookstore/@id") { |actual| actual =~ /\d+/ }
 	xml.match("<bookstore id='2'></bookstore>") # ==> true
 
 Formatting match results

data/lib/matcher/html_formatter.rb

@@ -37,7 +37,8 @@ module Matcher
                        :line => elem.line,
                        :path => elem.path,
                        :expected => info ? info.expected : Matcher::Xml::EXISTENCE,
-                       :actual => info ? info.actual : Matcher::Xml::UNMATCHED)
+                       :actual => info ? info.actual : Matcher::Xml::UNMATCHED,
+                       :custom_matched => info ? info.was_custom_matched : false)
       end
 
       def generate_html(data)

data/lib/matcher/nokogiri_extensions.rb

@@ -59,7 +59,7 @@ module Nokogiri
         return false unless other_elem
 
         custom_matcher = matcher.custom_matchers[path]
-        match = custom_matcher ? custom_matcher.call(other_elem) : (content == other_elem.content)
+        match = custom_matcher ? custom_matcher.call(other_elem.content) : (content == other_elem.content)
         @matcher.record(self.path, match, content, other_elem.content)
         match
       end
@@ -73,7 +73,7 @@ module Nokogiri
         return false unless other_elem
 
         custom_matcher = matcher.custom_matchers[path]
-        match = custom_matcher ? custom_matcher.call(other_elem) : (value == other_elem.value)
+        match = custom_matcher ? custom_matcher.call(other_elem.value) : (value == other_elem.value)
         matcher.record(self.path, match, value, other_elem.value)
         match
       end

data/lib/matcher/version.rb

@@ -1,3 +1,3 @@
 module Representative
-  VERSION = "0.1.5".freeze
+  VERSION = "0.2.0".freeze
 end

data/lib/matcher/xmatch.html.erb

@@ -42,7 +42,11 @@ Expected xml document is <b><%= completedness %>%</b> 'matched'.
 	<tr class=<%= match.result  %> >
 		<td><%= match.line %></td>
 		<td><%= match.path %></td>
+	<% if match.custom_matched == true%>
+    	<td><i>(something like) <%= match.expected %></i></td>
+	<% else %>
   		<td><%= match.expected %></td>
+	<% end %>
   		<td><%= match.actual %></td>
 	</tr>		
 	<% end %>

data/lib/matcher/xml.rb

@@ -17,6 +17,10 @@ module Matcher
       @results = {}
     end
 
+    def match_on(path, &blk)
+      @custom_matchers[path] = blk
+    end
+
     def match(actual)
       @results.clear
       @rhs = parse(actual)
@@ -26,7 +30,8 @@ module Matcher
     def record(path, result, expected, actual)
       # support 0 as true (for regex matches)
       r = !result || result.nil? ? false : true
-      @results[path] = OpenStruct.new(:result => r, :expected => expected, :actual => actual)
+      was_custom_matched = @custom_matchers[path] ? true : false
+      @results[path] = OpenStruct.new(:result => r, :expected => expected, :actual => actual, :was_custom_matched => was_custom_matched)
     end
 
     def result_for(path)

data/spec/matcher/xml_spec.rb

@@ -308,25 +308,41 @@ describe Matcher::Xml do
     end
     
     it "can be used on an attribute value" do
-      custom_matchers = { "/bookstore/@id" => lambda {|elem| elem.value == '2'} }
+      custom_matchers = { "/bookstore/@id" => lambda {|actual| actual == '2'} }
       xml = Matcher::Xml.new("<bookstore id='1'></bookstore>", custom_matchers)
       xml.match("<bookstore id='2'></bookstore>").should be_true
     end
     
     it "can be used on an element value" do
-      custom_matchers = { "/bookstore/book/text()" => lambda {|elem| elem.content == 'bar'} }
+      custom_matchers = { "/bookstore/book/text()" => lambda {|actual| actual == 'bar'} }
       xml = Matcher::Xml.new("<bookstore><book>foo</book></bookstore", custom_matchers)
       xml.match("<bookstore><book>bar</book></bookstore").should be_true 
     end
 
     it "supports regex style matching" do
-      custom_matchers = { "/bookstore/book/text()" => lambda {|elem| elem.content =~ /bar/} }
+      custom_matchers = { "/bookstore/book/text()" => lambda {|actual| actual =~ /bar/} }
       xml = Matcher::Xml.new("<bookstore><book>foo</book></bookstore", custom_matchers)
       xml.match("<bookstore><book>bar</book></bookstore").should be_true 
       xml.mismatches.should be_empty
       xml.matches.should have(3).matches
     end
     
+    it "can be matched on" do
+      xml = Matcher::Xml.new("<bookstore><book>foo</book></bookstore")
+      xml.match_on("/bookstore/book/text()") { |actual| actual =~ /bar/ }
+      xml.match("<bookstore><book>bar</book></bookstore").should be_true 
+      xml.mismatches.should be_empty
+      xml.matches.should have(3).matches
+    end
+
+    it "tells if a custom matcher was used" do
+      xml = Matcher::Xml.new("<bookstore><book>foo</book></bookstore")
+      xml.match_on("/bookstore/book/text()") { |actual| actual =~ /bar/ }
+      xml.match("<bookstore><book>bar</book></bookstore").should be_true 
+      xml.matches["/bookstore/book/text()"].was_custom_matched.should be_true
+      xml.matches["/bookstore/book"].was_custom_matched.should be_false
+    end
+    
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: xmatch
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 5
-  version: 0.1.5
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Peter Moran
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-23 00:00:00 +11:00
+date: 2010-11-24 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,7 +93,6 @@ files:
 - spec/fixtures/books7.xml
 - spec/fixtures/books8.xml
 - spec/fixtures/books9.xml
-- spec/matcher/html_formatter_spec.rb
 - spec/matcher/smoke_spec.rb
 - spec/matcher/xml_spec.rb
 - spec/spec_helper.rb
@@ -143,7 +142,6 @@ test_files:
 - spec/fixtures/books7.xml
 - spec/fixtures/books8.xml
 - spec/fixtures/books9.xml
-- spec/matcher/html_formatter_spec.rb
 - spec/matcher/smoke_spec.rb
 - spec/matcher/xml_spec.rb
 - spec/spec_helper.rb

data/spec/matcher/html_formatter_spec.rb

@@ -1,8 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-require 'nokogiri'
-
-describe Matcher::HtmlFormatter do
-
-
-end