genericode 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a658f75042c1064fc1032f885e266baeb816d38fd1f48324bdc791739abbd71e
-  data.tar.gz: 7ebc14d95ed7538b3c3991baba75b78bd0661102e00e85625a7ef17f6d47ed1f
+  metadata.gz: e291ef80bb1e2146628255afde45053ca058c30da6bf183c4b53ff8e65b46fc2
+  data.tar.gz: fc1d89c86ed420b4b1969959dbd250bf768c719e0cedae2197613dfc7996c46f
 SHA512:
-  metadata.gz: 304c01513d153bb25eed9cfc146a1502e2212404aa138574ded480e503142a1f2b11891e1ebddd08373780fef19d95133a2b97f969ef2501bb6bdb15b7aba3f8
-  data.tar.gz: 5f801ef2ea74a25c30c1a189c9cf5d55d768f45cac0d223436d3e6bb0d2e26610f7c7c4efaf09ca604396e61c7192135532f75bfa2e6997b7fac321015163e0d
+  metadata.gz: 12e6bbca723ee3b97fa3da11a3ca65757988824df665b877836ed5c53c5d610fb81f2282659e64acbb9ab37ad99a6291c851598eb5fe689c3009d2e73b7d64c8
+  data.tar.gz: 5bbb18bbede6f7d905eea7b75c616f2c8466da97cdb992cfb518ba884aa56b2d126203549337162ebaaee9f160990f09a785e4ebe0ec5d7bd3a89aaa39ed36fd

data/.rubocop_todo.yml

@@ -1,17 +1,32 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-08-27 09:46:41 UTC using RuboCop version 1.65.1.
+# on 2025-01-11 09:46:54 UTC using RuboCop version 1.70.0.
 # 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:
+  Exclude:
+    - 'Gemfile'
+
 # Offense count: 1
-# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
+# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches, IgnoreDuplicateElseBranch.
 Lint/DuplicateBranch:
   Exclude:
     - 'lib/genericode/code_list.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AutoCorrect, CheckForMethodsWithNoSideEffects.
+Lint/Void:
+  Exclude:
+    - 'lib/genericode/code_list.rb'
+
 # Offense count: 8
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
@@ -26,7 +41,7 @@ Metrics/BlockLength:
 # Offense count: 1
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 220
+  Max: 216
 
 # Offense count: 5
 # Configuration parameters: AllowedMethods, AllowedPatterns.
@@ -45,7 +60,7 @@ Metrics/PerceivedComplexity:
 
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 121

data/lib/genericode/annotation.rb

@@ -26,7 +26,7 @@ module Genericode
       namespace "http://docs.oasis-open.org/codelist/ns/genericode/1.0/", "gc"
 
       map_element "Description", to: :description, prefix: nil, namespace: nil
-      map_element "AppInfo", to: :app_info, prefix: nil, namespace: nil, render_nil: true
+      map_element "AppInfo", to: :app_info, prefix: nil, namespace: nil, value_map: { to: { nil: :empty } }
     end
   end
 end

data/lib/genericode/cli/converter.rb

@@ -22,13 +22,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/code_list.rb

@@ -108,7 +108,7 @@ module Genericode
         result.value.to_h do |v|
           [column_set.column.find do |c|
             c.id == v.column_ref
-          end.short_name.content, v.simple_value.content]
+          end.short_name.content, v.simple_value.content,]
         end
       end
     end
@@ -123,13 +123,13 @@ module Genericode
       # Rule 1: ColumnSet presence
       if column_set.nil? || column_set.column.empty?
         errors << { code: "MISSING_COLUMN_SET",
-                    message: "ColumnSet is missing or empty" }
+                    message: "ColumnSet is missing or empty", }
       end
 
       # Rule 2: SimpleCodeList presence
       if simple_code_list.nil? || simple_code_list.row.empty?
         errors << { code: "MISSING_SIMPLE_CODE_LIST",
-                    message: "SimpleCodeList is missing or empty" }
+                    message: "SimpleCodeList is missing or empty", }
       end
 
       # Rule 3: Unique column IDs
@@ -143,7 +143,7 @@ module Genericode
         row.value.each do |value|
           unless column_ids.include?(value.column_ref)
             errors << { code: "INVALID_COLUMN_REF",
-                        message: "Invalid ColumnRef '#{value.column_ref}' in row #{index + 1}" }
+                        message: "Invalid ColumnRef '#{value.column_ref}' in row #{index + 1}", }
           end
         end
       end
@@ -165,7 +165,7 @@ module Genericode
         required_columns.each do |col|
           unless row.value.any? { |v| v.column_ref == col.id && v.simple_value&.content }
             errors << { code: "MISSING_REQUIRED_VALUE",
-                        message: "Missing value for required column '#{col.short_name&.content}' in row #{index + 1}" }
+                        message: "Missing value for required column '#{col.short_name&.content}' in row #{index + 1}", }
           end
         end
       end
@@ -177,7 +177,7 @@ module Genericode
           value = row.value.find { |v| v.column_ref == col.id }&.simple_value&.content
           unless value_matches_type?(value, data_type)
             errors << { code: "INVALID_DATA_TYPE",
-                        message: "Invalid data type for column '#{col.short_name&.content}' in row #{index + 1}" }
+                        message: "Invalid data type for column '#{col.short_name&.content}' in row #{index + 1}", }
           end
         end
       end
@@ -191,19 +191,19 @@ module Genericode
       column_set&.column&.each do |col|
         if col.data&.type && !valid_datatype_id?(col.data.type)
           errors << { code: "INVALID_DATATYPE_ID",
-                      message: "Invalid datatype ID for column '#{col.short_name&.content}'" }
+                      message: "Invalid datatype ID for column '#{col.short_name&.content}'", }
         end
 
         # Rule 20 and 22: Complex data validation
         if col.data&.type == "*" && col.data&.datatype_library != "*"
           errors << { code: "INVALID_COMPLEX_DATA",
-                      message: "Invalid complex data configuration for column '#{col.short_name&.content}'" }
+                      message: "Invalid complex data configuration for column '#{col.short_name&.content}'", }
         end
 
         # Rule 23: Language attribute validation
         if col.data&.lang && col.data_restrictions&.lang
           errors << { code: "DUPLICATE_LANG_ATTRIBUTE",
-                      message: "Duplicate lang attribute for column '#{col.short_name&.content}'" }
+                      message: "Duplicate lang attribute for column '#{col.short_name&.content}'", }
         end
       end
 
@@ -218,7 +218,7 @@ module Genericode
       column_set&.column&.each do |col|
         if col.short_name&.content&.match?(/\s/)
           errors << { code: "INVALID_SHORT_NAME",
-                      message: "ShortName '#{col.short_name&.content}' contains whitespace" }
+                      message: "ShortName '#{col.short_name&.content}' contains whitespace", }
         end
       end
 
@@ -229,7 +229,7 @@ module Genericode
 
           unless valid_complex_value?(value.complex_value, column_set&.column&.find { |c| c.id == value.column_ref })
             errors << { code: "INVALID_COMPLEX_VALUE",
-                        message: "Invalid ComplexValue in row #{index + 1}, column '#{value.column_ref}'" }
+                        message: "Invalid ComplexValue in row #{index + 1}, column '#{value.column_ref}'", }
           end
         end
       end

data/lib/genericode/column.rb

@@ -20,7 +20,7 @@ module Genericode
     attribute :use, :string, default: -> { "optional" }
     attribute :annotation, Annotation
     attribute :short_name, ShortName
-    attribute :long_name, LongName, collection: true
+    attribute :long_name, LongName, collection: true, initialize_empty: true
     attribute :canonical_uri, CanonicalUri
     attribute :canonical_version_uri, :string
     attribute :data, Data
@@ -50,7 +50,7 @@ module Genericode
     end
 
     def long_name_to_json(model, doc)
-      return if model.long_name.empty?
+      return if model.long_name.nil? || model.long_name.empty?
 
       doc["LongName"] = LongName.as_json(Utils.one_or_all(model.long_name))
     end

data/lib/genericode/column_set.rb

@@ -14,8 +14,8 @@ module Genericode
     attribute :datatype_library, :string
     attribute :annotation, Annotation
     attribute :identification, Identification
-    attribute :column, Column, collection: true
-    attribute :column_ref, ColumnRef, collection: true
+    attribute :column, Column, collection: true, initialize_empty: true
+    attribute :column_ref, ColumnRef, collection: true, initialize_empty: true
     attribute :key, Key, collection: true
     attribute :key_ref, KeyRef, collection: true
 

data/lib/genericode/identification.rb

@@ -17,12 +17,12 @@ module Genericode
     include Json::ShortNameMixin
 
     attribute :short_name, ShortName
-    attribute :long_name, LongName, collection: true
+    attribute :long_name, LongName, collection: true, initialize_empty: true
     attribute :version, :string
     attribute :canonical_uri, CanonicalUri
     attribute :canonical_version_uri, :string
-    attribute :location_uri, :string, collection: true
-    attribute :alternate_format_location_uri, MimeTypedUri, collection: true
+    attribute :location_uri, :string, collection: true, initialize_empty: true
+    attribute :alternate_format_location_uri, MimeTypedUri, collection: true, initialize_empty: true
     attribute :agency, Agency
 
     json do
@@ -43,20 +43,19 @@ module Genericode
     end
 
     def long_name_to_json(model, doc)
-      return if model.long_name.empty?
+      return if model.long_name.nil? || model.long_name.empty?
 
       doc["LongName"] = LongName.as_json(model.long_name)
     end
 
     def location_uri_from_json(model, value)
-      # model.location_uri = Shale::Type::String.of_json(Utils.array_wrap(value))
       model.location_uri = Utils.array_wrap(value).map do |val|
         Lutaml::Model::Type::String.cast(val)
       end
     end
 
     def location_uri_to_json(model, doc)
-      return if model.location_uri.empty?
+      return if model.location_uri.nil? || model.location_uri.empty?
 
       doc["LocationUri"] = Lutaml::Model::Type::String.cast(Utils.one_or_all(model.location_uri))
     end
@@ -66,7 +65,7 @@ module Genericode
     end
 
     def alternate_format_location_uri_to_json(model, doc)
-      return if model.alternate_format_location_uri.empty?
+      return if model.alternate_format_location_uri.nil? || model.alternate_format_location_uri.empty?
 
       doc["AlternateFormatLocationUri"] = MimeTypedUri.as_json(Utils.one_or_all(model.alternate_format_location_uri))
     end

data/lib/genericode/key.rb

@@ -19,7 +19,7 @@ module Genericode
     attribute :id, :string
     attribute :annotation, Annotation
     attribute :short_name, ShortName
-    attribute :long_name, LongName, collection: true
+    attribute :long_name, LongName, collection: true, initialize_empty: true
     attribute :canonical_uri, CanonicalUri
     attribute :canonical_version_uri, :string
     attribute :column_ref, KeyColumnRef, collection: true
@@ -39,7 +39,7 @@ module Genericode
     end
 
     def long_name_to_json(model, doc)
-      return if model.long_name.empty?
+      return if model.long_name.nil? || model.long_name.empty?
 
       doc["LongName"] = LongName.as_json(model.long_name)
     end

data/lib/genericode/simple_code_list.rb

@@ -8,7 +8,7 @@ require_relative "row"
 module Genericode
   class SimpleCodeList < Lutaml::Model::Serializable
     attribute :annotation, Annotation
-    attribute :row, Row, collection: true
+    attribute :row, Row, collection: true, initialize_empty: true
 
     json do
       map "Annotation", to: :annotation

data/lib/genericode/value.rb

@@ -9,7 +9,7 @@ require_relative "column_ref"
 
 module Genericode
   class Value < Lutaml::Model::Serializable
-    attribute :column_ref, ColumnRef
+    attribute :column_ref, :string
     attribute :annotation, Annotation
     attribute :simple_value, SimpleValue
     attribute :complex_value, AnyOtherContent

data/lib/genericode/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: genericode
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-07 00:00:00.000000000 Z
+date: 2025-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csv
@@ -28,16 +28,16 @@ dependencies:
   name: lutaml-model
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: tabulo
   requirement: !ruby/object:Gem::Requirement
@@ -66,90 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: xml-c14n
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Parser and generator for OASIS Genericode
 email:
 - open.source@ribose.com'
@@ -213,7 +129,7 @@ metadata:
   homepage_uri: https://github.com/lutaml/genericode
   source_code_uri: https://github.com/lutaml/genericode
   changelog_uri: https://github.com/lutaml/genericode/releases
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -228,8 +144,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Parser and generator for OASIS Genericode
 test_files: []