minad-units 0.1.2 → 0.1.3

data/lib/systems/degree.yml

@@ -2,10 +2,9 @@ units:
   pi:
     sym: π
     def: 3.14159265358979323846
-
   degree:
-    sym: °
-    def: 180 * radiant / pi
+    sym: [°, deg]
+    def: pi radiant / 180
   arcminute:
     sym: \'
     def: degree / 60

data/lib/systems/misc.yml

@@ -16,3 +16,7 @@ units:
   calorie:
     sym: cal
     def: 4184 millijoule
+
+  fahrenheit:
+    sym: [°F, ℉]
+    def: 1.8 celsius

data/lib/systems/si.yml

@@ -25,7 +25,7 @@ units:
 
   # Derived SI units
   radiant:
-    sym: rad
+    sym: [rad, radian]
     def: 1
   steradiant:
     sym: sr
@@ -70,7 +70,7 @@ units:
     sym: H
     def: weber / ampere
   celsius:
-    sym: °C
+    sym: [°C, ℃]
     def: kelvin
   lumen:
     sym: lm

data/lib/systems/time.yml

@@ -8,6 +8,8 @@ units:
   day:
     sym: d
     def: 24 * hour
+  week:
+    def: 7 * day
   year:
     sym: a
     def: 365 * day

data/lib/units.rb

@@ -2,7 +2,7 @@
 require 'yaml'
 
 class Unit < Numeric
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 
   attr_reader :numerator, :denominator, :unit, :normalized, :system
 
@@ -102,7 +102,7 @@ class Unit < Numeric
   def compatible?(other)
     a, b = coerce(other)
     a, b = a.normalize, b.normalize
-    a.unit == b.unit
+    (a.unit == b.unit) || (a == 0 || b == 0)
   end
 
   alias compatible_with? compatible?
@@ -123,14 +123,26 @@ class Unit < Numeric
     s << "/#{@denominator}" if @denominator != 1
     positive = @unit.select {|prefix, name, exp| exp >= 0 }
     negative = @unit.select {|prefix, name, exp| exp < 0 }
-    if positive.empty? && !negative.empty?
-      s << ' 1'
-    else
-      s << ' ' << unit_string(positive)
+    s << ' ' << unit_string(positive, '·') if !positive.empty?
+    if !negative.empty?
+      s << ' 1' if positive.empty?
+      s << '/' << unit_string(negative, '·')
     end
+    s
+  end
+
+  def to_tex
+    s = '\SI{'
+    s << @numerator.to_s
+    s << "/#{@denominator}" if @denominator != 1
+    positive = @unit.select {|prefix, name, exp| exp >= 0 }
+    negative = @unit.select {|prefix, name, exp| exp < 0 }
+    s << '}{' << unit_string(positive, '.') if !positive.empty?
     if !negative.empty?
-      s << '/' << unit_string(negative)
+      s << ' 1' if positive.empty?
+      s << '/' << unit_string(negative, '.')
     end
+    s << '}'
     s
   end
 
@@ -146,7 +158,8 @@ class Unit < Numeric
     to_f.unit(unit)
   end
 
-  def to_unit(system)
+  def to_unit(system = nil)
+    system ||= Unit::System::DEFAULT
     raise TypeError, 'Different unit system' if @system != system
     self
   end
@@ -170,7 +183,7 @@ class Unit < Numeric
 
   private
 
-  def unit_string(list)
+  def unit_string(list, sep)
     units = []
     list.each do |prefix, name, exp|
       unit = ''
@@ -179,7 +192,7 @@ class Unit < Numeric
       unit << '^' << exp.abs.to_s if exp.abs != 1
       units << unit
     end
-    units.sort.join('·')
+    units.sort.join(sep)
   end
 
   def self.power_unit(unit, pow)
@@ -351,9 +364,9 @@ class Unit < Numeric
 
     REAL   = /^-?(?:(?:\d*\.\d+|\d+\.\d*)(?:[eE][-+]?\d+)?|\d+[eE][-+]?\d+)$/
     DEC    = /^-?\d+$/
-    SYMBOL = /^[a-zA-Z_][\w_]*$/
-    OPERATOR = { '/' => ['/', 1], '*' => ['*', 1], '·' => ['*', 1], '^' => ['^', 2] }
-    OPERATOR_TOKENS = OPERATOR.keys.map {|x| Regexp.quote(x) }
+    SYMBOL = /^[a-zA-Z_°'"][\w_°'"]*$/
+    OPERATOR = { '/' => ['/', 1], '*' => ['*', 1], '·' => ['*', 1], '^' => ['^', 2], '**' => ['^', 2] }
+    OPERATOR_TOKENS = OPERATOR.keys.sort_by {|x| -x.size }. map {|x| Regexp.quote(x) }
     VALUE_TOKENS = [REAL.source[1..-2], DEC.source[1..-2], SYMBOL.source[1..-2]]
     TOKENIZER = Regexp.new((OPERATOR_TOKENS + VALUE_TOKENS + ['\\(', '\\)']).join('|'))
 
@@ -460,6 +473,12 @@ class String
   end
 end
 
+class Symbol
+  def to_unit(system = nil)
+    to_s.to_unit(system)
+  end
+end
+
 class Array
   def to_unit(system = nil)
     system ||= Unit::System::DEFAULT

data/spec/spec_units.rb

@@ -68,6 +68,7 @@ describe 'Unit' do
     1.MeV.in_joule.should.equal Unit(1.602176487e-13, 'joule')
     1.kilometer.in_meter.should.equal Unit(1000, 'meter')
     1.liter.in('meter^3').should.equal Unit(1, 1000, 'meter^3')
+    1.kilometer_per_hour.in_meter_per_second.should.equal Unit(5, 18, 'meter/second')
   end
 
   it 'should have a working compatible? method' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: minad-units
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Daniel Mendler