assert2 0.4.5 → 0.4.6

data/lib/assert2/xhtml.rb

@@ -89,45 +89,90 @@ class BeHtmlWith
 
   def match_regexp(reference, sample)
     reference =~ /^\(\?/ and 
-        Regexp.new(reference) =~ sample
+      Regexp.new(reference) =~ sample
   end
 
   def match_text(ref, sam)
     ref_text = get_texts(ref)
-      #  TODO regices?
+
     ref_text.empty? or ( ref_text - (sam_text = get_texts(sam)) ).empty? or
       (ref_text.length == 1 and 
         match_regexp(ref_text.first, sam_text.join) )
   end  #  The irony _is_ lost on us
 
-  def match_attributes_and_text(reference, sample)
+  def verbose_spew(reference, sample)
+    if reference['verbose!'] == 'true' and
+       @spewed[yo_path = sample.path] == nil
+      puts
+      puts '-' * 60
+      p yo_path
+      puts sample.to_xhtml
+      @spewed[yo_path] = true
+    end
+  end
+
+  def match_class(attr_name, ref, sam)
+    return false unless attr_name == 'class'
+    return " #{sam} ".index(" #{ref} ")
+  end  #  NOTE  if you call it a class, but ref contains 
+       #        something fruity, you are on your own!
+  
+  def match_attributes(reference, sample)
     reference.attribute_nodes.each do |attr|
-      ref, sam = deAmpAmp(attr.value), deAmpAmp(sample[attr.name])
-      ref == sam or match_regexp(ref, sam) or
-        return false
+      unless %w( xpath! verbose! ).include? attr.name       
+        ref, sam = deAmpAmp(attr.value),
+                    deAmpAmp(sample[attr.name])
+        
+        ref == sam or 
+          match_regexp(ref, sam) or 
+          match_class(attr.name, ref, sam) or
+          return false
+      end
+    end
+    
+    return true
+  end
+
+  def match_xpath(reference, sample)
+    if value = reference['xpath!']
+      matches = sample.parent.xpath("*[ #{value} ]")
+      match_paths = matches.map{|m| m.path }
+      return match_paths.include? sample.path
     end
 
-    return match_text(reference, sample)
+    return true
+  end
+
+  def match_attributes_and_text(reference, sample)
+    if match_attributes(reference, sample) and
+        match_text(reference, sample) and
+        match_xpath(reference, sample)
+      
+      verbose_spew(reference, sample)
+      return true
+    end
+
+    return false
   end
 
   def elements_equal(element_1, element_2)
     raise 'programming error: mismatched elements' unless element_1.document == element_2.document
     element_1.path == element_2.path
   end
-  
-#       end  #  TODO  more "elements" less "nodes"
 
   def collect_samples(elements, index)
     samples = elements.find_all do |element|
       match_attributes_and_text(@references[index], element)
     end
 
-    @first_samples += samples if samples.any? and index == 0
+    @first_samples += elements # if index == 0  
+      #  TODO  this could use more testage, and it could enforce a link to the parent
     return samples
   end
   
   attr_accessor :doc,
-                :scope
+                :scope,
+                :builder
 
   def assemble_complaint
     @first_samples << @doc.root if @first_samples.empty?  #  TODO  test the first_samples system
@@ -140,7 +185,6 @@ class BeHtmlWith
     @builder = Nokogiri::HTML::Builder.new(&bwock)
 
     @builder.doc.children.each do |child|
-#       @first_samples = []
       @path = build_deep_xpath(child)
       next if @path == "//descendant::html[ refer(., '0') ]" # CONSIDER wtf is this?
       paths << @path
@@ -150,7 +194,7 @@ class BeHtmlWith
   end  #  TODO  refactor more to actually use this
   
   def matches?(stwing, &block)
-    @scope.wrap_expectation self do  #  TODO  put that back online
+    @scope.wrap_expectation self do
       begin
         paths = build_xpaths(&block)
         @doc = Nokogiri::HTML(stwing)
@@ -158,6 +202,7 @@ class BeHtmlWith
 
         @builder.doc.children.each do |child|
           @first_samples = []
+          @spewed = {}
           @path = build_deep_xpath(child)
           next if @path == "//descendant::html[ refer(., '0') ]" # CONSIDER wtf is this?
 
@@ -180,7 +225,7 @@ class BeHtmlWith
     @references = []
     path = build_xpath(element)
     if path.index('not') == 0
-      return '/*[ ' + path + ' ]'  #  ERGO  uh, is there a cleaner way?
+      return '/*[ ' + path + ' ]'   #  ERGO  uh, is there a cleaner way?
     end
     return '//' + path
   end
@@ -198,14 +243,8 @@ class BeHtmlWith
     element_kids = element.children.grep(Nokogiri::XML::Element)
 
     if element_kids.any?
-      path << element_kids.map{|child|
-#                 if child.name == 'without' # TODO throw away nested withouts?
-#                   'not( ' + build_predicate(child) + '1=1 )'
-#                 else
-                build_xpath(child)
-#                 end
-              }.join(conjunction)
-      path << ' and ' # conjunction
+      path << element_kids.map{|child|  build_xpath(child)  }.join(conjunction)
+      path << ' and '
     end
 
     return path
@@ -223,6 +262,8 @@ class BeHtmlWith
       path << '[ '
       path << build_predicate(element)
       path << "refer(., '#{count}') ]"  #  last so boolean short-circuiting optimizes
+#       xpath = element['xpath!']
+#       path << "[ #{ xpath } ]" if xpath
       return path
     end
   end
@@ -238,8 +279,6 @@ class BeHtmlWith
     if element_kids.length > 0
       child = element_kids[0]
       path << './descendant::' + build_xpath_too(child)
-#               }.join(' and ')
-#       path << ' and '
     end
 
     if element_kids.length > 1
@@ -274,15 +313,6 @@ class BeHtmlWith
     return nil
   end  #  TODO  use or lose these
 
-#  TODO does a multi-modal top axis work?
-# TODO      this_match = node.xpath('preceding::*').length
-    
-    # http://www.zvon.org/xxl/XPathTutorial/Output/example18.html
-    # The preceding axis contains all nodes in the same document 
-    # as the context node that are before the context node in 
-    # document order, excluding any ancestors and excluding 
-    # attribute nodes and namespace nodes 
-
   attr_accessor :failure_message
 
   def negative_failure_message
@@ -331,4 +361,11 @@ class Nokogiri::XML::Node
       def content= string
         self.native_content = encode_special_chars(string.to_s)
       end
-end
+end
+
+class Nokogiri::XML::Builder
+      def text(string)
+        node = Nokogiri::XML::Text.new(string.to_s, @doc)
+        insert(node)
+      end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: assert2
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors: 
 - Phlip
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-21 00:00:00 -07:00
+date: 2009-03-22 00:00:00 -07:00
 default_executable: 
 dependencies: []