nokogiri-happymapper 0.5.1 → 0.5.2

data/lib/happymapper.rb

@@ -250,7 +250,9 @@ module HappyMapper
         namespace = options[:namespace]
       elsif namespaces.has_key?("xmlns")
         namespace ||= DEFAULT_NS
-        namespaces[namespace] = namespaces.delete("xmlns")
+        default_namespace = namespaces.delete("xmlns")
+        namespaces[namespace] ||= default_namespace
+        namespaces["xmlns:#{namespaces.key(default_namespace)}"] = default_namespace
       elsif namespaces.has_key?(DEFAULT_NS)
         namespace ||= DEFAULT_NS
       end

data/spec/fixtures/default_namespace_combi.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<bk:book xmlns="urn:ISBN:0-395-36341-6" xmlns:bk="urn:loc.gov:books">
+    <bk:title>Cheaper by the Dozen</bk:title>
+    <number>1568491379</number>
+</bk:book>

data/spec/happymapper_spec.rb

@@ -535,8 +535,21 @@ class OptionalAttribute
   tag 'address'
   
   attribute :street, String
-end
+end  
+
+class DefaultNamespaceCombi
+  include HappyMapper
+
 
+  register_namespace 'bk', "urn:loc.gov:books"
+  register_namespace 'isbn', "urn:ISBN:0-395-36341-6"
+  namespace 'bk'
+
+  tag 'book'
+
+  element :title, String, :namespace => 'bk', :tag => "title"
+  element :number, String, :namespace => 'isbn', :tag => "number"
+end
 
 describe HappyMapper do
 
@@ -925,6 +938,22 @@ describe HappyMapper do
     end
     
   end
+  
+  describe "Default namespace combi" do
+    before(:each) do
+      file_contents = fixture_file('default_namespace_combi.xml')
+      @book = DefaultNamespaceCombi.parse(file_contents, :single => true)
+    end
+
+    it "should parse title" do
+      @book.title.should == "Cheaper by the Dozen"
+    end
+
+    it "should parse number" do
+      @book.number.should == "1568491379"
+    end
+
+  end
 
   describe 'Xml Content' do
     before(:each) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri-happymapper
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -71,6 +71,7 @@ files:
 - spec/fixtures/atom.xml
 - spec/fixtures/commit.xml
 - spec/fixtures/current_weather.xml
+- spec/fixtures/default_namespace_combi.xml
 - spec/fixtures/dictionary.xml
 - spec/fixtures/family_tree.xml
 - spec/fixtures/inagy.xml
@@ -129,6 +130,7 @@ test_files:
 - spec/fixtures/atom.xml
 - spec/fixtures/commit.xml
 - spec/fixtures/current_weather.xml
+- spec/fixtures/default_namespace_combi.xml
 - spec/fixtures/dictionary.xml
 - spec/fixtures/family_tree.xml
 - spec/fixtures/inagy.xml