@@ -143,22 +143,16 @@ module TypeLib def __getobj__ return @cache if @cache - @cache = case @bare_obj - when Hash - hash = { } - @bare_obj.each_key do |key| - hash[key] = @type_map[key] ? @converter.convert(@type_map[key], @bare_obj[key]) : @bare_obj[key] - end - hash - when Array - array = [ ] - @bare_obj.each_with_index do |obj, i| - array.push @type_map[i] ? @converter.convert(@type_map[i], obj) : obj - end - array - else - raise "Trouble figuring out what class to deal with during on-the-fly convert? Probably a bug." - end + @cache = [] + + case @bare_obj + when Hash + @bare_obj.each_key { |x| convert_object(x) } + when Array + @bare_obj.each_index { |x| convert_object(x) } + else + raise "Trouble figuring out what class to deal with during on-the-fly convert? Probably a bug." + end if @cache and !self.class.debug @bare_obj = nil @@ -166,5 +160,11 @@ module TypeLib @cache end + + protected + + def convert_object(key) + @cache[key] = @type_map[key] ? @converter.convert(@type_map[key], @bare_obj[key]) : @bare_obj[key] + end end end lib/typelib.rb d0327d1b926484dd430bdf581915c08689da6d6c Erik Hollensbe erikh@speyside.localdomain http://github.com/erikh/typelib/commit/b1e1ab12de5101dbddefd8d0dc11b3ebb52a58da b1e1ab12de5101dbddefd8d0dc11b3ebb52a58da 2009-10-18T05:08:04-07:00 2009-10-18T05:08:04-07:00 * A little cleanup, suggested by yxhuvud. dbf0e7c3049d97490fb66eb3571540a78afc8882 Erik Hollensbe erikh@speyside.localdomain