ruby-units 4.0.1 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab979845681df4808b65ce563da009fb7f85a959d5aaab8d34da777e4e8023cf
-  data.tar.gz: 6505e1967cd97df4a80dc708e69f22031b6be1fc7b776568a9c65c7c276f798a
+  metadata.gz: 2371b3ae13f46ce73b204bbbc66d9bdcd91e10a1acc890e7ef532c774a530d64
+  data.tar.gz: 16ebec59108aa9e7ac93cbb09c7610744c2f8aa39263a2069aba3999f4414e12
 SHA512:
-  metadata.gz: 579256ed6966a612661b3a677dcb5c991a39498b1b9789a48e501c68ad0d39b8937bb9c57ed4c47bc9ec5028c32752645d52b269a38cf6cf12a1062a4d52b27f
-  data.tar.gz: 708818f3a5311a0322c3b8afffdfb72dba0a9ba64892f403579abb16a76c0f7257a5602a66d02123a2a01afa02fdf4baf38ab94af0d0503d4c5923f489965f09
+  metadata.gz: 0fdfb41ee29400a9686c8555b41d2439b6e77b0f727a1a845e456e9625e91d86ded9c8bf55a745ebedb3eb1533f427f05e3b21625918b8a5c9bd8070ac837dd4
+  data.tar.gz: 616b0c7479d9e07d1fedb70539b13e4ff108157ef891f2bcf2de2dedfae02d04964c7876aec69eba51bf881e8295c2e5d30ffc425e9ce79b32a6ba84be8f268f

data/.rubocop.yml

@@ -24,3 +24,5 @@ Style/FormatString:
   Enabled: false
 Style/DateTime:
   Enabled: false
+Metrics/ClassLength:
+  Enabled: false

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    ruby-units (4.0.1)
+    ruby-units (4.0.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
     backport (1.2.0)
-    benchmark (0.2.1)
+    benchmark (0.3.0)
     coderay (1.1.3)
-    debug (1.8.0)
-      irb (>= 1.5.0)
-      reline (>= 0.3.1)
-    diff-lcs (1.5.0)
+    debug (1.9.1)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
+    diff-lcs (1.5.1)
     docile (1.4.0)
     e2mmap (0.1.0)
     ffi (1.16.3)
@@ -33,16 +33,16 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    io-console (0.6.0)
-    io-console (0.6.0-java)
-    irb (1.8.3)
+    io-console (0.7.2)
+    io-console (0.7.2-java)
+    irb (1.11.1)
       rdoc
-      reline (>= 0.3.8)
+      reline (>= 0.4.2)
     jar-dependencies (0.4.1)
     jaro_winkler (1.5.6)
     jaro_winkler (1.5.6-java)
-    json (2.6.3)
-    json (2.6.3-java)
+    json (2.7.1)
+    json (2.7.1-java)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -51,22 +51,22 @@ GEM
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.9)
+    lumberjack (1.2.10)
     method_source (1.0.0)
     nenv (0.3.0)
-    nokogiri (1.15.4-arm64-darwin)
+    nokogiri (1.16.2-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.4-java)
+    nokogiri (1.16.2-java)
       racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-darwin)
+    nokogiri (1.16.2-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-linux)
+    nokogiri (1.16.2-x86_64-linux)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.23.0)
-    parser (3.2.2.4)
+    parallel (1.24.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
     pry (0.14.2)
@@ -76,67 +76,67 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
       spoon (~> 0.0)
-    psych (5.1.1.1)
+    psych (5.1.2)
       stringio
-    psych (5.1.1.1-java)
+    psych (5.1.2-java)
       jar-dependencies (>= 0.1.7)
-    racc (1.7.2)
-    racc (1.7.2-java)
+    racc (1.7.3)
+    racc (1.7.3-java)
     rainbow (3.1.1)
     rake (13.1.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rbs (2.8.4)
-    rdoc (6.5.0)
+    rdoc (6.6.2)
       psych (>= 4.0.0)
     redcarpet (3.6.0)
-    regexp_parser (2.8.2)
-    reline (0.3.9)
+    regexp_parser (2.9.0)
+    reline (0.4.2)
       io-console (~> 0.5)
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
-    rubocop (1.57.2)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.0)
+    rubocop (1.60.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-capybara (2.19.0)
+    rubocop-capybara (2.20.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
-    rubocop-factory_bot (2.24.0)
-      rubocop (~> 1.33)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.25.0)
+    rubocop-rspec (2.26.1)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
     ruby-maven (3.3.13)
       ruby-maven-libs (~> 3.3.9)
     ruby-maven-libs (3.3.9)
-    ruby-prof (1.6.3)
+    ruby-prof (1.7.0)
     ruby-progressbar (1.13.0)
     shellany (0.0.1)
     simplecov (0.22.0)
@@ -145,7 +145,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    solargraph (0.49.0)
+    solargraph (0.50.0)
       backport (~> 1.2)
       benchmark
       bundler (~> 2.0)
@@ -163,7 +163,7 @@ GEM
       yard (~> 0.9, >= 0.9.24)
     spoon (0.0.6)
       ffi
-    stringio (3.0.8)
+    stringio (3.1.0)
     terminal-notifier (2.0.0)
     terminal-notifier-guard (1.7.0)
     thor (1.3.0)
@@ -175,6 +175,7 @@ GEM
 PLATFORMS
   arm64-darwin-21
   arm64-darwin-22
+  arm64-darwin-23
   java
   universal-java-11
   universal-java-18
@@ -203,4 +204,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.4.19
+   2.5.3

data/lib/ruby_units/unit.rb

@@ -1,6 +1,6 @@
 require 'date'
 module RubyUnits
-  # Copyright 2006-2023
+  # Copyright 2006-2024
   # @author Kevin C. Olbrich, Ph.D.
   # @see https://github.com/olbrich/ruby-units
   #
@@ -165,6 +165,17 @@ module RubyUnits
 
     # Class Methods
 
+    # Callback triggered when a subclass is created. This properly sets up the internal variables, and copies
+    # definitions from the parent class.
+    #
+    # @param [Class] subclass
+    def self.inherited(subclass)
+      super
+      subclass.definitions = definitions.dup
+      subclass.instance_variable_set(:@kinds, @kinds.dup)
+      subclass.setup
+    end
+
     # setup internal arrays and hashes
     # @return [Boolean]
     def self.setup
@@ -1629,8 +1640,11 @@ module RubyUnits
         return self
       end
 
-      while unit_string.gsub!(/(<#{self.class.unit_regex})><(#{self.class.unit_regex}>)/, '\1*\2')
-        # collapse <x><y><z> into <x*y*z>...
+      while unit_string.gsub!(/<(#{self.class.prefix_regex})><(#{self.class.unit_regex})>/, '<\1\2>')
+        # replace <prefix><unit> with <prefixunit>
+      end
+      while unit_string.gsub!(/<#{self.class.unit_match_regex}><#{self.class.unit_match_regex}>/, '<\1\2>*<\3\4>')
+        # collapse <prefixunit><prefixunit> into <prefixunit>*<prefixunit>...
       end
       # ... and then strip the remaining brackets for x*y*z
       unit_string.gsub!(/[<>]/, '')

data/lib/ruby_units/unit_definitions/standard.rb

@@ -27,7 +27,8 @@ end
 
 RubyUnits::Unit.define('naut-mile') do |naut|
   naut.definition = RubyUnits::Unit.new('1852 m')
-  naut.aliases    = %w[nmi M NM]
+  naut.aliases    = %w[nmi NM]
+  # Don't use the 'M' abbreviation here since it conflicts with 'Molar'
 end
 
 # on land
@@ -71,7 +72,9 @@ end
 
 RubyUnits::Unit.define('pica') do |pica|
   pica.definition = RubyUnits::Unit.new('1/72 ft')
-  pica.aliases    = %w[P pica picas]
+  pica.aliases    = %w[pica picas]
+  # Don't use 'P' as an abbreviation since it conflicts with 'Poise'
+  # Don't use 'pc' as an abbreviation since it conflicts with 'parsec'
 end
 
 RubyUnits::Unit.define('point') do |point|

data/lib/ruby_units/version.rb

@@ -1,5 +1,5 @@
 module RubyUnits
   class Unit < Numeric
-    VERSION = '4.0.1'.freeze
+    VERSION = '4.0.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-units
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.3
 platform: ruby
 authors:
 - Kevin Olbrich
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-02 00:00:00.000000000 Z
+date: 2024-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '2.0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Provides classes and methods to perform unit math and conversions