Loading order of units is broken in Ruby 1.8.7

minad · Feb 24, 2012 · 32a8d6f · 32a8d6f
1 parent c6eea95
commit 32a8d6f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/unit/system.rb b/lib/unit/system.rb
@@ -45,7 +45,11 @@ def load(input)
       load_factors(data['factors']) if data['factors']
       load_units(data['units']) if data['units']
 
-      @unit.each {|name, unit| validate_unit(unit[:def]) }
+      @unit.each do |name, unit|
+        defs = unit.delete(:defs)
+        unit[:def] = parse_unit(defs) if defs
+        validate_unit(unit[:def])
+      end
 
       true
     end
@@ -151,7 +155,7 @@ def load_units(units)
         name = name.to_sym
         symbols = [unit['sym'] || []].flatten
         $stderr.puts "Unit #{name} already defined" if @unit[name]
-        @unit[name] = { :symbol => symbols.first, :def => parse_unit(unit['def'])  }
+        @unit[name] = { :symbol => symbols.first, :defs => unit['def'] }
         symbols.each do |sym|
           $stderr.puts "Unit symbol #{sym} for #{name} already defined" if @unit_symbol[name]
           @unit_symbol[sym] = name