ruby-units 1.0.1 → 1.0.2

data/lib/ruby_units/string.rb

@@ -0,0 +1,94 @@
+# make a string into a unit
+class String
+  def to_unit(other = nil)
+    other ? Unit.new(self).to(other) : Unit.new(self)
+  end
+  alias :unit :to_unit
+  alias :u :to_unit
+  alias :unit_format :%
+  
+  # format unit output using formating codes '%0.2f' % '1 mm'.unit => '1.00 mm'
+  def %(*args)
+    case args[0]
+    when Unit: args[0].to_s(self)
+    when defined?(Uncertain) && Uncertain === args[0]: args[0].to_s(self)
+    when Complex: args[0].to_s
+    else
+      unit_format(*args)
+    end
+  end
+  
+  #needed for compatibility with Rails, which defines a String.from method  
+  if self.public_instance_methods.include? 'from'
+    alias :old_from :from
+  end 
+  
+  def from(time_point = ::Time.now)
+    return old_from(time_point) if Integer === time_point
+    self.unit.from(time_point)
+  end
+  
+  alias :after :from
+  alias :from_now :from
+  
+  def ago
+    self.unit.ago
+  end
+  
+  def before(time_point = ::Time.now)
+    self.unit.before(time_point)
+  end
+  alias :before_now :before
+  
+  def since(time_point = ::Time.now)
+    self.unit.since(time_point)
+  end
+  
+  def until(time_point = ::Time.now)
+    self.unit.until(time_point)
+  end
+  
+  def to(other)
+    self.unit.to(other)
+  end
+  
+  def time(options = {})
+    self.to_time(options) rescue self.to_datetime(options)
+  end
+  
+  def to_time(options = {})
+    begin
+      #raises exception when Chronic not defined or when it returns a nil (i.e., can't parse the input)
+      r = Chronic.parse(self,options)
+      raise(ArgumentError, 'Invalid Time String') unless r
+      return r
+    rescue
+      Time.local(*ParseDate.parsedate(self))
+    end
+  end
+  
+  def to_datetime(options = {})
+    begin
+      # raises an exception if Chronic.parse = nil or if Chronic not defined
+      r = Chronic.parse(self,options).to_datetime
+    rescue
+      r=DateTime.civil(*ParseDate.parsedate(self)[0..5].compact)
+    end
+    raise RuntimeError, "Invalid Time String" if r == DateTime.new      
+    return r
+  end
+  
+  def to_date(options={})
+    begin
+      r = Chronic.parse(self,options).to_date
+    rescue
+      r = Date.civil(*ParseDate.parsedate(self)[0..5].compact)
+    end
+    raise RuntimeError, 'Invalid Date String' if r == Date.new
+    return r
+  end
+
+  def datetime(options = {})
+    self.to_datetime(options) rescue self.to_time(options)
+  end
+end

data/lib/ruby_units/time.rb

@@ -0,0 +1,73 @@
+#
+# Time math is handled slightly differently.  The difference is considered to be an exact duration if
+# the subtracted value is in hours, minutes, or seconds.  It is rounded to the nearest day if the offset
+# is in years, decades, or centuries.  This leads to less precise values, but ones that match the 
+# calendar better.
+class Time
+  
+  class << self
+    alias unit_time_at at
+  end
+  
+  def self.at(*args)
+    if Unit === args[0]
+      unit_time_at(args[0].to("s").scalar)
+    else
+      unit_time_at(*args)
+    end
+  end
+  
+  def to_unit(other = nil)
+    other ? Unit.new(self).to(other) : Unit.new(self)
+  end
+  alias :unit :to_unit
+  alias :u :to_unit
+  alias :unit_add :+
+  
+  def to_datetime
+    DateTime.civil(1970,1,1)+(self.to_f+self.gmt_offset)/86400
+  end
+  
+  def to_date
+    x=(Date.civil(1970,1,1)+((self.to_f+self.gmt_offset)/86400.0)-0.5)
+    Date.civil(x.year, x.month, x.day)
+  end
+  
+  def +(other)
+    case other
+    when Unit:
+      other = other.to('d').round.to('s') if ['y', 'decade', 'century'].include? other.units  
+      begin
+        unit_add(other.to('s').scalar)
+      rescue RangeError
+        self.to_datetime + other
+      end
+    when DateTime: unit_add(other.to_time)
+    else
+      unit_add(other)
+    end
+  end
+  
+  # usage: Time.in '5 min'
+  def self.in(duration)
+    Time.now + duration.to_unit
+  end
+  
+  alias :unit_sub :-
+  
+  def -(other)
+    case other
+    when Unit: 
+      other = other.to('d').round.to('s') if ['y', 'decade', 'century'].include? other.units  
+      begin
+        unit_sub(other.to('s').scalar)
+      rescue RangeError
+        self.to_datetime - other
+      end
+      
+    when DateTime: unit_sub(other.to_time)
+    else
+      unit_sub(other)
+    end
+  end
+end

data/lib/{units.rb → ruby_units/units.rb}

@@ -86,7 +86,7 @@ UNIT_DEFINITIONS = {
   #speed
   '<kph>' => [%w{kph}, 0.277777778, :speed, %w{<meter>}, %w{<second>}],
   '<mph>' => [%w{mph}, 0.44704, :speed, %w{<meter>}, %w{<second>}],
-  '<knot>' => [%w{kn knot knots}, 0.514444444, :speed, %w{<meter>}, %w{<second>}],
+  '<knot>' => [%w{kt kn kts knot knots}, 0.514444444, :speed, %w{<meter>}, %w{<second>}],
   '<fps>'  => [%w{fps}, 0.3048, :speed, %w{<meter>}, %w{<second>}],
   
   #acceleration
@@ -117,12 +117,14 @@ UNIT_DEFINITIONS = {
   '<pascal>' => [%w{Pa pascal Pascal}, 1.0, :pressure, %w{<kilogram>},%w{<meter> <second> <second>}],
   '<bar>' => [%w{bar bars}, 100000, :pressure, %w{<kilogram>},%w{<meter> <second> <second>}],
   '<mmHg>' => [%w{mmHg}, 133.322368,:pressure, %w{<kilogram>},%w{<meter> <second> <second>}],
+  '<inHg>' => [%w{inHg}, 3386.3881472,:pressure, %w{<kilogram>},%w{<meter> <second> <second>}],
   '<torr>' => [%w{torr}, 133.322368,:pressure, %w{<kilogram>},%w{<meter> <second> <second>}],
   '<bar>' => [%w{bar}, 100000,:pressure, %w{<kilogram>},%w{<meter> <second> <second>}],
   '<atm>' => [%w{atm ATM atmosphere atmospheres}, 101325,:pressure, %w{<kilogram>},%w{<meter> <second> <second>}],
   '<psi>' => [%w{psi}, 6894.76,:pressure, %w{<kilogram>},%w{<meter> <second> <second>}],
   '<cmh2o>' => [%w{cmH2O}, 98.0638,:pressure, %w{<kilogram>},%w{<meter> <second> <second>}],
-
+  '<inh2o>' => [%w{inH2O}, 249.082052,:pressure, %w{<kilogram>},%w{<meter> <second> <second>}],
+  
   #viscosity
   '<poise>'  => [%w{P poise}, 0.1, :viscosity, %w{<kilogram>},%w{<meter> <second>} ],
   '<stokes>' => [%w{St stokes}, 1e-4, :viscosity, %w{<meter> <meter>}, %w{<second>}],
@@ -221,6 +223,14 @@ UNIT_DEFINITIONS = {
   '<dpm>' => [%w{dpm}, 1.0/60.0, :rate, %w{<count>},%w{<second>}],
   '<bpm>' => [%w{bpm}, 1.0/60.0, :rate, %w{<count>},%w{<second>}],
 
+  #resolution / typography
+  '<dot>' => [%w{dot dots}, 1, :resolution, %w{<each>}],
+  '<pixel>' => [%w{pixel px}, 1, :resolution, %w{<each>}],
+  '<ppi>' => [%w{ppi}, 1, :resolution, %w{<pixel>}, %w{<inch>}],
+  '<dpi>' => [%w{dpi}, 1, :typography, %w{<dot>}, %w{<inch>}],
+  '<pica>' => [%w{pica}, 0.00423333333 , :typography, %w{<meter>}],
+  '<point>' => [%w{point pt}, 0.000352777778, :typography, %w{<meter>}],
+
   #other
   '<cell>' => [%w{cells cell}, 1, :counting, %w{<each>}],
   '<each>' => [%w{each}, 1.0, :counting, %w{<each>}],

data/lib/ruby_units.rb

@@ -1 +1,11 @@
-require 'ruby-units'
+require 'ruby_units/array'
+require 'ruby_units/date'
+require 'ruby_units/time'
+require 'ruby_units/math'
+require 'ruby_units/numeric'
+require 'ruby_units/object'
+require 'ruby_units/string'
+require 'ruby_units/complex'
+require 'ruby_units/units'
+require 'ruby_units/ruby-units'
+

data/test/test_ruby-units.rb

@@ -1,10 +1,12 @@
 require 'test/unit'
 require 'ruby-units'
-require 'uncertain'
 require 'rubygems'
+require 'uncertain'
 require 'yaml'
 require 'chronic'
 
+
+
 class Unit < Numeric
   @@USER_DEFINITIONS = {'<inchworm>' =>  [%w{inworm inchworm}, 0.0254, :length, %w{<meter>} ],
                         '<habenero>'   => [%{degH}, 100, :temperature, %w{<celcius>}]}
@@ -261,14 +263,14 @@ class TestRubyUnits < Test::Unit::TestCase
     c = '1 in'.unit
     d = '1 ml'.unit
     
-    assert_equal (a+b).scalar, 100
-    assert_equal (a+b).units, 'mm'
-    assert_equal (b+a).scalar, 10
-    assert_equal (b+a).units, 'cm'
+    assert_equal (a+b), b
+    assert_equal (a+b).units, b.units
+    assert_equal (b+a), b
+    assert_equal (b+a).units, b.units
     assert_in_delta (b+c).scalar, 12.54, 0.01
     assert_equal (b+c).units, 'cm'
     assert_raises(ArgumentError) {
-      a + d
+      b + d
     }
   end
   
@@ -278,14 +280,14 @@ class TestRubyUnits < Test::Unit::TestCase
     c = '1 in'.unit
     d = '1 ml'.unit
     
-    assert_equal (a-b).scalar, -100
-    assert_equal (a-b).units, 'mm'
-    assert_equal (b-a).scalar, 10
-    assert_equal (b-a).units, 'cm'
+    assert_equal (a-b), -b
+    assert_equal (a-b).units, b.units
+    assert_equal (b-a), b
+    assert_equal (b-a).units, b.units
     assert_in_delta (b-c).scalar, 7.46, 0.01
     assert_equal (b-c).units, 'cm'
     assert_raises(ArgumentError) {
-      a - d
+      b - d
     }
   end
   
@@ -759,10 +761,9 @@ class TestRubyUnits < Test::Unit::TestCase
   end
   
   def test_uncertain
-    if defined? Uncertain
-      a = Uncertain.new(1,1)
-      b = a.unit('mm')
-      assert_equal b.to_s, '1 +/- 1 mm' 
+    if defined?(Uncertain)
+      a = '1 +/- 1 mm'.unit
+      assert_equal a.to_s, '1 +/- 1 mm' 
     else
       fail "Can't test Uncertain Units unless 'Uncertain' gem is installed"
     end  
@@ -855,9 +856,11 @@ class TestRubyUnits < Test::Unit::TestCase
   end
   
   def test_sqrt
-    assert_equal '1 mm'.unit, Math.sqrt('1 mm^2'.unit)
-    assert_raises(ArgumentError) {Math.sqrt('1 mm'.unit)}
-    assert_equal Math.sqrt("-1 mm^2".unit), '0+1i mm'.unit
+    a = '-9 mm^2'.unit
+    b = a**(0.5)
+    assert_in_delta Math.sqrt(a).to_unit.scalar.real, b.scalar.real, 0.00001
+    assert_in_delta Math.sqrt(a).to_unit.scalar.image, b.scalar.image, 0.00001
+    
   end
   
   def test_hypot
@@ -867,9 +870,7 @@ class TestRubyUnits < Test::Unit::TestCase
   
   def test_complex
     assert_equal '1+1i mm'.unit.scalar, Complex(1,1)
-    assert_equal '1+1i mm'.unit.real, '1 mm'.unit
-    assert_equal '1+1i mm'.unit.imag, '1i mm'.unit
-    assert_equal '1+1i'.unit, Complex(1,1)
+    assert_equal '1+1i'.unit.scalar, Complex(1,1)
     assert_raises (RuntimeError) { '1+1i mm'.unit.to_c}
   end
 
@@ -884,6 +885,10 @@ class TestRubyUnits < Test::Unit::TestCase
     assert_equal '1/4 in/s'.unit, '0.25 in/s'.unit
     assert_equal '1/4'.unit, 0.25
   end
-
-
+  
+  def test_to_date
+    a = Time.now
+    assert_equal a.to_date, Date.today
+  end
 end
+

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ruby-units
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
-date: 2007-01-17 00:00:00 -05:00
+  version: 1.0.2
+date: 2007-01-24 00:00:00 -05:00
 summary: A model that performs unit conversions and unit math
 require_paths: 
 - lib
@@ -36,7 +36,16 @@ files:
 - Rakefile
 - lib/ruby-units.rb
 - lib/ruby_units.rb
-- lib/units.rb
+- lib/ruby_units/units.rb
+- lib/ruby_units/math.rb
+- lib/ruby_units/date.rb
+- lib/ruby_units/time.rb
+- lib/ruby_units/string.rb
+- lib/ruby_units/array.rb
+- lib/ruby_units/numeric.rb
+- lib/ruby_units/object.rb
+- lib/ruby_units/complex.rb
+- lib/ruby_units/ruby-units.rb
 - test/test_ruby-units.rb
 test_files: 
 - test/test_ruby-units.rb