fix: load UnitsDB with context fallback and clean up MathML handling

Author: suleman-uzair

Gemfile

@@ -10,7 +10,7 @@ gem "lutaml-model",
     "~> 0.8.0",
     github: "lutaml/lutaml-model",
     branch: "fix/global-context-register-lookup-fallback"
-gem "mml", github: "plurimath/mml", branch: "main"
+gem "mml", github: "plurimath/mml", branch: "fix/mixed-content-collection"
 gem "oga"
 gem "ox"
 gem "plurimath", github: "plurimath/plurimath",

docs/README.adoc

@@ -54,7 +54,8 @@ out of commits unless the branch intentionally requires them.
 
 The standard Ruby runtime path goes through `::Unitsdb.database`. When
 `unitsdb-ruby` cannot load its bundled `data/` directory, UnitsML falls back to
-the packaged YAML files under `vendor/unitsdb`.
+the packaged YAML files in the `unitsdb-ruby` gem's `vendor/unitsdb`
+directory, rather than a `vendor/unitsdb` directory in this repository.
 
 
 == Usage

lib/unitsml/formula.rb

@@ -199,17 +199,6 @@ def plurimath_available?
         Plurimath.const_defined?(:Mathml)
     end
 
-    def nullify_mml_models
-      return unless defined?(Plurimath::Mathml::Parser::CONFIGURATION)
-
-      Plurimath::Mathml::Parser::CONFIGURATION.each_key { |klass| klass.model(klass) }
-    end
-
-    def reset_mml_models
-      return unless defined?(Plurimath::Mathml::Parser::CONFIGURATION)
-
-      ::Mml::V4::Configuration.custom_models = Plurimath::Mathml::Parser::CONFIGURATION
-    end
     def process_value(math, mathml_instances)
       case mathml_instances
       when Array

lib/unitsml/unit.rb

@@ -43,7 +43,7 @@ def to_mathml(options)
       if prefix
         value = mml_v4_with_content(
           value,
-          "#{prefix.to_mathml(**options, parent: value)}#{value.value}",
+          "#{prefix.to_mathml(options.merge(parent: value))}#{value.value}",
         )
       end
       if power_numerator

lib/unitsml/unitsdb.rb

@@ -68,18 +68,24 @@ def database
       private
 
       def load_database
+        context_id = Configuration.context.id
+
         if RUBY_ENGINE == "opal"
-          return Database.from_db(nil, context: Configuration.context.id)
+          return Database.from_db(nil, context: context_id)
         end
 
         if ::Unitsdb.respond_to?(:database)
-          return ::Unitsdb.database(context: Configuration.context.id)
+          return load_unitsdb_database(context_id)
         end
 
-        ::Unitsdb::Database.from_db(database_path)
+        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
-        ::Unitsdb::Database.from_db(database_path)
+        Database.from_db(database_path, context: context_id)
       end
 
       def database_path

lib/unitsml/unitsdb/prefix_reference.rb

@@ -16,7 +16,7 @@ def power
       end
 
       def prefix
-        @prefix ||= ::Unitsdb.database.prefixes.find do |p|
+        @prefix ||= Unitsml::Unitsdb.database.prefixes.find do |p|
           p.identifiers.any? { |i| i.id == id }
         end
       end

lib/unitsml/utility.rb

@@ -184,10 +184,10 @@ def prefix_like?(prefix)
       def prefix_symbolid(prefix)
         return prefix.symbolid if prefix.respond_to?(:symbolid)
 
-        resolved_prefix = resolved_prefix(prefix)
-        return unless resolved_prefix
+        prefix_record = resolved_prefix(prefix)
+        return unless prefix_record
 
-        resolved_prefix.symbols&.first&.ascii
+        prefix_record.symbols&.first&.ascii
       end
 
       def prefix_base(prefix)

spec/unitsml/unitsdb/database_spec.rb

@@ -31,11 +31,9 @@
       end
     end
   end
-end
 
-RSpec.describe Unitsml::Unitsdb do
-  describe ".database" do
-    let(:context) { instance_double("Unitsdb context", id: :unitsml_ruby) }
+  describe Unitsml::Unitsdb, ".database" do
+    let(:context) { Struct.new(:id).new(:unitsml_ruby) }
 
     before do
       described_class.instance_variable_set(:@database, nil)
@@ -61,5 +59,42 @@
         )
       end
     end
+
+    context "when unitsdb-ruby exposes a database loader" do
+      before do
+        stub_const("RUBY_ENGINE", "ruby")
+        allow(Unitsdb).to receive(:database).and_return(:unitsdb_database)
+      end
+
+      it "uses the unitsdb-ruby loader with the UnitsML context" do
+        expect(described_class.database).to eq(:unitsdb_database)
+        expect(Unitsdb).to have_received(:database).with(
+          context: :unitsml_ruby,
+        )
+      end
+    end
+
+    context "when unitsdb-ruby cannot load its packaged data directory" do
+      before do
+        stub_const("RUBY_ENGINE", "ruby")
+        allow(Unitsdb).to receive(:database).and_raise(
+          Unitsdb::Errors::DatabaseNotFoundError,
+        )
+        allow(described_class)
+          .to receive(:database_path)
+          .and_return("/tmp/fallback-unitsdb")
+        allow(Unitsml::Unitsdb::Database)
+          .to receive(:from_db)
+          .and_return(:fallback_database)
+      end
+
+      it "falls back to the UnitsML database wrapper with the same context" do
+        expect(described_class.database).to eq(:fallback_database)
+        expect(Unitsml::Unitsdb::Database).to have_received(:from_db).with(
+          "/tmp/fallback-unitsdb",
+          context: :unitsml_ruby,
+        )
+      end
+    end
   end
 end