xml-smart 0.3.3 → 0.3.4

data/lib/xml/smart.rb

@@ -13,6 +13,7 @@ require File.expand_path(File.dirname(__FILE__) + '/smart_domattributeset')
 require File.expand_path(File.dirname(__FILE__) + '/smart_domattribute')
 require File.expand_path(File.dirname(__FILE__) + '/smart_domnamespaceset')
 require File.expand_path(File.dirname(__FILE__) + '/smart_domnamespace')
+require File.expand_path(File.dirname(__FILE__) + '/smart_processinginstruction')
 
 module Nokogiri
   module XML
@@ -108,7 +109,7 @@ module Nokogiri
 end
 
 module XML
-  VERSION        = '0.3.3'
+  VERSION        = '0.3.4'
   LIBXML_VERSION = Nokogiri::VERSION_INFO['libxml']['loaded']
   LOCKFILE = {
     :min_sleep => 0.25,

data/lib/xml/smart_dom.rb

@@ -70,23 +70,25 @@ module XML
 
       def self::smart_helper(node)
         if node.instance_of? Nokogiri::XML::Element
-          Element.new(node)
+          XML::Smart::Dom::Element.new(node)
         elsif node.instance_of? Nokogiri::XML::Attr
-          Attribute.new(node)
+          XML::Smart::Dom::Attribute.new(node)
         elsif node.instance_of? Nokogiri::XML::NodeSet  
-          NodeSet.new(node)
+          XML::Smart::Dom::NodeSet.new(node)
         elsif node.instance_of?(String) || node.instance_of?(TrueClass) || node.instance_of?(FalseClass) || node.instance_of?(Float)  
           node
         elsif node.instance_of? Nokogiri::XML::Text  
-          Text.new(node)
+          XML::Smart::Dom::Text.new(node)
         elsif node.instance_of? Nokogiri::XML::Namespace  
-          Namespace.new(node)
+          XML::Smart::Dom::Namespace.new(node)
         elsif node.instance_of? Nokogiri::XML::Document
-          Dom.new(node)
+          XML::Smart::Dom.new(node)
+        elsif node.instance_of? Nokogiri::XML::ProcessingInstruction
+          XML::Smart::ProcessingInstruction.new(node)
         elsif node.nil?
           nil
         else
-          Other.new(node)
+          XML::Smart::Dom::Other.new(node)
         end  
       end
 

data/lib/xml/smart_domelement.rb

@@ -14,7 +14,7 @@ module XML
         end
 
         def add_helper(attrs)
-          if attrs.length>0 && attrs[0].is_a?(String)
+          if attrs.length>0 && attrs[0].is_a?(String) && attrs[0][0] != '?'
             pfx = ''
             ns = nil
             attrs[0] = attrs[0].dup
@@ -58,13 +58,11 @@ module XML
               end
             end
             return [tmp,false]
-          end
-          if attrs.length == 1 && attrs[0].is_a?(XML::Smart::Dom::Element)
+          elsif attrs.length == 1 && attrs[0].is_a?(XML::Smart::Dom::Element)
             ele = attrs[0].instance_variable_get(:@element)
             same = ele.document.root.pointer_id == @element.document.root.pointer_id
             return [same ? ele : ele.dup, !same]
-          end
-          if attrs.length == 1 && attrs[0].is_a?(XML::Smart::Dom::NodeSet)
+          elsif attrs.length == 1 && attrs[0].is_a?(XML::Smart::Dom::NodeSet)
             nos = attrs[0].instance_variable_get(:@nodeset)
             if nos.length > 0
               same = nos.first.document.root.pointer_id == @element.document.root.pointer_id
@@ -77,13 +75,11 @@ module XML
             else
               return [nos, false]
             end
-          end
-          if attrs.length == 2 && attrs[0].is_a?(XML::Smart::Dom::Element) && (attrs[1] == XML::Smart::COPY || attrs[1] == XML::Smart::MOVE)
+          elsif attrs.length == 2 && attrs[0].is_a?(XML::Smart::Dom::Element) && (attrs[1] == XML::Smart::COPY || attrs[1] == XML::Smart::MOVE)
             ele = attrs[0].instance_variable_get(:@element)
             same = ele.document.root.pointer_id == @element.document.root.pointer_id
             return [attrs[1] == XML::Smart::COPY ? ele.dup : ele, !same]
-          end
-          if attrs.length == 2 && attrs[0].is_a?(XML::Smart::Dom::NodeSet) && (attrs[1] == XML::Smart::COPY || attrs[1] == XML::Smart::MOVE)
+          elsif attrs.length == 2 && attrs[0].is_a?(XML::Smart::Dom::NodeSet) && (attrs[1] == XML::Smart::COPY || attrs[1] == XML::Smart::MOVE)
             nos = attrs[0].instance_variable_get(:@nodeset)
             if nos.length > 0
               same = nos.first.document.root.pointer_id == @element.document.root.pointer_id
@@ -96,6 +92,9 @@ module XML
             else  
               return [nos, false]
             end
+          elsif attrs.length == 2 && attrs[0].is_a?(String) && attrs[1].is_a?(String) && attrs[0][0] == '?'
+            tmp = Nokogiri::XML::ProcessingInstruction.new @element.document, attrs[0].sub(/./,''), attrs[1]
+            return [tmp,false]
           end
           return [nil, false]
         end

data/lib/xml/smart_processinginstruction.rb

@@ -0,0 +1,41 @@
+module XML
+  module Smart
+
+    class ProcessingInstruction
+      def initialize(element)
+        @element = element
+      end
+
+      def ===(cls); self.is_a? cls; end
+
+      def dump; @element.to_s; end
+
+      def replace_by(n)
+        case n
+          when ProcessingInstruction; ProcessingInstruction.new @element.replace(n.instance_variable_get(:@element))
+          else
+            nil
+        end
+      end
+
+      def qname; QName.new @element; end
+
+      def content; @element.content end
+      def content=(t); @element.content = t.to_s if t.respond_to? :to_s; end
+
+      def parent
+        Dom::smart_helper(@element.parent)
+      end
+      def parent?; !@element.parent.nil?; end
+
+      def path; @element.path; end
+
+      def ==(other)
+        return false unless other
+        return false unless other.respond_to?(:unique_id)
+        unique_id == other.unique_id
+      end
+      def unique_id; @element.pointer_id; end
+    end
+  end
+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">2013-04-24 20:51:43 +0200</name>
+    <name team="0" a="3">2013-05-15 11:04:06 +0200</name>
     <name team="1">Jürgen</name>
     <name team="1">Michel</name>
     <name team="1">Raphi</name>

data/test/tc_pi.rb

@@ -0,0 +1,23 @@
+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 TestAdd < MiniTest::Unit::TestCase
+  def test_add
+    doc = XML::Smart.open(::File.dirname(__FILE__) + "/EXAMPLE.xml")
+    pi = doc.root.add('?tobias', 'dj')
+    assert pi.dump == "<?tobias dj?>"
+    assert pi.path == "/test/processing-instruction('tobias')"
+    assert pi.parent? == true
+    assert pi.parent.unique_id == doc.root.unique_id
+    assert pi.qname.name == 'tobias'
+    assert pi.content == 'dj'
+    pi.content = 'vj'
+    assert pi.content == 'vj'
+
+    doc.root.add_before('?xsl-stylesheet', 'a="3" b="7"')
+    doc.root.children.delete_all!
+    assert doc.to_s == "<?xml version=\"1.0\"?>\n<?xsl-stylesheet a=\"3\" b=\"7\"?>\n<test xmlns:soap=\"http://schemas.xmlsoap.org/wsdl/soap/\" xml:lang=\"de\">\n  <?tobias vj?>\n</test>\n"
+  end   
+end  

data/xml-smart.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "xml-smart"
-  s.version          = "0.3.3"
+  s.version          = "0.3.4"
   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.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &73897900 !ruby/object:Gem::Requirement
+  requirement: &77763910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73897900
+  version_requirements: *77763910
 - !ruby/object:Gem::Dependency
   name: lockfile
-  requirement: &73897640 !ruby/object:Gem::Requirement
+  requirement: &77763640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73897640
+  version_requirements: *77763640
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &73897430 !ruby/object:Gem::Requirement
+  requirement: &77784950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73897430
+  version_requirements: *77784950
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &73897220 !ruby/object:Gem::Requirement
+  requirement: &77784700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73897220
+  version_requirements: *77784700
 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
@@ -71,6 +71,7 @@ files:
 - lib/xml/smart_dom.rb
 - lib/xml/smart_domelement.rb
 - lib/xml/smart_domother.rb
+- lib/xml/smart_processinginstruction.rb
 - lib/xml/smart_qname.rb
 - lib/xml/XSDtoRNG.xsl
 - lib/xml/smart_domattributeset.rb
@@ -103,6 +104,7 @@ files:
 - test/tc_qname.rb
 - test/tc_todoc.rb
 - test/tc_concurrent.rb
+- test/tc_pi.rb
 - test/tc_basic.rb
 - test/tc_namespace_find.rb
 - test/tc_relaxng.rb
@@ -173,6 +175,7 @@ test_files:
 - test/tc_qname.rb
 - test/tc_todoc.rb
 - test/tc_concurrent.rb
+- test/tc_pi.rb
 - test/tc_basic.rb
 - test/tc_namespace_find.rb
 - test/tc_relaxng.rb