phys-units 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd85b3f21ba5c367e32b56383e600e6c36e31bb8
-  data.tar.gz: c6ac0ffc4d76610c36dae6f2d4dea3be018a2efa
+  metadata.gz: 2e06684cda1b06703581638bf670183236f7a88c
+  data.tar.gz: cb52f3daa7ff765aec357ae6759ba89c7d6455f4
 SHA512:
-  metadata.gz: fb35776b083559d3d91b1c300bdc53c5d3779e2052c457c546c2384046e517b2c95b712e0e8103fbe5fbff0903d60bcd43dc023955d5c9d63db5ab7b67f1f2e7
-  data.tar.gz: 03d2a934294840bbbc5e7874c38b75986090cc06162e4a343ab32584d0049175c3c169968dc00c8b9f225e47a1c0cf2b8a01954ec6d9b87d06e9144281ea0732
+  metadata.gz: 21a45d0ffeee78feefe3d9ee15eda9b0554724fbba6fe39d2036c35a4b0b09d6bdbdd44df916fbb320054c09a3118c7a2fc99b8016dcab085ef27de6bd2214f8
+  data.tar.gz: cf395fb0b936bfdee564c740d4fdd607e3e7b6d84e05e96fb26729950efd68f9f92d8c64943c731517f46ff9e72c4fe9ddc41bd4d09d44635aac110043bf2668

data/lib/phys/units/mixin.rb

@@ -1,5 +1,14 @@
 require "phys/units"
 
 # @visibility private
-class Numeric; include Phys::UnitsNumericMixin; end
-include Phys::UnitsMixin
+class Numeric
+  include Phys::UnitsNumericMixin
+end
+
+module Phys
+  class Quantity
+    include Phys::UnitsNumericMixin
+  end
+end
+
+extend Phys::UnitsMixin

data/lib/phys/units/quantity.rb

@@ -89,7 +89,7 @@ module Phys
         @expr = nil
         @unit = unit
       when Unit
-        raise "Wrong # of argument" if unit
+        raise ArgumentError,"Wrong # of argument" if unit
         @expr = nil
         @unit = expr
       else
@@ -545,16 +545,9 @@ module Phys
     # Inspect String.
     # @return [String]
     def inspect
-      if @expr
-        expr = "," +@expr.inspect
-      else
-        expr = ""
-      end
-      if @@verbose_inspect
-        sufx = " "+@unit.inspect
-      else
-        sufx = ""
-      end
+      expr = @expr || @unit.expr
+      expr = (expr) ? ","+expr.inspect : ""
+      sufx = (@@verbose_inspect) ? " "+@unit.inspect : ""
       self.class.to_s+"["+Unit::Utils.num_inspect(@value)+expr+"]"+sufx
     end
 

data/lib/phys/units/unit.rb

@@ -87,7 +87,9 @@ module Phys
 
     # Expression of the unit.
     # @return [String, NilClass]
-    attr_reader :expr
+    def expr
+      @expr || @name || string_form
+    end
 
     # @visibility private
     attr_reader :offset
@@ -576,7 +578,7 @@ module Phys
         @factor = 1
         @dim = {@name=>1}
         @dim.default = 0
-        @expr = expr
+        @expr = nil
         if String===expr && /!dimensionless/ =~ expr
           @dimensionless = true
         end

data/lib/phys/units/unit_class.rb

@@ -115,8 +115,8 @@ module Phys
       def find_prefix(x)
         Unit.prefix_regex =~ x
         pre,post = $1,$2
-        if pre and pre and stem = (LIST[post] || unit_stem(post))
-          PREFIX[pre] * stem
+        if pre and post and stem = (LIST[post] || unit_stem(post))
+          Unit.new(stem * PREFIX[pre].factor, x)
         end
       end
 

data/lib/phys/units/units_mixin.rb

@@ -3,7 +3,7 @@ module Phys
   # @visibility private
   module UnitMeasures
     def self.included(mod)
-      Phys::Unit::LIST.each do |k,u|
+      Unit::LIST.each do |k,u|
         if /^[A-Z]\w*$/ =~ k
           const_set(k,u)
         end
@@ -30,25 +30,28 @@ module Phys
   #     end
   #   end
   #
-  #   include Phys::UnitsMixin
+  #   extend Phys::UnitsMixin
   #
   #   1*miles/hr >> 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)
+      if unit = Unit.find_unit(method)
         raise "argument must be empty" unless args.empty?
-        Phys::Quantity.new(1,method,unit)
+        Quantity.new(Rational(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|
+      Unit::LIST.each do |k,u|
         if unit.nil? || unit===u
           len = 32 - k.size
           len = 1 if len < 1
@@ -68,17 +71,32 @@ module Phys
   #     include Phys::UnitsNumericMixin
   #   end
   #
-  #   1.miles/1.hr >> 'm/s'  #=> Phys::Quantity[0.44704,"m/s"]
+  #   1.miles/hr >> m/s     #=> Phys::Quantity[0.44704,"m/s"]
+  #   1.(km/s) >> miles/hr  #=> Phys::Quantity[(1/0.00044704),"miles/hr"]
+  #
   module UnitsNumericMixin
+
     alias method_missing_units_alias method_missing
+
     def method_missing(method, *args, &block)
-      if unit=Phys::Unit.find_unit(method)
+      if unit = Unit.find_unit(method)
         raise "argument must be empty" unless args.empty?
-        Phys::Quantity.new(self,method,unit)
+        case self
+        when Integer
+          Quantity.new(Rational(self), method, unit)
+        when Numeric
+          Quantity.new(self, method, unit)
+        else
+          self * Quantity.new(1, method, unit)
+        end
       else
         method_missing_units_alias(method, *args, &block)
       end
     end
+
+    def call(unit)
+      self * unit
+    end
   end
 
 end

data/lib/phys/units/version.rb

@@ -1,5 +1,5 @@
 module Phys
   class Unit
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/spec/unit_spec.rb

@@ -7,7 +7,7 @@ describe "Create Units" do
     its(:factor) {is_expected.to eq 1}
     its(:conversion_factor) {is_expected.to eq 1}
     its(:name) {is_expected.to be_nil}
-    its(:expr) {is_expected.to be_nil}
+    its(:expr) {is_expected.to eq ""}
     its(:offset) {is_expected.to be_nil}
     its(:dimension) {is_expected.to eq({})}
     its(:dimension_value) {is_expected.to eq 1}
@@ -22,7 +22,7 @@ describe "Create Units" do
     its(:factor) {is_expected.to eq 2}
     its(:conversion_factor) {is_expected.to eq 2}
     its(:name) {is_expected.to be_nil}
-    its(:expr) {is_expected.to be_nil}
+    its(:expr) {is_expected.to eq "2"}
     its(:offset) {is_expected.to be_nil}
     its(:dimension) {is_expected.to eq({})}
     its(:dimension_value) {is_expected.to eq 1}
@@ -37,7 +37,7 @@ describe "Create Units" do
     its(:factor) {is_expected.to eq 1}
     its(:conversion_factor) {is_expected.to eq Math::PI}
     its(:name) {is_expected.to eq 'pi'}
-    its(:expr) {is_expected.to eq '!dimensionless'}
+    its(:expr) {is_expected.to eq 'pi'}
     its(:offset) {is_expected.to be_nil}
     its(:dimension) {is_expected.to eq({'pi'=>1})}
     its(:dimension_value) {is_expected.to eq Math::PI}
@@ -52,7 +52,7 @@ describe "Create Units" do
     its(:factor) {is_expected.to eq 1}
     its(:conversion_factor) {is_expected.to eq 1}
     its(:name) {is_expected.to eq 'm'}
-    its(:expr) {is_expected.to eq '!'}
+    its(:expr) {is_expected.to eq 'm'}
     its(:offset) {is_expected.to be_nil}
     its(:dimension) {is_expected.to eq({'m'=>1})}
     its(:dimension_value) {is_expected.to eq 1}
@@ -88,7 +88,7 @@ describe "Create Units" do
     its(:factor) {is_expected.to eq 1609.344}
     its(:conversion_factor) {is_expected.to eq 1609.344}
     its(:name) {is_expected.to be_nil}
-    its(:expr) {is_expected.to be_nil}
+    its(:expr) {is_expected.to eq "1609.344 m"}
     its(:offset) {is_expected.to be_nil}
     its(:dimension) {is_expected.to eq({'m'=>1})}
     its(:dimension_value) {is_expected.to eq 1}
@@ -149,7 +149,7 @@ describe "Create Units" do
     its(:factor) {is_expected.to eq 123.5}
     its(:conversion_factor) {is_expected.to eq 123.5}
     its(:name) {is_expected.to be_nil}
-    its(:expr) {is_expected.to be_nil}
+    its(:expr) {is_expected.to eq '123.5 s'}
     its(:offset) {is_expected.to be_nil}
     its(:dimension) {is_expected.to eq({'s'=>1})}
     its(:dimension_value) {is_expected.to eq 1}
@@ -164,7 +164,7 @@ describe "Create Units" do
     its(:factor) {is_expected.to eq 1}
     its(:conversion_factor) {is_expected.to eq 1}
     its(:name) {is_expected.to be_nil}
-    its(:expr) {is_expected.to be_nil}
+    its(:expr) {is_expected.to eq "m s^-1"}
     its(:offset) {is_expected.to be_nil}
     its(:dimension) {is_expected.to eq({'m'=>1, 's'=>-1})}
     its(:dimension_value) {is_expected.to eq 1}
@@ -180,7 +180,7 @@ describe "Create Units" do
     its(:factor) {is_expected.to eq 1}
     its(:conversion_factor) {is_expected.to eq 1}
     its(:name) {is_expected.to be_nil}
-    its(:expr) {is_expected.to be_nil}
+    its(:expr) {is_expected.to eq "m^2 s^-2"}
     its(:offset) {is_expected.to be_nil}
     its(:dimension) {is_expected.to eq({'m'=>2, 's'=>-2})}
     its(:dimension_value) {is_expected.to eq 1}
@@ -199,7 +199,7 @@ describe "Create Units" do
     its(:factor) {is_expected.to eq 1}
     its(:conversion_factor) {is_expected.to eq 1}
     its(:name) {is_expected.to eq 'tempC'}
-    its(:expr) {is_expected.to be_nil}
+    its(:expr) {is_expected.to eq 'tempC'}
     its(:offset) {is_expected.to eq 273.15}
     its(:dimension) {is_expected.to eq({'K'=>1})}
     its(:dimension_value) {is_expected.to eq 1}
@@ -215,7 +215,7 @@ describe "Create Units" do
     its(:factor) {is_expected.to be_an_instance_of Rational}
     its(:conversion_factor) {is_expected.to eq Rational(5,9)}
     its(:name) {is_expected.to eq 'tempF'}
-    its(:expr) {is_expected.to be_nil}
+    its(:expr) {is_expected.to eq 'tempF'}
     its(:offset) {is_expected.to eq Rational(45967,180)}
     its(:dimension) {is_expected.to eq({'K'=>1})}
     its(:dimension_value) {is_expected.to eq 1}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phys-units
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Masahiro TANAKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler