niceogiri 1.0.1 → 1.0.2

data/lib/niceogiri/version.rb

@@ -1,3 +1,3 @@
 module Niceogiri
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/niceogiri/xml/node.rb

@@ -65,7 +65,8 @@ module Niceogiri
         when Nokogiri::XML::Namespace
           self.nokogiri_namespace = namespaces
         when String
-          self.add_namespace nil, namespaces
+          ns = self.add_namespace nil, namespaces
+          self.nokogiri_namespace = ns
         when Hash
           self.add_namespace nil, ns if ns = namespaces.delete(nil)
           namespaces.each do |p, n|
@@ -132,7 +133,7 @@ module Niceogiri
       # @param [XML::Node] node the node to inherit
       # @return [self]
       def inherit(node)
-        set_namespace node.namespace if node.namespace
+        nokogiri_namespace = node.namespace
         inherit_attrs node.attributes
         node.children.each { |c| self << c.dup }
         self

data/spec/niceogiri/core_ext/nokogiri_spec.rb

@@ -3,90 +3,128 @@ require 'spec_helper'
 describe Nokogiri::XML::Node do
   let(:doc) { Nokogiri::XML::Document.new }
 
+  subject { Nokogiri::XML::Node.new 'foo', doc }
+
+  before { doc.root = subject }
+
   it 'aliases #name to #element_name' do
-    node = Nokogiri::XML::Node.new 'foo', doc
-    node.should respond_to :element_name
-    node.element_name.should == node.name
+    subject.should respond_to :element_name
+    subject.element_name.should == subject.name
   end
 
   it 'aliases #name= to #element_name=' do
-    node = Nokogiri::XML::Node.new 'foo', doc
-    node.should respond_to :element_name=
-    node.element_name.should == node.name
-    node.element_name = 'bar'
-    node.element_name.should == 'bar'
+    subject.should respond_to :element_name=
+    subject.element_name.should == subject.name
+    subject.element_name = 'bar'
+    subject.element_name.should == 'bar'
   end
 
   it 'allows symbols as hash keys for attributes' do
-    attrs = Nokogiri::XML::Node.new('foo', doc)
-    attrs['foo'] = 'bar'
-
-    attrs['foo'].should == 'bar'
-    attrs[:foo].should == 'bar'
+    subject['foo'] = 'bar'
+    subject['foo'].should == 'bar'
+    subject[:foo].should == 'bar'
   end
 
   it 'ensures a string is passed to the attribute setter' do
-    attrs = Nokogiri::XML::Node.new('foo', doc)
-    attrs[:foo] = 1
-    attrs[:foo].should == '1'
+    subject[:foo] = 1
+    subject[:foo].should == '1'
 
-    attrs[:some_attr] = :bah
-    attrs[:some_attr].should == 'bah'
+    subject[:some_attr] = :bah
+    subject[:some_attr].should == 'bah'
   end
 
   it 'joins an array into a string when passed to the attribute setter' do
-    attrs = Nokogiri::XML::Node.new('foo', doc)
-    attrs[:foo] = 1
-    attrs[:foo].should == '1'
+    subject[:foo] = 1
+    subject[:foo].should == '1'
 
-    attrs[:some_attr] = [:bah, :boo]
-    attrs[:some_attr].should == 'bahboo'
+    subject[:some_attr] = [:bah, :boo]
+    subject[:some_attr].should == 'bahboo'
   end
 
   it 'removes an attribute when set to nil' do
-    attrs = Nokogiri::XML::Node.new('foo', doc)
-    attrs['foo'] = 'bar'
-
-    attrs['foo'].should == 'bar'
-    attrs['foo'] = nil
-    attrs['foo'].should be_nil
+    subject['foo'] = 'bar'
+    subject['foo'].should == 'bar'
+    subject['foo'] = nil
+    subject['foo'].should be_nil
   end
 
   it 'allows attribute values to change' do
-    attrs = Nokogiri::XML::Node.new('foo', doc)
-    attrs['foo'] = 'bar'
-
-    attrs['foo'].should == 'bar'
-    attrs['foo'] = 'baz'
-    attrs['foo'].should == 'baz'
+    subject['foo'] = 'bar'
+    subject['foo'].should == 'bar'
+    subject['foo'] = 'baz'
+    subject['foo'].should == 'baz'
   end
 
   it 'allows symbols as the path in #xpath' do
-    node = Nokogiri::XML::Node.new('foo', doc)
-    node.should respond_to :find
-    doc.root = node
+    subject.should respond_to :find
+    doc.root = subject
     doc.xpath(:foo).first.should_not be_nil
     doc.xpath(:foo).first.should == doc.xpath('/foo').first
   end
 
   it 'allows symbols as namespace names in #xpath' do
-    node = Nokogiri::XML::Node.new('foo', doc)
-    node.namespace = node.add_namespace('bar', 'baz')
-    doc.root = node
-    node.xpath('/bar:foo', :bar => 'baz').first.should_not be_nil
+    subject.namespace = subject.add_namespace('bar', 'baz')
+    doc.root = subject
+    subject.xpath('/bar:foo', :bar => 'baz').first.should_not be_nil
   end
 
   it 'aliases #xpath to #find' do
-    node = Nokogiri::XML::Node.new('foo', doc)
-    node.should respond_to :find
-    doc.root = node
-    node.find('/foo').first.should_not be_nil
+    subject.should respond_to :find
+    doc.root = subject
+    subject.find('/foo').first.should_not be_nil
   end
 
   it 'has a helper function #find_first' do
-    node = Nokogiri::XML::Node.new('foo', doc)
-    node.should respond_to :find
-    doc.root = node
-    node.find_first('/foo').should == node.find('/foo').first
+    subject.should respond_to :find
+    doc.root = subject
+    subject.find_first('/foo').should == subject.find('/foo').first
+  end
+
+  describe "JRuby bugs" do
+    describe '#to_xml' do
+      context 'with a namespace on a child node' do
+        let(:ns_href) { 'foo' }
+        let(:child_node) { Nokogiri::XML::Node.new 'bar', doc }
+
+        before do
+          child_node.add_namespace nil, ns_href
+          subject << child_node
+        end
+
+        it 'should have the correct namespace in the rendered XML' do
+          p subject.to_xml
+          subject.to_xml.should match(/xmlns="foo"/)
+        end
+      end
+    end
+
+    describe '#xpath' do
+      context 'looking for a namespaced element inside a prefixed element' do
+        let(:child_node) { Nokogiri::XML::Node.new 'bar', doc }
+
+        let(:outer_ns_prefix) { 'pref' }
+        let(:outer_ns_href)   { 'outer_ns' }
+        let(:inner_ns_href)   { 'inner_ns' }
+
+        before do
+          ns = subject.add_namespace outer_ns_prefix, outer_ns_href
+          subject.namespace = ns
+          child_node.add_namespace nil, inner_ns_href
+          subject << child_node
+        end
+
+        it 'should have the correct namespace' do
+          ns = subject.children.first.namespace
+          ns.should be_a Nokogiri::XML::Namespace
+          ns.prefix.should be == nil
+          ns.href.should be == inner_ns_href
+        end
+
+        it 'should find the element' do
+          x = subject.xpath("//inner_ns:bar", 'inner_ns' => inner_ns_href)
+          x.first.should be child_node
+        end
+      end
+    end
   end
 end

data/spec/niceogiri/xml/node_spec.rb

@@ -145,6 +145,12 @@ module Niceogiri
         n2.to_s.should == n.to_s
       end
 
+      it 'holds on to namespaces without a prefix when inheriting content' do
+        n = Nokogiri::XML.parse('<message><bar:foo xmlns="http://bar.com"></message>').root
+        n2 = Node.new('message').inherit n
+        n2.to_s.should == n.to_s
+      end
+
       it 'holds on to namespaces when inheriting attributes' do
         n = Nokogiri::XML.parse('<foo xml:bar="http://bar.com"/>').root
         n2 = Node.new('foo').inherit n

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: niceogiri
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-31 00:00:00.000000000 Z
+date: 2012-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2165547740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,15 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2165547740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2165547040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2165547040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2165546540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +54,15 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2165546540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2165546000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +70,15 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *2165546000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2165545600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +86,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165545600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2165544980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +102,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165544980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Make dealing with XML less painful
 email:
 - ben@langfeld.me
@@ -118,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1076126536062088480
+      hash: 2448257972408275473
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -127,10 +157,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1076126536062088480
+      hash: 2448257972408275473
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Some additional niceties atop Nokogiri