xml-smart 0.3.2.3 → 0.3.3

data/lib/xml/smart.rb

@@ -26,6 +26,14 @@ module Nokogiri
         self
       end
 
+      def xpath_fast(path)
+        ns = self.custom_namespace_prefixes.merge(self.document.user_custom_namespace_prefixes)
+        ctx = XPathContext.new(self)
+        ctx.register_namespaces(self.document.custom_namespace_prefixes.merge(self.document.user_custom_namespace_prefixes))
+        path = path.gsub(/xmlns:/, ' :') unless Nokogiri.uses_libxml?
+        ctx.evaluate(path)
+      end
+
       def custom_namespace_prefixes_update
         result = {}
 
@@ -74,7 +82,17 @@ module Nokogiri
         XPathContext.new(self).evaluate(path)
       end
       def xpath_fast(path)
-        return xpath(path,self.document.custom_namespace_prefixes.merge(self.document.user_custom_namespace_prefixes))
+        # return xpath(path,self.document.custom_namespace_prefixes.merge(self.document.user_custom_namespace_prefixes))
+        return NodeSet.new(document) unless document
+
+        ns = self.document.custom_namespace_prefixes.merge(self.document.user_custom_namespace_prefixes)
+        ctx = XPathContext.new(self)
+        ctx.register_namespaces(self.document.custom_namespace_prefixes.merge(self.document.user_custom_namespace_prefixes))
+        path = path.gsub(/xmlns:/, ' :') unless Nokogiri.uses_libxml?
+        ctx.evaluate(path)
+      end
+
+      def xpath_experimental
         return NodeSet.new(document) unless document
         @nsc ||= 0
         if @nsc != self.document.ns_counter
@@ -90,7 +108,7 @@ module Nokogiri
 end
 
 module XML
-  VERSION        = '0.3.2'
+  VERSION        = '0.3.3'
   LIBXML_VERSION = Nokogiri::VERSION_INFO['libxml']['loaded']
   LOCKFILE = {
     :min_sleep => 0.25,

data/lib/xml/smart_dom.rb

@@ -16,7 +16,7 @@ module XML
       end
 
       def find(path)
-        Element.new(@dom.root).find(path)
+        Dom::smart_helper(@dom.xpath_fast(path))
       end
 
       def to_s

data/lib/xml/smart_domnamespaceset.rb

@@ -26,6 +26,7 @@ module XML
           end  
         end
         def []=(name,value) 
+          name = nil if name == 'xmlns'
           self.add(name,value)
         end
 
@@ -37,7 +38,7 @@ module XML
             nold.attributes.each do |attr|
               nnew.attributes[attr.qname.name] = attr.value
             end
-            ns = nnod.add_namespace_definition(name.to_s,value.to_s)
+            ns = nnod.add_namespace_definition(name.nil? ? nil : name.to_s,value.to_s)
             @node.namespace_definitions.each do |ns|
               nnod.add_namespace_definition(ns.prefix,ns.href)
             end

data/test/EXAMPLE.xml

@@ -1,6 +1,6 @@
 <test xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xml:lang="de">
   <names>
-    <name team="0" a="3">2012-12-12 16:43:40 +0100</name>
+    <name team="0" a="3">2013-04-24 20:51:43 +0200</name>
     <name team="1">Jürgen</name>
     <name team="1">Michel</name>
     <name team="1">Raphi</name>

data/test/tc_namespace_default.rb

@@ -50,9 +50,14 @@ class TestNamespaceDefault < MiniTest::Unit::TestCase
     # add a namespace to the element
     nsnode.namespaces.add("test","http://heise1")
     nsnode.namespaces.add("aaa","http://heise2")
+
+    assert(nsnode.namespaces[nil] == nil)
+    
     nsnode.namespaces.add(nil,"http://heise")
     nsnode.namespaces[nil] = "http://heiser"
 
+    assert(nsnode.namespaces[nil] != nil)
+
     assert(nsnode.namespaces[nil].prefix == 'xmlns')
     assert(nsnode.namespaces[nil].href == "http://heiser")
     assert(nsnode.namespaces['xmlns'].href == "http://heiser")

data/test/tc_root.rb

@@ -0,0 +1,22 @@
+require 'rubygems'
+require 'minitest/autorun'
+require File.expand_path(::File.dirname(__FILE__) + '/../lib/xml/smart')
+require File.expand_path(::File.dirname(__FILE__) + '/smartrunner.rb')
+
+class TestBasic < MiniTest::Unit::TestCase
+  def test_criss_cross
+    doc = XML::Smart.open(::File.dirname(__FILE__) + "/EXAMPLE.xml")
+
+    node = doc.find("test")
+    assert(node.length == 1)
+
+    node = doc.root.find("test")
+    assert(node.length == 0)
+
+    node = doc.root.find("/test")
+    assert(node.length == 1)
+
+    node = node.first.find("names")
+    assert(node.length == 1)
+  end
+end

data/xml-smart.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "xml-smart"
-  s.version          = "0.3.2.3"
+  s.version          = "0.3.3"
   s.platform         = Gem::Platform::RUBY
   s.summary          = "An xml library that doesn't suck - since 2004."
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xml-smart
 version: !ruby/object:Gem::Version
-  version: 0.3.2.3
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &77332010 !ruby/object:Gem::Requirement
+  requirement: &73897900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77332010
+  version_requirements: *73897900
 - !ruby/object:Gem::Dependency
   name: lockfile
-  requirement: &77359490 !ruby/object:Gem::Requirement
+  requirement: &73897640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77359490
+  version_requirements: *73897640
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &77359010 !ruby/object:Gem::Requirement
+  requirement: &73897430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77359010
+  version_requirements: *73897430
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &77357990 !ruby/object:Gem::Requirement
+  requirement: &73897220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77357990
+  version_requirements: *73897220
 description: An xml library that doesn't suck (since 2004). Based on Nokogiri since
   2012. For more info check out the Documentation link below.
 email: juergen.mangler@gmail.com
@@ -98,6 +98,7 @@ files:
 - test/tc_xsl.rb
 - test/tc_create.rb
 - test/tc_nested.rb
+- test/tc_root.rb
 - test/tc_xpath_root.rb
 - test/tc_qname.rb
 - test/tc_todoc.rb
@@ -167,6 +168,7 @@ test_files:
 - test/tc_xsl.rb
 - test/tc_create.rb
 - test/tc_nested.rb
+- test/tc_root.rb
 - test/tc_xpath_root.rb
 - test/tc_qname.rb
 - test/tc_todoc.rb