macasek-happymapper 0.2.5 → 0.2.6

data/happymapper.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{happymapper}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]

data/lib/happymapper.rb

@@ -95,17 +95,26 @@ module HappyMapper
       xpath = root ? '/' : './/'
       xpath += "#{namespace}:" if namespace
       xpath += options[:tag] ? options[:tag] : tag_name
-      
+
       nodes = node.find(xpath)
       collection = nodes.collect do |n|
         obj = new
-        
-        attributes.each do |attr| 
+
+        attrs = attributes
+        elems = elements
+        klass = self.superclass
+        while !klass.nil? && (klass != Object)           
+          elems += klass.elements if(klass.respond_to?(:elements))
+          attrs += klass.attributes if(klass.respond_to?(:attributes))
+          klass = (klass != self.superclass) ? self.superclass : nil
+        end
+
+        attrs.each do |attr| 
           obj.send("#{attr.method_name}=", 
                     attr.from_xml_node(n, namespace))
         end
-        
-        elements.each do |elem|
+
+        elems.each do |elem|
           obj.send("#{elem.method_name}=", 
                     elem.from_xml_node(n, namespace))
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: macasek-happymapper
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - John Nunemaker