relaton-bib 2.0.0.pre.alpha.8 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 728031e16c72a2dd3fd0b360c160a7140835e08f106ba02cf2cd0575749943ae
-  data.tar.gz: 73ad0387057360d47dc27e61ac2f0458e3179fde8755ab38518d50c6be243974
+  metadata.gz: 73e04205cda443de9b4c9f4b5d3ccbb9c62bfb5492c42a977a08ad385e2f3614
+  data.tar.gz: ea57c9c8ef051e0a9031595a853512c4984b52c4cfaa3e2ef565a19fb080bcd0
 SHA512:
-  metadata.gz: 407325046db2de8f575386879ee87aa219fb244899cf22eeded21ad26e2e3267b3b584d6aec9e5af5056a202165dfe40186f96e576cf5f3a63485a41bd492a6c
-  data.tar.gz: d495848aa3d5ec9fb69ee5987d842ae703e80e3d24d81d895d501957c02745041bb12f4f72b4de472243ff4ea0280e4280fbbccb8bb7b92b278f62e18228b05e
+  metadata.gz: b5ec1ef76fc6a7739713f0555bb1ed457604dd4d3465ed4108e70cc508ed7096c05dad9b61b6b719ae4318d640af1b46cb445d7c3fd6226ebed4a8123dfb1ffa
+  data.tar.gz: 7ab3eeef1061507bce7327b82faa10568ec201445b3e0676cec57662183b517915b450a9f92d512b5ba0945f96ffe256a1ca2de5b6cbf2aadf668608424bca1d

data/grammars/biblio.rng

@@ -2015,15 +2015,11 @@ provided that it is not the entire bibliographic item that is so related</a:docu
     <a:documentation>A version of the bibliographic item (within an edition). Can be used for drafts</a:documentation>
     <element name="version">
       <optional>
-        <ref name="revision-date">
-          <a:documentation>The date at which the current version of the bibliographic item was produced</a:documentation>
-        </ref>
-      </optional>
-      <optional>
-        <ref name="draft">
-          <a:documentation>The identifier for the current draft of the bibliographic item</a:documentation>
-        </ref>
+        <attribute name="type">
+          <a:documentation>Versioning scheme, in case of multiple versioning schemes</a:documentation>
+        </attribute>
       </optional>
+      <text/>
     </element>
   </define>
   <define name="vedition">

data/grammars/versions.json

@@ -31,5 +31,5 @@
 "relaton-model-ccsds": "",
 "relaton-model-un": "v1.0.2",
 "metanorma-model": "v2.1.6",
-"date": "2026-04-03T02:05:43Z"
+"date": "2026-04-30T03:49:24Z"
 }

data/lib/relaton/bib/converter/asciibib/to_asciibib.rb

@@ -123,8 +123,8 @@ module Relaton
           def render_version(ver, prefix, count)
             pref = prefix.empty? ? prefix : "#{prefix}."
             out = count > 1 ? "#{prefix}version::\n" : ""
-            out << "#{pref}version.revision_date:: #{ver.revision_date}\n" if ver.revision_date
-            out << "#{pref}version.draft:: #{ver.draft}\n" if ver.draft
+            out << "#{pref}version:: #{ver.content}\n" if ver.content
+            out << "#{pref}version.type:: #{ver.type}\n" if ver.type
             out
           end
 

data/lib/relaton/bib/converter/bibxml/from_rfcxml.rb

@@ -138,7 +138,7 @@ module Relaton
             return [] unless @reference.front.abstract&.t
 
             @reference.front.abstract.t.map do |t|
-              Abstract.new(content: t.content, language: "en", script: "Latn")
+              Abstract.new(content: t.content.join, language: "en", script: "Latn")
             end
           end
 
@@ -218,7 +218,7 @@ module Relaton
             org = author.organization
             return if org.nil? || org.content.empty?
 
-            name = ORGNAMES[org.content] || org.content
+            name = ORGNAMES[org.content.join] || org.content.join
             orgname = TypedLocalizedString.new(content: name, language: "en")
             abbrev = LocalizedString.new(content: org.abbrev, language: "en") if org.abbrev
             Organization.new(

data/lib/relaton/bib/converter/bibxml/to_rfcxml.rb

@@ -120,7 +120,7 @@ module Relaton
             abbrev = org.abbreviation&.content
             orgname = resolve_orgname(org, abbrev)
             Rfcxml::V3::Organization.new(
-              content: orgname, abbrev: abbrev,
+              content: [orgname], abbrev: abbrev,
             )
           end
 
@@ -283,7 +283,7 @@ module Relaton
 
             content = @item.abstract[0].content
             Rfcxml::V3::Abstract.new(
-              t: [Rfcxml::V3::Text.new(content: content)],
+              t: [Rfcxml::V3::Text.new(content: [content])],
             )
           end
 

data/lib/relaton/bib/hash_parser_v1.rb

@@ -196,10 +196,23 @@ module Relaton
       def version_hash_to_bib(ret)
         return unless ret[:version]
 
-        ret[:version] = array(ret[:version]).map do |v|
-          v[:revision_date] &&= parse_date(v[:revision_date], str: false)
-          Bib::Version.new(**v)
-        end
+        ret[:version] = array(ret[:version]).map { |v| version_entry(v) }
+      end
+
+      def version_entry(hash)
+        return Bib::Version.new(**hash) if hash[:content]
+
+        attrs = { content: legacy_version_content(hash) }
+        attrs[:type] = hash[:type] if hash[:type]
+        Bib::Version.new(**attrs)
+      end
+
+      def legacy_version_content(hash)
+        draft = hash[:draft]
+        revdate = hash[:revision_date]
+        return "#{draft} (#{revdate})" if draft && revdate
+
+        draft || revdate
       end
 
       def biblionote_hash_to_bib(ret)

data/lib/relaton/bib/model/bibdata.rb

@@ -1,23 +1,10 @@
+require_relative "bibdata_shared"
+
 module Relaton
   module Bib
-    module BibdataShared
-      def self.included(base)
-        base.class_eval do
-          model ItemData
-
-          # Bibdata doesn't have id attribute.
-          attributes.delete :id
-          mappings[:xml].instance_variable_get(:@attributes).delete("id")
-
-          xml do
-            root "bibdata"
-          end
-        end
-      end
-    end
-
-    # This class represents a bibliographic item as a bibdata.
+    # Bibliographic item serialized as <bibdata>. Has ext, no id.
     class Bibdata < Item
+      model ItemData
       include BibdataShared
     end
   end

data/lib/relaton/bib/model/bibdata_shared.rb

@@ -0,0 +1,12 @@
+require_relative "item_shared"
+
+module Relaton
+  module Bib
+    module BibdataShared
+      def self.included(base)
+        base.xml { root "bibdata" }
+        ItemShared.prune_attribute(base, :id, "id")
+      end
+    end
+  end
+end

data/lib/relaton/bib/model/bibitem.rb

@@ -1,22 +1,10 @@
+require_relative "bibitem_shared"
+
 module Relaton
   module Bib
-    module BibitemShared
-      def self.included(base)
-        base.class_eval do
-          model ItemData
-
-          # This class represents a bibliographic item as a bibitem.
-          attributes.delete :ext
-          mappings[:xml].instance_variable_get(:@elements).delete("ext")
-
-          xml do
-            root "bibitem"
-          end
-        end
-      end
-    end
-
+    # Bibliographic item serialized as <bibitem>. Has id, no ext.
     class Bibitem < Item
+      model ItemData
       include BibitemShared
     end
   end

data/lib/relaton/bib/model/bibitem_shared.rb

@@ -0,0 +1,12 @@
+require_relative "item_shared"
+
+module Relaton
+  module Bib
+    module BibitemShared
+      def self.included(base)
+        base.xml { root "bibitem" }
+        ItemShared.prune_attribute(base, :ext, "ext")
+      end
+    end
+  end
+end

data/lib/relaton/bib/model/contributor.rb

@@ -16,56 +16,14 @@ module Relaton
       end
 
       attribute :role, Role, collection: true, initialize_empty: true
-      # attribute :entity, ContributionInfo
-      # @TODO: use `import_model ContributionInfo` for person and organization when Lutaml supports it
-      choice(min: 1, max: 1) do
-        attribute :person, Person
-        attribute :organization, Organization
-      end
-      # import_model_attributes ContributionInfo
+      import_model_attributes ContributionInfo
 
       xml do
         root "contributor"
 
         map_element "role", to: :role
-        # map_content to: :entity, with: { from: :entity_from_xml, to: :entity_to_xml }
-        map_element "person", to: :person
-        map_element "organization", to: :organization # , with: { from: :organization_from_xml, to: :organization_to_xml }
+        import_model_mappings ContributionInfo
       end
-
-      # def entity
-      #   person || organization
-      # end
-
-      # def entity=(value)
-      #   if value.is_a? Person
-      #     self.person = value
-      #     self.organization = nil
-      #   elsif value.is_a? Organization
-      #     self.organization = value
-      #     self.person = nil
-      #   else
-      #     raise ArgumentError, "value must be a Person or Organization"
-      #   end
-      # end
-
-      # def organization_from_xml(model, node)
-      #   model.entity = Organization.of_xml node
-      # end
-
-      # def organization_to_xml(model, parent, _doc)
-      #   parent << model.entity.to_xml
-      # end
-
-      # def entity_from_xml(model, node)
-      #   n = node.instance_variable_get(:@node) || node
-      #   model.content = ContributionInfo.of_xml n
-      # rescue StandardError
-      # end
-
-      # def entity_to_xml(model, parent, _doc)
-      #   parent << model.content.to_xml
-      # end
     end
   end
 end

data/lib/relaton/bib/model/docidentifier.rb

@@ -6,6 +6,7 @@ module Relaton
       attribute :primary, :boolean
 
       xml do
+        root "docidentifier"
         map_attribute "type", to: :type
         map_attribute "scope", to: :scope
         map_attribute "primary", to: :primary

data/lib/relaton/bib/model/ext.rb

@@ -5,7 +5,7 @@ require_relative "structured_identifier"
 module Relaton
   module Bib
     class Ext < Lutaml::Model::Serializable
-      attribute :schema_version, :string
+      attribute :schema_version, :string, method: :get_schema_version
       attribute :doctype, Doctype
       attribute :subdoctype, :string
       attribute :flavor, :string
@@ -14,13 +14,26 @@ module Relaton
 
       xml do
         root "ext"
-        map_attribute "schema-version", to: :schema_version
+        map_attribute "schema-version", to: :schema_version, render_default: true
         map_element "doctype", to: :doctype
         map_element "subdoctype", to: :subdoctype
         map_element "flavor", to: :flavor
         map_element "ics", to: :ics
         map_element "structuredidentifier", to: :structuredidentifier
       end
+
+      key_value do
+        map_element "schema_version", to: :schema_version, render_default: true
+        map_element "doctype", to: :doctype
+        map_element "subdoctype", to: :subdoctype
+        map_element "flavor", to: :flavor
+        map_element "ics", to: :ics
+        map_element "structuredidentifier", to: :structuredidentifier
+      end
+
+      # Base returns nil so direct use omits schema-version. Subclasses in
+      # downstream relaton gems override to return their own version.
+      def get_schema_version = nil
     end
   end
 end

data/lib/relaton/bib/model/item.rb

@@ -1,5 +1,5 @@
 require "lutaml/model"
-require "lutaml/model/xml_adapter/nokogiri_adapter"
+require "lutaml/xml"
 require_relative "localized_string_attrs"
 require_relative "localized_string"
 require_relative "formattedref"
@@ -36,9 +36,11 @@ require_relative "validity"
 require_relative "depiction"
 require_relative "source_locality_stack"
 require_relative "ext"
+require_relative "item_shared"
+require_relative "type/plain_date"
 
 Lutaml::Model::Config.configure do |config|
-  config.xml_adapter = Lutaml::Model::Xml::NokogiriAdapter
+  config.xml_adapter_type = :nokogiri
 end
 
 module Relaton
@@ -47,91 +49,41 @@ module Relaton
     end
 
     # Item class repesents bibliographic item metadata.
+    # Used for YAML/JSON parsing and as the XML dispatch entry point.
     class Item < Lutaml::Model::Serializable
+      include NamespaceHelper
+
       attr_accessor :type # in some cases mehod type is unavailable
 
       model ItemData
 
+      def self.from_xml(xml, options = {})
+        return super unless self == namespace::Item
+
+        # lutaml-model has no built-in dispatch on root element name
+        # (polymorphic_map only works on attribute discriminators), so we
+        # peek at the root tag with Nokogiri and forward to the right class.
+        root_name = Nokogiri::XML(xml.to_s).root&.name
+        klass = root_name == "bibdata" ? namespace::Bibdata : namespace::Bibitem
+        klass.from_xml(xml, options)
+      end
+
       attribute :id, :string
-      attribute :type, :string, values: %W[
-        article book booklet manual proceedings presentation thesis techreport standard
-        unpublished map electronic\sresource audiovisual film video boradcast software
-        graphic_work music patent inbook incollection inproceedings journal website
-        webresource dataset archival social_media alert message convesation misc
-      ]
-      attribute :schema_version, method: :get_schema_version
-      attribute :fetched, :date
-      attribute :formattedref, Formattedref
-      attribute :title, Title, collection: true, initialize_empty: true
-      attribute :source, Uri, collection: true, initialize_empty: true
-      attribute :docidentifier, Docidentifier, collection: true, initialize_empty: true
-      attribute :docnumber, :string
-      attribute :date, Date, collection: true, initialize_empty: true
-      attribute :contributor, Contributor, collection: true, initialize_empty: true
-      attribute :edition, Edition
-      attribute :version, Version, collection: true, initialize_empty: true
-      attribute :note, Note, collection: true, initialize_empty: true
-      attribute :language, :string, collection: true, initialize_empty: true
-      attribute :locale, :string, collection: true, initialize_empty: true
-      attribute :script, :string, collection: true, initialize_empty: true
-      attribute :abstract, Abstract, collection: true, initialize_empty: true
-      attribute :status, Status
-      attribute :copyright, Copyright, collection: true, initialize_empty: true
-      attribute :relation, Relation, collection: true, initialize_empty: true
-      attribute :series, Series, collection: true, initialize_empty: true
-      attribute :medium, Medium
-      attribute :place, Place, collection: true, initialize_empty: true
-      attribute :price, Price, collection: true, initialize_empty: true
-      attribute :extent, Extent, collection: true, initialize_empty: true
-      attribute :size, Size
-      attribute :accesslocation, :string, collection: true, initialize_empty: true
-      attribute :license, :string, collection: true, initialize_empty: true
-      attribute :classification, Docidentifier, collection: true, initialize_empty: true
-      attribute :keyword, Keyword, collection: true, initialize_empty: true
-      attribute :validity, Validity
-      attribute :depiction, Depiction, collection: true, initialize_empty: true
+      attribute :schema_version, :string, method: :get_schema_version
+      attribute :fetched, PlainDate
+      instance_exec(&ItemShared::ATTRIBUTES)
       attribute :ext, Ext
 
-      xml do # rubocop:disable Metrics/BlockLength
+      xml do
         map_attribute "id", to: :id
         map_attribute "type", to: :type
-        map_attribute "schema-version", to: :schema_version
+        map_attribute "schema-version", to: :schema_version, render_default: true
         map_element "fetched", to: :fetched
-        map_element "formattedref", to: :formattedref
-        map_element "title", to: :title # , with: { from: :title_from_xml, to: :title_to_xml }
-        map_element "uri", to: :source
-        map_element "docidentifier", to: :docidentifier
-        map_element "docnumber", to: :docnumber
-        map_element "date", to: :date
-        map_element "contributor", to: :contributor
-        map_element "edition", to: :edition
-        map_element "version", to: :version
-        map_element "note", to: :note
-        map_element "language", to: :language
-        map_element "locale", to: :locale
-        map_element "script", to: :script
-        map_element "abstract", to: :abstract
-        map_element "status", to: :status
-        map_element "copyright", to: :copyright
-        map_element "relation", to: :relation # , with: { from: :relation_from_xml, to: :relation_to_xml }
-        map_element "series", to: :series
-        map_element "medium", to: :medium
-        map_element "place", to: :place
-        map_element "price", to: :price
-        map_element "extent", to: :extent
-        map_element "size", to: :size
-        map_element "accesslocation", to: :accesslocation
-        map_element "license", to: :license
-        map_element "classification", to: :classification
-        map_element "keyword", to: :keyword
-        map_element "validity", to: :validity
-        map_element "depiction", to: :depiction
+        instance_exec(&ItemShared::XML_BODY)
         map_element "ext", to: :ext
       end
 
-      def get_schema_version
-        Relaton.schema_versions["relaton-models"]
-      end
+      def get_schema_version = Relaton.schema_versions["relaton-models"]
     end
   end
 end

data/lib/relaton/bib/model/item_base.rb

@@ -1,27 +1,20 @@
 module Relaton
   module Bib
-    # Module to remove id, schema-version, fetched & ext attributes from Item subclasses.
-    # Used for bibitem/relation instances that don't need these attributes.
-    module ItemBaseAttributes
-      def self.included(base)
-        # we don't need id, schema-version & fetched attributes in relation/bibitem
-        base.mappings[:xml].instance_variable_get(:@attributes).delete("id")
-        base.mappings[:xml].instance_variable_get(:@attributes).delete("schema-version")
-        base.mappings[:xml].instance_variable_get(:@elements).delete("fetched")
-        base.mappings[:xml].instance_variable_get(:@elements).delete("ext")
-        base.attributes.delete :id
-        base.attributes.delete :schema_version
-        base.attributes.delete :fetched
-        base.attributes.delete :ext
-      end
-    end
+    # Bibliographic item used as a nested element inside Relation.
+    # Has neither id, schema_version, fetched, nor ext.
+    class ItemBase < Lutaml::Model::Serializable
+      include NamespaceHelper
+
+      attr_accessor :type
 
-    # The class is for relaton bibitem instances.
-    # The in relaton bibitem instances dosn't have schema-version & fetched attributes.
-    class ItemBase < Item
       model ItemData
 
-      include ItemBaseAttributes
+      instance_exec(&ItemShared::ATTRIBUTES)
+
+      xml do
+        map_attribute "type", to: :type
+        instance_exec(&ItemShared::XML_BODY)
+      end
     end
   end
 end

data/lib/relaton/bib/model/item_shared.rb

@@ -0,0 +1,88 @@
+module Relaton
+  module Bib
+    # Shared attribute and XML mapping declarations for Item/Bibitem/Bibdata/ItemBase.
+    # Each class composes these with its own header (id/schema_version/fetched/ext)
+    # via instance_exec, so subtractive monkey-patching of inherited mappings is
+    # not needed.
+    module ItemShared
+      ATTRIBUTES = lambda do # rubocop:disable Metrics/BlockLength
+        attribute :type, :string, values: %W[
+          article book booklet manual proceedings presentation thesis techreport standard
+          unpublished map electronic\sresource audiovisual film video boradcast software
+          graphic_work music patent inbook incollection inproceedings journal website
+          webresource dataset archival social_media alert message convesation misc
+        ]
+        attribute :formattedref, Formattedref
+        attribute :title, Title, collection: true, initialize_empty: true
+        attribute :source, Uri, collection: true, initialize_empty: true
+        attribute :docidentifier, Docidentifier, collection: true, initialize_empty: true
+        attribute :docnumber, :string
+        attribute :date, Date, collection: true, initialize_empty: true
+        attribute :contributor, Contributor, collection: true, initialize_empty: true
+        attribute :edition, Edition
+        attribute :version, Version, collection: true, initialize_empty: true
+        attribute :note, Note, collection: true, initialize_empty: true
+        attribute :language, :string, collection: true, initialize_empty: true
+        attribute :locale, :string, collection: true, initialize_empty: true
+        attribute :script, :string, collection: true, initialize_empty: true
+        attribute :abstract, Abstract, collection: true, initialize_empty: true
+        attribute :status, Status
+        attribute :copyright, Copyright, collection: true, initialize_empty: true
+        attribute :relation, Relation, collection: true, initialize_empty: true
+        attribute :series, Series, collection: true, initialize_empty: true
+        attribute :medium, Medium
+        attribute :place, Place, collection: true, initialize_empty: true
+        attribute :price, Price, collection: true, initialize_empty: true
+        attribute :extent, Extent, collection: true, initialize_empty: true
+        attribute :size, Size
+        attribute :accesslocation, :string, collection: true, initialize_empty: true
+        attribute :license, :string, collection: true, initialize_empty: true
+        attribute :classification, Docidentifier, collection: true, initialize_empty: true
+        attribute :keyword, Keyword, collection: true, initialize_empty: true
+        attribute :validity, Validity
+        attribute :depiction, Depiction, collection: true, initialize_empty: true
+      end
+
+      def self.prune_attribute(base, attr_name, xml_name)
+        return unless base.attributes.key?(attr_name)
+
+        xml_mapping = base.mappings[:xml]
+        xml_mapping.instance_variable_get(:@elements).delete(xml_name)
+        xml_mapping.instance_variable_get(:@attributes).delete(xml_name)
+        base.attributes.delete(attr_name)
+      end
+
+      XML_BODY = lambda do # rubocop:disable Metrics/BlockLength
+        map_element "formattedref", to: :formattedref
+        map_element "title", to: :title
+        map_element "uri", to: :source
+        map_element "docidentifier", to: :docidentifier
+        map_element "docnumber", to: :docnumber
+        map_element "date", to: :date
+        map_element "contributor", to: :contributor
+        map_element "edition", to: :edition
+        map_element "version", to: :version
+        map_element "note", to: :note
+        map_element "language", to: :language
+        map_element "locale", to: :locale
+        map_element "script", to: :script
+        map_element "abstract", to: :abstract
+        map_element "status", to: :status
+        map_element "copyright", to: :copyright
+        map_element "relation", to: :relation
+        map_element "series", to: :series
+        map_element "medium", to: :medium
+        map_element "place", to: :place
+        map_element "price", to: :price
+        map_element "extent", to: :extent
+        map_element "size", to: :size
+        map_element "accesslocation", to: :accesslocation
+        map_element "license", to: :license
+        map_element "classification", to: :classification
+        map_element "keyword", to: :keyword
+        map_element "validity", to: :validity
+        map_element "depiction", to: :depiction
+      end
+    end
+  end
+end

data/lib/relaton/bib/model/localized_string.rb

@@ -8,7 +8,7 @@ module Relaton
       end
 
       key_value do
-        map "content", to: :content # , with: { from: :content_from_key_value, to: :content_to_key_value }
+        map "content", to: :content
         map "language", to: :language
       end
     end
@@ -26,32 +26,16 @@ module Relaton
     end
 
     class LocalizedMarkedUpString < LocalizedStringAttrs
-      attribute :content, :string
+      attribute :content, :string, raw: true
 
       xml do
-        map_all to: :content, with: { from: :content_from_xml, to: :content_to_xml }
+        map_all to: :content
       end
 
       key_value do
-        map "content", to: :content, with: { from: :content_from_key_value, to: :content_to_key_value }
+        map "content", to: :content
         map "language", to: :language
       end
-
-      def content_from_xml(model, value)
-        model.content = value
-      end
-
-      def content_to_xml(model, parent, doc)
-        doc.add_xml_fragment parent, model.content
-      end
-
-      def content_from_key_value(model, value)
-        model.content = value
-      end
-
-      def content_to_key_value(model, doc)
-        doc["content"] = model.content
-      end
     end
   end
 end

data/lib/relaton/bib/model/type/plain_date.rb

@@ -0,0 +1,16 @@
+require "date"
+
+module Relaton
+  module Bib
+    # xs:date value type that always casts to ::Date, dropping any time and
+    # timezone component. Without this, lutaml-model's built-in Date type
+    # promotes inputs like "2018-04-15T00:00:00Z" to ::DateTime and serializes
+    # them back as "2018-04-15Z" — valid xs:date, but not valid ISO 8601.
+    class PlainDate < Lutaml::Model::Type::Date
+      def self.cast(value, options = {})
+        result = super
+        result.is_a?(::DateTime) ? result.to_date : result
+      end
+    end
+  end
+end

data/lib/relaton/bib/model/version.rb

@@ -1,14 +1,43 @@
 module Relaton
   module Bib
     class Version < Lutaml::Model::Serializable
-      attribute :revision_date, :date
+      attribute :type, :string
+      attribute :content, :string
+      attribute :revision_date, :string
       attribute :draft, :string
 
       xml do
         root "version"
+        map_attribute "type", to: :type
+        map_content to: :content
         map_element "revision-date", to: :revision_date
         map_element "draft", to: :draft
       end
+
+      key_value do
+        map "type", to: :type
+        map "content", to: :content
+        map "revision_date", to: :revision_date
+        map "draft", to: :draft
+      end
+
+      def content
+        return @content if @content && !@content.empty?
+
+        parts = [@draft, @revision_date].compact
+        case parts.size
+        when 2 then "#{@draft} (#{@revision_date})"
+        when 1 then parts.first
+        end
+      end
+
+      def revision_date
+        nil
+      end
+
+      def draft
+        nil
+      end
     end
   end
 end

data/lib/relaton/bib/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Bib
-    VERSION = "2.0.0-alpha.8".freeze
+    VERSION = "2.1.0".freeze
   end
 end

data/lib/relaton/bib.rb

@@ -11,6 +11,8 @@ require_relative "bib/namespace_helper"
 require_relative "bib/item_data"
 require_relative "bib/model/item"
 require_relative "bib/model/item_base"
+require_relative "bib/model/bibitem_shared"
+require_relative "bib/model/bibdata_shared"
 require_relative "bib/model/bibitem"
 require_relative "bib/model/bibdata"
 require_relative "bib/converter/bibxml"

data/relaton-bib.gemspec

@@ -26,10 +26,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "bibtex-ruby"
   spec.add_dependency "iso639"
   spec.add_dependency "isoics", "~> 0.1.0"
-  spec.add_dependency "lutaml-model", "~> 0.7"
+  spec.add_dependency "lutaml-model", "~> 0.8.0"
   spec.add_dependency "nokogiri", ">= 1.16"
   spec.add_dependency "psych", "~> 5.2.0" # versin 5.3.0 crashes
   spec.add_dependency "relaton-core", "~> 0.0.8"
   spec.add_dependency "relaton-logger", "~> 0.2.0"
-  spec.add_dependency "rfcxml", "~> 0.2.1"
+  spec.add_dependency "rfcxml", "~> 0.4.3"
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.8
+  version: 2.1.0
 platform: ruby
 authors:
 - Ribose Inc.
+autorequire:
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bibtex-ruby
@@ -57,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -127,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.4.3
 description: 'Relaton::Bib: Ruby XMLDOC impementation.'
 email:
 - open.source@ribose.com
@@ -181,7 +182,9 @@ files:
 - lib/relaton/bib/model/address.rb
 - lib/relaton/bib/model/affiliation.rb
 - lib/relaton/bib/model/bibdata.rb
+- lib/relaton/bib/model/bibdata_shared.rb
 - lib/relaton/bib/model/bibitem.rb
+- lib/relaton/bib/model/bibitem_shared.rb
 - lib/relaton/bib/model/contact.rb
 - lib/relaton/bib/model/contribution_info.rb
 - lib/relaton/bib/model/contributor.rb
@@ -200,6 +203,7 @@ files:
 - lib/relaton/bib/model/image.rb
 - lib/relaton/bib/model/item.rb
 - lib/relaton/bib/model/item_base.rb
+- lib/relaton/bib/model/item_shared.rb
 - lib/relaton/bib/model/keyword.rb
 - lib/relaton/bib/model/locality.rb
 - lib/relaton/bib/model/locality_stack.rb
@@ -222,6 +226,7 @@ files:
 - lib/relaton/bib/model/structured_identifier.rb
 - lib/relaton/bib/model/subdivision.rb
 - lib/relaton/bib/model/title.rb
+- lib/relaton/bib/model/type/plain_date.rb
 - lib/relaton/bib/model/type/string_date.rb
 - lib/relaton/bib/model/uri.rb
 - lib/relaton/bib/model/validity.rb
@@ -234,6 +239,7 @@ homepage: https://github.com/relaton/relaton-bib
 licenses:
 - BSD-2-Clause
 metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -248,7 +254,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: 'Relaton::Bib: Ruby XMLDOC impementation.'
 test_files: []