sy 2.0.14 → 2.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4e14ca002d2da647ce121e2f79b01fdced43697
-  data.tar.gz: ac575e703f152e1b8f049ee30b8462a1f25a1baa
+  metadata.gz: 03c905a6a5d6f664c79a57a4cabb98ef99366cff
+  data.tar.gz: 04c32a7833cbeeedb18e1d9ae24683b56386de9e
 SHA512:
-  metadata.gz: 96bc04ec2f55697c3906aa75e9aef8f6eeb968c08f963ad3b0935c1a72c137abea7b919b50cd57a48736d5d9e5d63a4b22c284350948469b9a796be51907ec43
-  data.tar.gz: 6e74e90b0b4b1fddcc8e35f7c86939bda2a0759ecab362a994056a76e5a4ef35d0d376c8872c7ee0474e0be3166a78800d96e99c07f639be4fb6d9623a9196e5
+  metadata.gz: 5b99d28de71f57ac9243fbb6c03c1ca67a375f2708c0445fe05826105e7de98e0b10f03e27411f586b24af5d306f9c48522f9309e1251a4aa748b507ac370117
+  data.tar.gz: e50d6453484916e53cb368f7f897423046c239e741c9ba2da0615184f373b34fb2ba9dce6c6f2a62770fa3ba764c2902cc86a8975ab717c89ef5e35f89f6784e

data/lib/sy/magnitude.rb

@@ -354,6 +354,8 @@ module SY::Magnitude
 
     # number, unit_presentation = choice
 
+    # return "#{amount} of #{quantity}"
+
     begin
       
       un = unit.short || unit.name

data/lib/sy/quantity.rb

@@ -411,13 +411,14 @@ class SY::Quantity
         mixin = relative? ? SY::SignedMagnitude : SY::AbsoluteMagnitude
         qnt_ɴ_λ = -> { name ? "#{name}@%s" : "#<Quantity:#{object_id}@%s>" }
 
+        qnt = self
         @Magnitude = Class.new do
           include mmod
           include mixin
 
           singleton_class.class_exec do
             define_method :zero do       # Costructor of zero magnitudes
-              new amount: 0
+              new amount: 0, of: qnt
             end
 
             define_method :to_s do       # Customized #to_s. It must be a proc,

data/lib/sy/unit.rb

@@ -7,7 +7,7 @@ module SY::Unit
   PROTECTED_NAMES = [ "kilogram" ]
 
   class << self
-    # Make Unit#instance ignore capitalization and accept abbreviations.
+    # Make Unit#instance ignore capitalization, accept abbreviations.
     # 
     def instance arg
       begin
@@ -28,58 +28,49 @@ module SY::Unit
     end
 
     def included target
-      target.class_exec do
-        # Let's set up the naming hook for NameMagic:
-        name_set_closure do |name, new_instance, old_name|
-          ɴ = name.to_s
-          up, down = ɴ.upcase, ɴ.downcase
-
-          # Check case (only all-upper or all-lower is acceptable).
-          msg = "Unit must be either all-upper or all-lower case!"
-          fail NameError, msg unless ɴ == up || ɴ = down
-
-          # Reject the names starting with a full prefix.
-          conflicter = SY::PREFIX_TABLE.full_prefixes
-            .find { |prefix| down.starts_with? prefix unless prefix.empty? }
-          fail NameError, "Name #{ɴ} starts with #{conflicter}- prefix!" unless
-            SY::Unit::PROTECTED_NAMES.include? down if conflicter
-
-          # Warn about method name conflicts in the target module(s), where
-          # SY::ExpressibleInUnits mixin is included.
-          if new_instance.warns? then
-            w = ::SY::ExpressibleInUnits::COLLISION_WARNING
-            ::SY::ExpressibleInUnits.included_in.each do |ɱ|
-              im = ɱ.instance_methods
-              # puts ɱ, "class: #{ɱ.class}"
-              # puts im.size
-              # puts down
-              # puts im.include? down
-              warn w % [down, ɱ] if im.include? down
-              abbrev = new_instance.abbreviation
-              warn w % [abbrev, ɱ] if im.include? abbrev
-            end
+      target.namespace = self
+
+      name_set_closure do |name, new_instance, old_name|
+        ɴ = name.to_s
+        up, down = ɴ.upcase, ɴ.downcase
+        msg = "Unit must be either all-upper or all-lower case (#{ɴ} given)!"
+        fail NameError, msg unless ɴ == up || ɴ = down
+        # Reject the names starting with a full prefix.
+        pref = SY::PREFIX_TABLE.full_prefixes.find do |pref|
+          down.starts_with? pref unless pref.empty?
+        end
+        fail NameError, "Name #{ɴ} starts with #{pref}- prefix!" unless
+          SY::Unit::PROTECTED_NAMES.include? down if pref
+        # Warn about the method name conflicts in the #include target module
+        if new_instance.warns? then
+          w = SY::ExpressibleInUnits::COLLISION_WARNING
+          SY::ExpressibleInUnits.included_in.each do |modul|
+            im = modul.instance_methods
+            # puts ɱ, "class: #{ɱ.class}"
+            # puts im.size
+            # puts down
+            # puts im.include? down
+            warn w % [down, modul] if im.include? down
+            abbrev = new_instance.abbreviation
+            warn w % [abbrev, modul] if im.include? abbrev
           end
-          up.to_sym
         end
+        up.to_sym.tap { |sym| puts "name_set_closure #{sym}" if SY::DEBUG }
       end
 
-      # name_get_closure { |name| name.to_s.downcase.to_sym }
-
-      # Using eval, we'll now define all the prefix methods on the target, such
-      # as #mili, #micro, #kilo, #mega, etc. These are defined only for units, to which
-      # they represent multiplication by the factor of the prefix (side effect
-      # of such multiplication is conversion to a normal magnitude). However,
-      # the Unit class offers the opportunity for these prefix methods to cause
-      # <em>reframing</em> into a quantity specified by #quantity_by_prefix
-      # instance method. (This instance method normally returns the unit's own
-      # quantity unchanged, but can and should be overriden for those unit,
-      # which have area-specific prefix use.)
+      # We'll now define all the prefix methods on the target (#mili, #mega...),
+      # representing multiplication by the aprropriate factor (side effect being
+      # returning a non-unit magnitude). However, Unit offers the opportunity to
+      # _reframe_ into another quantity, specified by #quantity_by_prefix method.
+      # (This method normally returns the unit's own quantity, but can and should
+      # be overriden for prefixes indicating special domain (eg. +cm+)...
       # 
-      SY::PREFIX_TABLE.full_prefixes.each do |prefix|
-        unless prefix.empty?
-          define_method prefix do
-            SY::Quantity.instance( quantity_by_prefix( prefix ) )
-              .magnitude( self * SY::PREFIX_TABLE.to_factor( prefix ) )
+      SY::PREFIX_TABLE.full_prefixes.each do |pref|
+        unless pref.empty?
+          define_method pref do
+            SY::Quantity
+              .instance( quantity_by_prefix( pref ) )
+              .magnitude( self * SY::PREFIX_TABLE.to_factor( pref ) )
           end
         end
       end

data/lib/sy/version.rb

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

data/test/sy_test.rb

@@ -285,7 +285,7 @@ describe SY::Quantity, SY::Magnitude do
       1.µM.quantity.absolute.name.must_equal :Molarity
       7.µM.must_be_within_epsilon 5.µM + 2.µM, 1e-6
       +1.s.must_equal 1.s
-      # -1.s.must_equal -1 * 1.s # must raise
+      -1.s.must_equal -1 * 1.s # must raisen
       assert_equal -(-(1.s)), +(1.s)
       1.s⁻¹.quantity.must_equal ( 1.s ** -1 ).quantity
       1.s⁻¹.quantity.must_equal ( 1 / 1.s ).quantity
@@ -304,9 +304,9 @@ describe SY::Quantity, SY::Magnitude do
       ( 1.s⁻¹ ).quantity.object_id.must_equal ( 1 / 1.s ).quantity.object_id
       ( 1 / 1.s ).must_equal 1.s⁻¹
       1.s⁻¹.( SY::Frequency ).must_equal 1.Hz
-      # 7.°C.must_equal( 8.°C - 1.K )
-      # (-15).°C.must_equal 258.15.K
-      # 7000.µM.must_be_within_epsilon( 7.mM, 1e-9 )
+      7.°C.must_equal( 8.°C - 1.K )
+      (-15).°C.must_equal 258.15.K
+      7000.µM.must_be_within_epsilon( 7.mM, 1e-9 )
       ::SY::Unit.instances.map do |i|
         begin
           i.abbreviation

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sy
 version: !ruby/object:Gem::Version
-  version: 2.0.14
+  version: 2.0.15
 platform: ruby
 authors:
 - boris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport