unitsdb 2.1.1 → 2.2.2

data/lib/unitsdb/quantity_reference.rb

@@ -7,4 +7,6 @@ module Unitsdb
     attribute :id, :string
     attribute :type, :string
   end
+
+  Config.register_model(QuantityReference, id: :quantity_reference)
 end

data/lib/unitsdb/qudt.rb

@@ -0,0 +1,105 @@
+# frozen_string_literal: true
+
+module Unitsdb
+  # QUDT Unit from units vocabulary
+  # Example: http://qudt.org/vocab/unit/M (meter)
+  class QudtUnit < Lutaml::Model::Serializable
+    attribute :uri, :string
+    attribute :label, :string
+    attribute :symbol, :string
+    attribute :has_quantity_kind, :string
+    attribute :has_dimension_vector, :string
+    attribute :conversion_multiplier, :float
+    attribute :conversion_offset, :float
+    attribute :description, :string
+    attribute :si_exact_match, :string
+
+    def identifier
+      "qudt:unit:#{uri}"
+    end
+  end
+  Config.register_model(QudtUnit, id: :qudt_unit)
+
+  # QUDT QuantityKind from quantitykinds vocabulary
+  # Example: http://qudt.org/vocab/quantitykind/Length
+  class QudtQuantityKind < Lutaml::Model::Serializable
+    attribute :uri, :string
+    attribute :label, :string
+    attribute :has_dimension_vector, :string
+    attribute :description, :string
+    attribute :symbol, :string
+    attribute :si_exact_match, :string
+
+    def identifier
+      "qudt:quantitykind:#{uri}"
+    end
+  end
+  Config.register_model(QudtQuantityKind, id: :qudt_quantity_kind)
+
+  # QUDT DimensionVector from dimensionvectors vocabulary
+  # Example: http://qudt.org/vocab/dimensionvector/A0E0L1I0M0H0T0D0
+  class QudtDimensionVector < Lutaml::Model::Serializable
+    attribute :uri, :string
+    attribute :label, :string
+    attribute :dimension_exponent_for_length, :integer
+    attribute :dimension_exponent_for_mass, :integer
+    attribute :dimension_exponent_for_time, :integer
+    attribute :dimension_exponent_for_electric_current, :integer
+    attribute :dimension_exponent_for_thermodynamic_temperature, :integer
+    attribute :dimension_exponent_for_amount_of_substance, :integer
+    attribute :dimension_exponent_for_luminous_intensity, :integer
+    attribute :description, :string
+
+    def identifier
+      "qudt:dimensionvector:#{uri}"
+    end
+  end
+  Config.register_model(QudtDimensionVector, id: :qudt_dimension_vector)
+
+  # QUDT SystemOfUnits from sou vocabulary
+  # Example: http://qudt.org/vocab/sou/SI
+  class QudtSystemOfUnits < Lutaml::Model::Serializable
+    attribute :uri, :string
+    attribute :label, :string
+    attribute :abbreviation, :string
+    attribute :description, :string
+
+    def identifier
+      "qudt:sou:#{uri}"
+    end
+  end
+  Config.register_model(QudtSystemOfUnits, id: :qudt_system_of_units)
+
+  # QUDT Prefix from prefixes vocabulary
+  # Example: http://qudt.org/vocab/prefix/Kilo
+  class QudtPrefix < Lutaml::Model::Serializable
+    attribute :uri, :string
+    attribute :label, :string
+    attribute :symbol, :string
+    attribute :prefix_multiplier, :float
+    attribute :prefix_multiplier_sn, :string
+    attribute :ucum_code, :string
+    attribute :si_exact_match, :string
+    attribute :description, :string
+    attribute :prefix_type, :string # "DecimalPrefix" or "BinaryPrefix"
+
+    def identifier
+      "qudt:prefix:#{uri}"
+    end
+  end
+  Config.register_model(QudtPrefix, id: :qudt_prefix)
+
+  # Container for all QUDT vocabularies
+  class QudtVocabularies
+    attr_accessor :units, :quantity_kinds, :dimension_vectors,
+                  :systems_of_units, :prefixes
+
+    def initialize
+      @units = []
+      @quantity_kinds = []
+      @dimension_vectors = []
+      @systems_of_units = []
+      @prefixes = []
+    end
+  end
+end

data/lib/unitsdb/root_unit_reference.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unit_reference"
-require_relative "prefix_reference"
-
 module Unitsdb
   class RootUnitReference < Lutaml::Model::Serializable
     # model Config.model_for(:root_unit)
@@ -11,4 +8,6 @@ module Unitsdb
     attribute :unit_reference, UnitReference
     attribute :prefix_reference, PrefixReference
   end
+
+  Config.register_model(RootUnitReference, id: :root_unit_reference)
 end

data/lib/unitsdb/scale.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "identifier"
-require_relative "localized_string"
-require_relative "scale_properties"
-
 module Unitsdb
   class Scale < Lutaml::Model::Serializable
     # model Config.model_for(:quantity)
@@ -14,4 +10,6 @@ module Unitsdb
     attribute :short, :string
     attribute :properties, ScaleProperties
   end
+
+  Config.register_model(Scale, id: :scale)
 end

data/lib/unitsdb/scale_properties.rb

@@ -9,4 +9,6 @@ module Unitsdb
     attribute :interval, :boolean
     attribute :ratio, :boolean
   end
+
+  Config.register_model(ScaleProperties, id: :scale_properties)
 end

data/lib/unitsdb/scale_reference.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative "identifier"
-
 module Unitsdb
   class ScaleReference < Identifier
     attribute :id, :string
     attribute :type, :string
   end
+
+  Config.register_model(ScaleReference, id: :scale_reference)
 end

data/lib/unitsdb/scales.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "scale"
-
 module Unitsdb
   class Scales < Lutaml::Model::Serializable
     # model Config.model_for(:Scale)
@@ -9,4 +7,6 @@ module Unitsdb
     attribute :version, :string
     attribute :scales, Scale, collection: true
   end
+
+  Config.register_model(Scales, id: :scales)
 end

data/lib/unitsdb/si_derived_base.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "root_unit_reference"
-
 # si_derived_bases:
 # - power: 2
 #   unit_reference:
@@ -16,4 +14,6 @@ module Unitsdb
   class SiDerivedBase < RootUnitReference
     # model Config.model_for(:si_derived_base)
   end
+
+  Config.register_model(SiDerivedBase, id: :si_derived_base)
 end

data/lib/unitsdb/symbol_presentations.rb

@@ -11,4 +11,6 @@ module Unitsdb
     attribute :mathml, :string
     attribute :unicode, :string
   end
+
+  Config.register_model(SymbolPresentations, id: :symbol_presentations)
 end

data/lib/unitsdb/ucum.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-
 module Unitsdb
   # <base-unit Code="s" CODE="S" dim="T">
   #   <name>second</name>
@@ -17,7 +15,7 @@ module Unitsdb
     attribute :property, :string
 
     xml do
-      root "base-unit"
+      element "base-unit"
       map_attribute "Code", to: :code_sensitive
       map_attribute "CODE", to: :code
       map_attribute "dim", to: :dimension
@@ -30,6 +28,7 @@ module Unitsdb
       "ucum:base-unit:code:#{code_sensitive}"
     end
   end
+  Config.register_model(UcumBaseUnit, id: :ucum_base_unit)
 
   #  <prefix Code="Y" CODE="YA">
   #   <name>yotta</name>
@@ -43,11 +42,12 @@ module Unitsdb
     attribute :content, :string
 
     xml do
-      root "value"
+      element "value"
       map_attribute "value", to: :value
       map_content to: :content
     end
   end
+  Config.register_model(UcumPrefixValue, id: :ucum_prefix_value)
 
   class UcumPrefix < Lutaml::Model::Serializable
     attribute :code_sensitive, :string
@@ -57,7 +57,7 @@ module Unitsdb
     attribute :value, UcumPrefixValue
 
     xml do
-      root "prefix"
+      element "prefix"
       map_attribute "Code", to: :code_sensitive
       map_attribute "CODE", to: :code
       map_element "name", to: :name
@@ -69,6 +69,7 @@ module Unitsdb
       "ucum:prefix:code:#{code_sensitive}"
     end
   end
+  Config.register_model(UcumPrefix, id: :ucum_prefix)
 
   #  <unit Code="10*" CODE="10*" isMetric="no" class="dimless">
   #   <name>the number ten for arbitrary powers</name>
@@ -110,12 +111,13 @@ module Unitsdb
     attribute :unit_sensitive, :string
 
     xml do
-      root "function"
+      element "function"
       map_attribute "name", to: :name
       map_attribute "value", to: :value
       map_attribute "Unit", to: :unit_sensitive
     end
   end
+  Config.register_model(UcumUnitValueFunction, id: :ucum_unit_value_function)
 
   class UcumUnitValue < Lutaml::Model::Serializable
     attribute :unit_sensitive, :string
@@ -125,7 +127,7 @@ module Unitsdb
     attribute :content, :string
 
     xml do
-      root "value"
+      element "value"
       map_attribute "Unit", to: :unit_sensitive
       map_attribute "UNIT", to: :unit
       map_attribute "value", to: :value
@@ -133,6 +135,7 @@ module Unitsdb
       map_content to: :content
     end
   end
+  Config.register_model(UcumUnitValue, id: :ucum_unit_value)
 
   class UcumUnit < Lutaml::Model::Serializable
     attribute :code_sensitive, :string
@@ -147,7 +150,7 @@ module Unitsdb
     attribute :value, UcumUnitValue
 
     xml do
-      root "unit"
+      element "unit"
       map_attribute "Code", to: :code_sensitive
       map_attribute "CODE", to: :code
       map_attribute "isMetric", to: :is_metric
@@ -167,6 +170,12 @@ module Unitsdb
       "ucum:unit:#{k}:code:#{code_sensitive}"
     end
   end
+  Config.register_model(UcumUnit, id: :ucum_unit)
+
+  class UcumNamespace < Lutaml::Xml::Namespace
+    uri "http://unitsofmeasure.org/ucum-essence"
+    prefix_default "ucum"
+  end
 
   # This is the root element of the UCUM XML "ucum-essence.xml" file.
   #
@@ -182,8 +191,9 @@ module Unitsdb
     attribute :units, UcumUnit, collection: true
 
     xml do
-      root "root"
-      namespace "http://unitsofmeasure.org/ucum-essence"
+      element "root"
+      namespace UcumNamespace
+
       map_attribute "version", to: :version
       map_attribute "revision", to: :revision
       map_attribute "revision-date", to: :revision_date
@@ -195,4 +205,5 @@ module Unitsdb
 
     # No adapter registration needed
   end
+  Config.register_model(UcumFile, id: :ucum_file)
 end

data/lib/unitsdb/unit.rb

@@ -1,15 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "symbol_presentations"
-require_relative "unit_system_reference"
-require_relative "root_unit_reference"
-require_relative "si_derived_base"
-require_relative "quantity_reference"
-require_relative "dimension_reference"
-require_relative "external_reference"
-require_relative "localized_string"
-require_relative "scale_reference"
-
 # "NISTu10":
 #   dimension_url: "#NISTd9"
 #   short: steradian
@@ -60,4 +50,6 @@ module Unitsdb
     attribute :references, ExternalReference, collection: true
     attribute :scale_reference, ScaleReference
   end
+
+  Config.register_model(Unit, id: :unit)
 end

data/lib/unitsdb/unit_reference.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative "identifier"
-
 module Unitsdb
   class UnitReference < Identifier
     attribute :id, :string
     attribute :type, :string
   end
+
+  Config.register_model(UnitReference, id: :unit_reference)
 end

data/lib/unitsdb/unit_system.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "identifier"
-require_relative "localized_string"
-
 module Unitsdb
   class UnitSystem < Lutaml::Model::Serializable
     # model Config.model_for(:unit_system)
@@ -11,5 +8,8 @@ module Unitsdb
     attribute :names, LocalizedString, collection: true
     attribute :short, :string
     attribute :acceptable, :boolean
+    attribute :references, ExternalReference, collection: true
   end
+
+  Config.register_model(UnitSystem, id: :unit_system)
 end

data/lib/unitsdb/unit_system_reference.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative "identifier"
-
 module Unitsdb
   class UnitSystemReference < Identifier
     attribute :id, :string
     attribute :type, :string
   end
+
+  Config.register_model(UnitSystemReference, id: :unit_system_reference)
 end

data/lib/unitsdb/unit_systems.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unit_system"
-
 module Unitsdb
   class UnitSystems < Lutaml::Model::Serializable
     # model Config.model_for(:unit_systems)
@@ -10,4 +8,6 @@ module Unitsdb
     attribute :version, :string
     attribute :unit_systems, UnitSystem, collection: true
   end
+
+  Config.register_model(UnitSystems, id: :unit_systems)
 end

data/lib/unitsdb/units.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "unit"
-
 module Unitsdb
   class Units < Lutaml::Model::Serializable
     # model Config.model_for(:units)
@@ -10,4 +8,6 @@ module Unitsdb
     attribute :version, :string
     attribute :units, Unit, collection: true
   end
+
+  Config.register_model(Units, id: :units)
 end

data/lib/unitsdb/utils.rb

@@ -2,7 +2,10 @@
 
 module Unitsdb
   module Utils
-    DEFAULT_YAML_FILES = %w[dimensions prefixes quantities unit_systems units].map { |f| "#{f}.yaml" }
+    DEFAULT_YAML_FILES = %w[dimensions prefixes quantities unit_systems
+                            units].map do |f|
+      "#{f}.yaml"
+    end
 
     def self.levenshtein_distance(s, t)
       m = s.length
@@ -32,7 +35,10 @@ module Unitsdb
     def self.find_similar_ids(id, valid_ids, max_results = 5)
       # Simple similarity measure based on Levenshtein distance
       valid_ids
-        .map { |valid_id| [valid_id, levenshtein_distance(id.to_s, valid_id.to_s)] }
+        .map do |valid_id|
+        [valid_id,
+         levenshtein_distance(id.to_s, valid_id.to_s)]
+      end
         .sort_by { |_, distance| distance }
         .take(max_results)
         .select { |_, distance| distance < [id.to_s.length, 10].min }
@@ -44,32 +50,37 @@ module Unitsdb
       when Hash
         # Transform values first, then sort keys
         obj.transform_values { |v| sort_yaml_keys(v) }
-           .sort_by do |key, _|
-             key_str = key.to_s
+          .sort_by do |key, _|
+          key_str = key.to_s
 
-             # Handle NIST IDs with proper category-based sorting
-             case key_str
-             when /\ANIST([a-z])(\d+)_(-?\d+)\Z/ # Prefixes with power (NISTp2_10)
-               [0, ::Regexp.last_match(1), ::Regexp.last_match(2).to_i, ::Regexp.last_match(3).to_i]
-             when /\ANIST([a-z])(\d+)\Z/ # Prefixes without power
-               [0, ::Regexp.last_match(1), ::Regexp.last_match(2).to_i, 0]
-             when %r{[/e]} # Composite IDs with '/' or 'e' to the end
-               [2, key_str]
-             when /\ANISTu(\d+)\.(.+)\Z/ # Simple unit IDs (NISTu10.1)
-               [1, "u", ::Regexp.last_match(1).to_i, ::Regexp.last_match(2)]
-             else
-               [3, key_str] # Everything else
-             end
-           end.to_h
+          # Handle NIST IDs with proper category-based sorting
+          case key_str
+          when /\ANIST([a-z])(\d+)_(-?\d+)\Z/ # Prefixes with power (NISTp2_10)
+            [0, ::Regexp.last_match(1), ::Regexp.last_match(2).to_i,
+             ::Regexp.last_match(3).to_i]
+          when /\ANIST([a-z])(\d+)\Z/ # Prefixes without power
+            [0, ::Regexp.last_match(1), ::Regexp.last_match(2).to_i, 0]
+          when %r{[/e]} # Composite IDs with '/' or 'e' to the end
+            [2, key_str]
+          when /\ANISTu(\d+)\.(.+)\Z/ # Simple unit IDs (NISTu10.1)
+            [1, "u", ::Regexp.last_match(1).to_i, ::Regexp.last_match(2)]
+          else
+            [3, key_str] # Everything else
+          end
+        end.to_h
       when Array
         # For arrays in the new structure, sort them if they're arrays of hashes with 'id' or 'short' keys
-        if !obj.empty? && obj.all? { |item| item.is_a?(Hash) }
+        if !obj.empty? && obj.all?(Hash)
           # Sort by 'id' within identifiers array
           if obj.first.key?("id") && obj.first.key?("type")
-            obj.sort_by { |item| item["id"].to_s }.map { |item| sort_yaml_keys(item) }
+            obj.sort_by do |item|
+              item["id"].to_s
+            end.map { |item| sort_yaml_keys(item) }
           # Sort by 'short' for other arrays (like main unit arrays)
           elsif obj.first.key?("short")
-            obj.sort_by { |item| item["short"].to_s }.map { |item| sort_yaml_keys(item) }
+            obj.sort_by do |item|
+              item["short"].to_s
+            end.map { |item| sort_yaml_keys(item) }
           else
             obj.map { |item| sort_yaml_keys(item) }
           end

data/lib/unitsdb/version.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
 module Unitsdb
-  VERSION = "2.1.1"
+  VERSION = "2.2.2"
+
+  # The version of the bundled UnitsDB data (from the data/ submodule).
+  # This version corresponds to a tag/commit in https://github.com/unitsml/unitsdb.
+  UNITS_DATA_VERSION = "2.0.0"
 end

data/lib/unitsdb.rb

@@ -1,21 +1,69 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
+require "unitsdb/config"
+require "unitsdb/identifier"
+require "unitsdb/localized_string"
+require "unitsdb/symbol_presentations"
+require "unitsdb/scale_properties"
+require "unitsdb/unit_reference"
+require "unitsdb/prefix_reference"
+require "unitsdb/quantity_reference"
+require "unitsdb/dimension_reference"
+require "unitsdb/unit_system_reference"
+require "unitsdb/scale_reference"
+require "unitsdb/external_reference"
+require "unitsdb/root_unit_reference"
+require "unitsdb/si_derived_base"
+require "unitsdb/dimension_details"
+require "unitsdb/dimension"
+require "unitsdb/prefix"
+require "unitsdb/unit_system"
+require "unitsdb/quantity"
+require "unitsdb/scale"
+require "unitsdb/unit"
+require "unitsdb/dimensions"
+require "unitsdb/prefixes"
+require "unitsdb/quantities"
+require "unitsdb/scales"
+require "unitsdb/unit_systems"
+require "unitsdb/units"
+require "unitsdb/database"
+require "unitsdb/qudt"
+require "unitsdb/ucum"
 
-require_relative "unitsdb/version"
-require_relative "unitsdb/config"
-require_relative "unitsdb/errors"
-require_relative "unitsdb/database"
-require_relative "unitsdb/dimensions"
-require_relative "unitsdb/prefixes"
-require_relative "unitsdb/quantities"
-require_relative "unitsdb/unit_systems"
-require_relative "unitsdb/scales"
-require_relative "unitsdb/units"
-require_relative "unitsdb/utils"
+module Unitsdb
+  # Core models are eagerly loaded so type registrations are complete before
+  # any context or database loading happens.
+  unless RUBY_ENGINE == "opal"
+    autoload :Cli, "unitsdb/cli"
+    autoload :Commands, "unitsdb/commands"
+  end
+  autoload :Errors, "unitsdb/errors"
+  autoload :Utils, "unitsdb/utils"
 
-# CLI-related requires
-require_relative "unitsdb/cli" if defined?(Thor)
+  class << self
+    # Returns the path to the bundled data directory containing YAML files
+    def data_dir
+      @data_dir ||= File.join(gem_dir, "data")
+    end
 
-module Unitsdb
+    # Returns a pre-loaded Database instance from the bundled data
+    def database(context: Config.context_id)
+      context_id = context.to_sym
+      Config.context(context_id) if context_id == Config.context_id && Config.find_context(context_id).nil?
+      klass = Config.resolve_type(:database, context: context_id)
+      databases[context_id] ||= klass.from_db(data_dir, context: context_id)
+    end
+
+    private
+
+    def databases
+      @databases ||= {}
+    end
+
+    def gem_dir
+      @gem_dir ||= File.dirname(__dir__)
+    end
+  end
 end

data/unitsdb.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
   spec.metadata["changelog_uri"] = "https://github.com/unitsml/unitsdb-ruby/releases"
+  spec.metadata["rubygems_mfa_required"] = "true"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -26,15 +27,17 @@ Gem::Specification.new do |spec|
       f.match(%r{^(test|spec|features)/})
     end
   end
+  # Include YAML data files in the gem
+  spec.files += Dir.glob("data/**/*.yaml")
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.test_files = `git ls-files -- {spec}/*`.split("\n")
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "lutaml-model", "~>0.7"
+  spec.add_dependency "fuzzy_match"
+  spec.add_dependency "lutaml-model", "~> 0.8.0"
   spec.add_dependency "rdf", "~> 3.1"
   spec.add_dependency "rdf-turtle", "~> 3.1"
   spec.add_dependency "rubyzip", "~> 2.3"
-  spec.add_dependency "terminal-table"
+  spec.add_dependency "table_tennis", "~> 0.0.7"
   spec.add_dependency "thor", "~> 1.0"
 end