genericode 0.1.2 → 0.2.0

data/lib/genericode/column_set.rb

@@ -1,45 +1,44 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
+require 'lutaml/model'
 
-require_relative "annotation"
-require_relative "column"
-require_relative "column_ref"
-require_relative "identification"
-require_relative "key"
-require_relative "key_ref"
+require_relative 'annotation'
+require_relative 'column'
+require_relative 'column_ref'
+require_relative 'identification'
+require_relative 'key'
+require_relative 'key_ref'
 
 module Genericode
   class ColumnSet < Lutaml::Model::Serializable
     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
 
     json do
-      map "DatatypeLibrary", to: :datatype_library
-      map "Annotation", to: :annotation
-      map "Identification", to: :identification
-      map "Column", to: :column
-      map "ColumnRef", to: :column_ref
-      map "Key", to: :key
-      map "KeyRef", to: :key_ref
+      map 'DatatypeLibrary', to: :datatype_library
+      map 'Annotation', to: :annotation
+      map 'Identification', to: :identification
+      map 'Column', to: :column
+      map 'ColumnRef', to: :column_ref
+      map 'Key', to: :key
+      map 'KeyRef', to: :key_ref
     end
 
     xml do
-      root "ColumnSet"
-      namespace "http://docs.oasis-open.org/codelist/ns/genericode/1.0/", "gc"
+      element 'ColumnSet'
 
-      map_attribute "DatatypeLibrary", to: :datatype_library
-      map_element "Annotation", to: :annotation, prefix: nil, namespace: nil
-      map_element "Identification", to: :identification, prefix: nil, namespace: nil
-      map_element "Column", to: :column, prefix: nil, namespace: nil
-      map_element "ColumnRef", to: :column_ref, prefix: nil, namespace: nil
-      map_element "Key", to: :key, prefix: nil, namespace: nil
-      map_element "KeyRef", to: :key_ref, prefix: nil, namespace: nil
+      map_attribute 'DatatypeLibrary', to: :datatype_library
+      map_element 'Annotation', to: :annotation
+      map_element 'Identification', to: :identification
+      map_element 'Column', to: :column
+      map_element 'ColumnRef', to: :column_ref
+      map_element 'Key', to: :key
+      map_element 'KeyRef', to: :key_ref
     end
   end
 end

data/lib/genericode/column_set_ref.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
+require 'lutaml/model'
 
-require_relative "annotation"
+require_relative 'annotation'
 
 module Genericode
   class ColumnSetRef < Lutaml::Model::Serializable
@@ -11,18 +11,17 @@ module Genericode
     attribute :location_uri, :string, collection: true
 
     json do
-      map "Annotation", to: :annotation
-      map "CanonicalVersionUri", to: :canonical_version_uri
-      map "LocationUri", to: :location_uri
+      map 'Annotation', to: :annotation
+      map 'CanonicalVersionUri', to: :canonical_version_uri
+      map 'LocationUri', to: :location_uri
     end
 
     xml do
-      root "ColumnSetRef"
-      namespace "http://docs.oasis-open.org/codelist/ns/genericode/1.0/", "gc"
+      element 'ColumnSetRef'
 
-      map_element "Annotation", to: :annotation, prefix: nil, namespace: nil
-      map_element "CanonicalVersionUri", to: :canonical_version_uri, prefix: nil, namespace: nil
-      map_element "LocationUri", to: :location_uri, prefix: nil, namespace: nil
+      map_element 'Annotation', to: :annotation
+      map_element 'CanonicalVersionUri', to: :canonical_version_uri
+      map_element 'LocationUri', to: :location_uri
     end
   end
 end

data/lib/genericode/data.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
+require 'lutaml/model'
 
-require_relative "annotation"
-require_relative "datatype_facet"
+require_relative 'annotation'
+require_relative 'datatype_facet'
 
 module Genericode
   class Data < Lutaml::Model::Serializable
@@ -14,22 +14,21 @@ module Genericode
     attribute :parameter, DatatypeFacet, collection: true
 
     json do
-      map "Type", to: :type
-      map "DatatypeLibrary", to: :datatype_library
-      map "Lang", to: :lang
-      map "Annotation", to: :annotation
-      map "Parameter", to: :parameter
+      map 'Type', to: :type
+      map 'DatatypeLibrary', to: :datatype_library
+      map 'Lang', to: :lang
+      map 'Annotation', to: :annotation
+      map 'Parameter', to: :parameter
     end
 
     xml do
-      root "Data"
-      namespace "http://docs.oasis-open.org/codelist/ns/genericode/1.0/", "gc"
+      element 'Data'
 
-      map_attribute "Type", to: :type
-      map_attribute "DatatypeLibrary", to: :datatype_library
-      map_attribute "Lang", to: :lang
-      map_element "Annotation", to: :annotation, prefix: nil, namespace: nil
-      map_element "Parameter", to: :parameter, prefix: nil, namespace: nil
+      map_attribute 'Type', to: :type
+      map_attribute 'DatatypeLibrary', to: :datatype_library
+      map_attribute 'Lang', to: :lang
+      map_element 'Annotation', to: :annotation
+      map_element 'Parameter', to: :parameter
     end
   end
 end

data/lib/genericode/data_restrictions.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
+require 'lutaml/model'
 
-require_relative "datatype_facet"
+require_relative 'datatype_facet'
 
 module Genericode
   class DataRestrictions < Lutaml::Model::Serializable
@@ -10,16 +10,15 @@ module Genericode
     attribute :parameter, DatatypeFacet, collection: true
 
     json do
-      map "Lang", to: :lang
-      map "Parameter", to: :parameter
+      map 'Lang', to: :lang
+      map 'Parameter', to: :parameter
     end
 
     xml do
-      root "DataRestrictions"
-      namespace "http://docs.oasis-open.org/codelist/ns/genericode/1.0/", "gc"
+      element 'DataRestrictions'
 
-      map_attribute "Lang", to: :lang
-      map_element "Parameter", to: :parameter, prefix: nil, namespace: nil
+      map_attribute 'Lang', to: :lang
+      map_element 'Parameter', to: :parameter
     end
   end
 end

data/lib/genericode/datatype_facet.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
-require_relative "json/short_name_mixin"
+require 'lutaml/model'
+require_relative 'json/short_name_mixin'
 
 module Genericode
   class DatatypeFacet < Lutaml::Model::Serializable
@@ -12,18 +12,17 @@ module Genericode
     attribute :long_name, :string
 
     json do
-      map "ShortName", to: :short_name, with: { from: :short_name_from_json, to: :short_name_to_json }
-      map "LongName", to: :long_name
-      map "_", to: :content
+      map 'ShortName', to: :short_name, with: { from: :short_name_from_json, to: :short_name_to_json }
+      map 'LongName', to: :long_name
+      map '_', to: :content
     end
 
     xml do
-      root "DatatypeFacet"
-      namespace "http://docs.oasis-open.org/codelist/ns/genericode/1.0/", "gc"
+      element 'DatatypeFacet'
 
       map_content to: :content
-      map_attribute "ShortName", to: :short_name
-      map_attribute "LongName", to: :long_name
+      map_attribute 'ShortName', to: :short_name
+      map_attribute 'LongName', to: :long_name
     end
   end
 end

data/lib/genericode/gc_namespace.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'lutaml/xml/namespace'
+
+module Genericode
+  class GcNamespace < Lutaml::Xml::Namespace
+    uri 'http://docs.oasis-open.org/codelist/ns/genericode/1.0/'
+    prefix_default 'gc'
+    element_form_default :unqualified
+    attribute_form_default :unqualified
+  end
+end

data/lib/genericode/general_identifier.rb

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

data/lib/genericode/identification.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
+require 'lutaml/model'
 
-require_relative "agency"
-require_relative "long_name"
-require_relative "mime_typed_uri"
-require_relative "canonical_uri"
-require_relative "short_name"
-require_relative "json/short_name_mixin"
-require_relative "json/canonical_uri_mixin"
-require_relative "utils"
+require_relative 'agency'
+require_relative 'long_name'
+require_relative 'mime_typed_uri'
+require_relative 'canonical_uri'
+require_relative 'short_name'
+require_relative 'json/short_name_mixin'
+require_relative 'json/canonical_uri_mixin'
+require_relative 'utils'
 
 module Genericode
   class Identification < Lutaml::Model::Serializable
@@ -17,25 +17,25 @@ 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
-      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 "Version", to: :version
-      map "CanonicalUri", to: :canonical_uri, with: { from: :canonical_uri_from_json, to: :canonical_uri_to_json }
-      map "CanonicalVersionUri", to: :canonical_version_uri
-      map "LocationUri", to: :location_uri, with: { from: :location_uri_from_json, to: :location_uri_to_json }
-      map "AlternateFormatLocationUri", to: :alternate_format_location_uri,
+      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 'Version', to: :version
+      map 'CanonicalUri', to: :canonical_uri, with: { from: :canonical_uri_from_json, to: :canonical_uri_to_json }
+      map 'CanonicalVersionUri', to: :canonical_version_uri
+      map 'LocationUri', to: :location_uri, with: { from: :location_uri_from_json, to: :location_uri_to_json }
+      map 'AlternateFormatLocationUri', to: :alternate_format_location_uri,
                                         with: { from: :alternate_format_location_uri_from_json,
-                                                to: :alternate_format_location_uri_to_json, }
-      map "Agency", to: :agency
+                                                to: :alternate_format_location_uri_to_json }
+      map 'Agency', to: :agency
     end
 
     def long_name_from_json(model, value)
@@ -43,22 +43,21 @@ 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)
+      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))
+      doc['LocationUri'] = Lutaml::Model::Type::String.cast(Utils.one_or_all(model.location_uri))
     end
 
     def alternate_format_location_uri_from_json(model, value)
@@ -66,23 +65,22 @@ 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))
+      doc['AlternateFormatLocationUri'] = MimeTypedUri.as_json(Utils.one_or_all(model.alternate_format_location_uri))
     end
 
     xml do
-      root "Identification"
-      namespace "http://docs.oasis-open.org/codelist/ns/genericode/1.0/", "gc"
-
-      map_element "ShortName", to: :short_name, prefix: nil, namespace: nil
-      map_element "LongName", to: :long_name, prefix: nil, namespace: nil
-      map_element "Version", to: :version, prefix: nil, namespace: nil
-      map_element "CanonicalUri", to: :canonical_uri, prefix: nil, namespace: nil
-      map_element "CanonicalVersionUri", to: :canonical_version_uri, prefix: nil, namespace: nil
-      map_element "LocationUri", to: :location_uri, prefix: nil, namespace: nil
-      map_element "AlternateFormatLocationUri", to: :alternate_format_location_uri, prefix: nil, namespace: nil
-      map_element "Agency", to: :agency, prefix: nil, namespace: nil
+      element 'Identification'
+
+      map_element 'ShortName', to: :short_name
+      map_element 'LongName', to: :long_name
+      map_element 'Version', to: :version
+      map_element 'CanonicalUri', to: :canonical_uri
+      map_element 'CanonicalVersionUri', to: :canonical_version_uri
+      map_element 'LocationUri', to: :location_uri
+      map_element 'AlternateFormatLocationUri', to: :alternate_format_location_uri
+      map_element 'Agency', to: :agency
     end
   end
 end

data/lib/genericode/json/canonical_uri_mixin.rb

@@ -10,7 +10,7 @@ module Genericode
       def canonical_uri_to_json(model, doc)
         return if model.canonical_uri.nil?
 
-        doc["CanonicalUri"] = model.canonical_uri&.content
+        doc['CanonicalUri'] = model.canonical_uri&.content
       end
     end
   end

data/lib/genericode/json/short_name_mixin.rb

@@ -10,7 +10,7 @@ module Genericode
       def short_name_to_json(model, doc)
         return if model.short_name.nil?
 
-        doc["ShortName"] = model.short_name.content
+        doc['ShortName'] = model.short_name.content
       end
     end
   end

data/lib/genericode/key.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
+require 'lutaml/model'
 
-require_relative "annotation"
-require_relative "key_column_ref"
-require_relative "canonical_uri"
-require_relative "long_name"
-require_relative "short_name"
-require_relative "json/short_name_mixin"
-require_relative "json/canonical_uri_mixin"
-require_relative "utils"
+require_relative 'annotation'
+require_relative 'key_column_ref'
+require_relative 'canonical_uri'
+require_relative 'long_name'
+require_relative 'short_name'
+require_relative 'json/short_name_mixin'
+require_relative 'json/canonical_uri_mixin'
+require_relative 'utils'
 
 module Genericode
   class Key < Lutaml::Model::Serializable
@@ -19,19 +19,19 @@ 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
 
     json do
-      map "Id", to: :id
-      map "Annotation", to: :annotation
-      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 "CanonicalUri", to: :canonical_uri, with: { from: :canonical_uri_from_json, to: :canonical_uri_to_json }
-      map "CanonicalVersionUri", to: :canonical_version_uri
-      map "ColumnRef", to: :column_ref, with: { from: :column_ref_from_json, to: :column_ref_to_json }
+      map 'Id', to: :id
+      map 'Annotation', to: :annotation
+      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 'CanonicalUri', to: :canonical_uri, with: { from: :canonical_uri_from_json, to: :canonical_uri_to_json }
+      map 'CanonicalVersionUri', to: :canonical_version_uri
+      map 'ColumnRef', to: :column_ref, with: { from: :column_ref_from_json, to: :column_ref_to_json }
     end
 
     def long_name_from_json(model, value)
@@ -39,9 +39,9 @@ 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)
+      doc['LongName'] = LongName.as_json(model.long_name)
     end
 
     def column_ref_from_json(model, value)
@@ -49,20 +49,19 @@ module Genericode
     end
 
     def column_ref_to_json(model, doc)
-      doc["ColumnRef"] = Utils.one_or_all(model.column_ref.map(&:ref))
+      doc['ColumnRef'] = Utils.one_or_all(model.column_ref.map(&:ref))
     end
 
     xml do
-      root "Key"
-      namespace "http://docs.oasis-open.org/codelist/ns/genericode/1.0/", "gc"
+      element 'Key'
 
-      map_attribute "Id", to: :id
-      map_element "Annotation", to: :annotation, prefix: nil, namespace: nil
-      map_element "ShortName", to: :short_name, prefix: nil, namespace: nil
-      map_element "LongName", to: :long_name, prefix: nil, namespace: nil
-      map_element "CanonicalUri", to: :canonical_uri, prefix: nil, namespace: nil
-      map_element "CanonicalVersionUri", to: :canonical_version_uri, prefix: nil, namespace: nil
-      map_element "ColumnRef", to: :column_ref, prefix: nil, namespace: nil
+      map_attribute 'Id', to: :id
+      map_element 'Annotation', to: :annotation
+      map_element 'ShortName', to: :short_name
+      map_element 'LongName', to: :long_name
+      map_element 'CanonicalUri', to: :canonical_uri
+      map_element 'CanonicalVersionUri', to: :canonical_version_uri
+      map_element 'ColumnRef', to: :column_ref
     end
   end
 end

data/lib/genericode/key_column_ref.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
+require 'lutaml/model'
 
-require_relative "annotation"
+require_relative 'annotation'
 
 module Genericode
   class KeyColumnRef < Lutaml::Model::Serializable
@@ -10,16 +10,15 @@ module Genericode
     attribute :annotation, Annotation
 
     json do
-      map "Ref", to: :ref
-      map "Annotation", to: :annotation
+      map 'Ref', to: :ref
+      map 'Annotation', to: :annotation
     end
 
     xml do
-      root "KeyColumnRef"
-      namespace "http://docs.oasis-open.org/codelist/ns/genericode/1.0/", "gc"
+      element 'KeyColumnRef'
 
-      map_attribute "Ref", to: :ref
-      map_element "Annotation", to: :annotation, prefix: nil, namespace: nil
+      map_attribute 'Ref', to: :ref
+      map_element 'Annotation', to: :annotation
     end
   end
 end

data/lib/genericode/key_ref.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
+require 'lutaml/model'
 
-require_relative "annotation"
+require_relative 'annotation'
 
 module Genericode
   class KeyRef < Lutaml::Model::Serializable
@@ -13,22 +13,21 @@ module Genericode
     attribute :location_uri, :string, collection: true
 
     json do
-      map "Id", to: :id
-      map "ExternalRef", to: :external_ref
-      map "Annotation", to: :annotation
-      map "CanonicalVersionUri", to: :canonical_version_uri
-      map "LocationUri", to: :location_uri
+      map 'Id', to: :id
+      map 'ExternalRef', to: :external_ref
+      map 'Annotation', to: :annotation
+      map 'CanonicalVersionUri', to: :canonical_version_uri
+      map 'LocationUri', to: :location_uri
     end
 
     xml do
-      root "KeyRef"
-      namespace "http://docs.oasis-open.org/codelist/ns/genericode/1.0/", "gc"
+      element 'KeyRef'
 
-      map_attribute "Id", to: :id
-      map_attribute "ExternalRef", to: :external_ref
-      map_element "Annotation", to: :annotation, prefix: nil, namespace: nil
-      map_element "CanonicalVersionUri", to: :canonical_version_uri, prefix: nil, namespace: nil
-      map_element "LocationUri", to: :location_uri, prefix: nil, namespace: nil
+      map_attribute 'Id', to: :id
+      map_attribute 'ExternalRef', to: :external_ref
+      map_element 'Annotation', to: :annotation
+      map_element 'CanonicalVersionUri', to: :canonical_version_uri
+      map_element 'LocationUri', to: :location_uri
     end
   end
 end

data/lib/genericode/long_name.rb

@@ -1,36 +1,36 @@
 # frozen_string_literal: true
 
-require "lutaml/model"
+require 'lutaml/model'
+require 'lutaml/xml/w3c'
 
 module Genericode
   class LongName < Lutaml::Model::Serializable
     attribute :content, :string
     attribute :identifier, :string
-    attribute :lang, :string
+    attribute :lang, Lutaml::Xml::W3c::XmlLangType
 
     json do
-      map "Identifier", to: :identifier
-      map "http://www.w3.org/XML/1998/namespace", to: :lang, with: { from: :lang_from_json, to: :lang_to_json }
-      map "_", to: :content
+      map 'Identifier', to: :identifier
+      map 'http://www.w3.org/XML/1998/namespace', to: :lang, with: { from: :lang_from_json, to: :lang_to_json }
+      map '_', to: :content
     end
 
     def lang_from_json(model, value)
-      model.lang = value["lang"]
+      model.lang = value['lang']
     end
 
     def lang_to_json(model, doc)
       return if model.lang.nil?
 
-      doc["http://www.w3.org/XML/1998/namespace"] = { "lang" => model.lang }
+      doc['http://www.w3.org/XML/1998/namespace'] = { 'lang' => model.lang }
     end
 
     xml do
-      root "LongName"
-      namespace "http://docs.oasis-open.org/codelist/ns/genericode/1.0/", "gc"
+      element 'LongName'
 
       map_content to: :content
-      map_attribute "Identifier", to: :identifier
-      map_attribute "lang", to: :lang, prefix: "xml", namespace: "http://www.w3.org/XML/1998/namespace"
+      map_attribute 'Identifier', to: :identifier
+      map_attribute 'lang', to: :lang
     end
   end
 end