genericode 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45525e09245553fcda6cb3606ec8f7b17c0fde0daf6507c41e47008d5e8dce43
-  data.tar.gz: 66c0b7b056d47c096d736176d9c575df8fba8c830f539d14e076b43a6f07cda8
+  metadata.gz: 3857740082db34080d9c007ae47c022e652e34852943ba6e86142e5e83a727cc
+  data.tar.gz: 436afb59bc58bec8027daa7f72f5142275b0e58dfd4141659f1b35eb87e5117e
 SHA512:
-  metadata.gz: d6dd2ebe439fde9ab7584ef67e149b3d79b026ae980b8beec200c5fd99a45e95c35b70663bfd8d27566095778394ce6a65ad2f4e7ff72b4706b7028c94ba55a5
-  data.tar.gz: 59951937dd0cd26496fe64e13f9ba70c12ed7d2757609ebfa10633e4d21a233fae230fc234b7da559f4bc12e1c121b029bec786af445f74d6fd5a703dcff83b0
+  metadata.gz: 05a154e0eb406023445a3f11b051f5f6b10cdf27384033507717da03abd178071bb0e4958863dd75b979297cb3b761327ee7e8d03fb6f6387b6b7ac4b87996b9
+  data.tar.gz: f10872b3dfa5fb2a17c4d842fee2c2dda3b5d221d9f0bfdf9d8c9b5d29712490b20c2ea7a891180a29118f126618106178f4027feef67d5fcaf6f42a8211b208

data/.rubocop.yml

@@ -3,32 +3,5 @@ inherit_from: .rubocop_todo.yml
 AllCops:
   NewCops: enable
   SuggestExtensions: false
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.2
 
-Gemspec/DevelopmentDependencies:
-  Enabled: false
-
-Gemspec/RequireMFA:
-  Enabled: false
-
-Metrics/BlockLength:
-  AllowedMethods:
-    - describe
-
-Style/Documentation:
-  Enabled: false
-
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
-
-Style/StringLiteralsInInterpolation:
-  EnforcedStyle: double_quotes
-
-Style/TrailingCommaInArguments:
-  EnforcedStyleForMultiline: consistent_comma
-
-Style/TrailingCommaInArrayLiteral:
-  EnforcedStyleForMultiline: consistent_comma
-
-Style/TrailingCommaInHashLiteral:
-  EnforcedStyleForMultiline: consistent_comma

data/.rubocop_todo.yml

@@ -1,18 +1,15 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2025-01-11 09:46:54 UTC using RuboCop version 1.70.0.
+# on 2026-03-21 05:26:15 UTC using RuboCop version 1.85.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
-# Include: **/*.gemfile, **/Gemfile, **/gems.rb
-Bundler/OrderedGems:
+# Offense count: 1
+Gemspec/RequiredRubyVersion:
   Exclude:
-    - 'Gemfile'
+    - 'genericode.gemspec'
 
 # Offense count: 1
 # Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches, IgnoreDuplicateElseBranch.
@@ -22,7 +19,7 @@ Lint/DuplicateBranch:
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AutoCorrect, CheckForMethodsWithNoSideEffects.
+# Configuration parameters: CheckForMethodsWithNoSideEffects.
 Lint/Void:
   Exclude:
     - 'lib/genericode/code_list.rb'
@@ -32,18 +29,18 @@ Lint/Void:
 Metrics/AbcSize:
   Max: 182
 
-# Offense count: 2
+# Offense count: 16
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 34
+  Max: 160
 
 # Offense count: 1
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
   Max: 216
 
-# Offense count: 5
+# Offense count: 6
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 92
@@ -58,9 +55,36 @@ Metrics/MethodLength:
 Metrics/PerceivedComplexity:
   Max: 92
 
+# Offense count: 2
+# Configuration parameters: Mode, AllowedMethods, AllowedPatterns, AllowBangMethods, WaywardPredicates.
+# AllowedMethods: call
+# WaywardPredicates: infinite?, nonzero?
+Naming/PredicateMethod:
+  Exclude:
+    - 'lib/genericode/cli/converter.rb'
+    - 'lib/genericode/cli/validator.rb'
+
+# Offense count: 37
+# Configuration parameters: AllowedConstants.
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 53
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiterals:
+  Exclude:
+    - 'genericode.gemspec'
+    - 'lib/genericode/cli/code_lister.rb'
+    - 'lib/genericode/cli/code_lookup.rb'
+    - 'lib/genericode/cli/commands.rb'
+    - 'lib/genericode/cli/converter.rb'
+    - 'lib/genericode/cli/validator.rb'
+
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
+# Configuration parameters: AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 121

data/Rakefile

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-require "rubocop/rake_task"
+require 'rubocop/rake_task'
 
 RuboCop::RakeTask.new
 

data/exe/genericode

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require_relative "../lib/genericode"
-require_relative "../lib/genericode/cli"
+require_relative '../lib/genericode'
+require_relative '../lib/genericode/cli'
 
 Genericode::Cli::Commands.start(ARGV)

data/lib/genericode/agency.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
+require 'lutaml/model'
 
-require_relative "general_identifier"
-require_relative "long_name"
-require_relative "short_name"
-require_relative "json/short_name_mixin"
-require_relative "utils"
+require_relative 'general_identifier'
+require_relative 'long_name'
+require_relative 'short_name'
+require_relative 'json/short_name_mixin'
+require_relative 'utils'
 
 module Genericode
   class Agency < Lutaml::Model::Serializable
@@ -17,9 +17,9 @@ module Genericode
     attribute :identifier, GeneralIdentifier, collection: true
 
     json do
-      map "ShortName", to: :short_name, with: { from: :short_name_from_json, to: :short_name_to_json }
-      map "LongName", to: :long_name, with: { from: :long_name_from_json, to: :long_name_to_json }
-      map "Identifier", to: :identifier, with: { from: :identifier_from_json, to: :identifier_to_json }
+      map 'ShortName', to: :short_name, with: { from: :short_name_from_json, to: :short_name_to_json }
+      map 'LongName', to: :long_name, with: { from: :long_name_from_json, to: :long_name_to_json }
+      map 'Identifier', to: :identifier, with: { from: :identifier_from_json, to: :identifier_to_json }
     end
 
     def long_name_from_json(model, value)
@@ -27,7 +27,7 @@ module Genericode
     end
 
     def long_name_to_json(model, doc)
-      doc["LongName"] = LongName.as_json(Utils.one_or_all(model.long_name))
+      doc['LongName'] = LongName.as_json(Utils.one_or_all(model.long_name))
     end
 
     def identifier_from_json(model, value)
@@ -35,16 +35,15 @@ module Genericode
     end
 
     def identifier_to_json(model, doc)
-      doc["Identifier"] = GeneralIdentifier.as_json(Utils.one_or_all(model.identifier))
+      doc['Identifier'] = GeneralIdentifier.as_json(Utils.one_or_all(model.identifier))
     end
 
     xml do
-      root "Agency"
-      namespace "http://docs.oasis-open.org/codelist/ns/genericode/1.0/", "gc"
+      element 'Agency'
 
-      map_element "ShortName", to: :short_name, prefix: nil, namespace: nil
-      map_element "LongName", to: :long_name, prefix: nil, namespace: nil
-      map_element "Identifier", to: :identifier, prefix: nil, namespace: nil
+      map_element 'ShortName', to: :short_name
+      map_element 'LongName', to: :long_name
+      map_element 'Identifier', to: :identifier
     end
   end
 end

data/lib/genericode/annotation.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
+require 'lutaml/model'
 
-require_relative "any_other_content"
-require_relative "any_other_language_content"
+require_relative 'any_other_content'
+require_relative 'any_other_language_content'
 
 module Genericode
   class Annotation < Lutaml::Model::Serializable
@@ -11,22 +11,21 @@ module Genericode
     attribute :app_info, AnyOtherContent
 
     json do
-      map "Description", to: :description
-      map "AppInfo", to: :app_info, render_nil: true
+      map 'Description', to: :description
+      map 'AppInfo', to: :app_info, render_nil: true
     end
 
     def self.of_json(hash, **)
-      hash = { "AppInfo" => hash } if hash.any?
+      hash = { 'AppInfo' => hash } if hash.any?
 
       super
     end
 
     xml do
-      root "Annotation"
-      namespace "http://docs.oasis-open.org/codelist/ns/genericode/1.0/", "gc"
+      element 'Annotation'
 
-      map_element "Description", to: :description, prefix: nil, namespace: nil
-      map_element "AppInfo", to: :app_info, prefix: nil, namespace: nil, render_nil: true
+      map_element 'Description', to: :description
+      map_element 'AppInfo', to: :app_info, value_map: { to: { nil: :empty } }
     end
   end
 end

data/lib/genericode/any_other_content.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
+require 'lutaml/model'
 
 module Genericode
   class AnyOtherContent < Lutaml::Model::Serializable
     xml do
-      root "AnyOtherContent"
-      namespace "http://docs.oasis-open.org/codelist/ns/genericode/1.0/", "gc"
+      element 'AnyOtherContent'
     end
   end
 end

data/lib/genericode/any_other_language_content.rb

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
+require 'lutaml/model'
+require 'lutaml/xml/w3c'
 
 module Genericode
   class AnyOtherLanguageContent < Lutaml::Model::Serializable
-    attribute :lang, :string
+    attribute :lang, Lutaml::Xml::W3c::XmlLangType
 
     json do
-      map "lang", to: :lang
+      map 'lang', to: :lang
     end
 
     xml do
-      root "AnyOtherLanguageContent"
-      namespace "http://docs.oasis-open.org/codelist/ns/genericode/1.0/", "gc"
+      element 'AnyOtherLanguageContent'
 
-      map_attribute "lang", to: :lang, prefix: "xml", namespace: "http://www.w3.org/XML/1998/namespace"
+      map_attribute 'lang', to: :lang
     end
   end
 end

data/lib/genericode/canonical_uri.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-require "uri"
+require 'lutaml/model'
+require 'uri'
 
 module Genericode
   # Rule 4: Must be an absolute URI, must not be relative
@@ -9,7 +9,7 @@ module Genericode
     attribute :content, :string
 
     xml do
-      root "CanonicalUri"
+      element 'CanonicalUri'
       map_content to: :content
     end
 

data/lib/genericode/cli/code_lister.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative "../code_list"
-require "tabulo"
-require "csv"
+require_relative '../code_list'
+require 'table_tennis'
+require 'csv'
 
 module Genericode
   module Cli
@@ -13,10 +13,16 @@ module Genericode
 
           # Validate data types
           code_list.validate_verbose.each do |error|
-            raise Error, "#{error[:code]}: #{error[:message]}" if error[:code] == "INVALID_DATA_TYPE"
+            if error[:code] == 'INVALID_DATA_TYPE'
+              raise Error,
+                    "#{error[:code]}: #{error[:message]}"
+            end
 
             # Ensure valid ColumnRefs
-            raise Error, "#{error[:code]}: #{error[:message]}" if error[:code] == "INVALID_COLUMN_REF"
+            if error[:code] == 'INVALID_COLUMN_REF'
+              raise Error,
+                    "#{error[:code]}: #{error[:message]}"
+            end
           end
 
           case format
@@ -40,26 +46,25 @@ module Genericode
             rows.each do |row|
               csv << columns.map do |col|
                 value = row.value.find { |v| v.column_ref == col.id }
-                value&.simple_value&.content || ""
+                value&.simple_value&.content || ''
               end
             end
-          end.strip.encode("UTF-8")
+          end.strip.encode('UTF-8')
         end
 
         def list_table(code_list)
           columns = code_list.column_set.column
           rows = code_list.simple_code_list.row
 
-          table = Tabulo::Table.new(rows) do |t|
-            columns.each do |column|
-              t.add_column(column.short_name.content) do |row|
-                value = row.value.find { |v| v.column_ref == column.id }
-                value&.simple_value&.content || ""
-              end
+          headers = columns.map { |col| col.short_name.content }
+          data = rows.map do |row|
+            columns.map do |col|
+              value = row.value.find { |v| v.column_ref == col.id }
+              value&.simple_value&.content || ''
             end
           end
 
-          table.to_s
+          TableTennis.render([headers] + data)
         end
       end
     end

data/lib/genericode/cli/code_lookup.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../code_list"
+require_relative '../code_list'
 
 module Genericode
   module Cli

data/lib/genericode/cli/commands.rb

@@ -1,52 +1,55 @@
 # frozen_string_literal: true
 
-require "thor"
-require_relative "validator"
-require_relative "converter"
-require_relative "code_lister"
-require_relative "code_lookup"
+require 'thor'
+require_relative 'validator'
+require_relative 'converter'
+require_relative 'code_lister'
+require_relative 'code_lookup'
 
 module Genericode
   module Cli
     class Commands < Thor
-      desc "convert INPUT OUTPUT", "Convert between Genericode XML and JSON formats"
+      desc 'convert INPUT OUTPUT',
+           'Convert between Genericode XML and JSON formats'
 
       def convert(input, output)
-        puts "Conversion successful." if Converter.convert(input, output)
+        puts 'Conversion successful.' if Converter.convert(input, output)
       rescue Error => e
         puts "Conversion failed: #{e.message}"
       end
 
-      desc "validate FILE", "Validate a Genericode file"
-      option :verbose, type: :boolean, desc: "Show detailed validation results"
+      desc 'validate FILE', 'Validate a Genericode file'
+      option :verbose, type: :boolean, desc: 'Show detailed validation results'
 
       def validate(file)
         code_list = CodeList.from_file(file)
         if options[:verbose]
           results = code_list.validate_verbose
           if results.empty?
-            puts "File is valid."
+            puts 'File is valid.'
           else
-            puts "File is invalid. Issues found:"
+            puts 'File is invalid. Issues found:'
             results.each do |error|
               puts "  [#{error[:code]}] #{error[:message]}"
             end
           end
         elsif code_list.valid?
-          puts "File is valid."
+          puts 'File is valid.'
         else
-          puts "File is invalid."
+          puts 'File is invalid.'
         end
       rescue Error => e
         puts "Validation failed: #{e.message}"
       end
 
-      desc "list_codes FILE", "List all codes and their associated data in a Genericode file"
-      option :format, type: :string, default: "tsv", enum: %w[tsv table], desc: "Output format (tsv or table)"
-      option :output, type: :string, desc: "Output file path (default: stdout)"
+      desc 'list_codes FILE',
+           'List all codes and their associated data in a Genericode file'
+      option :format, type: :string, default: 'tsv', enum: %w[tsv table],
+                      desc: 'Output format (tsv or table)'
+      option :output, type: :string, desc: 'Output file path (default: stdout)'
 
       def list_codes(file)
-        format = (options[:format] || "tsv").to_sym
+        format = (options[:format] || 'tsv').to_sym
         result = CodeLister.list_codes(file, format: format)
 
         if options[:output]
@@ -59,7 +62,7 @@ module Genericode
         puts "Listing codes failed: #{e.message}"
       end
 
-      desc "lookup FILE PATH", "Look up a particular code using Genericode path"
+      desc 'lookup FILE PATH', 'Look up a particular code using Genericode path'
 
       def lookup(file, path)
         result = CodeLookup.lookup(file, path)

data/lib/genericode/cli/converter.rb

@@ -7,14 +7,20 @@ module Genericode
         input_format = File.extname(input_path)
         output_format = File.extname(output_path)
 
-        raise Error, "Invalid input format" unless [".gc", ".gcj"].include?(input_format)
-        raise Error, "Invalid output format" unless [".gc", ".gcj"].include?(output_format)
-        raise Error, "Input and output formats are the same" if input_format == output_format
+        raise Error, 'Invalid input format' unless ['.gc',
+                                                    '.gcj'].include?(input_format)
+        raise Error, 'Invalid output format' unless ['.gc',
+                                                     '.gcj'].include?(output_format)
+
+        if input_format == output_format
+          raise Error,
+                'Input and output formats are the same'
+        end
 
         # begin
         code_list = CodeList.from_file(input_path)
 
-        result = if output_format == ".gcj"
+        result = if output_format == '.gcj'
                    code_list.to_json
                  else
                    code_list.to_xml
@@ -22,13 +28,6 @@ module Genericode
 
         File.write(output_path, result)
         true
-        # rescue JSON::ParserError => e
-        #   raise Error, "Invalid JSON in input file: #{e.message}"
-        # rescue Shale::ParseError => e
-        #   raise Error, "Invalid XML in input file: #{e.message}"
-        # rescue StandardError => e
-        #   raise Error, "Conversion error: #{e.message}"
-        # end
       end
     end
   end

data/lib/genericode/cli/validator.rb

@@ -4,15 +4,22 @@ module Genericode
   module Cli
     class Validator
       def self.validate(file_path)
-        raise Error, "File does not exist" unless File.exist?(file_path)
-        raise Error, "Invalid file format" unless file_path.end_with?(".gc", ".gcj")
+        raise Error, 'File does not exist' unless File.exist?(file_path)
+        raise Error, 'Invalid file format' unless file_path.end_with?('.gc',
+                                                                      '.gcj')
 
         code_list = CodeList.from_file(file_path)
 
-        raise Error, "No columns defined" if code_list.column_set.nil? || code_list.column_set.column.empty?
-        raise Error, "No rows defined" if code_list.simple_code_list.nil? || code_list.simple_code_list.row.empty?
+        if code_list.column_set.nil? || code_list.column_set.column.empty?
+          raise Error,
+                'No columns defined'
+        end
+        if code_list.simple_code_list.nil? || code_list.simple_code_list.row.empty?
+          raise Error,
+                'No rows defined'
+        end
 
-        raise Error, "Invalid Genericode structure" unless code_list.valid?
+        raise Error, 'Invalid Genericode structure' unless code_list.valid?
 
         true
       end

data/lib/genericode/cli.rb

@@ -5,4 +5,4 @@ module Genericode
   end
 end
 
-require_relative "cli/commands"
+require_relative 'cli/commands'