assert2 0.4.4 → 0.4.5

data/lib/assert2/xhtml.rb

@@ -128,30 +128,45 @@ class BeHtmlWith
   
   attr_accessor :doc,
                 :scope
+
+  def assemble_complaint
+    @first_samples << @doc.root if @first_samples.empty?  #  TODO  test the first_samples system
+    @failure_message = complain_about(@builder.doc.root, @first_samples)
+  end
+
+  def build_xpaths(&block)
+    paths = []
+    bwock = block || @block || proc{} #  TODO  what to do with no block? validate?
+    @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
+    end
+
+    return paths
+  end  #  TODO  refactor more to actually use this
   
   def matches?(stwing, &block)
     @scope.wrap_expectation self do  #  TODO  put that back online
       begin
-        bwock = block || @block || proc{} #  TODO  what to do with no block? validate?
-        builder = Nokogiri::HTML::Builder.new(&bwock)
+        paths = build_xpaths(&block)
         @doc = Nokogiri::HTML(stwing)
         @reason = nil
 
-        builder.doc.children.each do |child|
+        @builder.doc.children.each do |child|
           @first_samples = []
-            # TODO warn if child is text
           @path = build_deep_xpath(child)
-          next if @path == "//html[ refer(., '0') ]" # CONSIDER wtf is this?
+          next if @path == "//descendant::html[ refer(., '0') ]" # CONSIDER wtf is this?
 
           matchers = @doc.root.xpath_with_callback @path, :refer do |elements, index|
                        collect_samples(elements, index.to_i)
                      end
           
-          if matchers.empty?
-            @first_samples << @doc.root if @first_samples.empty?  #  TODO  test the first_samples system
-            @failure_message = complain_about(builder.doc.root, @first_samples)
-            return false
-          end  #  TODO  use or lose @reason
+          matchers.empty? and assemble_complaint and return false
+           #  TODO  use or lose @reason
         end
         
         # TODO complain if too many matchers
@@ -163,7 +178,11 @@ class BeHtmlWith
 
   def build_deep_xpath(element)
     @references = []
-    return '//' + build_xpath(element)
+    path = build_xpath(element)
+    if path.index('not') == 0
+      return '/*[ ' + path + ' ]'  #  ERGO  uh, is there a cleaner way?
+    end
+    return '//' + path
   end
 
   def build_deep_xpath_too(element)
@@ -173,19 +192,20 @@ class BeHtmlWith
 
   attr_reader :references
 
-  def build_predicate(element)
+  def build_predicate(element, conjunction = 'and')
     path = ''
+    conjunction = " #{ conjunction } "
     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
-                  './descendant::' + build_xpath(child)
-                end
-              }.join(' and ')
-      path << ' and '
+#                 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
     end
 
     return path
@@ -194,11 +214,17 @@ class BeHtmlWith
   def build_xpath(element)
     count = @references.length
     @references << element  #  note we skip the without @reference!
-    path = element.name.sub(/\!$/, '')
-    path << '[ '
-    path << build_predicate(element)
-    path << "refer(., '#{count}') ]"  #  last so boolean short-circuiting optimizes
-    return path
+    
+    if element.name == 'without!'
+      return 'not( ' + build_predicate(element, 'or') + '1=1 )'
+    else
+      path = 'descendant::'
+      path << element.name.sub(/\!$/, '')
+      path << '[ '
+      path << build_predicate(element)
+      path << "refer(., '#{count}') ]"  #  last so boolean short-circuiting optimizes
+      return path
+    end
   end
 
   def build_xpath_too(element)

data/lib/assert2/xhtml.rb~

@@ -128,30 +128,31 @@ class BeHtmlWith
   
   attr_accessor :doc,
                 :scope
-  
+
+  def assemble_complaint
+    @first_samples << @doc.root if @first_samples.empty?  #  TODO  test the first_samples system
+    @failure_message = complain_about(@builder.doc.root, @first_samples)
+  end
+
   def matches?(stwing, &block)
     @scope.wrap_expectation self do  #  TODO  put that back online
       begin
         bwock = block || @block || proc{} #  TODO  what to do with no block? validate?
-        builder = Nokogiri::HTML::Builder.new(&bwock)
+        @builder = Nokogiri::HTML::Builder.new(&bwock)
         @doc = Nokogiri::HTML(stwing)
         @reason = nil
 
-        builder.doc.children.each do |child|
+        @builder.doc.children.each do |child|
           @first_samples = []
-            # TODO warn if child is text
           @path = build_deep_xpath(child)
-          next if @path == "//html[ refer(., '0') ]" # CONSIDER wtf is this?
+          next if @path == "//descendant::html[ refer(., '0') ]" # CONSIDER wtf is this?
 
           matchers = @doc.root.xpath_with_callback @path, :refer do |elements, index|
                        collect_samples(elements, index.to_i)
                      end
           
-          if matchers.empty?
-            @first_samples << @doc.root if @first_samples.empty?  #  TODO  test the first_samples system
-            @failure_message = complain_about(builder.doc.root, @first_samples)
-            return false
-          end  #  TODO  use or lose @reason
+          matchers.empty? and assemble_complaint and return false
+           #  TODO  use or lose @reason
         end
         
         # TODO complain if too many matchers
@@ -163,7 +164,11 @@ class BeHtmlWith
 
   def build_deep_xpath(element)
     @references = []
-    return '//' + build_xpath(element)
+    path = build_xpath(element)
+    if path.index('not') == 0
+      path = '*[ ' + path + ' ]'  #  ERGO  uh, is there a cleaner way?
+    end
+    return '//' + path
   end
 
   def build_deep_xpath_too(element)
@@ -179,11 +184,11 @@ class BeHtmlWith
 
     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
-                  './descendant::' + build_xpath(child)
-                end
+#                 if child.name == 'without' # TODO throw away nested withouts?
+#                   'not( ' + build_predicate(child) + '1=1 )'
+#                 else
+                  build_xpath(child)
+#                 end
               }.join(' and ')
       path << ' and '
     end
@@ -194,11 +199,17 @@ class BeHtmlWith
   def build_xpath(element)
     count = @references.length
     @references << element  #  note we skip the without @reference!
-    path = element.name.sub(/\!$/, '')
-    path << '[ '
-    path << build_predicate(element)
-    path << "refer(., '#{count}') ]"  #  last so boolean short-circuiting optimizes
-    return path
+    
+    if element.name == 'without!'
+      return 'not( ' + build_predicate(element) + '1=1 )'
+    else
+      path = 'descendant::'
+      path << element.name.sub(/\!$/, '')
+      path << '[ '
+      path << build_predicate(element)
+      path << "refer(., '#{count}') ]"  #  last so boolean short-circuiting optimizes
+      return path
+    end
   end
 
   def build_xpath_too(element)

metadata

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