ruby-measurement 1.0.0 → 1.1.0

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - ruby-head

data/CHANGELOG.md

@@ -0,0 +1,21 @@
+## ruby-measurement 1.1.0 (Feb 6, 2013)
+
+* Move unit definition logic into `Unit` class. *Matt Huggins*
+* Create test suite. *Matt Huggins*
+* Fix parsing of `'` and `"` for feet and inches. *Matt Huggins*
+* Implement missing metric weights and U.S. customary capacities.
+  *Matt Huggins*
+* Fix several conversions that were found to be miscalculating.
+  *Matt Huggins*
+
+## ruby-measurement 1.0.0 (Jan 22, 2013)
+
+* Fix parsing of mixed fractions. *Matt Huggins*
+* Allow parsing of quantity & unit to work when not separated by a space.
+  *Matt Huggins*
+* Change `Measurement` initializer to accept quantity & unit instead of a
+  single string for parsing. *Matt Huggins*
+
+## ruby-measurement 0.0.1 (Jan 21, 2013)
+
+* Initial release. *Matt Huggins*

data/README.md

@@ -1,5 +1,7 @@
 # Measurement
 
+[![Build Status](https://secure.travis-ci.org/mhuggins/ruby-measurement.png)](http://travis-ci.org/mhuggins/ruby-measurement)
+
 [ruby-measurement](https://github.com/mhuggins/ruby-measurement) is a simple
 Ruby gem for calculating and converting units of measure.
 

data/Rakefile

@@ -1,3 +1,6 @@
 require 'bundler/gem_tasks'
 
 Dir.glob('tasks/**/*.rake').each(&method(:import))
+
+desc 'Default: run unit specs'
+task default: :spec

data/lib/ruby-measurement/definitions/metric.rb

@@ -2,3 +2,4 @@ require 'ruby-measurement/definitions/metric/area'
 require 'ruby-measurement/definitions/metric/capacity'
 require 'ruby-measurement/definitions/metric/length'
 require 'ruby-measurement/definitions/metric/volume'
+require 'ruby-measurement/definitions/metric/weight'

data/lib/ruby-measurement/definitions/metric/capacity.rb

@@ -1,89 +1,19 @@
 # encoding: UTF-8
 
-Measurement.define(:kl) do |unit|
-  unit.alias :kiloliter, :kiloliters
-  unit.convert_to(:hl) { |value| value * 10.0 }
-  unit.convert_to(:dal) { |value| value * 100.0 }
-  unit.convert_to(:l) { |value| value * 1000.0 }
-  unit.convert_to(:dl) { |value| value * 10000.0 }
-  unit.convert_to(:cl) { |value| value * 100000.0 }
-  unit.convert_to(:ml) { |value| value * 1000000.0 }
-  unit.convert_to(:µl) { |value| value * 10000000.0 }
+Measurement.define(:'m³') do |unit|
+  unit.alias :m3, :'m^3', :'m*m*m', :'cubic meter', :'cubic meters'
+  unit.convert_to(:dm3) { |value| value * 1_000.0 }
+  unit.convert_to(:cm3) { |value| value * 1_000_000.0 }
 end
 
-Measurement.define(:hl) do |unit|
-  unit.alias :hectoliter, :hectoliters
-  unit.convert_to(:kl) { |value| value / 10.0 }
-  unit.convert_to(:dal) { |value| value * 10.0 }
-  unit.convert_to(:l) { |value| value * 100.0 }
-  unit.convert_to(:dl) { |value| value * 1_000.0 }
-  unit.convert_to(:cl) { |value| value * 10_000.0 }
-  unit.convert_to(:ml) { |value| value * 100_000.0 }
-  unit.convert_to(:µl) { |value| value * 1_000_000.0 }
+Measurement.define(:'dm³') do |unit|
+  unit.alias :dm3, :'dm^3', :'dm*dm*dm', :'cubic decimeter', :'cubic decimeters'
+  unit.convert_to(:m3) { |value| value / 1_000.0 }
+  unit.convert_to(:cm3) { |value| value * 1_000.0 }
 end
 
-Measurement.define(:dal) do |unit|
-  unit.alias :dekaliter, :dekaliters
-  unit.convert_to(:kl) { |value| value / 100.0 }
-  unit.convert_to(:hl) { |value| value / 10.0 }
-  unit.convert_to(:l) { |value| value * 10.0 }
-  unit.convert_to(:dl) { |value| value * 100.0 }
-  unit.convert_to(:cl) { |value| value * 1_000.0 }
-  unit.convert_to(:ml) { |value| value * 10_000.0 }
-  unit.convert_to(:µl) { |value| value * 100_000.0 }
-end
-
-Measurement.define(:l) do |unit|
-  unit.alias :liter, :liters
-  unit.convert_to(:kl) { |value| value / 1_000.0 }
-  unit.convert_to(:hl) { |value| value / 100.0 }
-  unit.convert_to(:dal) { |value| value / 10.0 }
-  unit.convert_to(:dl) { |value| value * 10.0 }
-  unit.convert_to(:cl) { |value| value * 100.0 }
-  unit.convert_to(:ml) { |value| value * 1_000.0 }
-  unit.convert_to(:µl) { |value| value * 10_000.0 }
-end
-
-Measurement.define(:dl) do |unit|
-  unit.alias :deciliter, :deciliters
-  unit.convert_to(:kl) { |value| value / 10_000.0 }
-  unit.convert_to(:hl) { |value| value / 1_000.0 }
-  unit.convert_to(:dal) { |value| value / 100.0 }
-  unit.convert_to(:l) { |value| value / 10.0 }
-  unit.convert_to(:cl) { |value| value * 10.0 }
-  unit.convert_to(:ml) { |value| value * 100.0 }
-  unit.convert_to(:µl) { |value| value * 1_000.0 }
-end
-
-Measurement.define(:cl) do |unit|
-  unit.alias :centiliter, :centiliters
-  unit.convert_to(:kl) { |value| value / 10_0000.0 }
-  unit.convert_to(:hl) { |value| value / 10_000.0 }
-  unit.convert_to(:dal) { |value| value / 1_000.0 }
-  unit.convert_to(:l) { |value| value / 100.0 }
-  unit.convert_to(:dl) { |value| value / 10.0 }
-  unit.convert_to(:ml) { |value| value * 10.0 }
-  unit.convert_to(:µl) { |value| value * 100.0 }
-end
-
-Measurement.define(:ml) do |unit|
-  unit.alias :milliliter, :milliliters
-  unit.convert_to(:kl) { |value| value / 1_000_000.0 }
-  unit.convert_to(:hl) { |value| value / 100_000.0 }
-  unit.convert_to(:dal) { |value| value / 10_000.0 }
-  unit.convert_to(:l) { |value| value / 1_000.0 }
-  unit.convert_to(:dl) { |value| value / 100.0 }
-  unit.convert_to(:cl) { |value| value / 10.0 }
-  unit.convert_to(:µl) { |value| value * 10.0 }
-end
-
-Measurement.define(:µl) do |unit|
-  unit.alias :microliter, :microliters
-  unit.convert_to(:kl) { |value| value / 10_000_000.0 }
-  unit.convert_to(:hl) { |value| value / 1_000_000.0 }
-  unit.convert_to(:dal) { |value| value / 100_000.0 }
-  unit.convert_to(:l) { |value| value / 10_000.0 }
-  unit.convert_to(:dl) { |value| value / 1_000.0 }
-  unit.convert_to(:cl) { |value| value / 100.0 }
-  unit.convert_to(:ml) { |value| value / 10.0 }
+Measurement.define(:'cm³') do |unit|
+  unit.alias :cm3, :'cm^3', :'cm*cm*cm', :'cubic centimeter', :'cubic centimeters'
+  unit.convert_to(:m3) { |value| value / 1_000_000.0 }
+  unit.convert_to(:dm3) { |value| value / 1_000.0 }
 end

data/lib/ruby-measurement/definitions/metric/volume.rb

@@ -1,19 +1,89 @@
 # encoding: UTF-8
 
-Measurement.define(:'m³') do |unit|
-  unit.alias :m3, :'m^3', :'m*m*m', :'cubic meter', :'cubic meters'
-  unit.convert_to(:dm3) { |value| value * 1_000.0 }
-  unit.convert_to(:cm3) { |value| value * 1_000_000.0 }
+Measurement.define(:kl) do |unit|
+  unit.alias :kiloliter, :kiloliters
+  unit.convert_to(:hl) { |value| value * 10.0 }
+  unit.convert_to(:dal) { |value| value * 100.0 }
+  unit.convert_to(:l) { |value| value * 1000.0 }
+  unit.convert_to(:dl) { |value| value * 10000.0 }
+  unit.convert_to(:cl) { |value| value * 100000.0 }
+  unit.convert_to(:ml) { |value| value * 1000000.0 }
+  unit.convert_to(:µl) { |value| value * 10000000.0 }
 end
 
-Measurement.define(:'dm³') do |unit|
-  unit.alias :dm3, :'dm^3', :'dm*dm*dm', :'cubic decimeter', :'cubic decimeters'
-  unit.convert_to(:m3) { |value| value / 1_000.0 }
-  unit.convert_to(:cm3) { |value| value * 1_000.0 }
+Measurement.define(:hl) do |unit|
+  unit.alias :hectoliter, :hectoliters
+  unit.convert_to(:kl) { |value| value / 10.0 }
+  unit.convert_to(:dal) { |value| value * 10.0 }
+  unit.convert_to(:l) { |value| value * 100.0 }
+  unit.convert_to(:dl) { |value| value * 1_000.0 }
+  unit.convert_to(:cl) { |value| value * 10_000.0 }
+  unit.convert_to(:ml) { |value| value * 100_000.0 }
+  unit.convert_to(:µl) { |value| value * 1_000_000.0 }
 end
 
-Measurement.define(:'cm³') do |unit|
-  unit.alias :cm3, :'cm^3', :'cm*cm*cm', :'cubic centimeter', :'cubic centimeters'
-  unit.convert_to(:m3) { |value| value / 1_000_000.0 }
-  unit.convert_to(:dm3) { |value| value / 1_000.0 }
+Measurement.define(:dal) do |unit|
+  unit.alias :dekaliter, :dekaliters
+  unit.convert_to(:kl) { |value| value / 100.0 }
+  unit.convert_to(:hl) { |value| value / 10.0 }
+  unit.convert_to(:l) { |value| value * 10.0 }
+  unit.convert_to(:dl) { |value| value * 100.0 }
+  unit.convert_to(:cl) { |value| value * 1_000.0 }
+  unit.convert_to(:ml) { |value| value * 10_000.0 }
+  unit.convert_to(:µl) { |value| value * 100_000.0 }
+end
+
+Measurement.define(:l) do |unit|
+  unit.alias :liter, :liters
+  unit.convert_to(:kl) { |value| value / 1_000.0 }
+  unit.convert_to(:hl) { |value| value / 100.0 }
+  unit.convert_to(:dal) { |value| value / 10.0 }
+  unit.convert_to(:dl) { |value| value * 10.0 }
+  unit.convert_to(:cl) { |value| value * 100.0 }
+  unit.convert_to(:ml) { |value| value * 1_000.0 }
+  unit.convert_to(:µl) { |value| value * 10_000.0 }
+end
+
+Measurement.define(:dl) do |unit|
+  unit.alias :deciliter, :deciliters
+  unit.convert_to(:kl) { |value| value / 10_000.0 }
+  unit.convert_to(:hl) { |value| value / 1_000.0 }
+  unit.convert_to(:dal) { |value| value / 100.0 }
+  unit.convert_to(:l) { |value| value / 10.0 }
+  unit.convert_to(:cl) { |value| value * 10.0 }
+  unit.convert_to(:ml) { |value| value * 100.0 }
+  unit.convert_to(:µl) { |value| value * 1_000.0 }
+end
+
+Measurement.define(:cl) do |unit|
+  unit.alias :centiliter, :centiliters
+  unit.convert_to(:kl) { |value| value / 10_0000.0 }
+  unit.convert_to(:hl) { |value| value / 10_000.0 }
+  unit.convert_to(:dal) { |value| value / 1_000.0 }
+  unit.convert_to(:l) { |value| value / 100.0 }
+  unit.convert_to(:dl) { |value| value / 10.0 }
+  unit.convert_to(:ml) { |value| value * 10.0 }
+  unit.convert_to(:µl) { |value| value * 100.0 }
+end
+
+Measurement.define(:ml) do |unit|
+  unit.alias :milliliter, :milliliters
+  unit.convert_to(:kl) { |value| value / 1_000_000.0 }
+  unit.convert_to(:hl) { |value| value / 100_000.0 }
+  unit.convert_to(:dal) { |value| value / 10_000.0 }
+  unit.convert_to(:l) { |value| value / 1_000.0 }
+  unit.convert_to(:dl) { |value| value / 100.0 }
+  unit.convert_to(:cl) { |value| value / 10.0 }
+  unit.convert_to(:µl) { |value| value * 10.0 }
+end
+
+Measurement.define(:µl) do |unit|
+  unit.alias :microliter, :microliters
+  unit.convert_to(:kl) { |value| value / 10_000_000.0 }
+  unit.convert_to(:hl) { |value| value / 1_000_000.0 }
+  unit.convert_to(:dal) { |value| value / 100_000.0 }
+  unit.convert_to(:l) { |value| value / 10_000.0 }
+  unit.convert_to(:dl) { |value| value / 1_000.0 }
+  unit.convert_to(:cl) { |value| value / 100.0 }
+  unit.convert_to(:ml) { |value| value / 10.0 }
 end

data/lib/ruby-measurement/definitions/us_customary.rb

@@ -1,4 +1,5 @@
 require 'ruby-measurement/definitions/us_customary/area'
+require 'ruby-measurement/definitions/us_customary/capacity'
 require 'ruby-measurement/definitions/us_customary/length'
 require 'ruby-measurement/definitions/us_customary/volume'
 require 'ruby-measurement/definitions/us_customary/weight'

data/lib/ruby-measurement/definitions/us_customary/capacity.rb

@@ -0,0 +1,29 @@
+# encoding: UTF-8
+
+Measurement.define(:'acre ft') do |unit|
+  unit.alias :'acre-foot', :'acre-feet'
+  unit.convert_to(:yd3) { |value| value * Rational(4840, 3).to_f }
+  unit.convert_to(:ft3) { |value| value * 43_560.0 }
+  unit.convert_to(:in3) { |value| value * 75_271_680.0 }
+end
+
+Measurement.define(:'yd³') do |unit|
+  unit.alias :yd3, :'yd^3', :'yd*yd*yd', :'cubic yard', :'cubic yards'
+  unit.convert_to(:'acre ft') { |value| value / Rational(4840, 3).to_f }
+  unit.convert_to(:ft3) { |value| value * 27.0 }
+  unit.convert_to(:in3) { |value| value * 46_656.0 }
+end
+
+Measurement.define(:'ft³') do |unit|
+  unit.alias :ft3, :'ft^3', :'ft*ft*ft', :'cubic foot', :'cubic feet'
+  unit.convert_to(:'acre ft') { |value| value / 43_560.0 }
+  unit.convert_to(:yd3) { |value| value / 27.0 }
+  unit.convert_to(:in3) { |value| value * 1_728.0 }
+end
+
+Measurement.define(:'in³') do |unit|
+  unit.alias :in3, :'in^3', :'in*in*in', :'cubic inch', :'cubic inches'
+  unit.convert_to(:'acre ft') { |value| value / 75_271_680.0 }
+  unit.convert_to(:yd3) { |value| value / 46_656.0 }
+  unit.convert_to(:ft3) { |value| value / 1_728.0 }
+end

data/lib/ruby-measurement/definitions/us_customary/length.rb

@@ -1,20 +1,7 @@
 # encoding: UTF-8
 
-Measurement.define(:'lea.') do |unit|
-  unit.alias :lea, :league, :leagues
-  unit.convert_to(:mi) { |value| value * 3.45233834 }
-  unit.convert_to(:fur) { |value| value * 27.6187068 }
-  unit.convert_to(:ch) { |value| value * 276.187068 }
-  unit.convert_to(:ftm) { |value| value * 3_038.05774 }
-  unit.convert_to(:yd) { |value| value * 6_076.11549 }
-  unit.convert_to(:ft) { |value| value * 18_228.3465 }
-  unit.convert_to(:in) { |value| value * 218_740.157 }
-  unit.convert_to(:th) { |value| value * 218_740_157.0 }
-end
-
 Measurement.define(:'mi.') do |unit|
   unit.alias :mi, :mile, :miles
-  unit.convert_to(:lea) { |value| value / 3.45233834 }
   unit.convert_to(:fur) { |value| value * 8.0 }
   unit.convert_to(:ch) { |value| value * 80.0 }
   unit.convert_to(:ftm) { |value| value * 880.0 }
@@ -26,7 +13,6 @@ end
 
 Measurement.define(:'fur.') do |unit|
   unit.alias :fur, :furlong, :furlongs
-  unit.convert_to(:lea) { |value| value / 27.6187068 }
   unit.convert_to(:mi) { |value| value / 8.0 }
   unit.convert_to(:ch) { |value| value * 10.0 }
   unit.convert_to(:ftm) { |value| value * 110.0 }
@@ -38,7 +24,6 @@ end
 
 Measurement.define(:'ch.') do |unit|
   unit.alias :ch, :chain, :chains
-  unit.convert_to(:lea) { |value| value / 276.187068 }
   unit.convert_to(:mi) { |value| value / 80.0 }
   unit.convert_to(:fur) { |value| value / 10.0 }
   unit.convert_to(:ftm) { |value| value * 11.0 }
@@ -50,7 +35,6 @@ end
 
 Measurement.define(:'ftm.') do |unit|
   unit.alias :ftm, :fathom, :fathoms
-  unit.convert_to(:lea) { |value| value / 3_038.05774 }
   unit.convert_to(:mi) { |value| value / 880.0 }
   unit.convert_to(:fur) { |value| value / 110.0 }
   unit.convert_to(:ch) { |value| value / 11.0 }
@@ -62,7 +46,6 @@ end
 
 Measurement.define(:'yd.') do |unit|
   unit.alias :yd, :yard, :yards
-  unit.convert_to(:lea) { |value| value / 6_076.11549 }
   unit.convert_to(:mi) { |value| value / 1_760.0 }
   unit.convert_to(:fur) { |value| value / 220.0 }
   unit.convert_to(:ch) { |value| value / 22.0 }
@@ -74,7 +57,6 @@ end
 
 Measurement.define(:'ft.') do |unit|
   unit.alias :ft, :foot, :feet, :"'"
-  unit.convert_to(:lea) { |value| value / 18_228.3465 }
   unit.convert_to(:mi) { |value| value / 5_280.0 }
   unit.convert_to(:ch) { |value| value / 66.0 }
   unit.convert_to(:fur) { |value| value / 660.0 }
@@ -86,7 +68,6 @@ end
 
 Measurement.define(:'in.') do |unit|
   unit.alias :in, :inch, :inches, :'"'
-  unit.convert_to(:lea) { |value| value / 218_740.157 }
   unit.convert_to(:mi) { |value| value / 63_360.0 }
   unit.convert_to(:fur) { |value| value / 7_920.0 }
   unit.convert_to(:ch) { |value| value / 792.0 }
@@ -98,7 +79,6 @@ end
 
 Measurement.define(:'th.') do |unit|
   unit.alias :th, :thou
-  unit.convert_to(:lea) { |value| value / 218_740_157.0 }
   unit.convert_to(:mi) { |value| value / 63_360_000.0 }
   unit.convert_to(:fur) { |value| value / 7_920_000.0 }
   unit.convert_to(:ch) { |value| value / 792_000.0 }

data/lib/ruby-measurement/definitions/us_customary/weight.rb

@@ -3,7 +3,7 @@
 Measurement.define(:ton) do |unit|
   unit.alias :'short ton', :'short tons', :tons
   unit.convert_to(:cwt) { |value| value * 20.0 }
-  unit.convert_to(:lb) { |value| value * 2000.0 }
+  unit.convert_to(:lb) { |value| value * 2_000.0 }
   unit.convert_to(:oz) { |value| value * 32_000.0 }
   unit.convert_to(:dr) { |value| value * 512_000.0 }
   unit.convert_to(:gr) { |value| value * 14_000_000.0 }
@@ -14,8 +14,8 @@ Measurement.define(:cwt) do |unit|
   unit.convert_to(:ton) { |value| value / 20.0 }
   unit.convert_to(:lb) { |value| value * 100.0 }
   unit.convert_to(:oz) { |value| value * 1_600.0 }
-  unit.convert_to(:dr) { |value| value * 28_672.0 }
-  unit.convert_to(:gr) { |value| value * 784_000.0 }
+  unit.convert_to(:dr) { |value| value * 25_600.0 }
+  unit.convert_to(:gr) { |value| value * 700_000.0 }
 end
 
 Measurement.define(:lb) do |unit|
@@ -24,7 +24,7 @@ Measurement.define(:lb) do |unit|
   unit.convert_to(:cwt) { |value| value / 100.0 }
   unit.convert_to(:oz) { |value| value * 16.0 }
   unit.convert_to(:dr) { |value| value * 256.0 }
-  unit.convert_to(:gr) { |value| value * 7000.0 }
+  unit.convert_to(:gr) { |value| value * 7_000.0 }
 end
 
 Measurement.define(:oz) do |unit|
@@ -39,7 +39,7 @@ end
 Measurement.define(:dr) do |unit|
   unit.alias :dram, :drams
   unit.convert_to(:ton) { |value| value / 512_000.0 }
-  unit.convert_to(:cwt) { |value| value / 28_672.0 }
+  unit.convert_to(:cwt) { |value| value / 25_600.0 }
   unit.convert_to(:lb) { |value| value / 256.0 }
   unit.convert_to(:oz) { |value| value / 16.0 }
   unit.convert_to(:gr) { |value| value * 27.34375 }
@@ -48,7 +48,7 @@ end
 Measurement.define(:gr) do |unit|
   unit.alias :grain, :grains
   unit.convert_to(:ton) { |value| value / 14_000_000.0 }
-  unit.convert_to(:cwt) { |value| value / 784_000.0 }
+  unit.convert_to(:cwt) { |value| value / 700_000.0 }
   unit.convert_to(:lb) { |value| value / 7000.0 }
   unit.convert_to(:oz) { |value| value / 437.5 }
   unit.convert_to(:dr) { |value| value / 27.34375 }

data/lib/ruby-measurement/measurement.rb

@@ -2,7 +2,7 @@ require 'ruby-measurement/unit'
 require 'ruby-measurement/version'
 
 class Measurement
-  UNIT_REGEX        = /([a-zA-Z].*)/.freeze
+  UNIT_REGEX        = /([^\d\s\/].*)/.freeze
   SCIENTIFIC_NUMBER = /([+-]?\d*\.?\d+(?:[Ee][+-]?)?\d*)/.freeze
   SCIENTIFIC_REGEX  = /\A#{SCIENTIFIC_NUMBER}\s*#{UNIT_REGEX}?\z/.freeze
   RATIONAL_REGEX    = /\A([+-]?\d+\s+)?((\d+)\/(\d+))?\s*#{UNIT_REGEX}?\z/.freeze
@@ -10,12 +10,9 @@ class Measurement
   
   attr_reader :quantity, :unit
   
-  class << self;  attr_accessor :units end
-  @units = {}
-  
   def initialize(quantity, unit_name = :count)
     unit = unit_name
-    unit = self.class.units[unit_name.to_s] if unit_name.kind_of?(Symbol) || unit_name.kind_of?(String)
+    unit = Unit[unit_name.to_s] if unit_name.kind_of?(Symbol) || unit_name.kind_of?(String)
     
     raise ArgumentError, "Invalid quantity: #{quantity}" unless quantity.kind_of?(Numeric)
     raise ArgumentError, "Invalid unit: #{unit_name}" unless unit.kind_of?(Unit)
@@ -106,7 +103,7 @@ class Measurement
   end
   
   def convert_to(unit_name)
-    unit = self.class.unit(unit_name)
+    unit = Unit[unit_name]
     raise ArgumentError, "Invalid unit: '#{unit_name}'" unless unit
     
     return dup if unit == @unit
@@ -123,11 +120,6 @@ class Measurement
     self
   end
   
-  def self.unit(unit_name)
-    unit_name = unit_name.to_s
-    @units.values.find { |unit| unit.aliases.include?(unit_name) }
-  end
-  
   def self.parse(str = '0')
     str = str.strip
     
@@ -152,15 +144,14 @@ class Measurement
     end
     
     unit_name ||= 'count'
-    unit = units[unit_name.strip.downcase]
+    unit = Unit[unit_name.strip.downcase]
     raise ArgumentError, "Invalid unit: '#{unit_name}'" unless unit
     
     new(quantity, unit)
   end
   
   def self.define(unit_name, &block)
-    unit = Unit.new(unit_name, &block)
-    unit.aliases.each { |a| @units[a.downcase] = unit }
+    Unit.define(unit_name, &block)
   end
   
   define(:count) do |unit|