niceogiri 1.1.0 → 1.1.1

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - jruby-19mode
+  - rbx-19mode
+  - ruby-head

data/lib/niceogiri/version.rb

@@ -1,3 +1,3 @@
 module Niceogiri
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/lib/niceogiri/xml/node.rb

@@ -133,18 +133,19 @@ module Niceogiri
       # @param [XML::Node] node the node to inherit
       # @return [self]
       def inherit(node)
-        self.namespace = node.namespace.href if node.namespace
+        inherit_namespaces node
         inherit_attrs node.attributes
-        node.children.each do |c|
-          self << (n = c.dup)
-          if c.respond_to?(:namespace) && c.namespace
-            ns = n.add_namespace c.namespace.prefix, c.namespace.href
-            n.namespace = ns
-          end
-        end
+        inherit_children node
         self
       end
 
+      def inherit_namespaces(node)
+        node.namespace_definitions.each do |ns|
+          add_namespace ns.prefix, ns.href
+        end
+        self.namespace = node.namespace.href if node.namespace
+      end
+
       # Inherit a set of attributes
       #
       # @param [Hash] attrs a hash of attributes to set on the node
@@ -157,6 +158,16 @@ module Niceogiri
         self
       end
 
+      def inherit_children(node)
+        node.children.each do |c|
+          self << (n = c.dup)
+          if c.respond_to?(:namespace) && c.namespace
+            ns = n.add_namespace c.namespace.prefix, c.namespace.href
+            n.namespace = ns
+          end
+        end
+      end
+
       # The node as XML
       #
       # @return [String] XML representation of the node

data/spec/niceogiri/xml/node_spec.rb

@@ -162,6 +162,15 @@ module Niceogiri
         body.namespace.href.should be == 'barfoo'
       end
 
+      it 'holds on to prefixed namespaces when inheriting content' do
+        n = Nokogiri::XML.parse('<message xmlns:foo="foobar"></message>').root
+        n.namespaces['xmlns:foo'].should be == 'foobar'
+
+        n2 = Node.new('message').inherit n
+        n2.to_s.should == n.to_s
+        n2.namespaces['xmlns:foo'].should be == 'foobar'
+      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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: niceogiri
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2012-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -120,6 +120,7 @@ extra_rdoc_files:
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE
@@ -148,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1354346198489803166
+      hash: -1530677168278840494
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -157,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1354346198489803166
+      hash: -1530677168278840494
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24