unitsdb 2.0.1 → 2.1.0

data/lib/unitsdb/commands/validate.rb

@@ -13,7 +13,7 @@ module Unitsdb
       def references
         require_relative "validate/references"
 
-        Commands::Validate::References.new(options).run
+        Commands::References.new(options).run
       end
 
       desc "identifiers", "Check for uniqueness of identifier fields"
@@ -23,7 +23,7 @@ module Unitsdb
       def identifiers
         require_relative "validate/identifiers"
 
-        Commands::Validate::Identifiers.new(options).run
+        Commands::Identifiers.new(options).run
       end
 
       desc "si_references", "Validate that each SI digital framework reference is unique per entity type"
@@ -33,7 +33,7 @@ module Unitsdb
       def si_references
         require_relative "validate/si_references"
 
-        Commands::Validate::SiReferences.new(options).run
+        Validate::SiReferences.new(options).run
       end
     end
   end

data/lib/unitsdb/database.rb

@@ -12,7 +12,6 @@ module Unitsdb
     # model Config.model_for(:units)
 
     attribute :schema_version, :string
-    attribute :version, :string
     attribute :units, Unit, collection: true
     attribute :prefixes, Prefix, collection: true
     attribute :quantities, Quantity, collection: true

data/lib/unitsdb/dimensions.rb

@@ -7,7 +7,6 @@ module Unitsdb
     # model Config.model_for(:dimensions)
 
     attribute :schema_version, :string
-    attribute :version, :string
     attribute :dimensions, Dimension, collection: true
   end
 end

data/lib/unitsdb/prefixes.rb

@@ -17,7 +17,6 @@ module Unitsdb
     # model Config.model_for(:prefixes)
 
     attribute :schema_version, :string
-    attribute :version, :string
     attribute :prefixes, Prefix, collection: true
   end
 end

data/lib/unitsdb/quantities.rb

@@ -6,7 +6,6 @@ module Unitsdb
   class Quantities < Lutaml::Model::Serializable
     # model Config.model_for(:quantities)
     attribute :schema_version, :string
-    attribute :version, :string
     attribute :quantities, Quantity, collection: true
   end
 end

data/lib/unitsdb/scales.rb

@@ -6,7 +6,6 @@ module Unitsdb
   class Scales < Lutaml::Model::Serializable
     # model Config.model_for(:Scale)
     attribute :schema_version, :string
-    attribute :version, :string
     attribute :scales, Scale, collection: true
   end
 end

data/lib/unitsdb/unit_systems.rb

@@ -7,7 +7,6 @@ module Unitsdb
     # model Config.model_for(:unit_systems)
 
     attribute :schema_version, :string
-    attribute :version, :string
     attribute :unit_systems, UnitSystem, collection: true
   end
 end

data/lib/unitsdb/units.rb

@@ -7,7 +7,6 @@ module Unitsdb
     # model Config.model_for(:units)
 
     attribute :schema_version, :string
-    attribute :version, :string
     attribute :units, Unit, collection: true
   end
 end

data/lib/unitsdb/version.rb

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

data/unitsdb.gemspec

@@ -19,6 +19,8 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unitsdb
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-23 00:00:00.000000000 Z
+date: 2025-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -132,13 +132,6 @@ files:
 - 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
@@ -166,7 +159,6 @@ files:
 - 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

data/lib/unitsdb/commands/ucum/check.rb

@@ -1,126 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "../base"
-require_relative "../../database"
-require_relative "../../errors"
-require_relative "xml_parser"
-require_relative "formatter"
-require_relative "matcher"
-require_relative "updater"
-require "fileutils"
-
-module Unitsdb
-  module Commands
-    module Ucum
-      class Check < Base
-        # Constants
-        ENTITY_TYPES = %w[units prefixes].freeze
-
-        def run
-          # Get options
-          entity_type = @options[:entity_type]&.downcase
-          direction = @options[:direction]&.downcase || "both"
-          output_dir = @options[:output_updated_database]
-          include_potential = @options[:include_potential_matches] || false
-          database_path = @options[:database]
-          ucum_file = @options[:ucum_file]
-
-          # Validate parameters
-          validate_parameters(direction, ucum_file)
-
-          # Use the path as-is without expansion
-          puts "Using database directory: #{database_path}"
-
-          @db = Unitsdb::Database.from_db(database_path)
-
-          puts "Using UCUM file: #{ucum_file}"
-          puts "Include potential matches: #{include_potential ? "Yes" : "No"}"
-
-          # Parse UCUM XML file
-          ucum_data = XmlParser.parse_ucum_file(ucum_file)
-
-          # Process entity types
-          process_entities(entity_type, ucum_data, direction, output_dir, include_potential)
-        end
-
-        private
-
-        # Process all entity types or a specific one
-        def process_entities(entity_type, ucum_data, direction, output_dir, include_potential)
-          if entity_type && ENTITY_TYPES.include?(entity_type)
-            process_entity_type(entity_type, ucum_data, direction, output_dir, include_potential)
-          else
-            ENTITY_TYPES.each do |type|
-              process_entity_type(type, ucum_data, direction, output_dir, include_potential)
-            end
-          end
-        end
-
-        # Process a specific entity type
-        def process_entity_type(entity_type, ucum_data, direction, output_dir, include_potential = false)
-          puts "\n========== Processing #{entity_type.upcase} References ==========\n"
-
-          db_entities = @db.send(entity_type)
-          ucum_entities = XmlParser.get_entities_from_ucum(entity_type, ucum_data)
-
-          puts "Found #{ucum_entities.size} #{entity_type} in UCUM"
-          puts "Found #{db_entities.size} #{entity_type} in database"
-
-          check_from_ucum(entity_type, ucum_entities, db_entities, output_dir, include_potential) if %w[from_ucum
-                                                                                                        both].include?(direction)
-
-          return unless %w[to_ucum both].include?(direction)
-
-          check_to_ucum(entity_type, ucum_entities, db_entities, output_dir, include_potential)
-        end
-
-        # Validation helpers
-        def validate_parameters(direction, ucum_file)
-          unless %w[to_ucum from_ucum both].include?(direction)
-            puts "Invalid direction: #{direction}. Must be one of: to_ucum, from_ucum, both"
-            exit(1)
-          end
-
-          return if File.exist?(ucum_file)
-
-          puts "UCUM file not found: #{ucum_file}"
-          exit(1)
-        end
-
-        # Direction handler: UCUM → UnitsDB
-        def check_from_ucum(entity_type, ucum_entities, db_entities, output_dir, include_potential = false)
-          Formatter.print_direction_header("UCUM → UnitsDB")
-
-          matches, missing_matches, unmatched_ucum = Matcher.match_ucum_to_db(entity_type, ucum_entities, db_entities)
-
-          # Print results
-          Formatter.display_ucum_results(entity_type, matches, missing_matches, unmatched_ucum)
-
-          # Update references if needed
-          return unless output_dir && !missing_matches.empty?
-
-          output_file = File.join(output_dir, "#{entity_type}.yaml")
-          Updater.update_references(entity_type, missing_matches, db_entities, output_file, include_potential)
-          puts "\nUpdated references written to #{output_file}"
-        end
-
-        # Direction handler: UnitsDB → UCUM
-        def check_to_ucum(entity_type, ucum_entities, db_entities, output_dir, include_potential = false)
-          Formatter.print_direction_header("UnitsDB → UCUM")
-
-          matches, missing_refs, unmatched_db = Matcher.match_db_to_ucum(entity_type, ucum_entities, db_entities)
-
-          # Print results
-          Formatter.display_db_results(entity_type, matches, missing_refs, unmatched_db)
-
-          # Update references if needed
-          return unless output_dir && !missing_refs.empty?
-
-          output_file = File.join(output_dir, "#{entity_type}.yaml")
-          Updater.update_references(entity_type, missing_refs, db_entities, output_file, include_potential)
-          puts "\nUpdated references written to #{output_file}"
-        end
-      end
-    end
-  end
-end

data/lib/unitsdb/commands/ucum/formatter.rb

@@ -1,141 +0,0 @@
-# frozen_string_literal: true
-
-module Unitsdb
-  module Commands
-    module Ucum
-      # Formats output for UCUM matching results
-      module Formatter
-        module_function
-
-        # Print a direction header (UnitsDB → UCUM or UCUM → UnitsDB)
-        def print_direction_header(direction)
-          puts "\n=== #{direction} ===\n"
-        end
-
-        # Display results for UCUM → UnitsDB matching
-        def display_ucum_results(entity_type, matches, missing_matches, unmatched_ucum)
-          puts "\nResults for #{entity_type.capitalize} (UCUM → UnitsDB):"
-          puts "  Matched: #{matches.size}"
-          puts "  Missing matches (could be added): #{missing_matches.size}"
-          puts "  Unmatched UCUM entities: #{unmatched_ucum.size}"
-
-          unless unmatched_ucum.empty?
-            puts "\nUnmatched UCUM #{entity_type}:"
-            unmatched_ucum.each do |entity|
-              case entity
-              when Unitsdb::UcumPrefix
-                puts "  - #{entity.name} (#{entity.code_sensitive})"
-              when Unitsdb::UcumBaseUnit
-                puts "  - #{entity.name} (#{entity.code_sensitive}, dimension: #{entity.dimension})"
-              when Unitsdb::UcumUnit
-                name = entity.name.is_a?(Array) ? entity.name.first : entity.name
-                puts "  - #{name} (#{entity.code_sensitive}, class: #{entity.klass})"
-              else
-                puts "  - Unknown entity type"
-              end
-            end
-          end
-
-          return if missing_matches.empty?
-
-          puts "\nPotential additions (UCUM #{entity_type} that could be added to UnitsDB):"
-          missing_matches.each do |match|
-            ucum_entity = match[:ucum_entity]
-            db_entity = match[:db_entity]
-
-            # Get entity IDs and names
-            db_id = get_db_entity_id(db_entity)
-            db_name = get_db_entity_name(db_entity)
-            ucum_name = get_ucum_entity_name(ucum_entity)
-            ucum_code = ucum_entity.respond_to?(:code_sensitive) ? ucum_entity.code_sensitive : "unknown"
-
-            case ucum_entity
-            when Unitsdb::UcumPrefix
-              puts "  - UnitsDB prefix '#{db_name}' (#{db_id}) → UCUM prefix '#{ucum_name}' (#{ucum_code})"
-            when Unitsdb::UcumBaseUnit
-              puts "  - UnitsDB unit '#{db_name}' (#{db_id}) → UCUM base unit '#{ucum_name}' (#{ucum_code})"
-            when Unitsdb::UcumUnit
-              puts "  - UnitsDB unit '#{db_name}' (#{db_id}) → UCUM unit '#{ucum_name}' (#{ucum_code})"
-            end
-          end
-        end
-
-        # Display results for UnitsDB → UCUM matching
-        def display_db_results(entity_type, matches, missing_refs, unmatched_db)
-          puts "\nResults for #{entity_type.capitalize} (UnitsDB → UCUM):"
-          puts "  Matched: #{matches.size}"
-          puts "  Missing references (could be added): #{missing_refs.size}"
-          puts "  Unmatched UnitsDB entities: #{unmatched_db.size}"
-
-          unless unmatched_db.empty?
-            puts "\nUnmatched UnitsDB #{entity_type}:"
-            unmatched_db.each do |entity|
-              id = get_db_entity_id(entity)
-              name = get_db_entity_name(entity)
-              puts "  - #{name} (#{id})"
-            end
-          end
-
-          return if missing_refs.empty?
-
-          puts "\nPotential references (UCUM references that could be added to UnitsDB):"
-          missing_refs.each do |match|
-            ucum_entity = match[:ucum_entity]
-            db_entity = match[:db_entity]
-
-            # Get entity IDs and names
-            db_id = get_db_entity_id(db_entity)
-            db_name = get_db_entity_name(db_entity)
-            ucum_name = get_ucum_entity_name(ucum_entity)
-            ucum_code = ucum_entity.respond_to?(:code_sensitive) ? ucum_entity.code_sensitive : "unknown"
-
-            case ucum_entity
-            when Unitsdb::UcumPrefix
-              puts "  - UnitsDB prefix '#{db_name}' (#{db_id}) → UCUM prefix '#{ucum_name}' (#{ucum_code})"
-            when Unitsdb::UcumBaseUnit
-              puts "  - UnitsDB unit '#{db_name}' (#{db_id}) → UCUM base unit '#{ucum_name}' (#{ucum_code})"
-            when Unitsdb::UcumUnit
-              puts "  - UnitsDB unit '#{db_name}' (#{db_id}) → UCUM unit '#{ucum_name}' (#{ucum_code})"
-            end
-          end
-        end
-
-        # Helper to get db entity id
-        def get_db_entity_id(entity)
-          if entity.respond_to?(:identifiers) && entity.identifiers && !entity.identifiers.empty?
-            entity.identifiers.first.id
-          elsif entity.respond_to?(:id)
-            entity.id
-          else
-            "unknown-id"
-          end
-        end
-
-        # Helper to get db entity name
-        def get_db_entity_name(entity)
-          if entity.respond_to?(:names) && entity.names && !entity.names.empty?
-            entity.names.first.value
-          elsif entity.respond_to?(:short) && entity.short
-            entity.short
-          elsif entity.respond_to?(:name)
-            entity.name
-          else
-            "unknown-name"
-          end
-        end
-
-        # Helper to get ucum entity name
-        def get_ucum_entity_name(entity)
-          case entity
-          when Unitsdb::UcumPrefix, Unitsdb::UcumBaseUnit
-            entity.name
-          when Unitsdb::UcumUnit
-            entity.name.is_a?(Array) ? entity.name.first : entity.name
-          else
-            "unknown-name"
-          end
-        end
-      end
-    end
-  end
-end