measured 2.7.0 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82ffeb317f95fc3c354f43453eabc91b138a5e4f1b50eec651775425a27316e5
-  data.tar.gz: c664577f19d2ab99b95f7c533fb46323b60390c1b34da1bc3602b27979cddff6
+  metadata.gz: 808003a2689c157f3d3a1ef7ff2eb2f1decc242d23c40a536d9bca8c57364a79
+  data.tar.gz: 42f4a72969b5331d7cd460f87d5668b3b331001b82f351c221f7153488859be5
 SHA512:
-  metadata.gz: 4ae4538c2b2e9b00403b6363d639a6f0959704c4702b65cca3d1cd33d714f2eaf14c4fa4aa446b6247e1f9b7cd7977bc80581115965b21abbd4972b10b2e3eea
-  data.tar.gz: ee33ab98e63f586bcf1ce299909e4cd6ecc0c6b434e3f2e48340d5dc9f2641a8c34bcc2dd695f9c75f162f413b6533456f6c0ab22d29b3c93c21c186e647b671
+  metadata.gz: 4019bd9f128308af57f5ce9440e6a53f05587c1589f120b711c937b70d422a865c14d2e678d4b55bb13054e24a2663b5cb6ef51bfad12e834027eb4a644d5651
+  data.tar.gz: caf36d6ad0dbbd0e187adbb0d5a2ddd2718a38ddd67920e628c1d7ad09423f9c35edcef7f05cb863fec8e2849bb0eb8ce4145496aa0749cf2aaafbcd6459ba13

data/.github/workflows/ci.yml

@@ -10,9 +10,9 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - 2.5
-          - 2.6
-          - 2.7
+          - '2.6'
+          - '2.7'
+          - '3.0'
         gemfile:
           - Gemfile
           - gemfiles/activesupport-5.2.gemfile

data/CHANGELOG.md

@@ -1,3 +1,31 @@
+Unreleased
+-----
+
+
+
+2.8.2
+-----
+
+* Add cm3 and mm3 to volume. (@fekadeabdejene)
+
+2.8.1
+-----
+
+* Allow format without the conversion string. (@saraid)
+* Add special case for zero coercion to allow direct use of `sum` method. (@jmortlock)
+* Add useful numeric methods `finite?`, `infinite?`, `zero?`, `nonzero?`, `positive?` and `negative?`. (@jmortlock)
+
+2.8.0
+-----
+
+* Drop support for Ruby 2.5
+* Use Ruby 3.0.2 for development
+
+2.7.1
+-----
+
+* Fix Ruby 3.0 compatibility
+
 2.7.0
 -----
 

data/README.md

@@ -149,6 +149,15 @@ Measured::Weight.new("3.14", "grams").format("%.1<value>f %<unit>s")
 
 If no string is passed to the `format` method it defaults to `"%.2<value>f %<unit>s"`.
 
+If the unit isn't the standard SI unit, it will include a conversion string.
+
+```ruby
+Measured::Weight.new("3.14", "kg").format
+> "3.14 kg (1000/1 g)"
+Measured::Weight.new("3.14", "kg").format(with_conversion_string: false)
+> "3.14 kg"
+```
+
 ## Units and conversions
 
 ### SI units support

data/cache/volume.json

@@ -89,6 +89,14 @@
       "numerator": 1,
       "denominator": 1000
     },
+    "cm3": {
+      "numerator": 1000,
+      "denominator": 1
+    },
+    "mm3": {
+      "numerator": 1000000,
+      "denominator": 1
+    },
     "in3": {
       "numerator": 125000000,
       "denominator": 2048383
@@ -219,6 +227,14 @@
       "numerator": 1,
       "denominator": 1000000000000000000000000000
     },
+    "cm3": {
+      "numerator": 1,
+      "denominator": 1000000000000000000000
+    },
+    "mm3": {
+      "numerator": 1,
+      "denominator": 1000000000000000000
+    },
     "in3": {
       "numerator": 1,
       "denominator": 16387064000000000000000
@@ -349,6 +365,14 @@
       "numerator": 1,
       "denominator": 1000000000000000000000000
     },
+    "cm3": {
+      "numerator": 1,
+      "denominator": 1000000000000000000
+    },
+    "mm3": {
+      "numerator": 1,
+      "denominator": 1000000000000000
+    },
     "in3": {
       "numerator": 1,
       "denominator": 16387064000000000000
@@ -479,6 +503,14 @@
       "numerator": 1,
       "denominator": 1000000000000000000000
     },
+    "cm3": {
+      "numerator": 1,
+      "denominator": 1000000000000000
+    },
+    "mm3": {
+      "numerator": 1,
+      "denominator": 1000000000000
+    },
     "in3": {
       "numerator": 1,
       "denominator": 16387064000000000
@@ -609,6 +641,14 @@
       "numerator": 1,
       "denominator": 1000000000000000000
     },
+    "cm3": {
+      "numerator": 1,
+      "denominator": 1000000000000
+    },
+    "mm3": {
+      "numerator": 1,
+      "denominator": 1000000000
+    },
     "in3": {
       "numerator": 1,
       "denominator": 16387064000000
@@ -739,6 +779,14 @@
       "numerator": 1,
       "denominator": 1000000000000000
     },
+    "cm3": {
+      "numerator": 1,
+      "denominator": 1000000000
+    },
+    "mm3": {
+      "numerator": 1,
+      "denominator": 1000000
+    },
     "in3": {
       "numerator": 1,
       "denominator": 16387064000
@@ -869,6 +917,14 @@
       "numerator": 1,
       "denominator": 1000000000000
     },
+    "cm3": {
+      "numerator": 1,
+      "denominator": 1000000
+    },
+    "mm3": {
+      "numerator": 1,
+      "denominator": 1000
+    },
     "in3": {
       "numerator": 1,
       "denominator": 16387064
@@ -999,6 +1055,14 @@
       "numerator": 1,
       "denominator": 1000000000
     },
+    "cm3": {
+      "numerator": 1,
+      "denominator": 1000
+    },
+    "mm3": {
+      "numerator": 1,
+      "denominator": 1
+    },
     "in3": {
       "numerator": 125,
       "denominator": 2048383
@@ -1129,6 +1193,14 @@
       "numerator": 1,
       "denominator": 1000000
     },
+    "cm3": {
+      "numerator": 1,
+      "denominator": 1
+    },
+    "mm3": {
+      "numerator": 1000,
+      "denominator": 1
+    },
     "in3": {
       "numerator": 125000,
       "denominator": 2048383
@@ -1259,6 +1331,14 @@
       "numerator": 1,
       "denominator": 100000
     },
+    "cm3": {
+      "numerator": 10,
+      "denominator": 1
+    },
+    "mm3": {
+      "numerator": 10000,
+      "denominator": 1
+    },
     "in3": {
       "numerator": 1250000,
       "denominator": 2048383
@@ -1389,6 +1469,14 @@
       "numerator": 1,
       "denominator": 10000
     },
+    "cm3": {
+      "numerator": 100,
+      "denominator": 1
+    },
+    "mm3": {
+      "numerator": 100000,
+      "denominator": 1
+    },
     "in3": {
       "numerator": 12500000,
       "denominator": 2048383
@@ -1519,6 +1607,14 @@
       "numerator": 1,
       "denominator": 100
     },
+    "cm3": {
+      "numerator": 10000,
+      "denominator": 1
+    },
+    "mm3": {
+      "numerator": 10000000,
+      "denominator": 1
+    },
     "in3": {
       "numerator": 1250000000,
       "denominator": 2048383
@@ -1649,6 +1745,14 @@
       "numerator": 1,
       "denominator": 10
     },
+    "cm3": {
+      "numerator": 100000,
+      "denominator": 1
+    },
+    "mm3": {
+      "numerator": 100000000,
+      "denominator": 1
+    },
     "in3": {
       "numerator": 12500000000,
       "denominator": 2048383
@@ -1779,6 +1883,14 @@
       "numerator": 1,
       "denominator": 1
     },
+    "cm3": {
+      "numerator": 1000000,
+      "denominator": 1
+    },
+    "mm3": {
+      "numerator": 1000000000,
+      "denominator": 1
+    },
     "in3": {
       "numerator": 125000000000,
       "denominator": 2048383
@@ -1909,6 +2021,14 @@
       "numerator": 1000,
       "denominator": 1
     },
+    "cm3": {
+      "numerator": 1000000000,
+      "denominator": 1
+    },
+    "mm3": {
+      "numerator": 1000000000000,
+      "denominator": 1
+    },
     "in3": {
       "numerator": 125000000000000,
       "denominator": 2048383
@@ -2039,6 +2159,14 @@
       "numerator": 1000000,
       "denominator": 1
     },
+    "cm3": {
+      "numerator": 1000000000000,
+      "denominator": 1
+    },
+    "mm3": {
+      "numerator": 1000000000000000,
+      "denominator": 1
+    },
     "in3": {
       "numerator": 125000000000000000,
       "denominator": 2048383
@@ -2169,6 +2297,14 @@
       "numerator": 1000000000,
       "denominator": 1
     },
+    "cm3": {
+      "numerator": 1000000000000000,
+      "denominator": 1
+    },
+    "mm3": {
+      "numerator": 1000000000000000000,
+      "denominator": 1
+    },
     "in3": {
       "numerator": 125000000000000000000,
       "denominator": 2048383
@@ -2299,6 +2435,14 @@
       "numerator": 1000000000000,
       "denominator": 1
     },
+    "cm3": {
+      "numerator": 1000000000000000000,
+      "denominator": 1
+    },
+    "mm3": {
+      "numerator": 1000000000000000000000,
+      "denominator": 1
+    },
     "in3": {
       "numerator": 125000000000000000000000,
       "denominator": 2048383
@@ -2429,6 +2573,14 @@
       "numerator": 1000000000000000,
       "denominator": 1
     },
+    "cm3": {
+      "numerator": 1000000000000000000000,
+      "denominator": 1
+    },
+    "mm3": {
+      "numerator": 1000000000000000000000000,
+      "denominator": 1
+    },
     "in3": {
       "numerator": 125000000000000000000000000,
       "denominator": 2048383
@@ -2559,6 +2711,14 @@
       "numerator": 1000000000000000000,
       "denominator": 1
     },
+    "cm3": {
+      "numerator": 1000000000000000000000000,
+      "denominator": 1
+    },
+    "mm3": {
+      "numerator": 1000000000000000000000000000,
+      "denominator": 1
+    },
     "in3": {
       "numerator": 125000000000000000000000000000,
       "denominator": 2048383
@@ -2689,6 +2849,14 @@
       "numerator": 1000000000000000000000,
       "denominator": 1
     },
+    "cm3": {
+      "numerator": 1000000000000000000000000000,
+      "denominator": 1
+    },
+    "mm3": {
+      "numerator": 1000000000000000000000000000000,
+      "denominator": 1
+    },
     "in3": {
       "numerator": 125000000000000000000000000000000,
       "denominator": 2048383
@@ -2819,6 +2987,14 @@
       "numerator": 1,
       "denominator": 1000000000000000000000
     },
+    "cm3": {
+      "numerator": 1000000,
+      "denominator": 1
+    },
+    "mm3": {
+      "numerator": 1000000000,
+      "denominator": 1
+    },
     "in3": {
       "numerator": 125000000000,
       "denominator": 2048383
@@ -2860,6 +3036,282 @@
       "denominator": 473176473
     }
   },
+  "cm3": {
+    "cm3": {
+      "numerator": 1,
+      "denominator": 1
+    },
+    "l": {
+      "numerator": 1,
+      "denominator": 1000
+    },
+    "yl": {
+      "numerator": 1000000000000000000000,
+      "denominator": 1
+    },
+    "zl": {
+      "numerator": 1000000000000000000,
+      "denominator": 1
+    },
+    "al": {
+      "numerator": 1000000000000000,
+      "denominator": 1
+    },
+    "fl": {
+      "numerator": 1000000000000,
+      "denominator": 1
+    },
+    "pl": {
+      "numerator": 1000000000,
+      "denominator": 1
+    },
+    "nl": {
+      "numerator": 1000000,
+      "denominator": 1
+    },
+    "μl": {
+      "numerator": 1000,
+      "denominator": 1
+    },
+    "ml": {
+      "numerator": 1,
+      "denominator": 1
+    },
+    "cl": {
+      "numerator": 1,
+      "denominator": 10
+    },
+    "dl": {
+      "numerator": 1,
+      "denominator": 100
+    },
+    "dal": {
+      "numerator": 1,
+      "denominator": 10000
+    },
+    "hl": {
+      "numerator": 1,
+      "denominator": 100000
+    },
+    "kl": {
+      "numerator": 1,
+      "denominator": 1000000
+    },
+    "Ml": {
+      "numerator": 1,
+      "denominator": 1000000000
+    },
+    "Gl": {
+      "numerator": 1,
+      "denominator": 1000000000000
+    },
+    "Tl": {
+      "numerator": 1,
+      "denominator": 1000000000000000
+    },
+    "Pl": {
+      "numerator": 1,
+      "denominator": 1000000000000000000
+    },
+    "El": {
+      "numerator": 1,
+      "denominator": 1000000000000000000000
+    },
+    "Zl": {
+      "numerator": 1,
+      "denominator": 1000000000000000000000000
+    },
+    "Yl": {
+      "numerator": 1,
+      "denominator": 1000000000000000000000000000
+    },
+    "m3": {
+      "numerator": 1,
+      "denominator": 1000000
+    },
+    "mm3": {
+      "numerator": 1000,
+      "denominator": 1
+    },
+    "in3": {
+      "numerator": 125000,
+      "denominator": 2048383
+    },
+    "ft3": {
+      "numerator": 15625,
+      "denominator": 442450728
+    },
+    "gal": {
+      "numerator": 100,
+      "denominator": 454609
+    },
+    "us_gal": {
+      "numerator": 125000,
+      "denominator": 473176473
+    },
+    "qt": {
+      "numerator": 400,
+      "denominator": 454609
+    },
+    "us_qt": {
+      "numerator": 500000,
+      "denominator": 473176473
+    },
+    "pt": {
+      "numerator": 800,
+      "denominator": 454609
+    },
+    "us_pt": {
+      "numerator": 1000000,
+      "denominator": 473176473
+    },
+    "oz": {
+      "numerator": 16000,
+      "denominator": 454609
+    },
+    "us_oz": {
+      "numerator": 16000000,
+      "denominator": 473176473
+    }
+  },
+  "mm3": {
+    "mm3": {
+      "numerator": 1,
+      "denominator": 1
+    },
+    "l": {
+      "numerator": 1,
+      "denominator": 1000000
+    },
+    "yl": {
+      "numerator": 1000000000000000000,
+      "denominator": 1
+    },
+    "zl": {
+      "numerator": 1000000000000000,
+      "denominator": 1
+    },
+    "al": {
+      "numerator": 1000000000000,
+      "denominator": 1
+    },
+    "fl": {
+      "numerator": 1000000000,
+      "denominator": 1
+    },
+    "pl": {
+      "numerator": 1000000,
+      "denominator": 1
+    },
+    "nl": {
+      "numerator": 1000,
+      "denominator": 1
+    },
+    "μl": {
+      "numerator": 1,
+      "denominator": 1
+    },
+    "ml": {
+      "numerator": 1,
+      "denominator": 1000
+    },
+    "cl": {
+      "numerator": 1,
+      "denominator": 10000
+    },
+    "dl": {
+      "numerator": 1,
+      "denominator": 100000
+    },
+    "dal": {
+      "numerator": 1,
+      "denominator": 10000000
+    },
+    "hl": {
+      "numerator": 1,
+      "denominator": 100000000
+    },
+    "kl": {
+      "numerator": 1,
+      "denominator": 1000000000
+    },
+    "Ml": {
+      "numerator": 1,
+      "denominator": 1000000000000
+    },
+    "Gl": {
+      "numerator": 1,
+      "denominator": 1000000000000000
+    },
+    "Tl": {
+      "numerator": 1,
+      "denominator": 1000000000000000000
+    },
+    "Pl": {
+      "numerator": 1,
+      "denominator": 1000000000000000000000
+    },
+    "El": {
+      "numerator": 1,
+      "denominator": 1000000000000000000000000
+    },
+    "Zl": {
+      "numerator": 1,
+      "denominator": 1000000000000000000000000000
+    },
+    "Yl": {
+      "numerator": 1,
+      "denominator": 1000000000000000000000000000000
+    },
+    "m3": {
+      "numerator": 1,
+      "denominator": 1000000000
+    },
+    "cm3": {
+      "numerator": 1,
+      "denominator": 1000
+    },
+    "in3": {
+      "numerator": 125,
+      "denominator": 2048383
+    },
+    "ft3": {
+      "numerator": 125,
+      "denominator": 3539605824
+    },
+    "gal": {
+      "numerator": 1,
+      "denominator": 4546090
+    },
+    "us_gal": {
+      "numerator": 125,
+      "denominator": 473176473
+    },
+    "qt": {
+      "numerator": 2,
+      "denominator": 2273045
+    },
+    "us_qt": {
+      "numerator": 500,
+      "denominator": 473176473
+    },
+    "pt": {
+      "numerator": 4,
+      "denominator": 2273045
+    },
+    "us_pt": {
+      "numerator": 1000,
+      "denominator": 473176473
+    },
+    "oz": {
+      "numerator": 16,
+      "denominator": 454609
+    },
+    "us_oz": {
+      "numerator": 16000,
+      "denominator": 473176473
+    }
+  },
   "in3": {
     "in3": {
       "numerator": 1,
@@ -2953,6 +3405,14 @@
       "numerator": 2048383,
       "denominator": 125000000000
     },
+    "cm3": {
+      "numerator": 2048383,
+      "denominator": 125000
+    },
+    "mm3": {
+      "numerator": 2048383,
+      "denominator": 125
+    },
     "ft3": {
       "numerator": 1,
       "denominator": 1728
@@ -3083,6 +3543,14 @@
       "numerator": 55306341,
       "denominator": 1953125000
     },
+    "cm3": {
+      "numerator": 442450728,
+      "denominator": 15625
+    },
+    "mm3": {
+      "numerator": 3539605824,
+      "denominator": 125
+    },
     "in3": {
       "numerator": 1728,
       "denominator": 1
@@ -3213,6 +3681,14 @@
       "numerator": 454609,
       "denominator": 100000000
     },
+    "cm3": {
+      "numerator": 454609,
+      "denominator": 100
+    },
+    "mm3": {
+      "numerator": 4546090,
+      "denominator": 1
+    },
     "in3": {
       "numerator": 568261250,
       "denominator": 2048383
@@ -3343,6 +3819,14 @@
       "numerator": 473176473,
       "denominator": 125000000000
     },
+    "cm3": {
+      "numerator": 473176473,
+      "denominator": 125000
+    },
+    "mm3": {
+      "numerator": 473176473,
+      "denominator": 125
+    },
     "in3": {
       "numerator": 231,
       "denominator": 1
@@ -3473,6 +3957,14 @@
       "numerator": 454609,
       "denominator": 400000000
     },
+    "cm3": {
+      "numerator": 454609,
+      "denominator": 400
+    },
+    "mm3": {
+      "numerator": 2273045,
+      "denominator": 2
+    },
     "in3": {
       "numerator": 284130625,
       "denominator": 4096766
@@ -3603,6 +4095,14 @@
       "numerator": 473176473,
       "denominator": 500000000000
     },
+    "cm3": {
+      "numerator": 473176473,
+      "denominator": 500000
+    },
+    "mm3": {
+      "numerator": 473176473,
+      "denominator": 500
+    },
     "in3": {
       "numerator": 231,
       "denominator": 4
@@ -3733,6 +4233,14 @@
       "numerator": 454609,
       "denominator": 800000000
     },
+    "cm3": {
+      "numerator": 454609,
+      "denominator": 800
+    },
+    "mm3": {
+      "numerator": 2273045,
+      "denominator": 4
+    },
     "in3": {
       "numerator": 284130625,
       "denominator": 8193532
@@ -3863,6 +4371,14 @@
       "numerator": 473176473,
       "denominator": 1000000000000
     },
+    "cm3": {
+      "numerator": 473176473,
+      "denominator": 1000000
+    },
+    "mm3": {
+      "numerator": 473176473,
+      "denominator": 1000
+    },
     "in3": {
       "numerator": 231,
       "denominator": 8
@@ -3993,6 +4509,14 @@
       "numerator": 454609,
       "denominator": 16000000000
     },
+    "cm3": {
+      "numerator": 454609,
+      "denominator": 16000
+    },
+    "mm3": {
+      "numerator": 454609,
+      "denominator": 16
+    },
     "in3": {
       "numerator": 56826125,
       "denominator": 32774128
@@ -4123,6 +4647,14 @@
       "numerator": 473176473,
       "denominator": 16000000000000
     },
+    "cm3": {
+      "numerator": 473176473,
+      "denominator": 16000000
+    },
+    "mm3": {
+      "numerator": 473176473,
+      "denominator": 16000
+    },
     "in3": {
       "numerator": 231,
       "denominator": 128

data/dev.yml

@@ -2,7 +2,7 @@ name: measured
 
 up:
   - ruby:
-      version: 2.6.3
+      version: 3.0.2
   - bundler
 
 commands:

data/lib/measured/arithmetic.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 module Measured::Arithmetic
+  extend Forwardable
+  def_delegators :@value, :zero?, :positive?, :negative?, :finite?, :infinite?
+
   def +(other)
     arithmetic_operation(other, :+)
   end
@@ -19,6 +22,8 @@ module Measured::Arithmetic
   def coerce(other)
     if other.is_a?(self.class)
       [other, self]
+    elsif other.is_a?(Numeric) && other.zero?
+      [self.class.new(other, self.unit), self]
     else
       raise TypeError, "Cannot coerce #{other.class} to #{self.class}"
     end
@@ -28,6 +33,10 @@ module Measured::Arithmetic
     raise TypeError, "#{self.class} cannot be converted to an integer"
   end
 
+  def nonzero?
+    value.nonzero? ? self : false
+  end
+
   private
 
   def arithmetic_operation(other, operator)

data/lib/measured/cache/json.rb

@@ -37,11 +37,17 @@ module Measured::Cache
     end
 
     def decode(table)
-      table.each_with_object(table.dup) do |(k1, v1), accu|
-        v1.each do |k2, v2|
-          if v2.is_a?(Hash)
-            accu[k1][k2] = Rational(v2["numerator"], v2["denominator"])
+      table.transform_values do |value1|
+        if value1.is_a?(Hash)
+          value1.transform_values do |value2|
+            if value2.is_a?(Hash)
+              Rational(value2["numerator"], value2["denominator"])
+            else
+              value2
+            end
           end
+        else
+          value1
         end
       end
     end

data/lib/measured/measurable.rb

@@ -43,10 +43,10 @@ class Measured::Measurable < Numeric
     self.class.new(new_value, new_unit)
   end
 
-  def format(format_string=nil)
+  def format(format_string=nil, with_conversion_string: true)
     kwargs = {
       value: self.value,
-      unit: self.unit,
+      unit: self.unit.to_s(with_conversion_string: with_conversion_string),
     }
     (format_string || DEFAULT_FORMAT_STRING) % kwargs
   end

data/lib/measured/unit.rb

@@ -23,8 +23,8 @@ class Measured::Unit
     )
   end
 
-  def to_s
-    if @conversion_string
+  def to_s(with_conversion_string: true)
+    if with_conversion_string && @conversion_string
       "#{name} (#{@conversion_string})".freeze
     else
       name

data/lib/measured/units/volume.rb

@@ -3,6 +3,8 @@ Measured::Volume = Measured.build do
   si_unit :l, aliases: [:liter, :litre, :liters, :litres]
 
   unit :m3, value: "1000 l", aliases: [:cubic_meter, :cubic_metre, :cubic_meters, :cubic_metres]
+  unit :cm3, value: "0.001 l", aliases: [:cubic_centimeter, :cubic_centimetre, :cubic_centimeters, :cubic_centimetres]
+  unit :mm3, value: "0.000001 l", aliases: [:cubic_millimeter, :cubic_millimetre, :cubic_millimeters, :cubic_millimetres]
   unit :in3, value: "0.016387064 l", aliases: [:cubic_inch, :cubic_inches]
   unit :ft3, value: "1728 in3", aliases: [:cubic_foot, :cubic_feet]
   unit :gal, value: "4.54609 l", aliases: [:imp_gal, :imperial_gallon, :imp_gals, :imperial_gallons]

data/lib/measured/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Measured
-  VERSION = "2.7.0"
+  VERSION = "2.8.2"
 end

data/test/arithmetic_test.rb

@@ -8,6 +8,41 @@ class Measured::ArithmeticTest < ActiveSupport::TestCase
     @four = Magic.new(4, :magic_missile)
   end
 
+  test "should be able to sum same units" do
+    assert_equal Magic.new(9, :magic_missile), [@two, @three, @four].sum
+  end
+
+  test 'can check for finite?' do
+    assert Magic.new(0, :magic_missile).finite?
+    refute Magic.new(Float::INFINITY, :magic_missile).finite?
+  end
+
+  test 'can check for infinite?' do
+    assert Magic.new(Float::INFINITY, :magic_missile).infinite?
+    refute Magic.new(0, :magic_missile).infinite?
+  end
+
+  test 'can check for zero?' do
+    assert Magic.new(0, :magic_missile).zero?
+    refute Magic.new(1, :magic_missile).zero?
+  end
+
+  test 'can check for nonzero?' do
+    assert_equal Magic.new(10, :magic_missile), Magic.new(10, :magic_missile).nonzero?
+    assert Magic.new(10, :magic_missile).nonzero?
+    refute Magic.new(0, :magic_missile).nonzero?
+  end
+
+  test 'can check for positive?' do
+    assert Magic.new(1, :magic_missile).positive?
+    refute Magic.new(-1, :magic_missile).positive?
+  end
+
+  test 'can check for negative?' do
+    assert Magic.new(-1, :magic_missile).negative?
+    refute Magic.new(1, :magic_missile).negative?
+  end
+
   test "#+ should add together same units" do
     assert_equal Magic.new(5, :magic_missile), @two + @three
     assert_equal Magic.new(5, :magic_missile), @three + @two

data/test/measurable_test.rb

@@ -232,6 +232,11 @@ class Measured::MeasurableTest < ActiveSupport::TestCase
     assert_equal "9.34 magic_missile", Magic.new(9.342, :magic_missile).format
   end
 
+  test "#format can drop the conversion amount" do
+    assert_equal "1.00 fireball (2/3 magic_missile)", Magic.new(1, :fireball).format
+    assert_equal "1.00 fireball", Magic.new(1, :fireball).format(with_conversion_string: false)
+  end
+
   test "#humanize outputs the number and the unit properly pluralized" do
     assert_equal "1 fireball", Magic.new("1", :fire).humanize
     assert_equal "10 fireballs", Magic.new(10, :fire).humanize
@@ -246,12 +251,6 @@ class Measured::MeasurableTest < ActiveSupport::TestCase
     assert_equal "#<Magic: 1.234 #<Measured::Unit: magic_missile (magic_missiles, magic missile)>>", Magic.new(1.234, :magic_missile).inspect
   end
 
-  test "#zero? always returns false" do
-    refute_predicate Magic.new(0, :fire), :zero?
-    refute_predicate Magic.new(0.0, :fire), :zero?
-    refute_predicate Magic.new("0.0", :fire), :zero?
-  end
-
   test "#<=> compares regardless of the unit" do
     assert_equal (-1), @magic <=> Magic.new(20, :fire)
     assert_equal 1, @magic <=> Magic.new(9, :magic_missile)

data/test/unit_test.rb

@@ -43,6 +43,10 @@ class Measured::UnitTest < ActiveSupport::TestCase
     assert_equal "pie (1/2 sweet)", Measured::Unit.new(:pie, aliases: ["cake"], value: "0.5 sweet").to_s
   end
 
+  test "#to_s can drop the conversion amount" do
+    assert_equal "pie", Measured::Unit.new(:pie).to_s(with_conversion_string: false)
+  end
+
   test "#inspect returns an expected string" do
     assert_equal "#<Measured::Unit: pie>", Measured::Unit.new(:pie).inspect
     assert_equal "#<Measured::Unit: pie (cake, semi-sweet)>", Measured::Unit.new(:pie, aliases: ["cake", "semi-sweet"]).inspect

data/test/units/volume_test.rb

@@ -19,6 +19,16 @@ class Measured::VolumeTest < ActiveSupport::TestCase
       liters
       litres
       ft3
+      cm3
+      cubic_centimeter
+      cubic_centimeters
+      cubic_centimetre
+      cubic_centimetres
+      mm3
+      cubic_millimeter
+      cubic_millimeters
+      cubic_millimetre
+      cubic_millimetres
       cubic_foot
       cubic_feet
       in3
@@ -67,7 +77,7 @@ class Measured::VolumeTest < ActiveSupport::TestCase
   end
 
   test ".unit_names should be the list of base unit names" do
-    expected_units = %w(l m3 ft3 in3 gal us_gal qt us_qt pt us_pt oz us_oz)
+    expected_units = %w(l m3 ft3 in3 gal us_gal qt us_qt pt us_pt oz us_oz mm3 cm3)
     expected_units += Measured::UnitSystemBuilder::SI_PREFIXES.map { |short, _, _| "#{short}l" }
     assert_equal expected_units.sort, Measured::Volume.unit_names
   end
@@ -124,6 +134,102 @@ class Measured::VolumeTest < ActiveSupport::TestCase
   test ".convert_to from us_oz to us_oz" do
     assert_conversion Measured::Volume, "2000 us_oz", "2000 us_oz"
   end
+  
+  test ".convert_to from mm3 to mm3" do
+    assert_conversion Measured::Volume, "20000 mm3", "20000 mm3"
+  end
+
+  test ".convert_to from cm3 to cm3" do
+    assert_conversion Measured::Volume, "20000 cm3", "20000 cm3"
+  end
+
+  test ".convert_to from mm3 to m3" do
+    assert_conversion Measured::Volume, "20000 mm3", "0.00002 m3"
+  end
+
+  test ".convert_to from mm3 to ft3" do
+    assert_conversion Measured::Volume, "20000 mm3", "0.00070629333 ft3"
+  end
+
+  test ".convert_to from mm3 to in3" do
+    assert_conversion Measured::Volume, "20000 mm3", "1.2204749 in3"
+  end
+
+  test ".convert_to from mm3 to gal" do
+    assert_conversion Measured::Volume, "20000 mm3", "0.004399384965981756 gal"
+  end
+
+  test ".convert_to from mm3 to us_gal" do
+    assert_conversion Measured::Volume, "20000 mm3", "0.005283441047162969 us_gal"
+  end
+
+  test ".convert_to from mm3 to qt" do
+    assert_conversion Measured::Volume, "20000 mm3", "0.01759754 qt"
+  end
+
+  test ".convert_to from mm3 to us_qt" do
+    assert_conversion Measured::Volume, "20000 mm3", "0.021133764 us_qt"
+  end
+
+  test ".convert_to from mm3 to pt" do
+    assert_conversion Measured::Volume, "20000 mm3", "0.03519508 pt"
+  end
+
+  test ".convert_to from mm3 to us_pt" do
+    assert_conversion Measured::Volume, "20000 mm3", "0.042267528 us_pt"
+  end
+
+  test ".convert_to from mm3 to oz" do
+    assert_conversion Measured::Volume, "20000 mm3", "0.70390159 oz"
+  end
+
+  test ".convert_to from mm3 to us_oz" do
+    assert_conversion Measured::Volume, "20000 mm3", "0.67628045 us_oz"
+  end
+
+  test ".convert_to from cm3 to m3" do
+    assert_conversion Measured::Volume, "20000 cm3", "0.02 m3"
+  end
+
+  test ".convert_to from cm3 to ft3" do
+    assert_conversion Measured::Volume, "20000 cm3", "0.70629333 ft3"
+  end
+
+  test ".convert_to from cm3 to in3" do
+    assert_conversion Measured::Volume, "20000 cm3", "1220.4748818946457 in3"
+  end
+
+  test ".convert_to from cm3 to gal" do
+    assert_conversion Measured::Volume, "20000 cm3", "4.399384965981756 gal"
+  end
+
+  test ".convert_to from cm3 to us_gal" do
+    assert_conversion Measured::Volume, "20000 cm3", "5.283441047162969 us_gal"
+  end
+
+  test ".convert_to from cm3 to qt" do
+    assert_conversion Measured::Volume, "20000 cm3", "17.59754 qt"
+  end
+
+  test ".convert_to from cm3 to us_qt" do
+    assert_conversion Measured::Volume, "20000 cm3", "21.133764 us_qt"
+  end
+
+  test ".convert_to from cm3 to pt" do
+    assert_conversion Measured::Volume, "20000 cm3", "35.19508 pt"
+  end
+
+  test ".convert_to from cm3 to us_pt" do
+    assert_conversion Measured::Volume, "20000 cm3", "42.267528 us_pt"
+  end
+
+  test ".convert_to from cm3 to oz" do
+    assert_conversion Measured::Volume, "20000 cm3", "703.9015945570809 oz"
+  end
+
+  test ".convert_to from cm3 to us_oz" do
+    assert_conversion Measured::Volume, "20000 cm3", "676.28045403686 us_oz"
+  end
 
   test ".convert_to from ml to m3" do
     assert_conversion Measured::Volume, "2000 ml", "0.002 m3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: measured
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.2
 platform: ruby
 authors:
 - Kevin McPhillips
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-06 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.20
 signing_key: 
 specification_version: 4
 summary: Encapsulate measurements with their units in Ruby