Make :from override singularization in arrays

vihai · Jun 12, 2010 · 1b57366 · 1b57366
1 parent 8714620
commit 1b57366
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/roxml/definition.rb b/lib/roxml/definition.rb
@@ -63,8 +63,9 @@ def initialize(sym, opts = {}, &block)
       end
 
       @attr_name = accessor.to_s.chomp('?')
-      @name = (opts[:from] || @attr_name).to_s
+      @name = @attr_name.to_s
       @name = @name.singularize if hash? || array?
+      @name = opts[:from] || @name
       if hash? && (hash.key.name? || hash.value.name?)
         @name = '*'
       end