unitsml 0.6.2 → 0.6.4

data/lib/unitsml/unitsdb/units.rb

@@ -3,10 +3,6 @@
 module Unitsml
   module Unitsdb
     class Units < ::Unitsdb::Units
-      def units=(value)
-        super(value.map { |u| Unit.new(u.to_hash) })
-      end
-
       def find_by_id(u_id)
         find(u_id, :id, :identifiers)
       end
@@ -45,5 +41,7 @@ module Unitsml
         end
       end
     end
+
+    Configuration.register_model(Units, id: :units)
   end
 end

data/lib/unitsml/unitsdb.rb

@@ -1,32 +1,53 @@
 # frozen_string_literal: true
 
+require "unitsdb"
+
+require_relative "unitsdb/database"
+require_relative "unitsdb/dimension_details"
+require_relative "unitsdb/prefix_reference"
+require_relative "unitsdb/dimension"
+require_relative "unitsdb/dimensions"
+require_relative "unitsdb/unit"
+require_relative "unitsdb/units"
+require_relative "unitsdb/prefixes"
+require_relative "unitsdb/quantities"
 module Unitsml
   module Unitsdb
-    autoload :Unit, "#{__dir__}/unitsdb/unit"
-    autoload :Units, "#{__dir__}/unitsdb/units"
-    autoload :Prefixes, "#{__dir__}/unitsdb/prefixes"
-    autoload :Dimension, "#{__dir__}/unitsdb/dimension"
-    autoload :Dimensions, "#{__dir__}/unitsdb/dimensions"
-    autoload :Quantities, "#{__dir__}/unitsdb/quantities"
-    autoload :PrefixReference, "#{__dir__}/unitsdb/prefix_reference"
-    autoload :DimensionQuantity, "#{__dir__}/unitsdb/dimension_quantity"
-    autoload :SiDerivedBase, "#{__dir__}/unitsdb/si_derived_base"
-
     class << self
+      REQUIRED_DATABASE_FILES = %w[
+        prefixes.yaml
+        dimensions.yaml
+        units.yaml
+        quantities.yaml
+        unit_systems.yaml
+      ].freeze
+
       def units
-        Units.new(units: ::Unitsdb.database.units)
+        @units ||= Units.new(
+          units: database.units,
+          lutaml_register: Configuration.context.id,
+        )
       end
 
       def prefixes
-        Prefixes.new(prefixes: ::Unitsdb.database.prefixes)
+        @prefixes ||= Prefixes.new(
+          prefixes: database.prefixes,
+          lutaml_register: Configuration.context.id,
+        )
       end
 
       def dimensions
-        Dimensions.new(dimensions: ::Unitsdb.database.dimensions)
+        @dimensions ||= Dimensions.new(
+          dimensions: database.dimensions,
+          lutaml_register: Configuration.context.id,
+        )
       end
 
       def quantities
-        Quantities.new(quantities: ::Unitsdb.database.quantities)
+        @quantities ||= Quantities.new(
+          quantities: database.quantities,
+          lutaml_register: Configuration.context.id,
+        )
       end
 
       def prefixes_array
@@ -39,6 +60,53 @@ module Unitsml
 
         @sized_prefixes[size] = prefixes_array.select { |p| p.size == size }
       end
+
+      def database
+        @database ||= load_database
+      end
+
+      private
+
+      def load_database
+        context_id = Configuration.context.id
+
+        if ::Unitsdb.respond_to?(:database)
+          return load_unitsdb_database(context_id)
+        end
+
+        Database.from_db(database_path, context: context_id)
+      end
+
+      def load_unitsdb_database(context_id)
+        ::Unitsdb.database(context: context_id)
+      rescue ::Unitsdb::Errors::DatabaseNotFoundError,
+             ::Unitsdb::Errors::DatabaseFileNotFoundError
+        Database.from_db(database_path, context: context_id)
+      end
+
+      def database_path
+        candidate_database_paths.find do |path|
+          database_files_present?(path)
+        end ||
+          File.join(unitsdb_gem_path, "vendor", "unitsdb")
+      end
+
+      def candidate_database_paths
+        [
+          File.join(unitsdb_gem_path, "data"),
+          File.join(unitsdb_gem_path, "vendor", "unitsdb"),
+        ]
+      end
+
+      def database_files_present?(dir_path)
+        REQUIRED_DATABASE_FILES.all? do |file_name|
+          File.exist?(File.join(dir_path, file_name))
+        end
+      end
+
+      def unitsdb_gem_path
+        Gem.loaded_specs.fetch("unitsdb").full_gem_path
+      end
     end
   end
 end

data/lib/unitsml/utility.rb

@@ -40,6 +40,12 @@ module Unitsml
     ].freeze
 
     UNKNOWN = "unknown"
+    PREFIX_SYMBOL_METHODS = {
+      ASCII: :to_asciimath,
+      unicode: :to_unicode,
+      LaTeX: :to_latex,
+      HTML: :to_html,
+    }.freeze
 
     class << self
       def unit_instance(unit)
@@ -139,26 +145,71 @@ module Unitsml
       end
 
       def prefix_object(prefix)
-        return prefix unless prefix.is_a?(String)
-        return nil unless Unitsdb.prefixes_array.any?(prefix)
+        return nil if prefix.nil?
+        return prefix if prefix_like?(prefix)
+
+        if prefix.is_a?(String)
+          return nil unless Unitsdb.prefixes_array.any?(prefix)
+
+          return Prefix.new(prefix)
+        end
 
-        Prefix.new(prefix)
+        return Unitsdb.prefixes.find_by_id(prefix.id) if prefix.respond_to?(:id)
+
+        prefix
       end
 
       def combine_prefixes(p1, p2)
+        p1 = prefix_object(p1)
+        p2 = prefix_object(p2)
         return nil if p1.nil? && p2.nil?
-        return p1.symbolid if p2.nil?
-        return p2.symbolid if p1.nil?
-        return UNKNOWN if p1.base != p2.base
+        return prefix_symbolid(p1) if p2.nil?
+        return prefix_symbolid(p2) if p1.nil?
+        return UNKNOWN if prefix_base(p1) != prefix_base(p2)
 
         Unitsdb.prefixes_array.each do |prefix_name|
           p = prefix_object(prefix_name)
-          return p if p.base == p1.base && p.power == p1.power + p2.power
+          return p if prefix_base(p) == prefix_base(p1) &&
+            prefix_power(p) == prefix_power(p1) + prefix_power(p2)
         end
 
         UNKNOWN
       end
 
+      def prefix_like?(prefix)
+        prefix.respond_to?(:base) && prefix.respond_to?(:power) &&
+          (prefix.respond_to?(:symbolid) || prefix.respond_to?(:symbols))
+      end
+
+      def prefix_symbolid(prefix)
+        return prefix.symbolid if prefix.respond_to?(:symbolid)
+
+        prefix_record = resolved_prefix(prefix)
+        return unless prefix_record
+
+        prefix_record.symbols&.first&.ascii
+      end
+
+      def prefix_base(prefix)
+        return prefix.base if prefix.respond_to?(:base)
+
+        resolved_prefix(prefix)&.base
+      end
+
+      def prefix_power(prefix)
+        return prefix.power if prefix.respond_to?(:power)
+
+        resolved_prefix(prefix)&.power
+      end
+
+      def resolved_prefix(prefix)
+        return prefix if prefix.nil?
+        return prefix if prefix.respond_to?(:symbols) && prefix.respond_to?(:base) && prefix.respond_to?(:power)
+        return Unitsdb.prefixes.find_by_id(prefix.id) if prefix.respond_to?(:id)
+
+        prefix
+      end
+
       def unit(units, formula, dims, norm_text, name, options)
         attributes = {
           id: unit_id(norm_text),
@@ -168,7 +219,7 @@ module Unitsml
           root_units: rootunits(units),
         }
         attributes[:dimension_url] = "##{dim_id(dims)}" if dims
-        Model::Unit.new(attributes).to_xml
+        Model::Unit.new(**attributes, lutaml_register: Configuration.context.id).to_xml
           .force_encoding("UTF-8")
           .gsub("&lt;", "<")
           .gsub("&gt;", ">")
@@ -178,8 +229,11 @@ module Unitsml
       end
 
       def unitname(text, name)
-        name ||= unit_instance(text)&.en_name || text
-        Model::Units::Name.new(name: name)
+        name ||= unit_en_name(unit_instance(text)) || text
+        Model::Units::Name.new(
+          name: name,
+          lutaml_register: Configuration.context.id,
+        )
       end
 
       def unitsymbols(formula, options)
@@ -187,31 +241,44 @@ module Unitsml
           Model::Units::Symbol.new(
             type: lang,
             content: formula.public_send(:"to_#{lang.downcase}", options),
+            lutaml_register: Configuration.context.id,
           )
         end
       end
 
       def unitsystem(units)
         ret = []
-        ret << Model::Units::System.new(name: "not_SI", type: "not_SI") if units.any? { |u| !u.si_system_type? }
+        if units.any? { |u| !u.si_system_type? }
+          ret << Model::Units::System.new(
+            name: "not_SI",
+            type: "not_SI",
+            lutaml_register: Configuration.context.id,
+          )
+        end
         if units.any?(&:si_system_type?)
           if units.size == 1
             base = units[0].downcase_system_type == "si_base"
             base = true if units[0].unit_name == "g" && units[0]&.prefix_name == "k"
           end
-          ret << Model::Units::System.new(name: "SI",
-                                          type: (base ? "SI_base" : "SI_derived"))
+          ret << Model::Units::System.new(
+            name: "SI",
+            type: (base ? "SI_base" : "SI_derived"),
+            lutaml_register: Configuration.context.id,
+          )
         end
         ret
       end
 
       def dimension(norm_text)
-        dim_id = unit_instance(norm_text)&.dimension_url
+        dim_id = unit_dimension_id(unit_instance(norm_text))
         return unless dim_id
 
         dim_attrs = { id: dim_id }
         dimid2dimensions(dim_id)&.compact&.each { |u| dimension1(u, dim_attrs) }
-        Model::Dimension.new(dim_attrs).to_xml.force_encoding("UTF-8")
+        Model::Dimension.new(
+          dim_attrs,
+          lutaml_register: Configuration.context.id,
+        ).to_xml.force_encoding("UTF-8")
       end
 
       def dimension1(dim, dims_hash)
@@ -220,6 +287,7 @@ module Unitsml
         dims_hash[underscore(dim_name).to_sym] = dim_klass.new(
           symbol: dim[:symbol],
           power_numerator: float_to_display(dim[:exponent]),
+          lutaml_register: Configuration.context.id,
         )
       end
 
@@ -250,23 +318,44 @@ module Unitsml
       def prefixes(units, options)
         uniq_prefixes = units.filter_map(&:prefix).uniq(&:prefix_name)
         uniq_prefixes.map do |prefix|
-          prefix_attrs = { prefix_base: prefix&.base,
-                           prefix_power: prefix&.power, id: prefix&.id }
-          type_and_methods = { ASCII: :to_asciimath, unicode: :to_unicode,
-                               LaTeX: :to_latex, HTML: :to_html }
-          prefix_attrs[:name] = Model::Prefixes::Name.new(content: prefix&.name)
-          prefix_attrs[:symbol] = type_and_methods.map do |type, method_name|
-            Model::Prefixes::Symbol.new(
-              type: type,
-              content: prefix&.public_send(method_name, options),
-            )
-          end
-          Model::Prefix.new(prefix_attrs).to_xml.force_encoding("UTF-8").gsub(
-            "&amp;", "&"
-          )
+          prefix_xml(prefix, options)
         end.join("\n")
       end
 
+      def prefix_xml(prefix, options)
+        Model::Prefix.new(
+          prefix_attributes(prefix, options),
+          lutaml_register: Configuration.context.id,
+        ).to_xml.force_encoding("UTF-8").gsub("&amp;", "&")
+      end
+
+      def prefix_attributes(prefix, options)
+        {
+          prefix_base: prefix&.base,
+          prefix_power: prefix&.power,
+          id: prefix&.id,
+          name: prefix_name(prefix),
+          symbol: prefix_symbols(prefix, options),
+        }
+      end
+
+      def prefix_name(prefix)
+        Model::Prefixes::Name.new(
+          content: prefix&.name,
+          lutaml_register: Configuration.context.id,
+        )
+      end
+
+      def prefix_symbols(prefix, options)
+        PREFIX_SYMBOL_METHODS.map do |type, method_name|
+          Model::Prefixes::Symbol.new(
+            type: type,
+            content: prefix&.public_send(method_name, options),
+            lutaml_register: Configuration.context.id,
+          )
+        end
+      end
+
       def rootunits(units)
         return if units.size == 1 && !units[0].prefix
 
@@ -275,9 +364,15 @@ module Unitsml
           attributes[:prefix] = unit.prefix_name if unit.prefix
           unit.power_numerator && unit.power_numerator != "1" and
             attributes[:power_numerator] = unit.power_numerator.raw_value
-          Model::Units::EnumeratedRootUnit.new(attributes)
+          Model::Units::EnumeratedRootUnit.new(
+            **attributes,
+            lutaml_register: Configuration.context.id,
+          )
         end
-        Model::Units::RootUnits.new(enumerated_root_unit: enum_root_units)
+        Model::Units::RootUnits.new(
+          enumerated_root_unit: enum_root_units,
+          lutaml_register: Configuration.context.id,
+        )
       end
 
       def unit_id(text)
@@ -288,7 +383,7 @@ module Unitsml
       end
 
       def format_unit_id(unit, text)
-        return unit.nist_id&.gsub("'", "_") if unit
+        return unit_nist_id(unit)&.gsub("'", "_") if unit
 
         text&.gsub("*", ".")&.gsub("^", "")
       end
@@ -298,7 +393,10 @@ module Unitsml
 
         dim_attrs = { id: dim_id(dims) }
         dims.map { |u| dimension1(u, dim_attrs) }
-        Model::Dimension.new(dim_attrs).to_xml.force_encoding("UTF-8")
+        Model::Dimension.new(
+          **dim_attrs,
+          lutaml_register: Configuration.context.id,
+        ).to_xml.force_encoding("UTF-8")
       end
 
       def quantity(normtext, instance)
@@ -307,10 +405,36 @@ module Unitsml
 
         model_quantity_xml(
           instance || unit.quantity_references&.first&.id,
-          "##{unit.dimension_url}",
+          "##{unit_dimension_id(unit)}",
         )
       end
 
+      def unit_nist_id(unit)
+        return unless unit
+        return unit.nist_id if unit.respond_to?(:nist_id)
+
+        unit.identifiers&.find { |identifier| identifier.type == "nist" }&.id
+      end
+
+      def unit_en_name(unit)
+        return unless unit
+        return unit.en_name if unit.respond_to?(:en_name)
+
+        unit.names&.find { |name| name.lang == "en" }&.value
+      end
+
+      def unit_dimension_id(unit)
+        return unless unit
+        return unit.dimension_url if unit.respond_to?(:dimension_url)
+
+        unit.dimension_reference&.id ||
+          quantity_dimension_id(quantity_instance(unit.quantity_references&.first&.id))
+      end
+
+      def quantity_dimension_id(quantity)
+        quantity&.dimension_reference&.id
+      end
+
       def unit_or_quantity(unit, quantity)
         (unit && unit.quantity_references.size == 1) ||
           quantity_instance(quantity)
@@ -321,6 +445,7 @@ module Unitsml
           id: id,
           name: quantity_name(id),
           dimension_url: url,
+          lutaml_register: Configuration.context.id,
         ).to_xml.force_encoding("UTF-8")
       end
 
@@ -328,7 +453,7 @@ module Unitsml
         quantity_instance(id)&.names&.filter_map do |name|
           next unless name.lang == "en"
 
-          Model::Quantities::Name.new(content: name.value)
+          Model::Quantities::Name.new(content: name.value, lutaml_register: Configuration.context.id)
         end
       end
 

data/lib/unitsml/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Unitsml
-  VERSION = "0.6.2"
+  VERSION = "0.6.4"
 end

data/lib/unitsml.rb

@@ -1,18 +1,20 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require "unitsdb"
+require "mml"
 
 module Unitsml
   module_function
 
   autoload :Dimension, "unitsml/dimension"
+  autoload :Configuration, "unitsml/configuration"
   autoload :Errors, "unitsml/errors"
   autoload :Extender, "unitsml/extender"
   autoload :Fenced, "unitsml/fenced"
   autoload :FencedNumeric, "unitsml/fenced_numeric"
   autoload :Formula, "unitsml/formula"
   autoload :IntermediateExpRules, "unitsml/intermediate_exp_rules"
+  autoload :MathmlHelper, "unitsml/mathml_helper"
   autoload :Model, "unitsml/model"
   autoload :Namespace, "unitsml/namespace"
   autoload :Number, "unitsml/number"
@@ -26,54 +28,11 @@ module Unitsml
   autoload :Utility, "unitsml/utility"
   autoload :VERSION, "unitsml/version"
 
-  REGISTER_ID = :unitsml_ruby
-
   def parse(string)
     Unitsml::Parser.new(string).parse
   end
-
-  def register
-    @register ||= Lutaml::Model::GlobalRegister.lookup(REGISTER_ID)
-  end
-
-  def register_model(klass, id:)
-    register.register_model(klass, id: id)
-  end
-
-  def get_class_from_register(class_name)
-    register.get_class(class_name)
-  end
-
-  def register_type_substitution(from:, to:)
-    register.register_global_type_substitution(
-      from_type: from,
-      to_type: to,
-    )
-  end
-end
-
-Lutaml::Model::GlobalRegister.register(
-  Lutaml::Model::Register.new(Unitsml::REGISTER_ID),
-)
-
-{
-  Unitsdb::Unit => Unitsml::Unitsdb::Unit,
-  Unitsdb::Units => Unitsml::Unitsdb::Units,
-  Unitsdb::Prefixes => Unitsml::Unitsdb::Prefixes,
-  Unitsdb::Dimension => Unitsml::Unitsdb::Dimension,
-  Unitsdb::PrefixReference => Unitsml::Unitsdb::PrefixReference,
-  Unitsdb::DimensionDetails => Unitsml::Unitsdb::DimensionQuantity,
-}.each do |key, value|
-  Unitsml.register_type_substitution(from: key, to: value)
 end
 
-[
-  [Unitsml::Unitsdb::Dimensions, :unitsdb_dimensions],
-  [Unitsml::Unitsdb::Prefixes, :unitsdb_prefixes],
-  [Unitsml::Unitsdb::Quantities, :unitsdb_quantities],
-  [Unitsml::Unitsdb::Units, :unitsdb_units],
-].each { |klass, id| Unitsml.register_model(klass, id: id) }
-
 Lutaml::Model::Config.configure do |config|
   config.xml_adapter_type = RUBY_ENGINE == "opal" ? :oga : :ox
 end

data/unitsml.gemspec

@@ -30,11 +30,11 @@ Gem::Specification.new do |spec|
 
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib", "unitsdb/**/*.yaml"]
+  spec.require_paths = ["lib"]
 
   spec.add_dependency "htmlentities"
   spec.add_dependency "lutaml-model", "~> 0.8.0"
-  spec.add_dependency "mml"
+  spec.add_dependency "mml", "~> 2.3.6"
   spec.add_dependency "parslet"
-  spec.add_dependency "unitsdb", "~> 2.2.1"
+  spec.add_dependency "unitsdb", "~> 2.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unitsml
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-04-04 00:00:00.000000000 Z
+date: 2026-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -42,16 +42,16 @@ dependencies:
   name: mml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.6
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
 description: Library to work with UnitsML in Ruby
 email:
 - open.source@ribose.com
@@ -105,15 +105,18 @@ files:
 - docs/README.adoc
 - docs/navigation.adoc
 - lib/unitsml.rb
+- lib/unitsml/configuration.rb
 - lib/unitsml/dimension.rb
 - lib/unitsml/errors.rb
 - lib/unitsml/errors/base_error.rb
+- lib/unitsml/errors/opal_payload_not_bundled_error.rb
 - lib/unitsml/errors/plurimath_load_error.rb
 - lib/unitsml/extender.rb
 - lib/unitsml/fenced.rb
 - lib/unitsml/fenced_numeric.rb
 - lib/unitsml/formula.rb
 - lib/unitsml/intermediate_exp_rules.rb
+- lib/unitsml/mathml_helper.rb
 - lib/unitsml/model.rb
 - lib/unitsml/model/dimension.rb
 - lib/unitsml/model/dimension_quantities.rb
@@ -149,13 +152,13 @@ files:
 - lib/unitsml/transform.rb
 - lib/unitsml/unit.rb
 - lib/unitsml/unitsdb.rb
+- lib/unitsml/unitsdb/database.rb
 - lib/unitsml/unitsdb/dimension.rb
-- lib/unitsml/unitsdb/dimension_quantity.rb
+- lib/unitsml/unitsdb/dimension_details.rb
 - lib/unitsml/unitsdb/dimensions.rb
 - lib/unitsml/unitsdb/prefix_reference.rb
 - lib/unitsml/unitsdb/prefixes.rb
 - lib/unitsml/unitsdb/quantities.rb
-- lib/unitsml/unitsdb/si_derived_base.rb
 - lib/unitsml/unitsdb/unit.rb
 - lib/unitsml/unitsdb/units.rb
 - lib/unitsml/utility.rb
@@ -171,7 +174,6 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
-- unitsdb/**/*.yaml
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/unitsml/unitsdb/si_derived_base.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module Unitsml
-  module Unitsdb
-    class SiDerivedBase < ::Unitsdb::SiDerivedBase
-      def prefix_reference=(value)
-        return super if value.nil?
-        return super if value.is_a?(PrefixReference)
-
-        super(PrefixReference.new(value.to_hash))
-      end
-    end
-  end
-end