lib/consumer/mapping.rb in woahdae-consumer-0.8.1 vs lib/consumer/mapping.rb in woahdae-consumer-0.8.2

@@ -17,11 +17,11 @@
   # [+klass+]       The association class (i.e. Something.from_xml). 
   #                 Defaults to singular, capitalized +association+.
   # === Returns
   # Nothing in particular
   def association_from_xml(xml, association, klass = nil)
-    klass ||= association.to_s.capitalize.singularize.constantize 
+    klass ||= association.to_s.capitalize.singularize.camelcase.constantize 
 
     association_instance = klass.from_xml(xml)
     return if association_instance.nil?
     
     self.send(association.to_s + "=", association_instance)
@@ -101,10 +101,10 @@
         attrs = attrs_from_node_and_registry(node, map[:registry])
         instance = self.from_hash(attrs)
         
         map[:associations].each do |association|
           # TODO: spec
-          instance.association_from_xml(xml, association)
+          instance.association_from_xml(node.to_s, association)
         end
         
         b = map[:block]
         if b
           case b.arity # number of parameters
\ No newline at end of file