unitwise 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e61cddd2199fa0eb4c5bf1ef9f8765e6abf7c1dd
-  data.tar.gz: fe384987b89b94a4a7f7e166bdc0b1119f98686e
+  metadata.gz: 7b43a98361a2647155beb5a86d6bc1281e8f160c
+  data.tar.gz: 25dbd408ecc497a0003592c17c41b3636537d2bb
 SHA512:
-  metadata.gz: acc76a1ae389f002106bc3ec9913f5377b0470ec3fd056d2879fc40bbf009594e7aa69251026b88f62a084c9bc28fdbb8b4292aaab1bd8c94e3fb8df857a24d4
-  data.tar.gz: 5491cbd50d20baf23e431831df67a073bdd0123007cc310d41cf027bbb64746de2d7dd44858343f39c584a7ef510fdf3c48d4d34f5242bb5fcb5dc893cd06d41
+  metadata.gz: 1e1b4d53bc2c1cbe081df9a5df31d82872ae390773831558137fba10139d27fb9e4fab531149f5f876a5c4a7bf57d97340ef70e671d0fbabaa5c930a953f96a1
+  data.tar.gz: f17f89d11af392f7c9b520ad4defe197ddf9657ccb7bce721923f59a229caf5336ab892653c01fc9f6d5d546864bca1b7c298cd5e56ccb54e480e80fcc90bc8e

data/README.md

@@ -1,5 +1,6 @@
 # Unitwise
 
+[![Gem Version](https://badge.fury.io/rb/unitwise.png)](http://badge.fury.io/rb/unitwise)
 [![Build Status](https://travis-ci.org/joshwlewis/unitwise.png)](https://travis-ci.org/joshwlewis/unitwise)
 [![Dependency Status](https://gemnasium.com/joshwlewis/unitwise.png)](https://gemnasium.com/joshwlewis/unitwise)
 [![Coverage Status](https://coveralls.io/repos/joshwlewis/unitwise/badge.png)](https://coveralls.io/r/joshwlewis/unitwise)
@@ -10,8 +11,6 @@ Unitwise is a library for performing mathematical operations and conversions on
 
 Unitwise supports a vast number of units. At the time of writing, it supports 95 metric units, 199 non-metric units, and 24 unit prefixes. That's approximately 2,500 basic units, but these can also be combined through multiplication and/or division to create an infinite number of possibilities.
 
-Please note that while Unitwise is functional, it is still under development.
-
 ## Usage
 
 ### Initialization:

data/data/derived_unit.yaml

@@ -630,7 +630,7 @@
   :primary_code: AU
   :secondary_code: ASU
   :scale:
-    :value: 149597.87
+    :value: 149597.870691
     :unit_code: Mm
   :classification: iso1000
   :property: length
@@ -688,7 +688,7 @@
 - :names: permittivity of vacuum
   :symbol: <i>ε<sub><r>0</r></sub></i>
   :primary_code: '[eps_0]'
-  :secondary_code: '[eps_0]'
+  :secondary_code: '[EPS_0]'
   :scale:
     :value: 8.854187817e-12
     :unit_code: F/m
@@ -700,7 +700,7 @@
 - :names: permeability of vacuum
   :symbol: <i>μ<sub><r>0</r></sub></i>
   :primary_code: '[mu_0]'
-  :secondary_code: '[mu_0]'
+  :secondary_code: '[MU_0]'
   :scale:
     :value: 1.0
     :unit_code: 4.[pi].10*-7.N/A2
@@ -1754,6 +1754,51 @@
   :metric: false
   :special: false
   :arbitrary: false
+- :names: metric fluid ounce
+  :symbol: oz fl
+  :primary_code: '[foz_m]'
+  :secondary_code: '[FOZ_M]'
+  :scale:
+    :value: 30.0
+    :unit_code: mL
+  :classification: us-volumes
+  :property: fluid volume
+  :metric: false
+  :special: false
+  :arbitrary: false
+- :names: metric cup
+  :primary_code: '[cup_m]'
+  :secondary_code: '[CUP_M]'
+  :scale:
+    :value: 240.0
+    :unit_code: mL
+  :classification: us-volumes
+  :property: volume
+  :metric: false
+  :special: false
+  :arbitrary: false
+- :names: metric teaspoon
+  :primary_code: '[tsp_m]'
+  :secondary_code: '[TSP_M]'
+  :scale:
+    :value: 5.0
+    :unit_code: mL
+  :classification: us-volumes
+  :property: volume
+  :metric: false
+  :special: false
+  :arbitrary: false
+- :names: metric tablespoon
+  :primary_code: '[tbs_m]'
+  :secondary_code: '[TBS_M]'
+  :scale:
+    :value: 15.0
+    :unit_code: mL
+  :classification: us-volumes
+  :property: volume
+  :metric: false
+  :special: false
+  :arbitrary: false
 - :names: gallon
   :primary_code: '[gal_br]'
   :secondary_code: '[GAL_BR]'
@@ -2043,6 +2088,17 @@
   :metric: false
   :special: false
   :arbitrary: false
+- :names: metric ounce
+  :primary_code: '[oz_m]'
+  :secondary_code: '[OZ_M]'
+  :scale:
+    :value: 28.0
+    :unit_code: g
+  :classification: apoth
+  :property: mass
+  :metric: false
+  :special: false
+  :arbitrary: false
 - :names: line
   :primary_code: '[lne]'
   :secondary_code: '[LNE]'
@@ -2176,6 +2232,18 @@
   :metric: false
   :special: true
   :arbitrary: false
+- :names: degree Rankine
+  :symbol: °R
+  :primary_code: '[degR]'
+  :secondary_code: '[degR]'
+  :scale:
+    :value: 5.0
+    :unit_code: K/9
+  :classification: heat
+  :property: temperature
+  :metric: false
+  :special: false
+  :arbitrary: false
 - :names: calorie at 15 °C
   :symbol: cal<sub>15°C</sub>
   :primary_code: cal_[15]
@@ -2355,6 +2423,30 @@
   :metric: false
   :special: false
   :arbitrary: false
+- :names: tex
+  :symbol: tex
+  :primary_code: tex
+  :secondary_code: TEX
+  :scale:
+    :value: 1.0
+    :unit_code: g/km
+  :classification: heat
+  :property: linear mass density (of textile thread)
+  :metric: true
+  :special: false
+  :arbitrary: false
+- :names: Denier
+  :symbol: den
+  :primary_code: '[den]'
+  :secondary_code: '[DEN]'
+  :scale:
+    :value: 1.0
+    :unit_code: g/9/km
+  :classification: heat
+  :property: linear mass density (of textile thread)
+  :metric: false
+  :special: false
+  :arbitrary: false
 - :names: meter of water column
   :symbol: m H<sub><r>2</r></sub>O
   :primary_code: m[H2O]
@@ -2394,7 +2486,7 @@
 - :names: inch of mercury column
   :symbol: in Hg
   :primary_code: '[in_i''Hg]'
-  :secondary_code: '[IN_i''HG]'
+  :secondary_code: '[IN_I''HG]'
   :scale:
     :value: 1.0
     :unit_code: m[Hg].[in_i]/m
@@ -2484,7 +2576,7 @@
   :secondary_code: '[CH]'
   :scale:
     :value: 1.0
-    :unit_code: mm/[pi]
+    :unit_code: mm/3
   :classification: clinical
   :property: gauge of catheters
   :metric: false
@@ -2496,7 +2588,7 @@
   :secondary_code: '[DRP]'
   :scale:
     :value: 1.0
-    :unit_code: ml/12
+    :unit_code: ml/20
   :classification: clinical
   :property: volume
   :metric: false
@@ -2875,6 +2967,17 @@
   :metric: false
   :special: false
   :arbitrary: true
+- :names: anti factor Xa unit
+  :primary_code: '[anti''Xa''U]'
+  :secondary_code: '[ANTI''XA''U]'
+  :scale:
+    :value: 1.0
+    :unit_code: '1'
+  :classification: chemical
+  :property: biologic activity of factor Xa inhibitor (heparin)
+  :metric: false
+  :special: false
+  :arbitrary: true
 - :names: Todd unit
   :primary_code: '[todd''U]'
   :secondary_code: '[TODD''U]'
@@ -2987,6 +3090,18 @@
   :metric: false
   :special: false
   :arbitrary: true
+- :names: 50% embryo infectious dose
+  :symbol: EID<sub>50</sub>
+  :primary_code: '[EID_50]'
+  :secondary_code: '[EID_50]'
+  :scale:
+    :value: 1.0
+    :unit_code: '1'
+  :classification: chemical
+  :property: biologic activity (infectivity) of an infectious agent preparation
+  :metric: false
+  :special: false
+  :arbitrary: true
 - :names: plaque forming units
   :symbol: PFU
   :primary_code: '[PFU]'
@@ -3091,7 +3206,40 @@
     :value: 1.0
     :unit_code: '1'
   :classification: chemical
-  :property: procedure defined amount of an antigen substance
+  :property: procedure defined amount of a poliomyelitis d-antigen substance
+  :metric: false
+  :special: false
+  :arbitrary: true
+- :names: fibrinogen equivalent unit
+  :primary_code: '[FEU]'
+  :secondary_code: '[FEU]'
+  :scale:
+    :value: 1.0
+    :unit_code: '1'
+  :classification: chemical
+  :property: amount of fibrinogen broken down into the measured d-dimers
+  :metric: false
+  :special: false
+  :arbitrary: true
+- :names: ELISA unit
+  :primary_code: '[ELU]'
+  :secondary_code: '[ELU]'
+  :scale:
+    :value: 1.0
+    :unit_code: '1'
+  :classification: chemical
+  :property: arbitrary ELISA unit
+  :metric: false
+  :special: false
+  :arbitrary: true
+- :names: Ehrlich unit
+  :primary_code: '[EU]'
+  :secondary_code: '[EU]'
+  :scale:
+    :value: 1.0
+    :unit_code: '1'
+  :classification: chemical
+  :property: Ehrlich unit
   :metric: false
   :special: false
   :arbitrary: true
@@ -3383,7 +3531,7 @@
 - :names: baud
   :symbol: Bd
   :primary_code: Bd
-  :secondary_code: Bd
+  :secondary_code: BD
   :scale:
     :value: 1.0
     :unit_code: /s

data/lib/unitwise/atom.rb

@@ -63,7 +63,7 @@ module Unitwise
       base? ? 1 : scale.scalar
     end
 
-    def functional(x, direction=1)
+    def functional(x=scalar, direction=1)
       scale.functional(x, direction)
     end
 

data/lib/unitwise/functional.rb

@@ -9,11 +9,11 @@ module Unitwise
     end
 
     def scalar
-      puts "Warning: Mathematical operations with special units should be used with caution."
+      puts "Warning: Mathematical operations with special units not reccomended by UCUM."
       super()
     end
 
-    def functional(x, direction=1)
+    def functional(x=scalar, direction=1)
       function.functional(x, direction)
     end
 

data/lib/unitwise/measurement.rb

@@ -53,11 +53,11 @@ module Unitwise
         if other_unit.special?
           other_unit.functional functional(value, -1)
         else
-          functional(value, -1)
+          functional(value, -1) / other_unit.scalar
         end
       else
         if other_unit.special?
-          other_unit.functional(value)
+          other_unit.functional(scalar)
         else
           scalar / other_unit.scalar
         end

data/lib/unitwise/scale.rb

@@ -25,8 +25,8 @@ module Unitwise
       unit.special?
     end
 
-    def functional(value, direction=1)
-      unit.functional(value, direction)
+    def functional(x=value, direction=1)
+      unit.functional(x, direction)
     end
 
     def scalar

data/lib/unitwise/term.rb

@@ -53,8 +53,8 @@ module Unitwise
       (factor * (prefix ? prefix.scalar : 1) * (atom ? atom.scalar : 1)) ** exponent
     end
 
-    def functional(value, direction=1)
-      (factor * (prefix ? prefix.scalar : 1)) * (atom ? atom.functional(value, direction) : 1) ** exponent
+    def functional(x=scalar, direction=1)
+      (factor * (prefix ? prefix.scalar : 1)) * (atom ? atom.functional(x, direction) : 1) ** exponent
     end
 
     def root_terms

data/lib/unitwise/unit.rb

@@ -29,8 +29,8 @@ module Unitwise
       terms.count == 1 && terms.all?(&:special?)
     end
 
-    def functional(value, direction=1)
-      terms.first.functional(value, direction)
+    def functional(x=scalar, direction=1)
+      terms.first.functional(x, direction)
     end
 
     def dup

data/lib/unitwise/version.rb

@@ -1,3 +1,3 @@
 module Unitwise
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/test/unitwise/measurement_test.rb

@@ -42,6 +42,7 @@ describe Unitwise::Measurement do
   let(:cel) { Unitwise::Measurement.new(22, 'Cel') }
   let(:k) {Unitwise::Measurement.new(373.15, 'K') }
   let(:f) {Unitwise::Measurement.new(98.6, '[degF]')}
+  let(:r) { Unitwise::Measurement.new(491.67, '[degR]') }
 
   describe "#scalar" do
     it "must return value relative to terminal atoms" do
@@ -66,6 +67,12 @@ describe Unitwise::Measurement do
     it "must convert special units to special units" do
       f.convert('Cel').value.must_equal 37
     end
+    it "must convert special units to non-special units" do
+      cel.convert("[degR]").value.must_equal 531.27
+    end
+    it "must convert derived units to special units" do
+      r.convert("Cel").value.round.must_equal 0
+    end
   end
 
   describe "#*" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unitwise
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Josh Lewis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: signed_multiset
@@ -210,4 +210,3 @@ test_files:
 - test/unitwise/term_test.rb
 - test/unitwise/unit_test.rb
 - test/unitwise_test.rb
-has_rdoc: