@@ -86,7 +86,11 @@ module HappyMapper # namespace prefix registered here will propagate down namespaces = node.namespaces if namespaces && namespaces.default - namespaces.default_prefix = DEFAULT_NS + # don't assign the default_prefix if it has already been assigned + already_assigned = namespaces.definitions.detect do |defn| + namespaces.default && namespaces.default.href == defn.href && defn.prefix + end + namespaces.default_prefix = DEFAULT_NS unless already_assigned namespace ||= DEFAULT_NS end lib/happymapper.rb @@ -6,5 +6,12 @@ <feature>This is feature text 2</feature> <bug>This is a bug</bug> </features_bullets> + <address> + <street>Milchstrasse</street> + <housenumber>23</housenumber> + <postcode>26131</postcode> + <city>Oldenburg</city> + <country code="de">Germany</country> + </address> </product> -</products> \ No newline at end of file +</products> spec/fixtures/product_default_namespace.xml @@ -2,6 +2,17 @@ require File.dirname(__FILE__) + '/spec_helper.rb' require 'pp' require 'uri' +class Address + include HappyMapper + + tag 'address' + element :street, String + element :postcode, String + element :housenumber, String + element :city, String + element :country, String +end + class Feature include HappyMapper element :name, String, :tag => '.|.//text()' @@ -20,6 +31,7 @@ class Product element :title, String has_one :feature_bullets, FeatureBullet + has_one :address, Address end module FamilySearch @@ -189,17 +201,6 @@ class CurrentWeather element :current_condition, String, :tag => 'current-condition', :attributes => {:icon => String} end -class Address - include HappyMapper - - tag 'address' - element :street, String - element :postcode, String - element :housenumber, String - element :city, String - element :country, String -end - # for type coercion class ProductGroup < String; end spec/happymapper_spec.rb 9a1bb59f35f7023ea9ad8d1b4f6baa5ab89bbee6 Dave Bolton david@davidbolton.net http://github.com/lightningdb/happymapper/commit/ac6510bcec0314435d29ae092e857e965c0e1c28 ac6510bcec0314435d29ae092e857e965c0e1c28 2009-02-03T14:46:46-08:00 2009-02-03T14:46:46-08:00 fix for issue #8: http://jnunemaker.lighthouseapp.com/projects/20014-happy-mapper/tickets/8 1f7666ccfa6e5c01ff1816c016a4cda9fe03fed1 Dave Bolton david@davidbolton.net