sy 2.0.20 → 2.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8188db91a1be774b2ea6858b9b690c5533664748
-  data.tar.gz: aac76cadeb0e3737136ecb6e81887ac8e4388b57
+  metadata.gz: 5166cc89ba9595945e3f0632fbe80bde86e63d8c
+  data.tar.gz: 6c3124ad680e80855f5ae38aa2baa69aa76b10d1
 SHA512:
-  metadata.gz: a89e002696b4d93d231d7733c40d6aa9753dc20f1ff517e06d3c44abddc7cc335ce5a5de5d9a20c3ac53533fea73a86f640282529b7eda205b3a2db593abe45c
-  data.tar.gz: 769545fec641a14f785b81884e2c71fb60fe6e25655796eef2352b63d27ada1eca88f7856c1ccd549a83484359799ee16bf58bb1598f94ef755fbdea2565f76a
+  metadata.gz: 192290b7bffa579003cafc95691d62487dd8363a69c21db6b6e210a5d536566c0c58c583716930e2d9f513fa83a8069719fd7828ab0f653506a0656e97503b88
+  data.tar.gz: 1e8563d0e46326b3c4c953c302518bf74155ac29e6ad916890fe5690f8445964d21a920ee913781aaf44a5e4ae6e5727b15f7a43f268af77495ee3378f1202b1

data/lib/sy.rb

@@ -51,7 +51,11 @@ require_relative 'sy/matrix'
 # be used. In this particular case, SY methods still can be invoked using
 # abbreviations (5.s, 5.h, 5.min)
 # 
-Numeric.class_exec { include ::SY::ExpressibleInUnits }
+module SY
+  AUTOINCLUDE = true unless defined? ::SY::AUTOINCLUDE
+end
+
+Numeric.class_exec { include ::SY::ExpressibleInUnits } if SY::AUTOINCLUDE
 
 # === Instead of introduction
 # 
@@ -80,7 +84,7 @@ module SY
 
   # And let SY::MOLE be its standard unit, related to SY::Amount via Nᴀ:
   puts "About to construct MOLE." if SY::DEBUG
-  MOLE = Unit.standard of: MoleAmount, short: "mol", amount: Nᴀ.unit
+  MOLE = Unit.standard of: MoleAmount, short: "mol", amount: Nᴀ * UNIT
   puts SY::Unit.__instances__ if SY::DEBUG
   puts "MOLE constructed. SY::Unit instances are" +
     "#{SY::Unit.instance_names}" if SY::DEBUG
@@ -101,11 +105,13 @@ module SY
   # Let SY::KILOGRAM be its standard unit:
   KILOGRAM = Unit.standard of: Mass, short: "kg"
   # Let SY::GRAM be another unit of SY::Mass, equal to 0.001.kg:
-  GRAM = Unit.of Mass, amount: 0.001.kg, short: "g"
+  GRAM = Unit.of Mass, amount: 0.001 * KILOGRAM, short: "g"
   # Let SY::TON be another...
-  TON = Unit.of Mass, amount: 1000.kg, short: "t"
+  TON = Unit.of Mass, amount: 1000 * KILOGRAM, short: "t"
   # And SY::DALTON another...
-  DALTON = Unit.of Mass, short: "Da", amount: 1.66053892173e-27.kg
+  DALTON = Unit.of Mass,
+                   short: "Da",
+                   amount: 1.66053892173e-27 * KILOGRAM
 
   # === Basic dimension T
 
@@ -115,9 +121,9 @@ module SY
   # Let SY::SECOND be its standard unit:
   SECOND = Unit.standard of: Time, short: "s"
   # Let SY::MINUTE be another unit:
-  MINUTE = Unit.of Time, short: "min", amount: 60.s
+  MINUTE = Unit.of Time, short: "min", amount: 60 * SECOND
   # And SY::HOUR another:
-  HOUR = Unit.of Time, short: "h", amount: 60.min
+  HOUR = Unit.of Time, short: "h", amount: 60 * MINUTE
 
   # === Basic dimension Q
 
@@ -136,14 +142,14 @@ module SY
   KELVIN = Unit.standard of: Temperature, short: "K"
 
   # Now let us define a useful constant:
-  TP_H₂O = TRIPLE_POINT_OF_WATER = 273.15.K
+  TP_H₂O = TRIPLE_POINT_OF_WATER = 273.15 * KELVIN
 
   # Celsius temperature is a little bit peculiar in that it has offset of
   # 273.15.K with respect to Kelvin temperature, and I am not sure whether
   # at this moment SY is handling this right. But nevertheless:
   CelsiusTemperature = Quantity.of :Θ, coerces_to: Temperature
 
-  CELSIUS_MEASURE = SY::Measure.simple_offset( TRIPLE_POINT_OF_WATER.in( :K ) )
+  CELSIUS_MEASURE = SY::Measure.simple_offset( TRIPLE_POINT_OF_WATER.to_f )
 
   # Degree celsius is SY::CELSIUS
   CELSIUS = Unit.standard( of: CelsiusTemperature,
@@ -206,8 +212,8 @@ module SY
   
   # HUMAN_BODY_TEMPERATURE = 37.°C.( KELVIN )
   # STANDARD_TEMPERATURE = 25.°C.( KELVIN )
-  HUMAN_BODY_TEMPERATURE = TP_H₂O + 37.K
-  STANDARD_LABORATORY_TEMPERATURE = TP_H₂O + 25.K
+  HUMAN_BODY_TEMPERATURE = TP_H₂O + 37 * KELVIN
+  STANDARD_LABORATORY_TEMPERATURE = TP_H₂O + 25 * KELVIN
 
   # === Dimensionless quantities
 
@@ -230,7 +236,7 @@ module SY
   LitreVolume = Quantity.of Volume.dimension, coerces_to: Volume
 
   # SY::LITRE is the standard unit of SY::LitreVolume:
-  LITRE = Unit.standard of: LitreVolume, short: "l", amount: 1.dm³
+  LITRE = Unit.standard of: LitreVolume, short: "l", amount: 0.001 * METRE ** 3
 
   # At this point, there are certain things to note. Since standard units of
   # SY::Area and SY::Volume have not been specified, they are assumed to be
@@ -280,7 +286,7 @@ module SY
   # make SY::JOULE its standard unit:
   JOULE = Unit.standard of: Energy, short: "J"
   # SY::CALORIE means thermochemical calorie:
-  CALORIE = Unit.of Energy, short: "cal", amount: 4.184.J
+  CALORIE = Unit.of Energy, short: "cal", amount: 4.184 * JOULE
 
   # SY::Power...
   Power = ( Energy / Time ).standard!
@@ -321,5 +327,5 @@ module SY
   Molecularity = Amount / LitreVolume
 
   # Having defined Joules and Kelvins, we can spell out the Boltzmann constant:
-  Kʙ = BOLTZMANN_CONSTANT = 1.380648813e-23.J.K⁻¹
+  Kʙ = BOLTZMANN_CONSTANT = 1.380648813e-23 * JOULE / KELVIN
 end

data/lib/sy/imperial.rb

@@ -1,31 +1,33 @@
-# -*- coding: utf-8 -*-
-require 'sy'
+# encoding: utf-8
+
+require_relative '../sy'
 
 # Imperial units.
 # 
 module SY
   # === Length
-  INCH = Unit.of Length, amount: 25.4.mm # short: 'in' would be ambiguous
-  FOOT = Unit.of Length, short: 'ft', amount: 12.inch
-  YARD = Unit.of Length, short: 'yd', amount: 3.ft
+  INCH = Unit.of Length, amount: 25.4 * 0.001 * METRE
+  # short: 'in' would be ambiguous
+  FOOT = Unit.of Length, short: 'ft', amount: 12 * INCH
+  YARD = Unit.of Length, short: 'yd', amount: 3 * FOOT
   # forget CHAIN and FURLONG
-  MILE = Unit.of Length, short: 'mi', amount: 5_280.ft
-  FATHOM = Unit.of Length, short: 'ftm', amount: 1.853184.m
-  NAUTICAL_MILE = Unit.of Length, amount: 1000.fathom
+  MILE = Unit.of Length, short: 'mi', amount: 5_280 * FOOT
+  FATHOM = Unit.of Length, short: 'ftm', amount: 1.853184 * METRE
+  NAUTICAL_MILE = Unit.of Length, amount: 1000 * FATHOM
 
   # === Area
-  ACRE = Unit.of Area, amount: ( 1.0 / 640 ).mile²
+  ACRE = Unit.of Area, amount: ( 1.0 / 640 ) * MILE ** 2
 
   # === Volume
-  PINT = Unit.of Volume, amount: 568.26125.cm³
+  PINT = Unit.of Volume, amount: 568.26125 * ( 0.01 * METRE ) ** 3
   # FIXME: PINT = Unit.of Volume, amount: 568.26125.ml didn't work, it gave 1000 times more value
   # something is wrong with the conversion mechanics
-  QUART = Unit.of Volume, amount: 2.pint
-  GALLON = Unit.of Volume, short: 'gal', amount: 8.pint
+  QUART = Unit.of Volume, amount: 2 * PINT
+  GALLON = Unit.of Volume, short: 'gal', amount: 8 * PINT
 
   # === Mass
-  POUND = Unit.of Mass, short: 'lb', amount: 453.59237.g
-  OUNCE = Unit.of Mass, short: 'oz', amount: ( 1.0 / 16 ).lb
-  STONE = Unit.of Mass, amount: 14.lb
-  IMPERIAL_TON = Unit.of Mass, amount: 2240.lb
+  POUND = Unit.of Mass, short: 'lb', amount: 453.59237 * GRAM
+  OUNCE = Unit.of Mass, short: 'oz', amount: ( 1.0 / 16 ) * POUND
+  STONE = Unit.of Mass, amount: 14 * POUND
+  IMPERIAL_TON = Unit.of Mass, amount: 2240 * POUND
 end

data/lib/sy/noinclude.rb

@@ -0,0 +1,10 @@
+# encoding: utf-8
+
+# Setting +AUTOINCLUDE+ constant to _false_ at the beginning of the +sy+ loading
+# process prevents automatic inclusion of +SY::ExpressibleInUnits+ in +Numeric+.
+# 
+module SY
+  AUTOINCLUDE = false
+end
+
+require_relative '../sy'

data/lib/sy/version.rb

@@ -1,5 +1,5 @@
 module SY
-  VERSION = "2.0.20"
+  VERSION = "2.0.21"
   DEBUG = false # debug mode switch - sometimes there are lines like
   # puts "something" if SY::DEBUG
 end

data/test/noinclude_test.rb

@@ -0,0 +1,44 @@
+#! /usr/bin/ruby
+# encoding: utf-8
+
+# **************************************************************************
+# THIS IS SPEC-STYLE TEST FILE FOR SY PHYSICAL UNITS LIBRARY
+# **************************************************************************
+
+# The following will load Ruby spec-style library
+require 'mathn'
+require 'minitest/autorun'
+
+
+# **************************************************************************
+# THE SPECIFICATIONS START HERE
+# **************************************************************************
+
+describe "case of require 'sy/noinclude'" do
+  before do
+    # The following will load SY library
+    # require 'sy'
+    require './../lib/sy/noinclude'
+  end
+
+  it "should show at least some signs of life" do
+    SY::Length.magnitude( 1 ).must_equal SY::METRE
+    SY::Length.magnitude( 2 ).must_equal SY::METRE * 2
+    SY::Volume.magnitude( 1 ).must_equal SY::METRE ** 3
+    # without caring for exhaustive test coverage...
+  end
+end
+
+describe "require 'sy/noinclude'; require 'sy/imperial'" do
+  before do
+    # The following will load SY library
+    # require 'sy'
+    require './../lib/sy/noinclude'
+    require './../lib/sy/imperial'
+  end
+
+  it "should show signs of life" do
+    SY::YARD.must_equal SY::FOOT * 3
+    SY::POUND.must_equal 16 * SY::OUNCE
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sy
 version: !ruby/object:Gem::Version
-  version: 2.0.20
+  version: 2.0.21
 platform: ruby
 authors:
 - boris
@@ -47,12 +47,14 @@ files:
 - lib/sy/mapping.rb
 - lib/sy/matrix.rb
 - lib/sy/measure.rb
+- lib/sy/noinclude.rb
 - lib/sy/quantity.rb
 - lib/sy/signed_magnitude.rb
 - lib/sy/unit.rb
 - lib/sy/version.rb
 - lib/sy/wildcard_zero.rb
 - sy.gemspec
+- test/noinclude_test.rb
 - test/sy_test.rb
 homepage: ''
 licenses: []
@@ -78,4 +80,5 @@ signing_key:
 specification_version: 4
 summary: Simple and concise way to express physical units.
 test_files:
+- test/noinclude_test.rb
 - test/sy_test.rb