quantify 1.0.5 → 1.1.0

data/spec/compound_unit_spec.rb

@@ -0,0 +1,205 @@
+require 'quantify'
+include Quantify
+
+describe Unit do
+
+  describe "compound unit naming algorithms" do
+
+    it "should return pluralised unit name" do
+      Unit.m.pluralized_name.should == 'metres'
+      Unit.ft.pluralized_name.should == 'feet'
+      Unit.lux.pluralized_name.should == 'lux'
+      Unit.kg.pluralized_name.should == 'kilograms'
+      Unit.nautical_league.pluralized_name.should == 'nautical leagues'
+      Unit.centimetre_of_water.pluralized_name.should == 'centimetres of water'
+      (Unit.t*Unit.km).pluralized_name.should == 'tonne kilometres'
+      (Unit.t*Unit.km/Unit.year).pluralized_name.should == 'tonne kilometres per year'
+      (Unit.kg*Unit.m*Unit.m/Unit.s/Unit.s).or_equivalent.pluralized_name.should == 'joules'
+    end
+
+    it "should create unit with dynamic method and pluralized name" do
+      Unit.feet.symbol.should == 'ft'
+      Unit.gigagrams.name.should == 'gigagram'
+      (Unit.kilograms/(Unit.tonne*Unit.km)).pluralized_name.should == 'kilograms per tonne kilometre'
+      (Unit.kilograms/(Unit.megagrams*Unit.km)).pluralized_name.should == 'kilograms per megagram kilometre'
+    end
+
+    it "squared unit should be called that" do
+      (Unit.m**2).name.should == "square metre"
+    end
+
+    it "cubed unit should be called that" do
+      (Unit.s**3).name.should == "cubic second"
+    end
+
+    it "raised unit should be called that" do
+      (Unit.kg**4).name.should == "kilogram to the 4th power"
+    end
+
+    it "should derive correct label for compound unit" do
+      unit = (Unit.kg/(Unit.t*Unit.km))
+      unit.label.should == "kg/t·km"
+    end
+
+    it "should derive correct label for compound unit" do
+      unit = 1/Unit.m
+      unit.label.should == "m^-1"
+    end
+
+    it "should derive correct label for compound unit" do
+      unit = Unit.MJ*(Unit.m**3)/(Unit.kg**2)
+      unit.label.should == "MJ·m³/kg²"
+    end
+
+  end
+
+  describe "specific compound unit operations" do
+
+    it "should find equivalent unit for compound unit" do
+      (Unit.m*Unit.m).equivalent_known_unit.name.should == 'square metre'
+      (Unit.km*Unit.lb).equivalent_known_unit.should == nil
+    end
+
+    it "should return equivalent unit if appropriate" do
+      (Unit.m*Unit.m).or_equivalent.name.should == 'square metre'
+      (Unit.km*Unit.lb).or_equivalent.name.should == 'kilometre pound'
+      (Unit.kg*Unit.m*Unit.m/Unit.s/Unit.s).or_equivalent.name.should == 'joule'
+    end
+
+    it "should consolidate across all base units" do
+      unit = Unit.m*Unit.m*Unit.s*Unit.kg/(Unit.m*Unit.m*Unit.m*Unit.s)
+      unit.symbol.should == "m² s kg s^-1 m^-3"
+      unit.base_units.size.should == 5
+      unit.consolidate_base_units!
+      unit.symbol.should == "kg m^-1"
+      unit.base_units.size.should == 2
+    end
+
+    it "should cancel base units with one argument which is a symbol" do
+      unit = Unit.m*Unit.m*Unit.s*Unit.kg/(Unit.m*Unit.m*Unit.m*Unit.s)
+      unit.symbol.should == "m² s kg s^-1 m^-3"
+      unit.base_units.size.should == 5
+      unit.cancel_base_units! :m
+      unit.symbol.should == "s kg m^-1 s^-1"
+      unit.base_units.size.should == 4
+    end
+
+    it "should cancel base units with multiple arguments including unit objects and strings" do
+      unit = Unit.m*Unit.m*Unit.s*Unit.kg/(Unit.m*Unit.m*Unit.m*Unit.s)
+      unit.symbol.should == "m² s kg s^-1 m^-3"
+      unit.base_units.size.should == 5
+      unit.cancel_base_units! Unit.m, 's'
+      unit.symbol.should == "kg m^-1"
+      unit.base_units.size.should == 2
+    end
+
+    it "should refuse to cancel by a compound unit" do
+      unit = Unit.m*Unit.m*Unit.s*Unit.kg/(Unit.m*Unit.m*Unit.m*Unit.s)
+      lambda{unit.cancel_base_units!(Unit.m**2)}.should raise_error
+    end
+
+    it "should initialize compound unit with one CompoundBaseUnit" do
+      base = Unit::CompoundBaseUnit.new Unit.h, -1
+      compound_unit = Unit::Compound.new base
+      compound_unit.symbol.should == "h^-1"
+    end
+
+    it "should initialize compound unit with multiple CompoundBaseUnits" do
+      base1 = Unit::CompoundBaseUnit.new Unit.h, -1
+      base2 = Unit::CompoundBaseUnit.new Unit.mi
+      compound_unit = Unit::Compound.new base1, base2
+      compound_unit.symbol.should == "mi h^-1"
+    end
+
+    it "should initialize compound unit with multiple individual units" do
+      base1 = Unit.kW
+      base2 = Unit.h
+      compound_unit = Unit::Compound.new base1, base2
+      compound_unit.symbol.should == "kW h"
+    end
+
+    it "should initialize compound unit with array splat of multiple individual units" do
+      base1 = Unit.kW
+      base2 = Unit.h
+      array = [base1,base2]
+      compound_unit = Unit::Compound.new *array
+      compound_unit.symbol.should == "kW h"
+    end
+
+    it "should initialize compound unit with one sub-array" do
+      base1 = [Unit.h, -1]
+      compound_unit = Unit::Compound.new base1
+      compound_unit.symbol.should == "h^-1"
+    end
+
+    it "should initialize compound unit with multiple sub-arrays" do
+      base1 = [Unit.h, -1]
+      base2 = [Unit.m, 2]
+      compound_unit = Unit::Compound.new base1, base2
+      compound_unit.symbol.should == "m² h^-1"
+    end
+
+    it "should initialize compound unit with variable arguments" do
+      base1 = Unit.kg
+      base2 = Unit::CompoundBaseUnit.new Unit.m, 2
+      base3 = [Unit.s, -2]
+      compound_unit = Unit::Compound.new base1, base2, base3
+      compound_unit.measures.should == "energy"
+    end
+
+    it "should initialize compound unit with variable arguments in splat array" do
+      base1 = Unit.kg
+      base2 = Unit::CompoundBaseUnit.new Unit.m, 2
+      base3 = [Unit.s, -2]
+      array = [base1,base2,base3]
+      compound_unit = Unit::Compound.new *array
+      compound_unit.measures.should == "energy"
+    end
+
+    it "should throw error if base unit is a compound unit" do
+      base1 = Unit.kg*Unit.m
+      base2 = Unit::CompoundBaseUnit.new Unit.m, 2
+      base3 = [Unit.s, -2]
+      array = [base1,base2,base3]
+      lambda{compound_unit = Unit::Compound.new *array}.should raise_error
+    end
+
+    it "should throw error is base unit is a compound unit" do
+      base1 = Unit.kg
+      base2 = Unit::CompoundBaseUnit.new Unit.m, 2
+      base3 = [Unit.kg*Unit.m, -2]
+      array = [base1,base2,base3]
+      lambda{compound_unit = Unit::Compound.new *array}.should raise_error
+    end
+
+    it "should throw error is base unit array too big" do
+      base1 = Unit.kg
+      base2 = Unit::CompoundBaseUnit.new Unit.m, 2
+      base3 = [Unit.kg, -2, "something else"]
+      array = [base1,base2,base3]
+      lambda{compound_unit = Unit::Compound.new *array}.should raise_error
+    end
+
+    it "should not allow comound unit to be used to initialize CompoundBaseUnit" do
+      lambda{Unit::CompoundBaseUnit.new((Unit.m*Unit.m), 2)}.should raise_error
+    end
+
+
+    it "should rationalize base units with automatically" do
+      unit = Unit.yard*Unit.foot
+      unit.rationalize_base_units!.label.should eql 'yd²'
+      unit = Unit.metre*Unit.centimetre/Unit.inch
+      unit.rationalize_base_units!(:full).label.should eql 'm²/m'
+      unit.consolidate_base_units!.label.should eql 'm'
+    end
+
+    it "should rationalize base units with specified unit" do
+      unit = Unit.yard*Unit.foot
+      unit.rationalize_base_units!(:partial,:yd).label.should eql 'yd²'
+      unit = Unit.metre*Unit.centimetre/Unit.inch
+      unit.rationalize_base_units!(:full,:m).label.should eql 'm²/m'
+      unit.consolidate_base_units!.label.should eql 'm'
+    end
+    
+  end
+end

data/spec/dimension_spec.rb

@@ -276,7 +276,7 @@ describe Dimensions do
   it "should return the correct SI base units" do
     units = Dimensions.area.si_base_units :symbol
     units.class.should == Array
-    units.include?('m^2').should == true
+    units.include?('m²').should == true
   end
 
   it "should recognise molar quantity" do
@@ -290,5 +290,53 @@ describe Dimensions do
     dimension.is_molar_quantity?.should == false
     dimension.is_specific_quantity?.should == true
   end
+
+  it "should unload a dimension with instance method" do
+    dimension = Dimensions.length
+    dimension.loaded?.should be_true
+    dimension.unload
+    dimension.loaded?.should be_false
+    dimension.load
+  end
+
+  it "should unload a dimension with class method and object" do
+    dimension = Dimensions.length
+    dimension.loaded?.should be_true
+    Dimensions.unload(dimension)
+    dimension.loaded?.should be_false
+    dimension.load
+  end
+
+  it "should unload a dimension with class method and multiple objects" do
+    dimension1 = Dimensions.length
+    dimension2 = Dimensions.mass
+    dimension1.loaded?.should be_true
+    dimension2.loaded?.should be_true
+    Dimensions.unload(dimension1,dimension2)
+    dimension1.loaded?.should be_false
+    dimension2.loaded?.should be_false
+    dimension1.load
+    dimension2.load
+  end
+
+  it "should unload a dimension with class method and physical_quantity" do
+    dimension = Dimensions.length
+    dimension.loaded?.should be_true
+    Dimensions.unload(dimension.physical_quantity)
+    dimension.loaded?.should be_false
+    dimension.load
+  end
+
+  it "should unload a dimension with class method and multiple objects and physical_quantity" do
+    dimension1 = Dimensions.length
+    dimension2 = Dimensions.mass
+    dimension1.loaded?.should be_true
+    dimension2.loaded?.should be_true
+    Dimensions.unload(dimension1.physical_quantity,dimension2.physical_quantity)
+    dimension1.loaded?.should be_false
+    dimension2.loaded?.should be_false
+    dimension1.load
+    dimension2.load
+  end
 end
 

data/spec/quantify_spec.rb

@@ -0,0 +1,20 @@
+require 'quantify'
+include Quantify
+
+describe Quantify do
+
+  it "should initialize superscript format" do
+    Quantify.use_superscript_characters?.should be_true
+  end
+
+  it "should set superscript usage to true" do
+    Quantify.use_superscript_characters=true
+    Quantify.use_superscript_characters?.should be_true
+  end
+
+  it "should set superscript usage to false" do
+    Quantify.use_superscript_characters=false
+    Quantify.use_superscript_characters?.should be_false
+  end
+
+end

data/spec/quantity_spec.rb

@@ -191,7 +191,7 @@ describe Quantity do
   it "should convert to SI unit correctly" do
     100.cm.to_si.to_s.should == "1.0 m"
     2.kWh.to_si.to_s.should == "7200000.0 J"
-    400.ha.to_si.to_s.should == "4000000.0 m^2"
+    400.ha.to_si.to_s.should == "4000000.0 m²"
     35.degree_celsius.to_si.to_s.should == "308.15 K"
   end
 
@@ -218,23 +218,23 @@ describe Quantity do
 
   it "should raise a quantity to a power correctly" do
     unit = 50.ft ** 2
-    unit.to_s.should == "2500.0 ft^2"
+    unit.to_s.should == "2500.0 ft²"
     unit = 50.ft ** 3
-    unit.to_s.should == "125000.0 ft^3"
+    unit.to_s.should == "125000.0 ft³"
     unit = 50.ft ** -1
     unit.to_s.should == "0.02 ft^-1"
     unit = (10.m/1.s)**2
-    unit.to_s.should == "100.0 m^2 s^-2"
+    unit.to_s.should == "100.0 m² s^-2"
     unit = (10.m/1.s)**-1
     unit.to_s.should == "0.1 s m^-1"
     lambda{ ((10.m/1.s)** 0.5) }.should raise_error
   end
 
   it "should raise a quantity to a power correctly" do
-    (50.ft.pow! 2).to_s.should == "2500.0 ft^2"
-    (50.ft.pow! 3).to_s.should == "125000.0 ft^3"
+    (50.ft.pow! 2).to_s.should == "2500.0 ft²"
+    (50.ft.pow! 3).to_s.should == "125000.0 ft³"
     (50.ft.pow! -1).to_s.should == "0.02 ft^-1"
-    ((10.m/1.s).pow! 2).to_s.should == "100.0 m^2 s^-2"
+    ((10.m/1.s).pow! 2).to_s.should == "100.0 m² s^-2"
     ((10.m/1.s).pow! -1).to_s.should == "0.1 s m^-1"
     lambda{ ((10.m/1.s).pow! 0.5) }.should raise_error
   end
@@ -257,14 +257,14 @@ describe Quantity do
     quantity.to_s.should eql "432.0 yd ft"
     new_quantity=quantity.rationalize_units
     quantity.to_s.should eql "432.0 yd ft"
-    new_quantity.to_s.should eql "144.0 yd^2"
+    new_quantity.to_s.should eql "144.0 yd²"
   end
 
   it "should rationalize units and modify value in place" do
     quantity = 12.yards*36.feet
     quantity.to_s.should eql "432.0 yd ft"
     quantity.rationalize_units!
-    quantity.to_s.should eql  "144.0 yd^2"
+    quantity.to_s.should eql  "144.0 yd²"
   end
 
   it "should be greater than" do

data/spec/string_spec.rb

@@ -0,0 +1,55 @@
+
+require 'quantify'
+
+describe String do
+
+  describe "applying superscripts" do
+
+    it "should replace 2s with superscripts" do
+      "kg^2".with_superscript_characters.should eql "kg²"
+    end
+
+    it "should replace 3s with superscripts" do
+      "kg^3".with_superscript_characters.should eql "kg³"
+    end
+
+    it "should not replace 4s with superscripts" do
+      "kg^4".with_superscript_characters.should eql "kg^4"
+    end
+
+    it "should not replace larger numbers starting with 2 with superscripts" do
+      "kg^25".with_superscript_characters.should eql "kg^25"
+    end
+
+    it "should replace multiple 2s and 3s with superscripts" do
+      "kg^3 m^2 K^2".with_superscript_characters.should eql "kg³ m² K²"
+    end
+
+    it "should replace multiple 2s and 3s with superscripts except negatives or larger numbers" do
+      "kg^3 bq^-2 m^2 K^2 A^2500".with_superscript_characters.should eql "kg³ bq^-2 m² K² A^2500"
+    end
+
+  end
+
+  describe "removing superscripts" do
+
+    it "should replace superscripts with 2s" do
+      "kg²".without_superscript_characters.should eql "kg^2"
+    end
+
+    it "should replace superscripts with 3s" do
+      "kg³".without_superscript_characters.should eql "kg^3"
+    end
+
+    it "should replace multiple superscripts with 2s and 3s" do
+      "kg³ m² K²".without_superscript_characters.should eql "kg^3 m^2 K^2"
+    end
+
+    it "should replace multiple superscripts with 2s and 3s except negatives or larger numbers" do
+      "kg³ bq^-2 m² K² A^2500".without_superscript_characters.should eql "kg^3 bq^-2 m^2 K^2 A^2500"
+    end
+
+  end
+
+end
+

data/spec/unit_spec.rb

@@ -3,6 +3,236 @@ include Quantify
 
 describe Unit do
 
+  it "unload" do
+    Unit.unload(:rad)
+  end
+  
+  describe "unit identifiers" do
+
+    describe "default configuration" do
+
+      it "should know that superscripts are to be used" do
+        Quantify.use_superscript_characters?.should be_true
+      end
+
+      it "should use superscript characters for powers of 2 and 3 by default" do
+        Quantify.use_superscript_characters?.should be_true
+        Unit.cubic_metre.label.should eql 'm³'
+        Unit.square_metre.label.should eql 'm²'
+        (Unit.m**2).label.should eql 'm²'
+        (Unit.kg**3).label.should eql 'kg³'
+        unit = (Unit.m*Unit.m*Unit.K*Unit.K)/(Unit.s**3)
+        unit.label.should eql 'm²·K²/s³'
+        unit = unit*Unit.m
+        unit.label.should eql 'm³·K²/s³'
+        unit = unit*Unit.m
+        unit.label.should eql 'm^4·K²/s³'
+      end
+      
+      it "should recognize and get unit with alternative syntax" do
+        Unit.for("m^2").label.should eql 'm²'
+        Unit.for("km^2").label.should eql 'km²'
+        Unit.for("Gg^3").label.should eql 'Gg³'
+        (Unit.Gg**3).label.should eql 'Gg³'
+      end
+
+      it "parsing complex unit strings with any syntax should work" do
+        Unit.parse("m^4·K²/s³").label.should eql 'm^4·K²/s³'
+        Unit.parse("m^4 K²/s³").label.should eql 'm^4·K²/s³'
+        Unit.parse("m^4 K^2/s^3").label.should eql 'm^4·K²/s³'
+        Unit.parse("m^4 K^2 s^-3").label.should eql 'm^4·K²/s³'
+
+        Unit.parse("m^4·K²/s³").symbol.should eql 'm^4 K² s^-3'
+        Unit.parse("m^4 K²/s³").symbol.should eql 'm^4 K² s^-3'
+        Unit.parse("m^4 K^2/s^3").symbol.should eql 'm^4 K² s^-3'
+        Unit.parse("m^4 K^2 s^-3").symbol.should eql 'm^4 K² s^-3'
+
+        Unit.parse("m^4·K²/s³").name.should eql 'metre to the 4th power square kelvin per cubic second'
+        Unit.parse("m^4 K²/s³").name.should eql 'metre to the 4th power square kelvin per cubic second'
+        Unit.parse("m^4 K^2/s^3").name.should eql 'metre to the 4th power square kelvin per cubic second'
+        Unit.parse("m^4 K^2 s^-3").name.should eql 'metre to the 4th power square kelvin per cubic second'
+      end
+
+    end
+
+    describe "explicitly turning off superscript characters" do
+
+      before :all do
+        Quantify.use_superscript_characters=false
+      end
+
+      after :all do
+        Quantify.use_superscript_characters!
+      end
+
+      it "should know that superscripts are not to be used" do
+        Quantify.use_superscript_characters?.should be_false
+      end
+
+      it "should NOT use superscript characters for powers of 2 and 3" do
+        Unit.cubic_metre.label.should eql 'm^3'
+        Unit.square_metre.label.should eql 'm^2'
+        (Unit.m**2).label.should eql 'm^2'
+        (Unit.kg**3).label.should eql 'kg^3'
+        unit = (Unit.m*Unit.m*Unit.K*Unit.K)/(Unit.s**3)
+        unit.label.should eql 'm^2·K^2/s^3'
+        unit = unit*Unit.m
+        unit.label.should eql 'm^3·K^2/s^3'
+        unit = unit*Unit.m
+        unit.label.should eql 'm^4·K^2/s^3'
+      end
+
+      it "should recognize and get unit with alternative syntax" do
+        Unit.for("m²").label.should eql "m^2"
+        Unit.for('km²').label.should eql "km^2"
+        Unit.for('Gg³').label.should eql "Gg^3"
+        (Unit.Gg**3).label.should eql "Gg^3"
+      end
+
+      it "parsing complex unit strings with any syntax should work" do
+        Unit.parse("m^4·K²/s³").label.should eql "m^4·K^2/s^3"
+        Unit.parse("m^4 K²/s³").label.should eql "m^4·K^2/s^3"
+        Unit.parse("m^4 K^2/s^3").label.should eql "m^4·K^2/s^3"
+        Unit.parse("m^4 K^2 s^-3").label.should eql "m^4·K^2/s^3"
+
+
+        Unit.parse("m^4·K²/s³").symbol.should eql 'm^4 K^2 s^-3'
+        Unit.parse("m^4 K²/s³").symbol.should eql 'm^4 K^2 s^-3'
+        Unit.parse("m^4 K^2/s^3").symbol.should eql 'm^4 K^2 s^-3'
+        Unit.parse("m^4 K^2 s^-3").symbol.should eql 'm^4 K^2 s^-3'
+
+        Unit.parse("m^4·K²/s³").name.should eql 'metre to the 4th power square kelvin per cubic second'
+        Unit.parse("m^4 K²/s³").name.should eql 'metre to the 4th power square kelvin per cubic second'
+        Unit.parse("m^4 K^2/s^3").name.should eql 'metre to the 4th power square kelvin per cubic second'
+        Unit.parse("m^4 K^2 s^-3").name.should eql 'metre to the 4th power square kelvin per cubic second'
+      end
+
+    end
+
+    describe "explicitly turning on superscript characters" do
+
+      before :all do
+        Quantify.use_superscript_characters=false
+        Quantify.use_superscript_characters=true
+      end
+
+      it "should know that superscripts are to be used" do
+        Quantify.use_superscript_characters?.should be_true
+      end
+
+      it "should use superscript characters for powers of 2 and 3" do
+        Unit.cubic_metre.label.should eql 'm³'
+        Unit.square_metre.label.should eql 'm²'
+        (Unit.m**2).label.should eql 'm²'
+        (Unit.kg**3).label.should eql 'kg³'
+        unit = (Unit.m*Unit.m*Unit.K*Unit.K)/(Unit.s**3)
+        unit.label.should eql 'm²·K²/s³'
+        unit = unit*Unit.m
+        unit.label.should eql 'm³·K²/s³'
+        unit = unit*Unit.m
+        unit.label.should eql 'm^4·K²/s³'
+      end
+      
+      it "should recognize and get unit with alternative syntax" do
+        Unit.for("m^2").label.should eql 'm²'
+        Unit.for("km^2").label.should eql 'km²'
+        Unit.for("Gg^3").label.should eql 'Gg³'
+        (Unit.Gg**3).label.should eql 'Gg³'
+      end
+
+      it "parsing complex unit strings with any syntax should work" do
+        Unit.parse("m^4·K²/s³").label.should eql 'm^4·K²/s³'
+        Unit.parse("m^4 K²/s³").label.should eql 'm^4·K²/s³'
+        Unit.parse("m^4 K^2/s^3").label.should eql 'm^4·K²/s³'
+        Unit.parse("m^4 K^2 s^-3").label.should eql 'm^4·K²/s³'
+
+        Unit.parse("m^4·K²/s³").symbol.should eql 'm^4 K² s^-3'
+        Unit.parse("m^4 K²/s³").symbol.should eql 'm^4 K² s^-3'
+        Unit.parse("m^4 K^2/s^3").symbol.should eql 'm^4 K² s^-3'
+        Unit.parse("m^4 K^2 s^-3").symbol.should eql 'm^4 K² s^-3'
+
+        Unit.parse("m^4·K²/s³").name.should eql 'metre to the 4th power square kelvin per cubic second'
+        Unit.parse("m^4 K²/s³").name.should eql 'metre to the 4th power square kelvin per cubic second'
+        Unit.parse("m^4 K^2/s^3").name.should eql 'metre to the 4th power square kelvin per cubic second'
+        Unit.parse("m^4 K^2 s^-3").name.should eql 'metre to the 4th power square kelvin per cubic second'
+      end
+
+    end
+
+    describe "explicitly turning on superscript characters with bang! method" do
+
+      before :all do
+        Quantify.use_superscript_characters=false
+        Quantify.use_superscript_characters!
+      end
+
+      it "should know that superscripts are to be used" do
+        Quantify.use_superscript_characters?.should be_true
+      end
+
+      it "should use superscript characters for powers of 2 and 3" do
+        Unit.cubic_metre.label.should eql 'm³'
+        Unit.square_metre.label.should eql 'm²'
+        (Unit.m**2).label.should eql 'm²'
+        (Unit.kg**3).label.should eql 'kg³'
+        unit = (Unit.m*Unit.m*Unit.K*Unit.K)/(Unit.s**3)
+        unit.label.should eql 'm²·K²/s³'
+        unit = unit*Unit.m
+        unit.label.should eql 'm³·K²/s³'
+        unit = unit*Unit.m
+        unit.label.should eql 'm^4·K²/s³'
+      end
+
+      it "should recognize and get unit with alternative syntax" do
+        Unit.for("m^2").label.should eql 'm²'
+        Unit.for("km^2").label.should eql 'km²'
+        Unit.for("Gg^3").label.should eql 'Gg³'
+        (Unit.Gg**3).label.should eql 'Gg³'
+      end
+
+      it "parsing complex unit strings with any syntax should work" do
+        Unit.parse("m^4·K²/s³").label.should eql 'm^4·K²/s³'
+        Unit.parse("m^4 K²/s³").label.should eql 'm^4·K²/s³'
+        Unit.parse("m^4 K^2/s^3").label.should eql 'm^4·K²/s³'
+        Unit.parse("m^4 K^2 s^-3").label.should eql 'm^4·K²/s³'
+
+        Unit.parse("m^4·K²/s³").symbol.should eql 'm^4 K² s^-3'
+        Unit.parse("m^4 K²/s³").symbol.should eql 'm^4 K² s^-3'
+        Unit.parse("m^4 K^2/s^3").symbol.should eql 'm^4 K² s^-3'
+        Unit.parse("m^4 K^2 s^-3").symbol.should eql 'm^4 K² s^-3'
+
+        Unit.parse("m^4·K²/s³").name.should eql 'metre to the 4th power square kelvin per cubic second'
+        Unit.parse("m^4 K²/s³").name.should eql 'metre to the 4th power square kelvin per cubic second'
+        Unit.parse("m^4 K^2/s^3").name.should eql 'metre to the 4th power square kelvin per cubic second'
+        Unit.parse("m^4 K^2 s^-3").name.should eql 'metre to the 4th power square kelvin per cubic second'
+      end
+
+    end
+
+    describe "identifier case" do
+
+      it "should ignore case when initialising units by name" do
+        Unit.METRE.label.should eql 'm'
+        Unit.metre.label.should eql 'm'
+        Unit.KiLoMeTrE.label.should eql 'km'
+      end
+
+      it "should NOT ignore case when initialising units by symbol" do
+        Unit.m.label.should eql 'm'
+        lambda{Unit.M}.should raise_error
+        Unit.Gg.name.should eql 'gigagram'
+        lambda{Unit.GG}.should raise_error
+      end
+
+      it "should NOT ignore case when initialising units by label" do
+        Unit.ton_us.label.should eql 'ton_us'
+        lambda{Unit.TON_US}.should raise_error
+      end
+
+    end
+
+  end
+
   describe "unit retrieval" do
 
     it "symbols list should include" do
@@ -86,7 +316,7 @@ describe Unit do
       Unit.cm.factor.should == 0.01
       Unit.TJ.name.should == 'terajoule'
       Unit::Prefix::NonSI.load(:name => 'million ', :symbol => 'MM', :factor => 1e6)
-      Unit.MMBTU.name.should == 'million british thermal unit (59 °f)'
+      Unit.MMBTU.name.should == 'million british thermal unit (59 °F)'
       Unit::Prefix.unload :MM
     end
 
@@ -105,6 +335,58 @@ describe Unit do
     it "empty string should return nil" do
       Unit.for("").should be_nil
     end
+
+    it "should recognize m²" do
+      Unit.for("m²").should be_a Unit::Base
+    end
+
+    it "should recognise unit with single word name" do
+      Unit.centimetre.symbol.should eql "cm"
+    end
+
+    it "should recognise unit with multiple word name" do
+      Unit.centimetre_of_mercury.symbol.should eql "cmHg"
+    end
+
+    it "should recognise unit with single word pluralized name" do
+      Unit.centimetres.symbol.should eql "cm"
+    end
+
+    it "should recognise unit with multiple word pluralized name" do
+      Unit.centimetres_of_mercury.symbol.should eql "cmHg"
+    end
+
+    it "should recognise compound unit with single word name" do
+      Unit.centimetre_per_hour.symbol.should eql "cm h^-1"
+    end
+
+    it "should recognise compound unit with multiple word name" do
+      Unit.centimetre_of_mercury_per_hour.symbol.should eql "cmHg h^-1"
+    end
+
+    it "should recognise compound unit with single word pluralized name" do
+      Unit.centimetres_per_hour.symbol.should eql "cm h^-1"
+    end
+
+    it "should recognise compound unit with multiple word pluralized name" do
+      Unit.centimetres_of_mercury_per_hour.symbol.should eql "cmHg h^-1"
+    end
+
+    it "should recognise compound unit with single word name" do
+      Unit.centimetre_per_hour_US_bushel.symbol.should eql "cm h^-1 bu (Imp)^-1"
+    end
+
+    it "should recognise compound unit with multiple word name" do
+      Unit.centimetre_of_mercury_per_hour_US_bushel.symbol.should eql "cmHg h^-1 bu (Imp)^-1"
+    end
+
+    it "should recognise compound unit with single word pluralized name" do
+      Unit.centimetres_per_hour_US_bushels.symbol.should eql "cm h^-1 bu (Imp)^-1"
+    end
+
+    it "should recognise compound unit with multiple word pluralized name" do
+      Unit.centimetres_of_mercury_per_hour_US_bushels.symbol.should eql "cmHg h^-1 bu (Imp)^-1"
+    end
     
     describe "parsing unit string" do
       
@@ -221,7 +503,7 @@ describe Unit do
     it "should mass load units with prefixes" do
       Unit::SI.prefix_and_load([:kilo,:mega,:giga,:tera],[:metre,:gram,:second])
       Unit.kilometre.loaded?.should == true
-      Unit.Gigametre.loaded?.should == true
+      Unit.gigametre.loaded?.should == true
       Unit.kilogram.loaded?.should == true
       Unit.teragram.loaded?.should == true
       Unit.kilosecond.loaded?.should == true
@@ -231,13 +513,13 @@ describe Unit do
     it "should mass load unit with prefixes" do
       Unit::SI.prefix_and_load([:kilo,:mega,:giga,:tera],:metre)
       Unit.kilometre.loaded?.should == true
-      Unit.Gigametre.loaded?.should == true
+      Unit.gigametre.loaded?.should == true
       Unit.nanometre.loaded?.should == false
     end
 
     it "should mass load units with prefix" do
       Unit::SI.prefix_and_load(:giga,[:metre,:gram,:second])
-      Unit.Gigametre.loaded?.should == true
+      Unit.gigametre.loaded?.should == true
       Unit.gigagram.loaded?.should == true
       Unit.gigasecond.loaded?.should == true
       Unit.nanometre.loaded?.should == false
@@ -245,7 +527,7 @@ describe Unit do
 
     it "should mass load units with prefix using objects as arguments" do
       Unit::SI.prefix_and_load(Unit::Prefix.giga,[Unit.metre,Unit.gram,Unit.second])
-      Unit.Gigametre.loaded?.should == true
+      Unit.gigametre.loaded?.should == true
       Unit.gigagram.loaded?.should == true
       Unit.gigasecond.loaded?.should == true
       Unit.nanometre.loaded?.should == false
@@ -297,7 +579,7 @@ describe Unit do
 
     it "should change the label of canonical unit representation" do
       unit = Unit.cubic_metre
-      unit.label.should eql "m^3"
+      unit.label.should eql "m³"
       unit.canonical_label = "m3"
       unit.label.should eql "m3"
       Unit.cubic_metre.label.should eql "m3"
@@ -612,19 +894,19 @@ describe Unit do
     it "should recognise similar units" do
       unit_1 = Unit.yard
       unit_2 = Unit.yard
-      unit_1.is_same_as?(unit_2).should == true
+      unit_1.is_equivalent_to?(unit_2).should == true
     end
 
     it "should recognise non-similar units" do
       unit_1 = Unit.yard
       unit_2 = Unit.foot
-      unit_1.is_same_as?(unit_2).should_not == true
+      unit_1.is_equivalent_to?(unit_2).should_not == true
     end
 
     it "should recognise non-similar units" do
       unit_1 = Unit.yard
       unit_2 = Unit.kelvin
-      (unit_1 == unit_2).should_not == true
+      (unit_1.is_equivalent_to? unit_2).should_not == true
     end
 
     it "should recognise known units from compound units based on dimensions and factor" do
@@ -639,7 +921,7 @@ describe Unit do
       megagram = Unit.Mg
       megagram.symbol.should == 'Mg'
       megagram.factor.should == 1000.0
-      megagram.should == tonne
+      megagram.is_equivalent_to?(tonne).should be_true
     end
 
     it "should return correct SI unit" do