RubyGems - assert_xpath - Versions diffs - 0.3.1 → 0.4.0 - Mend

assert_xpath 0.3.1 → 0.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

data/lib/assert_javascript.rb CHANGED Viewed

@@ -96,8 +96,8 @@ module AssertJavaScript
     stuff = {}
     @xdoc.each_element(sit_and_spin) do |node|
-      name = REXML::XPath.first(node, './/Identifier').text
-      number = REXML::XPath.first(node, './/Number').text
+      name = node.get_path('.//Identifier').text
+      number = node.get_path('.//Number').text
       stuff[name.to_sym] = number.to_f
       #  ERGO  is to_f best?
       #  ERGO  simpler way to add an ostruct member?
@@ -172,29 +172,29 @@ module AssertJavaScript
       end  #  ERGO  use assert_any_xpath
       jsonic.each_element('descendant-or-self::PropertyNameAndValueList/PropertyPair') do |node|
-        name = REXML::XPath.first(node, 'PropertyName/*')
+        name = node.get_path('PropertyName/*')
         name = name.text.to_sym
         json[name] =
           case
-            when b = REXML::XPath.first(node, 'ObjectLiteral/PropertyNameAndValueList')
+            when b = node.get_path('ObjectLiteral/PropertyNameAndValueList')
               assert_json(b)
-            when b = REXML::XPath.first(node, 'Boolean')
+            when b = node.get_path('Boolean')
               b.text == '1'
-            when b = REXML::XPath.first(node, 'Number')
+            when b = node.get_path('Number')
               b.text
 #  ERGO  how to do an or in an XPath??
-            when b = REXML::XPath.first(node, 'String')
+            when b = node.get_path('String')
               b.text
-            when b = REXML::XPath.first(node, 'Identifier')
+            when b = node.get_path('Identifier')
               b.text  #  ERGO  test me!
-            when b = REXML::XPath.first(node, 'ArrayLiteral/ElementList')
+            when b = node.get_path('ArrayLiteral/ElementList')
               #  ERGO  recurse here
               returning [] do |list|
                 b.each_element('*') do |item|
@@ -241,7 +241,8 @@ module AssertJavaScript
     params = {}
     if query
-      query.split('&').each do |item|
+      splitter = using(:libxml?) ? '&amp;' : '&'
+      query.split(splitter).each do |item|
         key, value = item.split('=')
         params[key.to_sym] = CGI::unescape(value)
       end
@@ -292,10 +293,10 @@ module AssertJavaScript
   #
   def deny_js_replace_html(element_id, matcher = nil, diagnostic = nil)
     path = object_method_xpath('Element', 'update', element_id)
   #  ERGO  don't let subsequent updates with the same element_id confuse the matcher!
-    if matcher and node = REXML::XPath.first(@xdoc, path)
+    if matcher and node = @xdoc.get_path(path)
       stash_xdoc do
         @xdoc = node
         assert_no_match matcher, assert_js_argument(2), diagnostic
@@ -364,8 +365,11 @@ module AssertJavaScript
       if (tag_id.class != String and tag_id.class != Regexp) or
           /#{tag_id}/ =~ assert_js_argument(2)
         if action
-          assert_equal action.to_s.gsub('&amp;', '&'),
-                       assert_js_argument(1),
+        #  ERGO  move those GCI::unescapeHTMLs up the food chain?
+          assert_equal CGI::unescapeHTML(action),
+                       CGI::unescapeHTML(assert_js_argument(1)),
                        diagnostic
         end
         #  ERGO  a better system to extract GET parameters
@@ -389,7 +393,12 @@ module AssertJavaScript
   # Not ready for public use!
   #
   def assert_js_xml(q)  #  ERGO explain this beast; hide inside assert_js_*
+  #  FIXME test this with an &entity;!
     xml = eval('"' + q + '"')
+    xml = '<html><body>' + CGI::unescapeHTML(xml) + '</body></html>'  if using :libxml?
     assert_xml xml  #  ERGO  what are the errors if these fail?
   end  #  ERGO  test the error recoverer in assert_xml
@@ -462,6 +471,12 @@ module AssertJavaScript
     def javascript_to_xml(source, diagnostic)
       source   ||= default_js_source(diagnostic)
+      source = source.to_s
+      source.gsub!('<![CDATA[>', '')
+      source.gsub!('<![CDATA[', '')
+      source.gsub!('//]]]]>', '')
+      source.gsub!(']]>', '')   #  ERGO  fix these things at their source
       here = File.dirname(__FILE__)
       jsToXml_pl = File.join(here, 'jsToXml.pl')

data/lib/assert_xpath.rb CHANGED Viewed

@@ -1,5 +1,6 @@
 require 'rexml/document'
 require 'stringio'
+require 'libxml'  #  FIXME  soften that requirement!
 RAILS_ENV = ENV.fetch('RAILS_ENV', 'test') unless defined?(RAILS_ENV)
 AFE = Test::Unit::AssertionFailedError unless defined?(AFE)
@@ -185,7 +186,7 @@ module AssertXPath
     def rexml? ;   false end  #  becase diverse libraries are a "boundary"
     def hpricot? ; false end  #  situation. We can't control their contents!
   end
   class HpricotHelper < XmlHelper  #:nodoc:
     def hpricot? ;  true  end
     def symbol_to_xpath(tag)  tag.to_s  end
@@ -232,7 +233,7 @@ module AssertXPath
   # run entire suites in this mode.
   #
   def invoke_libxml(favorite_flavor = :html)
-    @_favorite_flavor = favorite_flavor
+    @_favorite_flavor = favorite_flavor
     @xdoc   = nil
     @helper = LibxmlHelper.new
   end
@@ -244,12 +245,12 @@ module AssertXPath
       :xhtml => '<!DOCTYPE html PUBLIC ' +
                 '"-//W3C//DTD XHTML 1.0 Transitional//EN" ' +
                 '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" >',
-      :xml => ''
+      :xml => nil
                }.freeze
   end
   private :_doc_type
-  #  FIXME what happens to assert_js_replace_html bearing entities??
+  #  ERGO  what happens to assert_js_replace_html bearing entities??
   # Subsequent +assert_xml+ calls will use REXML. See
   # +invoke_hpricot+ to learn the various differences between the
@@ -310,6 +311,8 @@ module AssertXPath
     contents.gsub!('//<![CDATA[', '')
     contents.gsub!('//]]>', '')
     contents.gsub!('//]>', '')
+    contents.gsub!('//]]', '')
+    contents.gsub!('//]', '')
     begin
       @xdoc = REXML::Document.new(contents)
@@ -323,18 +326,38 @@ module AssertXPath
     return (assert_xpath('/*') rescue nil)  if @xdoc
   end
+  #  Temporarily sets the validation type to :xml, :html, or :xhtml
+  #
+  def validate_as(type) # FIXME use or lose this
+    @_favorite_flavor, formerly = type, @_favorite_flavor
+    yield
+  ensure
+    @_favorite_flavor = type
+  end  #  ERGO  more documentation!
   def assert_libxml(*args, &block)
     xml = args.shift || @xdoc || @response.body
-    require 'xml/libxml'
-    xp = XML::Parser.new()
     xhtml = xml.to_s
+      #  CONSIDER  fix this like at the source??
+    xhtml.gsub!('<![CDATA[>', '')
+    xhtml.gsub!('<![CDATA[', '')
+    xhtml.gsub!('//]]]]>', '')
+    xhtml.gsub!(']]>', '')
     if xhtml !~ /^\<\!DOCTYPE\b/ and xhtml !~ /\<\?xml\b/
-      xhtml = _doc_type[@_favorite_flavor || :html] + "\n" + xhtml
+      xhtml = _doc_type[@_favorite_flavor || :html] + "\n" + xhtml if _doc_type[@_favorite_flavor]
     end  #  ERGO  document we pass HTML level into invoker
+    if xhtml.index('<?xml version="1" standalone="yes"?>') == 0
+      xhtml.gsub!('<?xml version="1" standalone="yes"?>', '')
+      xhtml.strip!  #  ERGO  what is libxml's problem with that line???
+    end
     # # FIXME blog that libxml will fully validate your ass...
+    xp = xhtml =~ /\<\!DOCTYPE/ ? XML::HTMLParser.new() : XML::Parser.new()
+    xhtml = '<xml/>' unless xhtml.any?
     xp.string = xhtml
 #  FIXME  blog we don't work with libxml-ruby 3.8.4
 #   XML::Parser.default_load_external_dtd = false
@@ -541,6 +564,8 @@ module AssertXPath
     end
   end
+   # FIXME @helper -> @_helper
   # Wraps the common idiom <code>assert_xpath('descendant-or-self::./<em>my_tag</em>[ @id = "<em>my_id</em>" ]')</code>. Depends on +assert_xml+
   # * +tag+ - an XML node name, such as +div+ or +input+.
   #   If this is a <code>:symbol</code>, we prefix "<code>.//</code>"
@@ -672,7 +697,7 @@ module AssertXPath
   #  ERGO  then update documentation of those who use this
     def symbol_to_xpath(tag)
       return tag unless tag.class == Symbol
-      using :libxml? # prop-ulates @helper
+      @helper or using :libxml? # prop-ulates @helper
       return @helper.symbol_to_xpath(tag)
     end
@@ -859,6 +884,7 @@ module XML
       end
       return [find_first(xpath, "x:http://www.w3.org/1999/xhtml")]
     end
+    alias each_element search
     def text
 #p text?
@@ -910,10 +936,10 @@ end
 class REXML::Element
   include AssertXPath::CommonXPathExtensions
-    # Semi-private method to match Hpricotic abilities
-    def search(xpath)
-      return self.each_element( xpath ){}
-    end
+  # Semi-private method to match Hpricotic abilities
+  def search(xpath)
+    return self.each_element( xpath ){}
+  end
   def method_missing(*args, &block) #:nodoc:
     symbol = args.shift

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: assert_xpath
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Phlip
@@ -9,27 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2008-03-08 00:00:00 -08:00
+date: 2008-03-10 00:00:00 -07:00
 default_executable:
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rubynode
-  version_requirement:
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: "0"
-    version:
-- !ruby/object:Gem::Dependency
-  name: assert2
-  version_requirement:
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: "0"
-    version:
+dependencies: []
 description:
 email: phlip2005@gmail.com
 executables: []