unite 1.1.1 → 1.2.0

data/lib/unite/lookup/definitions.rb

@@ -13,15 +13,25 @@ module Unite
 
   #TIME
   Lookup.add SimpleUnit.new(:name => "s", :si_factor => 1, :dimension => :time)
-  Lookup.add SimpleUnit.new(:name => "h", :si_factor => 3600, :dimension => :time)
+  Lookup.add SimpleUnit.new(:name => "hr", :si_factor => 3600, :dimension => :time)
 
-  Lookup.add_property Property.new(:name => :time, :expression => 'h')
+  Lookup.add DerivedUnit.new(:name => "day", :expression => '24*hr')
+
+  Lookup.add_property Property.new(:name => :time, :expression => 'hr')
 
   #LENGTH
   Lookup.add SimpleUnit.new(:name => "m", :si_factor => 1, :dimension => :length)
+  Lookup.add SimpleUnit.new(:name => "cm", :si_factor => 0.01, :dimension => :length)
   Lookup.add SimpleUnit.new(:name => "dm", :si_factor => 0.1, :dimension => :length)
   Lookup.add SimpleUnit.new(:name => "km", :si_factor => 1000, :dimension => :length)
 
+  Lookup.add SimpleUnit.new(:name => "inch", :si_factor => 0.0254, :dimension => :length)
+  Lookup.add DerivedUnit.new(:name => "ft", :expression => '12*inch')
+  Lookup.add DerivedUnit.new(:name => "yd", :expression => '3*ft')
+  Lookup.add DerivedUnit.new(:name => "mi", :expression => '1760*ft')
+  Lookup.add DerivedUnit.new(:name => "NM", :expression => '1852*m')
+
+
   Lookup.add_property Property.new(:name => :distance, :expression => 'km')
 
 
@@ -29,6 +39,11 @@ module Unite
   Lookup.add SimpleUnit.new(:name => "g", :si_factor => 1, :dimension => :mass)
   Lookup.add SimpleUnit.new(:name => "kg", :si_factor => 1000, :dimension => :mass)
   Lookup.add SimpleUnit.new(:name => "tonne", :si_factor => 1000000, :dimension => :mass)
+  Lookup.add SimpleUnit.new(:name => "metric_tonne", :si_factor => 1000000, :dimension => :mass)
+
+  Lookup.add SimpleUnit.new(:name => "long_ton", :si_factor => 1.01605e6, :dimension => :mass)
+  Lookup.add SimpleUnit.new(:name => "short_ton", :si_factor => 907185, :dimension => :mass)
+  Lookup.add SimpleUnit.new(:name => "lb", :si_factor => 453.592, :dimension => :mass)
 
   Lookup.add_property Property.new(:name => :mass, :expression => 'tonne')
 
@@ -37,12 +52,11 @@ module Unite
   Lookup.add SimpleUnit.new(:name => "GBP", :si_factor => 1, :dimension => :money)
 
   #Right now only one currency is supported. It is too difficult to be able to convert them.
-  
+
   # Lookup.add SimpleUnit.new(:name => "EUR", :si_factor => nil, :dimension => :money)
   # Lookup.add SimpleUnit.new(:name => "USD", :si_factor => nil, :dimension => :money)
   # Lookup.add SimpleUnit.new(:name => "CAD", :si_factor => nil, :dimension => :money)
 
-
   Lookup.add_property Property.new(:name => :money, :expression => 'GBP')
 
 
@@ -52,19 +66,29 @@ module Unite
   Lookup.add DerivedUnit.new(:name => "J", :expression => 'kg*m^2/s^2')
   Lookup.add DerivedUnit.new(:name => "kWh", :expression => '3.6e6*J')
 
+  Lookup.add DerivedUnit.new(:name => "GJ", :expression => '1e9*J')
+  Lookup.add DerivedUnit.new(:name => "therm", :expression => '0.1055056*GJ')
+  Lookup.add DerivedUnit.new(:name => "toe", :expression => '396.83*therm')
+  Lookup.add DerivedUnit.new(:name => "kcal", :expression => '4186.8*J')
+
   Lookup.add_property Property.new(:name => :energy, :expression => 'kWh')
 
   #AREA
   Lookup.add DerivedUnit.new(:name => "square_meter", :expression => 'm^2')
   Lookup.add DerivedUnit.new(:name => "hectare", :expression => '10000*m^2')
   Lookup.add DerivedUnit.new(:name => "acre", :expression => '4046.85642*m^2')
+  Lookup.add DerivedUnit.new(:name => "square_feet", :expression => 'ft^2')
 
   Lookup.add_property Property.new(:name => :area, :expression => 'hectare')
 
   #Volume
   Lookup.add DerivedUnit.new(:name => "cubic_meter", :expression => 'm^3')
   Lookup.add DerivedUnit.new(:name => "L", :expression => 'dm^3')
-  Lookup.add DerivedUnit.new(:name => "gallon", :expression => '3.785411784*L')
+
+  Lookup.add DerivedUnit.new(:name => "cubic_feet", :expression => 'ft^3')
+  Lookup.add DerivedUnit.new(:name => "gal(UK)", :expression => '4.54609*L')
+  Lookup.add DerivedUnit.new(:name => "gal(US)", :expression => '231*inch^3')
+  Lookup.add DerivedUnit.new(:name => "bbl", :expression => '42*gal(US)')
 
   Lookup.add_property Property.new(:name => :volume, :expression => 'cubic_meter')
 

data/lib/unite/version.rb

@@ -1,3 +1,3 @@
 module Unite
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unite
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2012-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70241757471700 !ruby/object:Gem::Requirement
+  requirement: &70217581503440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70241757471700
+  version_requirements: *70217581503440
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70241757471120 !ruby/object:Gem::Requirement
+  requirement: &70217581502860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70241757471120
+  version_requirements: *70217581502860
 description: Unite provides extensions to your objects to support values with units
 email:
 - scott.ellard@gmail.com