phys-units 0.9.1 → 0.9.2

data/lib/phys/units/unit_class.rb

@@ -50,11 +50,12 @@ module Phys
       end
 
       def word(x)
-        find_unit(x) || define(x)
+        find_unit(x) or raise UnitError, "Undefined unit: #{x.inspect}"
+        #find_unit(x) || define(x,nil)
       end
 
       def parse(x)
-        find_unit(x) || Parse.new.parse(x)
+        find_unit(x) || Unit.cast(Parse.new.parse(x))
       end
 
       def find_unit(x)
@@ -71,8 +72,8 @@ module Phys
       alias [] find_unit
 
       def unit_stem(x)
-        ( /(.{3,}(?:s|z|ch))es$/ =~ x && LIST[$1] ) ||
-          ( /(.{3,})s$/ =~ x && LIST[$1] )
+        ( /(.{2,}(?:s|z|ch))es$/ =~ x && LIST[$1] ) ||
+          ( /(.{2,})s$/ =~ x && LIST[$1] )
       end
 
       def find_prefix(x)
@@ -86,7 +87,7 @@ module Phys
 #--
 
       def unit_chars
-        '\\s*+\\/0-9<=>()\\[\\]^{|}~\\\\'
+        '\\s*+\\/<=>()\\[\\]^{|}~\\\\'
       end
 
       def control_units_dat(var,skip,line)

data/lib/phys/units/version.rb

@@ -1,5 +1,5 @@
 module Phys
   class Unit
-    VERSION = "0.9.1"
+    VERSION = "0.9.2"
   end
 end

data/spec/helper.rb

@@ -1,4 +1,26 @@
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 require "phys/units"
+
 U = Phys::Unit
 Q = Phys::Quantity
+
+RSpec::Matchers.define :be_sfloat_close_to do |y|
+  match do |x|
+    if x==0 && y==0
+      true 
+    else
+      x = x.to_f
+      (x-y).abs/(x.abs+y.abs) < 1.2e-7
+    end
+  end
+end
+
+RSpec::Matchers.define :be_a_quantity_close_to do |expected|
+  match do |actual|
+    if !(Phys::Quantity===actual && Phys::Quantity===expected)
+      false
+    else
+      actual.close_to(expected,1.2e-7)
+    end
+  end
+end