unitsdb 0.1.1 → 2.0.1

data/lib/unitsdb/unit.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
-require_relative "unit_system"
-require_relative "unit_symbol"
-require_relative "root_units"
+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"
@@ -13,7 +17,7 @@ require_relative "quantity_reference"
 #   unit_system:
 #     type: "SI_derived_special"
 #     name: "SI"
-#   unit_name:
+#   names:
 #     - "steradian"
 #   unit_symbols:
 #     - id: "sr"
@@ -26,7 +30,7 @@ require_relative "quantity_reference"
 #     enumerated_root_units:
 #       - unit: "steradian"
 #         power_denominator: 1
-#         power_numerator: 1
+#         power: 1
 #   quantity_reference:
 #     - name: "solid angle"
 #       url: "#NISTq11"
@@ -40,30 +44,20 @@ require_relative "quantity_reference"
 
 module Unitsdb
   class Unit < Lutaml::Model::Serializable
-    attribute :id, :string
+    # model Config.model_for(:unit)
+
+    attribute :identifiers, Identifier, collection: true
     attribute :short, :string
     attribute :root, :boolean
     attribute :prefixed, :boolean
-    attribute :dimension_url, :string
-    attribute :unit_system, UnitSystem, collection: true
-    attribute :unit_name, :string, collection: true
-    attribute :unit_symbol, UnitSymbol, collection: true
-    attribute :root_units, RootUnits, collection: true
-    attribute :quantity_reference, QuantityReference, collection: true
+    attribute :dimension_reference, DimensionReference
+    attribute :unit_system_reference, UnitSystemReference, collection: true
+    attribute :names, LocalizedString, collection: true
+    attribute :symbols, SymbolPresentations, collection: true
+    attribute :quantity_references, QuantityReference, collection: true
     attribute :si_derived_bases, SiDerivedBase, collection: true
-
-    key_value do
-      map :id, to: :id
-      map :dimension_url, to: :dimension_url
-      map :short, to: :short, render_nil: true
-      map :root, to: :root
-      map :prefixed, to: :prefixed
-      map :unit_system, to: :unit_system
-      map :unit_name, to: :unit_name
-      map :unit_symbols, to: :unit_symbol
-      map :root_units, to: :root_units
-      map :quantity_reference, to: :quantity_reference
-      map :si_derived_bases, to: :si_derived_bases
-    end
+    attribute :root_units, RootUnitReference, collection: true
+    attribute :references, ExternalReference, collection: true
+    attribute :scale_reference, ScaleReference
   end
 end

data/lib/unitsdb/unit_reference.rb

@@ -1,13 +1,10 @@
 # frozen_string_literal: true
 
-module Unitsdb
-  class UnitReference < Lutaml::Model::Serializable
-    attribute :name, :string
-    attribute :url, :string
+require_relative "identifier"
 
-    key_value do
-      map :name, to: :name
-      map :url, to: :url
-    end
+module Unitsdb
+  class UnitReference < Identifier
+    attribute :id, :string
+    attribute :type, :string
   end
 end

data/lib/unitsdb/unit_system.rb

@@ -1,17 +1,15 @@
 # frozen_string_literal: true
 
+require_relative "identifier"
+require_relative "localized_string"
+
 module Unitsdb
   class UnitSystem < Lutaml::Model::Serializable
-    attribute :id, :string
-    attribute :name, :string
-    attribute :type, :string
-    attribute :acceptable, :boolean
+    # model Config.model_for(:unit_system)
 
-    key_value do
-      map :id, to: :id
-      map :type, to: :type
-      map :name, to: :name
-      map :acceptable, to: :acceptable
-    end
+    attribute :identifiers, Identifier, collection: true
+    attribute :names, LocalizedString, collection: true
+    attribute :short, :string
+    attribute :acceptable, :boolean
   end
 end

data/lib/unitsdb/unit_system_reference.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require_relative "identifier"
+
+module Unitsdb
+  class UnitSystemReference < Identifier
+    attribute :id, :string
+    attribute :type, :string
+  end
+end

data/lib/unitsdb/unit_systems.rb

@@ -4,22 +4,10 @@ require_relative "unit_system"
 
 module Unitsdb
   class UnitSystems < Lutaml::Model::Serializable
-    attribute :unit_system, UnitSystem, collection: true
+    # model Config.model_for(:unit_systems)
 
-    # TODO: How do I parse this?
-    # ---
-    # - id: SI_base
-    #   name: SI
-    #   acceptable: true
-    # - id: SI_derived_special
-    #   name: SI
-    #   acceptable: true
-    # - id: SI_derived_non-special
-
-    key_value do
-      map to: :unit_system, root_mappings: {
-        id: :key
-      }
-    end
+    attribute :schema_version, :string
+    attribute :version, :string
+    attribute :unit_systems, UnitSystem, collection: true
   end
 end

data/lib/unitsdb/units.rb

@@ -4,12 +4,10 @@ require_relative "unit"
 
 module Unitsdb
   class Units < Lutaml::Model::Serializable
-    attribute :units, Unit, collection: true
+    # model Config.model_for(:units)
 
-    key_value do
-      map to: :units, root_mappings: {
-            id: :key,
-          }
-    end
+    attribute :schema_version, :string
+    attribute :version, :string
+    attribute :units, Unit, collection: true
   end
 end

data/lib/unitsdb/utils.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+module Unitsdb
+  module Utils
+    DEFAULT_YAML_FILES = %w[dimensions prefixes quantities unit_systems units].map { |f| "#{f}.yaml" }
+
+    def self.levenshtein_distance(s, t)
+      m = s.length
+      n = t.length
+
+      return m if n.zero?
+      return n if m.zero?
+
+      d = Array.new(m + 1) { Array.new(n + 1) }
+
+      (0..m).each { |i| d[i][0] = i }
+      (0..n).each { |j| d[0][j] = j }
+
+      (1..n).each do |j|
+        (1..m).each do |i|
+          d[i][j] = if s[i - 1] == t[j - 1]
+                      d[i - 1][j - 1]
+                    else
+                      [d[i - 1][j] + 1, d[i][j - 1] + 1, d[i - 1][j - 1] + 1].min
+                    end
+        end
+      end
+
+      d[m][n]
+    end
+
+    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)] }
+        .sort_by { |_, distance| distance }
+        .take(max_results)
+        .select { |_, distance| distance < [id.to_s.length, 10].min }
+        .map { |valid_id, _| valid_id }
+    end
+
+    def self.sort_yaml_keys(obj)
+      case obj
+      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
+
+             # 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) }
+          # 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) }
+          # 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) }
+          else
+            obj.map { |item| sort_yaml_keys(item) }
+          end
+        else
+          obj.map { |item| sort_yaml_keys(item) }
+        end
+      else
+        obj
+      end
+    end
+  end
+end

data/lib/unitsdb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Unitsdb
-  VERSION = "0.1.1"
+  VERSION = "2.0.1"
 end

data/lib/unitsdb.rb

@@ -2,17 +2,20 @@
 
 require "lutaml/model"
 
-# Lutaml::Model::Config.configure do |config|
-#   require "lutaml/model/xml_adapter/nokogiri_adapter"
-#   config.xml_adapter = Lutaml::Model::XmlAdapter::NokogiriAdapter
-# end
-
-module Unitsdb
-  class Error < StandardError; end
-end
-
 require_relative "unitsdb/version"
-require_relative "unitsdb/units"
+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"
+
+# CLI-related requires
+require_relative "unitsdb/cli" if defined?(Thor)
+
+module Unitsdb
+end

data/unitsdb.gemspec

@@ -19,8 +19,6 @@ Gem::Specification.new do |spec|
   spec.metadata["source_code_uri"] = spec.homepage
   spec.metadata["changelog_uri"] = "https://github.com/unitsml/unitsdb-ruby/releases"
 
-  spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
-
   # 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.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
@@ -33,5 +31,10 @@ Gem::Specification.new do |spec|
   spec.test_files = `git ls-files -- {spec}/*`.split("\n")
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "lutaml-model"
+  spec.add_dependency "lutaml-model", "~>0.7"
+  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 "thor", "~> 1.0"
 end

metadata

@@ -1,17 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: unitsdb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 2.0.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-11 00:00:00.000000000 Z
+date: 2025-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: rdf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rdf-turtle
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -24,16 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Library to handle UnitsDB content.
 email:
 - open.source@ribose.com
-executables: []
+executables:
+- unitsdb
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/dependent-repos.json"
+- ".github/workflows/depenedent-gems.yml"
 - ".github/workflows/rake.yml"
 - ".github/workflows/release.yml"
 - ".gitignore"
+- ".gitmodules"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -44,28 +118,62 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- exe/unitsdb
 - lib/unitsdb.rb
+- lib/unitsdb/cli.rb
+- lib/unitsdb/commands/_modify.rb
+- lib/unitsdb/commands/base.rb
+- lib/unitsdb/commands/check_si.rb
+- lib/unitsdb/commands/get.rb
+- lib/unitsdb/commands/normalize.rb
+- lib/unitsdb/commands/release.rb
+- lib/unitsdb/commands/search.rb
+- lib/unitsdb/commands/si_formatter.rb
+- lib/unitsdb/commands/si_matcher.rb
+- lib/unitsdb/commands/si_ttl_parser.rb
+- lib/unitsdb/commands/si_updater.rb
+- lib/unitsdb/commands/ucum.rb
+- lib/unitsdb/commands/ucum/check.rb
+- lib/unitsdb/commands/ucum/formatter.rb
+- lib/unitsdb/commands/ucum/matcher.rb
+- lib/unitsdb/commands/ucum/update.rb
+- lib/unitsdb/commands/ucum/updater.rb
+- lib/unitsdb/commands/ucum/xml_parser.rb
+- lib/unitsdb/commands/validate.rb
+- lib/unitsdb/commands/validate/identifiers.rb
+- lib/unitsdb/commands/validate/references.rb
+- lib/unitsdb/commands/validate/si_references.rb
+- lib/unitsdb/config.rb
+- lib/unitsdb/database.rb
 - lib/unitsdb/dimension.rb
-- lib/unitsdb/dimension_quantity.rb
-- lib/unitsdb/dimension_symbol.rb
+- lib/unitsdb/dimension_details.rb
+- lib/unitsdb/dimension_reference.rb
 - lib/unitsdb/dimensions.rb
+- lib/unitsdb/errors.rb
+- lib/unitsdb/external_reference.rb
+- lib/unitsdb/identifier.rb
+- lib/unitsdb/localized_string.rb
 - lib/unitsdb/prefix.rb
-- lib/unitsdb/prefix_symbol.rb
+- lib/unitsdb/prefix_reference.rb
 - lib/unitsdb/prefixes.rb
 - lib/unitsdb/quantities.rb
 - lib/unitsdb/quantity.rb
 - lib/unitsdb/quantity_reference.rb
-- lib/unitsdb/root_unit.rb
-- lib/unitsdb/root_units.rb
+- lib/unitsdb/root_unit_reference.rb
+- lib/unitsdb/scale.rb
+- lib/unitsdb/scale_properties.rb
+- lib/unitsdb/scale_reference.rb
+- lib/unitsdb/scales.rb
 - lib/unitsdb/si_derived_base.rb
-- lib/unitsdb/symbol.rb
+- lib/unitsdb/symbol_presentations.rb
+- lib/unitsdb/ucum.rb
 - lib/unitsdb/unit.rb
 - lib/unitsdb/unit_reference.rb
-- lib/unitsdb/unit_symbol.rb
 - lib/unitsdb/unit_system.rb
+- lib/unitsdb/unit_system_reference.rb
 - lib/unitsdb/unit_systems.rb
 - lib/unitsdb/units.rb
-- lib/unitsdb/unitsdb.rb
+- lib/unitsdb/utils.rb
 - lib/unitsdb/version.rb
 - sig/unitsdb.rbs
 - unitsdb.gemspec
@@ -91,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Ruby library for UnitsDB

data/lib/unitsdb/dimension_quantity.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "dimension_symbol"
-# NISTd1:
-#   length:
-#     powerNumerator: 1
-#     symbol: L
-#     dim_symbols:
-#     - id: "dim_L"
-#       ascii: "L"
-#       html: "𝖫"
-#       mathml: "<mi mathvariant='sans-serif'>L</mi>"
-#       latex: \ensuremath{\mathsf{L}}
-#       unicode: "𝖫"
-
-module Unitsdb
-  class DimensionQuantity < Lutaml::Model::Serializable
-    attribute :power_numerator, :integer
-    attribute :symbol, :string
-    attribute :dim_symbols, DimensionSymbol, collection: true
-
-    key_value do
-      map :powerNumerator, to: :power_numerator
-      map :symbol, to: :symbol
-      map :dim_symbols, to: :dim_symbols
-    end
-  end
-end

data/lib/unitsdb/dimension_symbol.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "symbol"
-
-# - id: "dim_L"
-#   ascii: "L"
-#   html: "𝖫"
-#   mathml: "<mi mathvariant='sans-serif'>L</mi>"
-#   latex: \ensuremath{\mathsf{L}}
-#   unicode: "𝖫"
-
-module Unitsdb
-  class DimensionSymbol < Symbol
-    attribute :id, :string
-    attribute :mathml, :string
-
-    key_value do
-      map :id, to: :id
-      map :mathml, to: :mathml
-    end
-  end
-end

data/lib/unitsdb/prefix_symbol.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-#   symbol:
-#     ascii: R
-#     html: R
-#     latex: R
-#     unicode: R
-
-module Unitsdb
-  class PrefixSymbol < Symbol
-  end
-end

data/lib/unitsdb/root_unit.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Unitsdb
-  class RootUnit < Lutaml::Model::Serializable
-    attribute :unit, :string
-    attribute :power_denominator, :integer
-    attribute :power_numerator, :integer
-    attribute :prefix, :string
-
-    key_value do
-      map :unit, to: :unit
-      map :power_denominator, to: :power_denominator
-      map :power_numerator, to: :power_numerator
-      map :prefix, to: :prefix
-    end
-  end
-end

data/lib/unitsdb/root_units.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "root_unit"
-
-module Unitsdb
-  class RootUnits < Lutaml::Model::Serializable
-    attribute :unit, :string
-    attribute :power_denominator, :integer
-    attribute :power_numerator, :integer
-    attribute :enumerated_root_units, RootUnit, collection: true
-
-    key_value do
-      map :unit, to: :unit
-      map :power_denominator, to: :power_denominator
-      map :power_numerator, to: :power_numerator
-      map :enumerated_root_units,
-          to: :enumerated_root_units
-    end
-  end
-end

data/lib/unitsdb/symbol.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Unitsdb
-  class Symbol < Lutaml::Model::Serializable
-    attribute :ascii, :string
-    attribute :html, :string
-    attribute :latex, :string
-    attribute :unicode, :string
-
-    key_value do
-      map :ascii, to: :ascii
-      map :html, to: :html
-      map :latex, to: :latex
-      map :unicode, to: :unicode
-    end
-  end
-end

data/lib/unitsdb/unit_symbol.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "symbol"
-
-module Unitsdb
-  class UnitSymbol < Symbol
-    attribute :id, :string
-    attribute :mathml, :string
-
-    key_value do
-      map :id, to: :id
-      map :mathml, to: :mathml
-    end
-  end
-end

data/lib/unitsdb/unitsdb.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-module Unitsdb
-  class Error < StandardError; end
-  # Your code goes here...
-end