phys-units 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c123870463b0713958805751bbcef484dc35d1dc
-  data.tar.gz: 8a7bd323be840936ea2b3535b8a5bf6e312f5b4d
+  metadata.gz: f0ec7810800a733cda3aa7f753bf10d11b76891d
+  data.tar.gz: b2c93b618d876183ea89ebfab9e6f353a6160746
 SHA512:
-  metadata.gz: efbbc5b61cb7a9eebf65f0e2420073365750321f502b24aeecc45afa9cc42f01b6a895f126383e4a3cf49e3cf8178a230602c3fed460a6d7ebcda678e756083a
-  data.tar.gz: f1657606f20fadf5ff43744261b334322538ede36f93d89921f9afd7cbc68af5de040a67b2ccb0d56fda09e5a08afce03c9250fdcd27bc76052bbe4a46002bcf
+  metadata.gz: b0b1ea5529d3017813abe2c056b8eda47db00f47dd3cf0405fd0551182f551bdd95493352ea0ff8ecce1091e5269a593411c09d1caa705514d9c39520e8d54b5
+  data.tar.gz: 7d4bdf5a200c37d8d9cd7b0416bbaa7812a988905b358ea93e88dd635f056226305a6c57bbae0bfe27c48ef7ed9080a64ca91a28fcabc9b66675b4ab082443fd

data/README.md

@@ -1,38 +1,63 @@
 # Phys-Units
 
-GNU Units-compatible library for Ruby.
+[GNU Units](http://www.gnu.org/software/units/)-compatible library for Ruby.
 Former name is [Quanty](http://narray.rubyforge.org/quanty/quanty-en.html),
 the first Ruby units library released in 2001.
 
-## Phys::Quantity
-is the primary class of Phys-Units library, to be manipulated by users.
-It contains:
+* [GitHub](https://github.com/masa16/phys-units)
+* [RubyGems](https://rubygems.org/gems/phys-units)
+* [Class Documentation](http://rubydoc.info/gems/phys-units/frames/)
+
+## Installation
+
+Install from gem as:
+
+    $ gem install phys-units
+
+Or install from source tree:
+
+    $ ruby setup.rb
+
+## Overview
+
+### Phys::Quantity
+is the primary class of Phys-Units library, intended to be manipulated by users.
+This class represents Physical Quantities with a Unit of measurement.
+It contains *Value* and *Unit*.
 
 * *Value*
   must be a class instance having arithmetic methods,
   but it is not necessary to be a Numeric.
   This is a duck typing way.
+
+        Phys::Quantity[2.5,"miles"].value  #=> 2.5
+
 * *Unit*
-  is an instance of Phys::Unit class
-  obtained by parsing *expr* string.
+  is an instance of Phys::Unit class obtained by parsing *expr* string.
 
-See [Phys::Quantity Documentation](http://rubydoc.info/gems/phys-units/frames/Phys/Quantity)
-for more details.
+        Phys::Quantity[2.5,"miles"].unit   #=> #<Phys::Unit 1609.344,{"m"=>1},@expr="5280 ft">
 
-## Installation
+### Phys::Unit
+is a class to represent Physical Units of measurement.
+This class is used in the Phys::Quantity for calculations with Units,
+and users do not always need to know its mechanism.
+It has *Factor* and *Dimension*:
 
-Install from gem as:
+* *Factor* of the unit is a scale factor relative to its base unit.
 
-    $ gem install phys-units
+        Phys::Unit["km"].factor #=> 1000
 
-Or install from source tree:
+* *Dimension* of the unit
+  is a hash table containing base units and dimensions as key-value pairs.
 
-    $ ruby setup.rb
+        Phys::Unit["N"].dimension #=> {"kg"=>1, "m"=>1, "s"=>-2}
 
-## Usage
+### Examples
 
-    require 'phys/units'
+    require "phys/units"
     Q = Phys::Quantity
+    U = Phys::Unit
+
     Q[1.23,'km'] + Q[4.56,'m']    #=> Phys::Quantity[1.23456,'km']
     Q[123,'mile'] / Q[2,'hr']     #=> Phys::Quantity[61,'mile/hr']
     Q[61,'miles/hr'].want('m/s')  #=> Phys::Quantity[27.26944,'m/s']
@@ -41,17 +66,32 @@ Or install from source tree:
     Q[20,'tempC'].want('tempF')   #=> Phys::Quantity[68,'tempF']
     Math.cos(Q[60,'degree'].to_f) #=> 0.5
 
+    U["m/s"] === Q[1,'miles/hr']  #=> true
+
+    case Q[1,"miles/hr"]
+    when U["LENGTH"]
+      puts "length"
+    when U["TIME"]
+      puts "time"
+    when U["VELOCITY"]
+      puts "velocity"
+    else
+      puts "other"
+    end                    #=> "velocity"
+
 ## Features
 
-Phys-Units library is discriminated from many other units libraies for Ruby,
+Phys-Units library is differentiated from many other units libraries for Ruby,
 by the following features:
 
 * Compatible with GNU Units except nonlinear units.
 * Provides 2331 units, 85 prefixes, including UTF-8 unit names.
-* Defines Units by reading GNU Units text data,
+* Defines Units by reading GNU Units text data
+  (see [load_units.rb](https://github.com/masa16/phys-units/blob/master/lib/phys/units/load_units.rb)),
   unlike other libraries which define Units in Ruby code.
-* No addition or modification to Ruby standard classes,
-  avoiding conflict with other libraries.
+* Provides orthodox design of class interface.
+* No addition or modification to Ruby standard classes in standard usage,
+  to avoid conflicts with other libraries.
 * Calculation of values is through Ruby Numeric arithmetic methods.
   Phys-Units does not care it.
 * Conversion factors are internally held in Rational form even
@@ -59,6 +99,31 @@ by the following features:
 * PI number has a dimension.
 * Japanese Units are available by require 'phys/units/jp'.
 
+## Appendix Feature
+
+Mix-in feature provides simple calculator of units.
+Caution: The use of Mix-in may cause conflicts with other library.
+
+    $ irb -rphys/units/mixin
+
+    irb> (2.5.miles/hr).want m/s
+    => Phys::Quantity[1.1176,"m/s"]
+
+    irb> 23.tempC.want tempF
+    => Phys::Quantity[73.4,"tempF"]
+
+    irb> print_units LENGTH
+    m                               !
+    meter                           m
+    LENGTH                          meter
+     :
+
+    irb> print_units ENERGY
+    joule                           N m
+    J                               joule
+    prout                           185.5 keV
+     :
+
 ## Platforms tested
 
 * ruby 2.0.0p0 (2013-02-24 revision 39474) [x86_64-linux]

data/lib/phys/units.rb

@@ -6,3 +6,4 @@ require "phys/units/utils.rb"
 require "phys/units/parse.rb"
 require "phys/units/quantity.rb"
 require "phys/units/load_units.rb"
+require "phys/units/units_mixin.rb"

data/lib/phys/units/mixin.rb

@@ -1,18 +1,5 @@
 require "phys/units"
 
-# ActiveSupport-like mix-in to Numeric.
-# This is activated by:
-#     require 'phys/units/mixin'
-#
-# However, this kind of global change will cause unexpected problems.
-
-class Numeric
-  alias method_missing_orig method_missing
-  def method_missing(method, *args, &block)
-    if unit=Phys::Unit.find_unit(method.to_s)
-      Phys::Quantity.new(self,nil,unit)
-    else
-      method_missing_orig(method,*args, &block)
-    end
-  end
-end
+# @visibility private
+class Numeric; include Phys::UnitsNumericMixin; end
+include Phys::UnitsMixin

data/lib/phys/units/parse.rb

@@ -723,7 +723,7 @@ module_eval(<<'.,.,', 'parse.y', 31)
 
 module_eval(<<'.,.,', 'parse.y', 35)
   def _reduce_10(val, _values, result)
-     result = Unit.rdiv(val[0],val[2]) 
+     result = val[0] / val[2] 
     result
   end
 .,.,

data/lib/phys/units/parse.y

@@ -33,7 +33,7 @@ rule
      ;
 
  numexpr: NUMBER
-        | numexpr '|' numexpr { result = Unit.rdiv(val[0],val[2]) }
+        | numexpr '|' numexpr { result = val[0] / val[2] }
         ;
 
  pexpr: '(' expr ')'          { result = val[1] }

data/lib/phys/units/quantity.rb

@@ -14,19 +14,27 @@ module Phys
   #  Quantity.new(*a)
   #end
 
-  # Phys::Quantity is a class to represent physical quantities
-  # with unit of measure.
-  # It contains:
-  # * *Value* of the quantity.
-  #   +value+ must be a class instance having arithmetic methods,
+  # Phys::Quantity is the primary class of Phys-Units library,
+  # intended to be manipulated by users.
+  # This class represents Physical Quantities with a Unit of measurement.
+  # It contains *Value* and *Unit*.
+  # * *Value* of the quantity
+  #   must be an instance having arithmetic methods,
   #   but it is not necessary to be a Numeric.
   #   This is a duck typing way.
-  # * *Unit* of the quantity.
-  #   +unit+ is a instance of Phys::Unit class
-  #   obtained by parsing a +expr+ string.
-  #== Usage
+  #        Phys::Quantity[2.5,"miles"].value    #=> 2.5
+  #        Phys::Quantity[NArray.float(5).indgen,"miles"].want("m").value
+  #        #=> NArray.float(5):
+  #            [ 0.0, 1609.34, 3218.69, 4828.03, 6437.38 ]
+  # * *Unit*
+  #   is an instance of Phys::Unit class obtained by parsing *expr* string.
+  #   see document of Phys::Unit.
+  #        Phys::Quantity[2.5,"miles"].unit #=> #<Phys::Unit 1609.344,{"m"=>1},@expr="5280 ft">
+  #
+  # @example
   #   require 'phys/units'
-  #   Q=Phys::Quantity
+  #   Q = Phys::Quantity
+  #
   #   Q[1.23,'km'] + Q[4.56,'m']    #=> Phys::Quantity[1.23456,'km']
   #   Q[123,'mile'] / Q[2,'hr']     #=> Phys::Quantity[61,'mile/hr']
   #   Q[61,'miles/hr'].want('m/s')  #=> Phys::Quantity[27.26944,'m/s']
@@ -34,43 +42,71 @@ module Phys
   #   Q[70,'tempF'] + Q[10,'tempC'] #=> Phys::Quantity[88,'tempF']
   #   Q[20,'tempC'].want('tempF')   #=> Phys::Quantity[68,'tempF']
   #   Math.cos(Q[60,'degree'].to_f) #=> 0.5
+  #
+  # @see Unit
+  #
   class Quantity
 
+    @@verbose_inspect = false
+
     class << self
       # Alias to Phys::Quantity.new.
-      # @param  [Object] value
-      #         Value of quantity.
-      # @param  [String] expr  a string of unit expression.
-      #         If +expr+ is not supplied, it becomes dimeinsionless.
+      #   @param [Object]      value  Value of quantity.
+      #   @param [String,Symbol] expr  Unit string to be parsed later.
+      # @overload initialize(value,unit)
+      #   @param [Object]      value  Value of quantity.
+      #   @param [Phys::Unit]  unit   This unit is copyed if exists.
+      # @overload initialize(value)
+      #   @param [Object]      value  Value of dimensionless quantity.
       # @return [Phys::Quantity]
-      # @raise  [Phys::UnitError] if unit conversion is failed.
+      # @raise [TypeError] if invalid arg types.
+      # @raise [Phys::UnitError] if unit conversion is failed.
       def [](value,expr=nil)
         self.new(value,expr)
       end
     end
 
     # Initialize a new quantity.
-    # @param  [Object] value
-    #         Value of quantity.
-    # @param  [String] expr  a string of unit expression.
-    #         If +expr+ is not supplied, it becomes dimeinsionless.
-    # @param  [Phys::Unit] unit  (optional)
-    # @raise  [Phys::UnitError] if unit conversion is failed.
+    # @overload initialize(value,expr,unit=nil)
+    #   @param [Object]     value  Value of quantity.
+    #   @param [String,Symbol] expr  Unit string to be parsed later.
+    #   @param [Phys::Unit] unit   This unit is copyed if exists.
+    # @overload initialize(value,unit)
+    #   @param [Object]     value  Value of quantity.
+    #   @param [Phys::Unit] unit   This unit is copyed if exists.
+    # @overload initialize(value)
+    #   @param [Object]     value  Value of dimensionless quantity.
+    # @raise [TypeError] if invalid arg types.
+    # @raise [Phys::UnitError] if unit conversion is failed.
     #
     def initialize(value,expr=nil,unit=nil)
       @value = value
-      expr = expr.to_s if Symbol===expr
-      @expr = (expr=='') ? nil : expr
-      @unit = unit
-      if @unit.nil?
+      case expr
+      when String, Symbol
+        @expr = expr.to_s.strip
+        @expr = nil if @expr==''
+        @unit = unit
+      when NilClass
+        @expr = nil
+        @unit = unit
+      when Unit
+        raise "Wrong # of argument" if unit
+        @expr = nil
+        @unit = expr
+      else
+        raise ArgumentError,"Second argument is invalid: #{expr.inspect}"
+      end
+      case @unit
+      when NilClass
         @unit = Unit.parse(@expr||1)
-      elsif !@unit.kind_of? Unit
-        raise ArgumentError, "third arg must be Phys::Unit"
+      when Unit
+      else
+        raise ArgumentError, "Third argument is invalid: #{@unit.inspect}"
       end
     end
 
     # Value of the quantity.
-    # Instance of classes with same arithmetic methods as Numric.
+    # Instance of classes with same arithmetic methods as Numeric.
     # @return [Object]
     attr_reader :value
     alias val value
@@ -84,13 +120,28 @@ module Phys
     attr_reader :unit
 
     # Conversion to a quantity in another unit.
-    # @param  [String] expr unit expression.
-    # @return [Phys::Quantity] quantity in the unit of +expr+.
+    # @param  [String,Symbol,Unit,Quantity] unit unit expression.
+    # @return [Phys::Quantity] quantity in the unit of +unit+.
     # @raise  [Phys::UnitError] if unit conversion is failed.
     #
-    def want(expr)
-      unit = Unit.parse(expr)
-      val  = unit.convert(self)
+    def want(unit=nil)
+      case unit
+      when Unit
+        expr = unit.expr
+      when Quantity
+        expr = unit.expr
+        unit = unit.unit
+      when String,Symbol
+        expr = unit
+        unit = Unit.parse(expr)
+      when Numeric
+        unit = Unit.cast(unit)
+      when NilClass
+        unit = Unit.cast(1)
+      else
+        raise TypeError, "invalid argument: #{unit.inspect}"
+      end
+      val = unit.convert(self)
       self.class.new( val, expr, unit )
     end
     alias convert want
@@ -204,7 +255,7 @@ module Phys
       end
     end
 
-    # Comparison. Returns +true+ if +self+ is greather-than or equal-to +other+.
+    # Comparison. Returns +true+ if +self+ is greater-than or equal-to +other+.
     # Before the comparison, it converts +other+ to the unit of +self+.
     # @param  [Phys::Quantity] other
     # @return [Boolean]
@@ -260,7 +311,7 @@ module Phys
     def **(n)
       if @expr.nil?
         expr = nil
-      elsif /^[A-Za-z_]+&/o =~ @expr
+      elsif /^[A-Za-z_]+$/o =~ @expr
         expr = @expr+'^'+n.to_s
       else
         expr = '('+@expr+')^'+n.to_s+''
@@ -496,7 +547,32 @@ module Phys
       else
         expr = ""
       end
-      self.class.to_s+"["+Unit::Utils.num_inspect(@value)+expr+"] "+@unit.inspect
+      if @@verbose_inspect
+        sufx = " "+@unit.inspect
+      else
+        sufx = ""
+      end
+      self.class.to_s+"["+Unit::Utils.num_inspect(@value)+expr+"]"+sufx
+    end
+
+    # Comformability of quantity. Returns true if unit conversion between +self+ and +x+ is possible.
+    # @param [Object] x  other object (Unit or Quantity or Numeric or something else)
+    # @return [Boolean]
+    def ===(x)
+      case x
+      when Unit
+        unit === x
+      when Quantity
+        unit === x.unit
+      when Numeric
+        unit.dimensionless?
+      else
+        false
+      end
     end
+    alias conformable? ===
+    alias compatible? ===
+    alias conversion_allowed? ===
+
   end
 end

data/lib/phys/units/unit.rb

@@ -9,22 +9,24 @@
 
 module Phys
 
-  # Phys::Unit is a class to represent Physical Unit of Measure.
-  # It must have:
-  # * *Factor* of the unit. Conversion factor to +dimension+,
-  #   i.e., its base units.
-  # * *Dimension* of the unit.
-  #   Dimension is a hash table with base units and dimension values.
-  #   Example:
+  # Phys::Unit is a class to represent Physical Units of measurement.
+  # This class is used in the Phys::Quantity for calculations with Units,
+  # and users do not always need to know its mechanism.
+  # It has *Factor* and *Dimension*:
+  # * *Factor* of the unit is a scale factor relative to its base unit.
+  #     Phys::Unit["km"].factor #=> 1000
+  # * *Dimension* of the unit
+  #   is a hash table containing base units and dimensions as key-value pairs.
   #     Phys::Unit["N"].dimension #=> {"kg"=>1, "m"=>1, "s"=>-2}
-  #== Usage
+  # @example
   #   require "phys/units"
   #   Q = Phys::Quantity
   #   U = Phys::Unit
   #
-  #   U["miles"] / U["hr"]   #=> #<Phys::Unit 0.44704,{"m"=>1, "s"=>-1}>
-  #   U["hr"] + U["30 min"]  #=> #<Phys::Unit 5400,{"s"=>1}>
-  #   U["(m/s)"]**2          #=> #<Phys::Unit 1,{"m"=>2, "s"=>-2}>
+  #   U["miles"] / U["hr"]         #=> #<Phys::Unit 0.44704,{"m"=>1, "s"=>-1}>
+  #   U["hr"] + U["30 min"]        #=> #<Phys::Unit 5400,{"s"=>1}>
+  #   U["(m/s)"]**2                #=> #<Phys::Unit 1,{"m"=>2, "s"=>-2}>
+  #   U["m/s"] === Q[1,'miles/hr'] #=> true
   #
   #   case Q[1,"miles/hr"]
   #   when U["m"]
@@ -36,6 +38,9 @@ module Phys
   #   else
   #     "other"
   #   end                    #=> "velocity"
+  #
+  # @see Quantity
+  #
   class Unit
 
     # @visibility private
@@ -50,7 +55,7 @@ module Phys
 
     # Initialize a new unit.
     # @overload initialize(factor,dimension=nil)
-    #   @param [Numeric] factor  Unit conversion factor.
+    #   @param [Numeric] factor  Unit scale factor.
     #   @param [Hash] dimension  Dimension hash.
     # @overload initialize(expr,name=nil)
     #   @param [String] expr  Unit string to be parsed later.
@@ -58,23 +63,23 @@ module Phys
     # @overload initialize(unit,name=nil)
     #   @param [Phys::Unit] unit  Copy contents from the argument.
     #   @param [String] name  Name of this unit.
-    # @raise  [TypeError] if invalit arg types.
+    # @raise  [TypeError] if invalid arg types.
     #
-    def initialize(arg,extr=nil)
-      case arg
+    def initialize(a1,a2=nil)
+      case a1
       when Numeric
-        arg = Rational(arg) if Integer===arg
-        @factor = arg
-        alloc_dim(extr)
+        a1 = Rational(a1) if Integer===a1
+        @factor = a1
+        alloc_dim(a2)
       when Phys::Unit
-        @factor = arg.factor
-        alloc_dim arg.dim
-        @name = extr
+        @factor = a1.factor
+        alloc_dim a1.dim
+        @name = a2.strip if a2
       when String
-        @expr = arg
-        @name = extr
+        @expr = a1.strip
+        @name = a2.strip if a2
       else
-        raise TypeError,"invalid argument : #{arg.inspect}"
+        raise TypeError,"Invalid argument: #{a1.inspect}"
       end
     end
 
@@ -97,16 +102,21 @@ module Phys
     end
     alias dim dimension
 
-    # Conversion factor except the dimension-value.
+    # Scale factor excluding the dimension-value.
     # @return [Numeric]
+    # @example
+    #   Phys::Unit["deg"].dimension         #=> {"pi"=>1, "radian"=>1}
+    #   Phys::Unit["deg"].factor            #=> (1/180)
+    #   Phys::Unit["deg"].conversion_factor #=> 0.017453292519943295
+    # @see #conversion_factor
     def factor
       use_dimension
       @factor
     end
 
-    # Dimension value. Returns PI number for pi dimension,
-    # otherwise returns one. see BaseUnit.
+    # Dimension value. Always returns 1 unless BaseUnit.
     # @return [Numeric]
+    # @see BaseUnit#dimension_value
     def dimension_value
       1
     end
@@ -154,9 +164,12 @@ module Phys
 
     # Inspect string.
     # @return [String]
+    # @example
+    #   Phys::Unit["N"].inspect #=> '#<Phys::Unit 1,{"kg"=>1, "m"=>1, "s"=>-2},@expr="newton">'
     def inspect
+      use_dimension
       a = [Utils.num_inspect(@factor), @dim.inspect]
-      #a << "@name="+@name.inspect if @name
+      a << "@name="+@name.inspect if @name
       a << "@expr="+@expr.inspect if @expr
       a << "@offset="+@offset.inspect if @offset
       a << "@dimensionless=true" if @dimensionless
@@ -167,8 +180,10 @@ module Phys
       "#<#{self.class} #{s}>"
     end
 
-    # Make unit string from dimension.
+    # Make a string of this unit expressed in base units.
     # @return [String]
+    # @example
+    #   Phys::Unit["psi"].string_form #=> "(8896443230521/129032)*1e-04 kg m^-1 s^-2"
     def unit_string
       use_dimension
       a = []
@@ -184,8 +199,13 @@ module Phys
     end
     alias string_form unit_string
 
-    # Conversion Factor to base unit.
+    # Conversion Factor to base unit, including dimension-value.
     # @return [Numeric]
+    # @example
+    #   Phys::Unit["deg"].dimension         #=> {"pi"=>1, "radian"=>1}
+    #   Phys::Unit["deg"].factor            #=> (1/180)
+    #   Phys::Unit["deg"].conversion_factor #=> 0.017453292519943295
+    # @see #factor
     def conversion_factor
       use_dimension
       f = @factor
@@ -202,7 +222,7 @@ module Phys
 
     # Returns true if scalar unit.
     # *Scalar* means the unit does not have any dimension
-    # including dimensionless-dimension, and its factor is one.
+    # including dimensionless-units, and its factor is one.
     # @return [Boolean]
     def scalar?
       use_dimension
@@ -248,10 +268,10 @@ module Phys
       end
     end
 
-    # Comformability of units. Returns true if unit conversion is allowed.
-    # @param [Object] x  other object (unit or quantity or numeric or other)
+    # Comformability of units. Returns true if unit conversion between +self+ and +x+ is possible.
+    # @param [Object] x  other object (Unit or Quantity or Numeric or something else)
     # @return [Boolean]
-    def conformable?(x)
+    def ===(x)
       case x
       when Unit
         dimensionless_deleted == x.dimensionless_deleted
@@ -263,9 +283,9 @@ module Phys
         false
       end
     end
-    alias === conformable?
-    alias compatible? conformable?
-    alias conversion_allowed? conformable?
+    alias conformable? ===
+    alias compatible? ===
+    alias conversion_allowed? ===
 
     # Convert a quantity to this unit.
     # @param [Phys::Quantity] quantity to be converted.
@@ -314,7 +334,7 @@ module Phys
     alias to_num to_numeric
 
 
-    # Returns Base Unit excluding dimensionless-dimension.
+    # Returns Base Unit excluding dimensionless-units.
     # @return [Phys::Unit]
     def base_unit
       Unit.new(1,dimensionless_deleted)
@@ -367,7 +387,7 @@ module Phys
           x.dup
         end
       else
-        raise "dimensin not defined"
+        raise "dimension not defined"
       end
     end
 
@@ -384,7 +404,7 @@ module Phys
         end
         dims
       else
-        raise "dimensin not defined"
+        raise "dimension not defined"
       end
     end
 
@@ -465,29 +485,6 @@ module Phys
       Unit.new(factor,dims)
     end
 
-    # Rational division of units.
-    # Both units must be operable.
-    # @param  [Phys::Unit, Numeric] x  other unit
-    # @return [Phys::Unit]
-    # @raise  [Phys::UnitError] if not operable.
-    def rdiv(x)
-      x = Unit.cast(x)
-      if scalar?
-        return x.inverse
-      elsif x.scalar?
-        return self
-      end
-      check_operable2(x)
-      dims = dimension_binop(x){|a,b| a-b}
-      factor = Rational(self.factor,x.factor)
-      Unit.new(factor,dims)
-    end
-
-    # @visibility private
-    def self.rdiv(x,y)
-      Unit.cast(x).rdiv(y)
-    end
-
     # Inverse of units.
     # This unit must be operable.
     # @param  [Phys::Unit, Numeric] unit
@@ -548,26 +545,32 @@ module Phys
   end # Unit
 
 
-  # BaseUnit is a class to represent units defined by "!" in unit.dat
-  # including SI units.
+  # BaseUnit is a class to represent units defined by "!"
+  # in the data form of GNU units.
+  # It includes SI units and dimensinless units such as radian.
   class BaseUnit < Unit
 
     def self.define(name,expr,dimval=nil)
-      dimles = (expr == "!dimensionless")
-      LIST[name] = self.new(name,dimles,dimval)
+      if LIST[name]
+        warn "unit definition is overwritten: #{name}" if debug
+      end
+      LIST[name] = self.new(expr,name,dimval)
     end
 
-    def initialize(name,dimless=false,dimval=nil)
+    def initialize(expr,name,dimval=nil)
       case name
       when String
-        @name = name
+        @name = name.strip
         @factor = 1
-        @dim = {name=>1}
+        @dim = {@name=>1}
         @dim.default = 0
-        @dimensionless = dimless
+        @expr = expr
+        if String===expr && /!dimensionless/ =~ expr
+          @dimensionless = true
+        end
         @dimension_value = dimval || 1
       else
-        raise ArgumentError "BaseUnit#initialize: arg must be string: #{s}"
+        raise ArgumentError,"Second argument must be string: #{name}"
       end
     end
 
@@ -598,7 +601,7 @@ module Phys
 
 
   # OffsetUnit is a class to represent units with offset value.
-  # Focused on Farenheight/Celsius temperature.
+  # Allows Farenheight/Celsius temperature.
   class OffsetUnit < Unit
 
     def self.define(name,unit,offset=nil)
@@ -623,7 +626,7 @@ module Phys
         v = quantity.value * quantity.unit.conversion_factor
         v = v / self.conversion_factor
       else
-        raise UnitError,"not Quantitiy: #{quantity.inspect}"
+        raise UnitError,"not Quantity: #{quantity.inspect}"
       end
     end
 

data/lib/phys/units/unit_class.rb

@@ -18,12 +18,16 @@ module Phys
         false
       end
 
-      # Define New Unit.  Expression is not parsed in this method.
-      # @param [String] name Name of this unit.
+      # Define a new Unit. Expression is not parsed at the time of this method.
+      # @param [String,Symbol] name Name of this unit.
       # @param [String] expr Expression.
       def define(name,expr)
-        if !(String===name)
-          raise TypeError,"unit name should be string : #{name.inspect}"
+        case name
+        when String
+        when Symbol
+          name = name.to_s
+        else
+          raise TypeError,"Unit name must be String or Symbol: #{name.inspect}"
         end
         if /^(.*)-$/ =~ name
           name = $1
@@ -36,8 +40,7 @@ module Phys
             warn "unit definition is overwritten: #{name}" if debug
           end
           if expr.kind_of?(String) && /^!/ =~ expr
-            dimless = (expr == "!dimensionless")
-            LIST[name] = BaseUnit.new(name,dimless)
+            LIST[name] = BaseUnit.new(expr,name)
           else
             LIST[name] = self.new(expr,name)
           end
@@ -45,10 +48,12 @@ module Phys
       end
 
 
-      # Force argument to be Phys::Unit.
+      # Force the argument to be Phys::Unit.
+      # @param [Phys::Unit,Numeric]
       # @return [Phys::Unit]
       def cast(x)
-        if x.kind_of?(Unit)
+        case x
+        when Unit
           x
         else
           Unit.new(x)
@@ -61,8 +66,9 @@ module Phys
         find_unit(x) or raise UnitError, "Undefined unit: #{x.inspect}"
       end
 
-      # Searches a registered unit and then Parse as a unit string
+      # Searches a registered unit and then parse as a unit string
       # if not registered.
+      # @param [String,Symbol,Numeric,Unit,Quantity,NilClass] x
       # @return [Phys::Unit]
       def parse(x)
         find_unit(x) || Unit.cast(Parse.new.parse(x))
@@ -70,15 +76,27 @@ module Phys
       alias [] parse
 
       # Searches a registered unit.
+      # @param [String,Symbol,Numeric,Unit,Quantity,NilClass] x
       # @return [Phys::Unit, NilClass]
       def find_unit(x)
-        if Numeric===x
+        case x
+        when String,Symbol
+          x = x.to_s.strip
+          if x==''
+            Unit.new(1)
+          else
+            LIST[x] || PREFIX[x] || find_prefix(x) || unit_stem(x)
+          end
+        when Numeric
           Unit.new(x)
-        elsif x=='' || x.nil?
+        when NilClass
           Unit.new(1)
+        when Unit
+          x
+        when Quantity
+          x.unit
         else
-          x = x.to_s
-          LIST[x] || PREFIX[x] || find_prefix(x) || unit_stem(x)
+          raise TypeError, "Invalid argument: #{x.inspect}"
         end
       end
 
@@ -165,8 +183,7 @@ module Phys
           end
 
           if /^([^\s()\[\]{}!*|\/^#]+)\s+([^#]+)/ =~ str
-            name,repr = $1,$2.strip
-            Unit.define(name,repr)
+            Unit.define($1,$2.strip)
           elsif !str.strip.empty?
             puts "unrecognized definition: '#{str}'" if debug
           end

data/lib/phys/units/units_mixin.rb

@@ -0,0 +1,80 @@
+module Phys
+
+  # @visibility private
+  module UnitMeasures
+    def self.included(mod)
+      Phys::Unit::LIST.each do |k,u|
+        if /^[A-Z]\w*$/ =~ k
+          const_set(k,u)
+        end
+      end
+    end
+  end
+
+  # Defines method with unit name.
+  # *Caution*: Variable names may conflict with unit names.
+  # @example
+  #   Phys::UnitsMixin.module_eval do
+  #     puts 123.4*km
+  #     puts (23*mile/hr).want(m/s)
+  #     puts h.to_si
+  #     case mile/hr
+  #     when m
+  #       puts "length"
+  #     when m/s
+  #       puts "velocity"
+  #     else
+  #       puts "other"
+  #     end
+  #   end
+  #
+  #   include Phys::UnitsMixin
+  #
+  #   (1*miles/hr).want m/s    #=> Phys::Quantity[0.44704,"m/s"]
+  #
+  module UnitsMixin
+    include UnitMeasures
+    module_function
+    alias method_missing_units_alias method_missing
+    def method_missing(method, *args, &block)
+      if unit=Phys::Unit.find_unit(method)
+        raise "argument must be empty" unless args.empty?
+        Phys::Quantity.new(1,method,unit)
+      else
+        method_missing_units_alias(method, *args, &block)
+      end
+    end
+
+    def print_units(unit=nil)
+      Phys::Unit::LIST.each do |k,u|
+        if unit.nil? || unit===u
+          len = 32 - k.size
+          len = 1 if len < 1
+          puts k+" "*len+"#{u.expr}"
+        end
+      end
+      nil
+    end
+  end
+
+  # ActiveSupport-like mix-in.
+  # *Caution*: This kind of global change will cause unexpected problems.
+  # @example
+  #   class Numeric
+  #     include Phys::UnitsNumericMixin
+  #   end
+  #
+  #   (1.miles/1.hr).want 'm/s'  #=> Phys::Quantity[0.44704,"m/s"]
+  module UnitsNumericMixin
+    alias method_missing_units_alias method_missing
+    def method_missing(method, *args, &block)
+      if unit=Phys::Unit.find_unit(method)
+        raise "argument must be empty" unless args.empty?
+        Phys::Quantity.new(self,method,unit)
+      else
+        method_missing_units_alias(method, *args, &block)
+      end
+    end
+  end
+
+end

data/lib/phys/units/version.rb

@@ -1,5 +1,5 @@
 module Phys
   class Unit
-    VERSION = "0.9.3"
+    VERSION = "0.9.4"
   end
 end

data/spec/unit_spec.rb

@@ -38,7 +38,7 @@ describe "Create Units" do
     its(:factor) {should == 1}
     its(:conversion_factor) {should == Math::PI}
     its(:name) {should == 'pi'}
-    its(:expr) {should be_nil}
+    its(:expr) {should == '!dimensionless'}
     its(:offset) {should be_nil}
     its(:dimension) {should == {'pi'=>1}}
     its(:dimension_value) {should == Math::PI}
@@ -53,7 +53,7 @@ describe "Create Units" do
     its(:factor) {should == 1}
     its(:conversion_factor) {should == 1}
     its(:name) {should == 'm'}
-    its(:expr) {should be_nil}
+    its(:expr) {should == '!'}
     its(:offset) {should be_nil}
     its(:dimension) {should == {'m'=>1}}
     its(:dimension_value) {should == 1}
@@ -173,6 +173,7 @@ describe "Create Units" do
     it {should_not be_dimensionless}
     it {should_not be_scalar}
     it {should be_operable}
+    it {should === Q[1,'miles/hr']}
   end
 
   describe U.parse('(m/s)**2') do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phys-units
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Masahiro TANAKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-03 00:00:00.000000000 Z
+date: 2013-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,6 +62,7 @@ files:
 - lib/phys/units/quanty.rb
 - lib/phys/units/unit.rb
 - lib/phys/units/unit_class.rb
+- lib/phys/units/units_mixin.rb
 - lib/phys/units/utils.rb
 - lib/phys/units/version.rb
 - misc/mkjpspec.rb