Merge branch 'refs/heads/issue_40'

twalpole · May 13, 2012 · 68eb642 · 68eb642
2 parents 7e27a1e + 6dee6df
commit 68eb642
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lib/ruby_units/unit.rb b/lib/ruby_units/unit.rb
@@ -314,6 +314,7 @@ def initialize(*options)
     @unit_name   = nil
     @signature   = nil
     @output      = {}
+    raise ArgumentError, "Invalid Unit Format" if options[0].nil?
     if options.size == 2
       # options[0] is the scalar
       # options[1] is a unit string

diff --git a/spec/ruby-units/unit_spec.rb b/spec/ruby-units/unit_spec.rb
@@ -427,7 +427,7 @@
     its(:temperature_scale) {should be_nil}
   end
 
-  describe Unit.new("1 m^2 s^-2") do
+  describe Unit("1 m^2 s^-2") do
     it {should be_an_instance_of Unit}
     its(:scalar) {should be_an Integer}
     its(:units) {should == "m^2/s^2"}
@@ -441,7 +441,7 @@
     its(:temperature_scale) {should be_nil}    
   end
 
-  describe Unit.new(1,"m^2","s^2") do
+  describe Unit(1,"m^2","s^2") do
     it {should be_an_instance_of Unit}
     its(:scalar) {should be_an Integer}
     its(:units) {should == "m^2/s^2"}
@@ -456,7 +456,7 @@
   end
 
   #scientific notation
-  describe Unit.new("1e6 cells") do
+  describe Unit("1e6 cells") do
     it {should be_an_instance_of Unit}
     its(:scalar) {should be_an Integer}
     its(:scalar) {should == 1e6 }
@@ -568,6 +568,11 @@
     expect {Unit("-100 tempR")}.to raise_error(ArgumentError,"Temperatures must not be less than absolute zero")
     expect {Unit("-500/9 tempR")}.to raise_error(ArgumentError,"Temperatures must not be less than absolute zero")
   end
+
+  specify "no nil scalar" do
+    expect {Unit(nil, "feet")}.to raise_error(ArgumentError, "Invalid Unit Format")
+    expect {Unit(nil, "feet", "min")}.to raise_error(ArgumentError, "Invalid Unit Format")
+  end
 
 end