xml-smart 0.3.12 → 0.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be39705fa3c69647ef581c26f96bc40df8073474
-  data.tar.gz: daf048cf47a87e78342788896a3844fb6f8f22b3
+  metadata.gz: 9fa0cb5980990dae96d416b9122d90882d1ef5ae
+  data.tar.gz: 26a3c1597a503cee447ab4eccd226d564d34ade5
 SHA512:
-  metadata.gz: 2288bb3cd7925f304dc175890c0eccc3637fcd51feff4692e04774f731bc98eae2535d30056cfe83c51ab711b48c2cdd36ca6c2e2b03afc9346a459e0c484c64
-  data.tar.gz: 7d72f428e5393033c3c353625fcebb56d6fab8f14144e49d06e43eb12101f80f35c137f177002a5341fd322378b270271e43205b8b3b9984bfcb614752ae62ff
+  metadata.gz: 1cfd22611b531f7121c314edfcfee7830da6cd69f5e654020b238aad6582e0b08252e0d2885450cec4ac349d3735278c20937d8e8ddea3227b680ad016f31349
+  data.tar.gz: 0b52ff70a78c074914b6bda148d02b5ade3cfc19140b8eab1d319d1406f6ca3c95003b350bad97e3bb884ed0a30e717a9285001dc3a56c7667322c921b5862bc

data/README.rdoc

@@ -47,6 +47,32 @@ Register your own shortcusts to be available in all XPaths:
     doc.root.add "test_node"
   end
 
+=== check against relaxng and xml schema
+
+Libxml2, the basis for nokogiri has only partial xml-schema support, but full
+relaxng support. Thus checking against xml-schema with nokogiri may return
+positive results, although it is a lie. XML::Smart internally converts
+xml-schema to relaxng, thus allowing for seamless schema usage:
+
+  doc = XML::Smart.string('<test xmlns:aaa="uri:aaa"><aaa:test/></test>')
+  doc.validate_against(XML::Smart.open_unprotected('xmlschema.xml'))
+  doc.validate_against(XML::Smart.open_unprotected('xmlschema.xml'))
+  doc.find('string(a:test)')
+  doc.close
+
+=== xinclude
+
+Libxml2, the basis for nokogiri does not support https xincludes. Nokogiri may
+impelement this in the future (issue
+https://github.com/sparklemotion/nokogiri/issues/1321), but for now we do
+support it:
+
+  doc.xinclude!
+
+or
+  
+  doc.find('//someelement').first.xinclude!
+
 == Changes since 0.2.x (see Changelog)
 
 - qname instead of name

data/example/EXAMPLE.xml

@@ -5,7 +5,7 @@
     <name team="1">J�rgen</name>
     <name team="1">Michel</name>
     <name team="1">Raphi</name>
-    <name team="2">Kathrin <b>Fiedler</b> MBA</name>
+    <name xmlns:doc="arrra" soap:team="2">Kathrin <b>Fiedler</b> MBA</name>
     <name team="5">egon</name>
   </names>
   <colors>

data/lib/xml/smart.rb

@@ -1,6 +1,8 @@
 require 'rubygems'
 require 'nokogiri'
 require 'tempfile'
+require 'open-uri'
+require 'openssl'
 
 require File.expand_path(File.dirname(__FILE__) + '/smart_qname')
 require File.expand_path(File.dirname(__FILE__) + '/smart_dom')
@@ -26,6 +28,13 @@ module Nokogiri
         self
       end
 
+      def basepath=(path)
+        @basepath = File.dirname(path.to_s)
+      end
+      def basepath
+        @basepath || ''
+      end
+      
       def xpath_fast(path)
         ns = self.custom_namespace_prefixes.merge(self.document.user_custom_namespace_prefixes)
         ctx = XPathContext.new(self)
@@ -84,6 +93,26 @@ module Nokogiri
         ctx.evaluate(path)
       end
 
+      def do_xinclude_manual(relative_to=nil)
+        path = ((relative_to || self.document.basepath.to_s) + '/').sub(/\/+$/,'/')
+        ctx = XPathContext.new(self)
+        ctx.register_namespaces "xi"=>"http://www.w3.org/2001/XInclude"
+        ctx.evaluate('//xi:include').each do |ele|
+          name = ele.attributes['href'].value
+          name = path + name if name !~ /^(https?:|ftp:)/
+          content = open(name,{ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE}).read
+          insert = begin 
+            Nokogiri::XML::parse(content){|config| config.noblanks.noent.nsclean.strict }.root
+          rescue
+            content
+          end
+          x = ele.replace insert
+          x.each do |n|
+            n.do_xinclude_manual if n.is_a? Nokogiri::XML::Element
+          end
+        end
+      end
+
       def xpath_experimental
         return NodeSet.new(document) unless document
         @nsc ||= 0
@@ -119,15 +148,15 @@ module XML
             io = ::Kernel::open(name,'r+')
             io.flock(File::LOCK_EX)
           end  
-          dom = Dom.new Nokogiri::XML::parse(io){|config| config.noblanks.noent.nsclean.strict }
+          dom = Dom.new Nokogiri::XML::parse(io){|config| config.noblanks.noent.nsclean.strict }, name
           io.rewind
         elsif name.is_a?(String) && !File.exists?(name)
           MUTEX.synchronize do
             io = ::Kernel::open(name,'w')
             io.flock(File::LOCK_EX)
           end  
-          dom = Smart::string(default)
-        elsif name.is_a?(IO) || name.is_a?(Tempfile)  
+          dom = Smart::string(default,name)
+        elsif name.is_a?(IO) || name.is_a?(Tempfile)
           MUTEX.synchronize do
             io = name
             io.flock(File::LOCK_EX)
@@ -167,10 +196,17 @@ module XML
       raise Error, 'first parameter has to be a filename or filehandle' unless name.is_a?(String) || name.is_a?(IO) || name.is_a?(Tempfile)
       raise Error, 'second parameter has to be an xml string' unless default.is_a?(String) || default.nil?
       dom = begin
-        io = name.is_a?(String) ? ::Kernel::open(name) : name
+        filename = nil
+        io = if name.is_a?(String) 
+          filename = name
+          ::Kernel::open(name) 
+        else
+          filename = name.path
+          name
+        end
         begin
           io.flock(File::LOCK_EX) if lock
-          Dom.new Nokogiri::XML::parse(io){|config| config.noblanks.noent.nsclean.strict }
+          Dom.new Nokogiri::XML::parse(io){|config| config.noblanks.noent.nsclean.strict }, filename
         ensure
           io.flock(File::LOCK_UN)
         end
@@ -190,9 +226,9 @@ module XML
       end
     end
 
-    def self::string(str)
+    def self::string(str,basepath=nil)
       raise Error, 'first parameter has to be stringable (:to_s)' unless str.is_a?(String)
-      dom = Dom.new Nokogiri::XML::parse(str.to_s){|config| config.noblanks.noent.nsclean.strict }
+      dom = Dom.new Nokogiri::XML::parse(str.to_s){|config| config.noblanks.noent.nsclean.strict }, basepath
       if block_given?
         yield dom
         nil

data/lib/xml/smart_dom.rb

@@ -1,8 +1,9 @@
 module XML
   module Smart
     class Dom
-      def initialize(dom)
+      def initialize(dom,basepath=nil)
         @dom = dom
+        @dom.basepath = basepath
         @unformated = false
       end
 

data/lib/xml/smart_domelement.rb

@@ -160,11 +160,7 @@ module XML
         def namespaces; NamespaceSet.new(self,@element); end
 
         def xinclude!(basedir=nil)
-          if basedir.is_a?(String) && File.directory?(basedir)
-            Dir.chdir(basedir) { @element.do_xinclude Nokogiri::XML::ParseOptions::STRICT }
-          else
-            @element.do_xinclude Nokogiri::XML::ParseOptions::STRICT
-          end  
+          @element.do_xinclude_manual(basedir)
           @element.document.custom_namespace_prefixes_update
           @element.document.ns_update
           true

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">2015-03-13 11:04:34 +0100</name>
+    <name team="0" a="3">2015-07-23 21:37:19 +0200</name>
     <name team="1">Jürgen</name>
     <name team="1">Michel</name>
     <name team="1">Raphi</name>

data/test/concurrent.xml

@@ -1 +1,7 @@
-<solutions><solution matnr="9906264" name="mangler" secid="1" assessment="16"><question block="1" question="2"/><question block="2" question="4"/><question block="3" question="6"/></solution></solutions>
+<solutions>
+  <solution matnr="9906264" name="mangler" secid="1" when="2015-07-23T21:37:19+02:00" assessment="16">
+    <question block="1" question="2"/>
+    <question block="2" question="4"/>
+    <question block="3" question="6"/>
+  </solution>
+</solutions>

data/xml-smart.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xml-smart
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.14
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri