unitsdb 1.0.0 → 2.0.1

data/lib/unitsdb/unit.rb

@@ -0,0 +1,63 @@
+# 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
+#   root: true
+#   unit_system:
+#     type: "SI_derived_special"
+#     name: "SI"
+#   names:
+#     - "steradian"
+#   unit_symbols:
+#     - id: "sr"
+#       ascii: "sr"
+#       html: "sr"
+#       mathml: "<mi mathvariant='normal'>sr</mi>"
+#       latex: \ensuremath{\mathrm{sr}}
+#       unicode: "sr"
+#   root_units:
+#     enumerated_root_units:
+#       - unit: "steradian"
+#         power_denominator: 1
+#         power: 1
+#   quantity_reference:
+#     - name: "solid angle"
+#       url: "#NISTq11"
+#   si_derived_bases:
+#     - id: NISTu1
+#       prefix:
+#       power: 1
+#     - id: NISTu1
+#       prefix:
+#       power: -1
+
+module Unitsdb
+  class Unit < Lutaml::Model::Serializable
+    # model Config.model_for(:unit)
+
+    attribute :identifiers, Identifier, collection: true
+    attribute :short, :string
+    attribute :root, :boolean
+    attribute :prefixed, :boolean
+    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
+    attribute :root_units, RootUnitReference, collection: true
+    attribute :references, ExternalReference, collection: true
+    attribute :scale_reference, ScaleReference
+  end
+end

data/lib/unitsdb/unit_reference.rb

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

data/lib/unitsdb/unit_system.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_relative "identifier"
+require_relative "localized_string"
+
+module Unitsdb
+  class UnitSystem < Lutaml::Model::Serializable
+    # model Config.model_for(:unit_system)
+
+    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

@@ -1,18 +1,13 @@
 # frozen_string_literal: true
 
-require_relative "unit_systems/unit_system"
+require_relative "unit_system"
 
 module Unitsdb
-  class UnitSystems
-    include Lutaml::Model::Serialize
-    model Config.model_for(:unit_systems)
+  class UnitSystems < Lutaml::Model::Serializable
+    # model Config.model_for(:unit_systems)
 
+    attribute :schema_version, :string
+    attribute :version, :string
     attribute :unit_systems, UnitSystem, collection: true
-
-    key_value do
-      map to: :unit_systems, root_mappings: {
-        id: :key
-      }
-    end
   end
 end

data/lib/unitsdb/units.rb

@@ -1,18 +1,13 @@
 # frozen_string_literal: true
 
-require "unitsdb/units/unit"
+require_relative "unit"
 
 module Unitsdb
-  class Units
-    include Lutaml::Model::Serialize
-    model Config.model_for(:units)
+  class Units < Lutaml::Model::Serializable
+    # model Config.model_for(:units)
 
+    attribute :schema_version, :string
+    attribute :version, :string
     attribute :units, Unit, collection: true
-
-    key_value do
-      map to: :units, root_mappings: {
-            id: :key,
-          }
-    end
   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 = "1.0.0"
+  VERSION = "2.0.1"
 end

data/lib/unitsdb.rb

@@ -4,8 +4,18 @@ require "lutaml/model"
 
 require_relative "unitsdb/version"
 require_relative "unitsdb/config"
-require_relative "unitsdb/units"
-require_relative "unitsdb/unit_systems"
+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: 1.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-07 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,10 +80,25 @@ 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:
@@ -36,6 +107,7 @@ files:
 - ".github/workflows/rake.yml"
 - ".github/workflows/release.yml"
 - ".gitignore"
+- ".gitmodules"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -46,30 +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_details.rb
+- lib/unitsdb/dimension_reference.rb
 - lib/unitsdb/dimensions.rb
-- lib/unitsdb/dimensions/dimension.rb
-- lib/unitsdb/dimensions/quantity.rb
-- lib/unitsdb/dimensions/symbol.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_reference.rb
 - lib/unitsdb/prefixes.rb
-- lib/unitsdb/prefixes/prefix.rb
-- lib/unitsdb/prefixes/symbol.rb
 - lib/unitsdb/quantities.rb
-- lib/unitsdb/quantities/quantity.rb
-- lib/unitsdb/quantities/unit_reference.rb
+- lib/unitsdb/quantity.rb
+- lib/unitsdb/quantity_reference.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_presentations.rb
+- lib/unitsdb/ucum.rb
+- lib/unitsdb/unit.rb
+- lib/unitsdb/unit_reference.rb
+- lib/unitsdb/unit_system.rb
+- lib/unitsdb/unit_system_reference.rb
 - lib/unitsdb/unit_systems.rb
-- lib/unitsdb/unit_systems/unit_system.rb
 - lib/unitsdb/units.rb
-- lib/unitsdb/units/quantity_reference.rb
-- lib/unitsdb/units/root_unit.rb
-- lib/unitsdb/units/root_units.rb
-- lib/unitsdb/units/si_derived_base.rb
-- lib/unitsdb/units/symbol.rb
-- lib/unitsdb/units/system.rb
-- lib/unitsdb/units/unit.rb
-- lib/unitsdb/unitsdb.rb
+- lib/unitsdb/utils.rb
 - lib/unitsdb/version.rb
 - sig/unitsdb.rbs
 - unitsdb.gemspec
@@ -95,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/dimensions/dimension.rb

@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "quantity"
-# 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: "𝖫"
-
-# NISTd9:
-# -dimensionless: true
-# -plane_angle:
-# -  dim_symbols:
-# -  - ascii: phi
-# -    html: "&#x1D785;"
-# -    id: dim_phi
-# -    latex: "\\ensuremath{\\mathsf{\\phi}}"
-# -    mathml: "<mi mathvariant='sans-serif'>&#x3c6;</mi>"
-# -    unicode: "\U0001D785"
-# -  powerNumerator: 1
-# -  symbol: phi
-
-module Unitsdb
-  class Dimensions
-    class Dimension < Lutaml::Model::Serializable
-      model Config.model_for(:dimension)
-
-      attribute :id, :string
-      attribute :dimensionless, :boolean
-      attribute :length, Quantity
-      attribute :mass, Quantity
-      attribute :time, Quantity
-      attribute :electric_current, Quantity
-      attribute :thermodynamic_temperature, Quantity
-      attribute :amount_of_substance, Quantity
-      attribute :luminous_intensity, Quantity
-      attribute :plane_angle, Quantity
-
-      key_value do
-        map :id, to: :id
-        map :dimensionless, to: :dimensionless
-        map :length, to: :length
-        map :mass, to: :mass
-        map :time, to: :time
-        map :electric_current, to: :electric_current
-        map :thermodynamic_temperature, to: :thermodynamic_temperature
-        map :amount_of_substance, to: :amount_of_substance
-        map :luminous_intensity, to: :luminous_intensity
-        map :plane_angle, to: :plane_angle
-      end
-    end
-  end
-end

data/lib/unitsdb/dimensions/quantity.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "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 Dimensions
-    class Quantity < Lutaml::Model::Serializable
-      model Config.model_for(:dimension_quantity)
-
-      attribute :power_numerator, :integer
-      attribute :symbol, :string
-      attribute :dim_symbols, Symbol, collection: true
-
-      key_value do
-        map :powerNumerator, to: :power_numerator
-        map :symbol, to: :symbol
-        map :dim_symbols, to: :dim_symbols
-      end
-    end
-  end
-end

data/lib/unitsdb/dimensions/symbol.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "../symbol_presentations"
-
-# - id: "dim_L"
-#   ascii: "L"
-#   html: "𝖫"
-#   mathml: "<mi mathvariant='sans-serif'>L</mi>"
-#   latex: \ensuremath{\mathsf{L}}
-#   unicode: "𝖫"
-
-module Unitsdb
-  class Dimensions
-    class Symbol < SymbolPresentations
-      model Config.model_for(:dimension_symbol)
-
-      attribute :id, :string
-      attribute :mathml, :string
-
-      key_value do
-        map :id, to: :id
-        map :mathml, to: :mathml
-      end
-    end
-  end
-end

data/lib/unitsdb/prefixes/prefix.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "symbol"
-# ---
-# NISTp10_30:
-#   name: quetta
-#   symbol:
-#     ascii: Q
-#     html: Q
-#     latex: Q
-#     unicode: Q
-#   base: 10
-#   power: 30
-
-module Unitsdb
-  class Prefixes
-    class Prefix < Lutaml::Model::Serializable
-      model Config.model_for(:prefix)
-
-      attribute :id, :string
-      attribute :name, :string
-      attribute :symbol, Symbol
-      attribute :base, :integer
-      attribute :power, :integer
-
-      key_value do
-        map :id, to: :id
-        map :name, to: :name
-        map :symbol, to: :symbol
-        map :base, to: :base
-        map :power, to: :power
-      end
-    end
-  end
-end

data/lib/unitsdb/prefixes/symbol.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "../symbol_presentations"
-
-#   symbol:
-#     ascii: R
-#     html: R
-#     latex: R
-#     unicode: R
-
-module Unitsdb
-  class Prefixes
-    class Symbol < SymbolPresentations
-      model Config.model_for(:prefix_symbol)
-    end
-  end
-end