relaton-bib 2.0.0.pre.alpha.6 → 2.0.0.pre.alpha.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df8a186e99080f04f69cd39523b60ae094d44c366519e8634b3a84732654035d
-  data.tar.gz: 471cfc9f0cd4998e9d4b151800dad5e9d93be2e840655f029a536614ddca6180
+  metadata.gz: e3fe5b77c0ee8f91ec2b4e1d57c10351e0eea9ce718b28fcb0040c47b1264827
+  data.tar.gz: 883cdc867ba51a5101e9c288c387d23cebee1f3f4d3571a81b6061b522db2876
 SHA512:
-  metadata.gz: ba6276c2b6af2b9bc200e71afedc86c960fb5599f24f30fcc9932853b4d8c67b58d76f82ffc264cdcec8664063a54691fb677eec016be7e0bacb5ce289209037
-  data.tar.gz: '094187c15b5c9effa8712c463b870426b7461c140326dd93abf8be107aace294bd4d951aea18b1e26b1f448e03d744924b7b7a9f1e1594bf4fe6dc9808baa3e3'
+  metadata.gz: 9020cbe421387930baefbf07d6219fdb3e95733d04902c1d67d9e22fb6feca331cd5175ccdd925ba38fd70e7fb62bc005803e7513e895248ea6d0fb11a88d159
+  data.tar.gz: da47ca0cffcfb0a76e1632f02bc3a5faf74b7aad02c10d4a2331c6af85511910784e7ee51a5ac9c939c4ede896d24234dcc5415b8c692bd3185bb06efd32db84

data/grammars/basicdoc.rng

@@ -187,6 +187,15 @@ Applicable to modify and delete</a:documentation>
         <a:documentation>Optional caption of this block</a:documentation>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="position">
+        <a:documentation>For an "add" change, whether the change is added before or after the location</a:documentation>
+        <choice>
+          <value>before</value>
+          <value>after</value>
+        </choice>
+      </attribute>
+    </optional>
     <optional>
       <element name="location">
         <a:documentation>The location(s) in the original document which have undergone the change described in this block</a:documentation>
@@ -208,11 +217,15 @@ Applicable to modify and delete</a:documentation>
     </zeroOrMore>
     <optional>
       <element name="newcontent">
-        <a:documentation>New content to be added to the document; applicable to add and modify</a:documentation>
+        <a:documentation>New content to be added to the document; applicable to add and modify.
+Can be blocks and/or sections</a:documentation>
         <ref name="OptionalId"/>
         <zeroOrMore>
           <ref name="BasicBlock"/>
         </zeroOrMore>
+        <zeroOrMore>
+          <ref name="section"/>
+        </zeroOrMore>
       </element>
     </optional>
     <zeroOrMore>

data/grammars/biblio.rng

@@ -466,11 +466,11 @@ Editorial and advisory groups are represented as consecutive subdivisions of the
         <a:documentation>Contact information for the organization, including address, phone number, and email</a:documentation>
       </ref>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="logo">
         <a:documentation>A logo for the organization</a:documentation>
       </ref>
-    </optional>
+    </zeroOrMore>
   </define>
   <define name="orgname">
     <element name="name">
@@ -502,6 +502,11 @@ Editorial and advisory groups are represented as consecutive subdivisions of the
   </define>
   <define name="logo">
     <element name="logo">
+      <optional>
+        <attribute name="type">
+          <a:documentation>The type of logo</a:documentation>
+        </attribute>
+      </optional>
       <ref name="image-no-id"/>
     </element>
   </define>
@@ -513,6 +518,11 @@ Editorial and advisory groups are represented as consecutive subdivisions of the
           <a:documentation>Description of what is being depicted</a:documentation>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="type">
+          <a:documentation>Description of what kind of depiction this</a:documentation>
+        </attribute>
+      </optional>
       <zeroOrMore>
         <ref name="image-no-id">
           <a:documentation>A visual depiction of the bibliographic item</a:documentation>
@@ -690,7 +700,7 @@ Examples include GRID, LEI, CrossRef, and Ringgold</a:documentation>
   <define name="CitationType">
     <attribute name="bibitemid">
       <a:documentation>Bibliographic item that the citation applies to, referenced as the anchor of a bibliographic description</a:documentation>
-      <data type="IDREF"/>
+      <ref name="IdRefType"/>
     </attribute>
     <choice>
       <zeroOrMore>
@@ -1132,11 +1142,11 @@ NOTE: This should preferably be encoded as  a URI or short identifier, rather th
         <a:documentation>Information about how long the current description of the bibliographic item is valid for</a:documentation>
       </ref>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="depiction">
         <a:documentation>Depiction of the bibliographic item, typically an image</a:documentation>
       </ref>
-    </optional>
+    </zeroOrMore>
   </define>
   <define name="ReducedBibliographicItem">
     <a:documentation>Reduced description of a bibliographic resource, without mandatory title and docidentifier, used for document relations
@@ -1236,9 +1246,9 @@ Refer to `BibliographicItem` for definitions</a:documentation>
     <optional>
       <ref name="validity"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="depiction"/>
-    </optional>
+    </zeroOrMore>
   </define>
   <define name="btitle">
     <a:documentation>A title of a bibliographic item, associated with a type of title</a:documentation>
@@ -1296,17 +1306,17 @@ for which this claim of validity is made, if applicable</a:documentation>
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="TypedTitleString">
@@ -1929,10 +1939,10 @@ Detailed in https://www.relaton.org/model/relations/</a:documentation>
       <value>hasAnnotation</value>
       <value>draftOf</value>
       <value>hasDraft</value>
-      <value>preliminaryDraftOf</value>
-      <value>hasPreliminaryDraft</value>
-      <value>revisionDraftOf</value>
-      <value>hasRevisionDraft</value>
+      <value>predecessorDraftOf</value>
+      <value>hasPredecessorDraft</value>
+      <value>successorDraftOf</value>
+      <value>hasSuccessorDraft</value>
       <value>editionOf</value>
       <value>hasEdition</value>
       <value>updates</value>
@@ -2053,13 +2063,13 @@ provided that it is not the entire bibliographic item that is so related</a:docu
           <ref name="LocalizedString"/>
         </element>
       </optional>
-      <oneOrMore>
+      <zeroOrMore>
         <element name="taxon">
           <a:documentation>The keywords as a hierarchical taxonomy. For example, the sequence of `taxon` elements
 `pump`, `centrifugal pump`, `line shaft pump` represents a taxonomic classification</a:documentation>
           <ref name="LocalizedString"/>
         </element>
-      </oneOrMore>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="vocabid">
           <a:documentation>Identifiers for the keyword as a controlled vocabulary</a:documentation>

data/grammars/versions.json

@@ -1,35 +1,35 @@
 {
-"relaton-models": "v1.4.1",
-"basicdoc-models": "v1.2.2",
+"relaton-models": "v1.5.6",
+"basicdoc-models": "v1.2.5",
 "metanorma-requirements-models": "v1.0.2",
-"relaton-model-ieee": "v1.0.1",
-"relaton-model-iso": "v1.0.5",
-"relaton-model-iec": "v1.0.0",
-"relaton-model-bsi": "v1.0.3",
-"relaton-model-gb": "v1.0.0",
+"relaton-model-ieee": "v1.1.3",
+"relaton-model-iso": "v1.1.2",
+"relaton-model-iec": "v1.1.2",
+"relaton-model-bsi": "v1.1.3",
+"relaton-model-gb": "v1.1.2",
 "relaton-model-mpfa": "v1.0.0",
-"relaton-model-bipm": "v1.0.1",
+"relaton-model-bipm": "v1.1.2",
 "relaton-model-w3c": "v1.0.0",
-"relaton-model-3gpp": "v1.0.1",
-"relaton-model-csa": "v1.0.0",
-"relaton-model-cc": "v1.0.0",
-"relaton-model-ietf": "v1.0.1",
-"relaton-model-iho": "v1.0.0",
-"relaton-model-itu": "v1.0.2",
-"relaton-model-m3aawg": "v1.0.0",
-"relaton-model-nist": "v1.0.0",
-"relaton-model-ribose": "v1.0.0",
-"relaton-model-ogc": "v1.0.1",
-"relaton-model-un": "v1.0.0",
+"relaton-model-3gpp": "v1.0.4",
+"relaton-model-cc": "v1.1.2",
+"relaton-model-ietf": "v1.1.2",
+"relaton-model-iho": "v1.1.2",
+"relaton-model-itu": "v1.1.3",
+"relaton-model-m3aawg": "v1.0.1",
+"relaton-model-nist": "v1.1.2",
+"relaton-model-ribose": "v1.1.2",
+"relaton-model-ogc": "v1.1.2",
 "relaton-model-cen": "v1.0.1",
 "relaton-model-ecma": "v1.0.0",
 "relaton-model-cie": "v1.0.0",
 "relaton-model-iana": "v1.0.0",
 "relaton-model-omg": "v1.0.0",
-"relaton-model-oasis": "v1.0.1",
-"relaton-model-jis": "v0.0.1",
-"relaton-model-etsi": "v0.0.3",
-"relaton-model-plateau": "v0.0.2",
-"metanorma-model": "v1.4.1",
-"date": "2024-12-03T03:33:24Z"
+"relaton-model-oasis": "v1.0.4",
+"relaton-model-jis": "v1.0.2",
+"relaton-model-etsi": "v0.1.2",
+"relaton-model-plateau": "v0.1.0",
+"relaton-model-ccsds": "",
+"relaton-model-un": "v1.0.2",
+"metanorma-model": "v2.1.6",
+"date": "2026-04-03T02:05:43Z"
 }

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

@@ -102,7 +102,7 @@ module Relaton
 
             ed = @item.edition
             pref = "edition"
-            out = "#{pref}.content:: #{ed.content}\n"
+            out = ed.content ? "#{pref}.content:: #{ed.content}\n" : ""
             out << "#{pref}.number:: #{ed.number}\n" if ed.number
             out
           end
@@ -404,7 +404,7 @@ module Relaton
             pref = prefix.empty? ? prefix : "#{prefix}."
             out = count > 1 ? "#{pref}identifier::\n" : ""
             out << "#{pref}identifier.type:: #{id.type}\n"
-            out << "#{pref}identifier.content:: #{id.content}\n"
+            out << "#{pref}identifier.content:: #{id.content}\n" if id.content
             out
           end
 
@@ -422,7 +422,11 @@ module Relaton
             ids = array(org.identifier)
             ids.each { |n| out << render_org_identifier(n, pref, ids.size) }
             out << render_contact(org, pref)
-            out << render_logo(org.logo, pref) if org.logo
+            logos = array(org.logo)
+            logos.each do |l|
+              out << ("#{pref}.logo::\n" if logos.size > 1).to_s
+              out << render_logo(l, pref)
+            end
             out
           end
 
@@ -430,7 +434,7 @@ module Relaton
             pref = prefix.empty? ? prefix : "#{prefix}."
             out = count > 1 ? "#{pref}identifier::\n" : ""
             out << "#{pref}identifier.type:: #{id.type}\n"
-            out << "#{pref}identifier.content:: #{id.content}\n"
+            out << "#{pref}identifier.content:: #{id.content}\n" if id.content
             out
           end
 
@@ -511,7 +515,7 @@ module Relaton
           def render_bibitem(item, prefix) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
             pref = prefix.empty? ? prefix : "#{prefix}."
             out = ""
-            out << "#{pref}formattedref:: #{item.formattedref}\n" if item.formattedref
+            out << "#{pref}formattedref:: #{item.formattedref.content}\n" if item.formattedref
             array(item.title).each { |t| out << render_title(t, prefix, array(item.title).size) }
             array(item.docidentifier).each do |di|
               out << render_docidentifier(di, prefix, array(item.docidentifier).size)
@@ -547,7 +551,7 @@ module Relaton
             pref = prefix.empty? ? "series" : "#{prefix}.series"
             out = count > 1 ? "#{pref}::\n" : ""
             out << "#{pref}.type:: #{ser.type}\n" if ser.type
-            out << "#{pref}.formattedref:: #{ser.formattedref}\n" if ser.formattedref
+            out << "#{pref}.formattedref:: #{ser.formattedref.content}\n" if ser.formattedref
             array(ser.title).each { |t| out << render_title(t, pref, 1) }
             out << render_series_place(ser.place, pref) if ser.place
             out << "#{pref}.organization:: #{ser.organization}\n" if ser.organization
@@ -580,7 +584,7 @@ module Relaton
           end
 
           def render_formattedref
-            @item.formattedref ? "formattedref:: #{@item.formattedref}\n" : ""
+            @item.formattedref ? "formattedref:: #{@item.formattedref.content}\n" : ""
           end
 
           def render_keywords
@@ -589,8 +593,11 @@ module Relaton
           end
 
           def render_keyword(kw, prefix, count)
-            taxons = array(kw.taxon)
-            taxons.map { |t| render_localized_string(t, prefix, count) }.join
+            if kw.vocab
+              render_localized_string(kw.vocab, prefix, count)
+            else
+              array(kw.taxon).map { |t| render_localized_string(t, prefix, count) }.join
+            end
           end
 
           def render_ics_collection
@@ -644,7 +651,7 @@ module Relaton
             end
 
             out = count > 1 ? "#{prefix}::\n" : ""
-            out << "#{pref}content:: #{ls.content}\n"
+            out << "#{pref}content:: #{ls.content}\n" if ls.content
             out << "#{pref}language:: #{ls.language}\n" if ls.language
             out << "#{pref}script:: #{ls.script}\n" if ls.script
             out

data/lib/relaton/bib/converter/bibtex/from_bibtex.rb

@@ -230,7 +230,7 @@ module Relaton
           # @return [Array<Relaton::Bib::Keyword>]
           def fetch_keyword
             @entry["keywords"]&.split(/,\s?/)&.map do |kw|
-              Keyword.new(taxon: [LocalizedString.new(content: kw)])
+              Keyword.new(vocab: LocalizedString.new(content: kw))
             end || []
           end
 

data/lib/relaton/bib/converter/bibtex/to_bibtex.rb

@@ -296,7 +296,9 @@ module Relaton # rubocop:disable Style/OneClassPerFile
           #
           def add_keyword
             if @bib.keyword&.any?
-              @item.keywords = @bib.keyword.reduce([]) { |m, kw| m + kw.taxon.map(&:content) }.join(", ")
+              @item.keywords = @bib.keyword.reduce([]) do |m, kw|
+                  m + (kw.vocab ? [kw.vocab.content] : kw.taxon.map(&:content))
+                end.join(", ")
             end
           end
 

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

@@ -129,7 +129,7 @@ module Relaton
           def formattedref
             return if @reference.front.title
 
-            @reference.anchor
+            Formattedref.new(content: @reference.anchor)
           end
 
           # --- Abstract ---
@@ -138,8 +138,7 @@ module Relaton
             return [] unless @reference.front.abstract&.t
 
             @reference.front.abstract.t.map do |t|
-              LocalizedMarkedUpString.new(content: t.content, language: "en",
-                                          script: "Latn")
+              Abstract.new(content: t.content, language: "en", script: "Latn")
             end
           end
 
@@ -331,9 +330,9 @@ module Relaton
 
           def keyword
             (@reference.front.keyword || []).map do |kw|
-              taxon = LocalizedString.new(content: kw.content, language: "en",
+              vocab = LocalizedString.new(content: kw.content, language: "en",
                                           script: "Latn")
-              Keyword.new(taxon: [taxon])
+              Keyword.new(vocab: vocab)
             end
           end
 

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

@@ -270,7 +270,11 @@ module Relaton
 
           def create_keyword
             @item.keyword.inject([]) do |a, k|
-              a + k.taxon.map { |t| Rfcxml::V3::Keyword.new content: t.content }
+              if k.vocab
+                a + [Rfcxml::V3::Keyword.new(content: k.vocab.content)]
+              else
+                a + k.taxon.map { |t| Rfcxml::V3::Keyword.new(content: t.content) }
+              end
             end
           end
 

data/lib/relaton/bib/hash_parser_v1.rb

@@ -74,7 +74,7 @@ module Relaton
 
       def keyword_hash_to_bib(ret)
         ret[:keyword] = array(ret[:keyword]).map do |keyword|
-          Bib::Keyword.new taxon: [localizedstring(keyword)]
+          Bib::Keyword.new vocab: localizedstring(keyword)
         end
       end
 
@@ -129,7 +129,9 @@ module Relaton
 
       def abstract_hash_to_bib(ret)
         ret[:abstract] &&= array(ret[:abstract]).map do |a|
-          localized_marked_up_string a
+          a = { content: a } if a.is_a?(String)
+          lang_scrip_array_to_string(a)
+          Bib::Abstract.new(**a)
         end
       end
 
@@ -267,7 +269,9 @@ module Relaton
         org[:phone] = phone_hash_to_bib(org[:contact])
         org[:email] = email_hash_to_bib(org[:contact])
         org[:uri] = uri_hash_to_bib(org[:contact] || org)
-        org[:logo] = Bib::Logo.new image: Bib::Image.new(**org[:logo][:image]) if org[:logo]
+        org[:logo] = array(org[:logo]).map do |l|
+          Bib::Logo.new(image: Bib::Image.new(**l[:image]))
+        end
         org[:name] = typed_localized_string(org[:name])
         org[:abbreviation] &&= localizedstring(org[:abbreviation])
         org
@@ -599,10 +603,13 @@ module Relaton
         p = period == :ends ? -1 : 1
         case t
         when /^\d{4}$/
-          ::Date.new(t.to_i, p, p).to_time
+          ::Date.new(t.to_i, p, p).to_datetime.to_time.utc
         when /^(?<year>\d{4})-(?<month>\d{1,2})$/
-          ::Date.new($~[:year].to_i, $~[:month].to_i, p).to_time
-        else ::Date.parse t
+          ::Date.new($~[:year].to_i, $~[:month].to_i, p).to_datetime.to_time.utc
+        else
+          # Default to UTC when no timezone is specified
+          t += " UTC" unless t.match?(/[+-]\d{2}:?\d{2}\s*$|Z\s*$/i)
+          ::Time.parse t
         end
       end
 
@@ -716,11 +723,10 @@ module Relaton
       # @return [Relaton::Bib::Formattedref]
       def formattedref(frf)
         if frf.is_a?(Hash)
-          # Relaton::Bib::Formattedref.new(**frf)
-          frf[:content]
+          lang_scrip_array_to_string(frf)
+          Relaton::Bib::Formattedref.new(**frf)
         else
-          # Relaton::Bib::Formattedref.new(content: frf)
-          frf
+          Relaton::Bib::Formattedref.new(content: frf)
         end
       end
 

data/lib/relaton/bib/item_data.rb

@@ -9,12 +9,12 @@ module Relaton
 
       ATTRIBUTES = %i[
         type schema_version fetched formattedref docnumber edition status
-        medium size validity depiction ext
+        medium size validity ext
       ].freeze
       COLLECTION_ATTRBUTES = %i[
         date contributor version note language locale script
         copyright series place price extent accesslocation license
-        classification keyword
+        classification keyword depiction
       ].freeze
       COLLECTION_WRITE_ONLY_ATTRIBUTES = %i[title abstract source relation].freeze
 

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

@@ -0,0 +1,16 @@
+module Relaton
+  module Bib
+    class Abstract < LocalizedMarkedUpString
+      attribute :format, :string
+
+      xml do
+        root "abstract"
+        map_attribute "format", to: :format
+      end
+
+      key_value do
+        map "format", to: :format
+      end
+    end
+  end
+end

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

@@ -2,11 +2,13 @@ module Relaton
   module Bib
     class Depiction < Lutaml::Model::Serializable
       attribute :scope, :string
+      attribute :type, :string
       attribute :image, Image, collection: true, initialize_empty: true
 
       xml do
         root "depiction"
         map_attribute "scope", to: :scope
+        map_attribute "type", to: :type
         map_element "image", to: :image
       end
     end

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

@@ -0,0 +1,43 @@
+module Relaton
+  module Bib
+    class Formattedref < LocalizedMarkedUpString
+      attribute :format, :string
+
+      xml do
+        root "formattedref"
+        map_attribute "format", to: :format
+      end
+
+      key_value do
+        map "format", to: :format
+      end
+
+      # Handle plain string input from YAML/JSON deserialization
+      def self.from_yaml(value)
+        return new(content: value) if value.is_a?(String)
+
+        super
+      end
+
+      def self.from_json(value)
+        return new(content: value) if value.is_a?(String)
+
+        super
+      end
+
+      # Serialize as plain string when only content is present
+      def self.as(format, instance, options = {})
+        return instance.content if simple_content?(instance, format)
+
+        super
+      end
+
+      def self.simple_content?(instance, format)
+        return false if format == :xml
+
+        instance.format.nil? && instance.language.nil? &&
+          instance.script.nil? && instance.locale.nil?
+      end
+    end
+  end
+end

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

@@ -2,6 +2,8 @@ require "lutaml/model"
 require "lutaml/model/xml_adapter/nokogiri_adapter"
 require_relative "localized_string_attrs"
 require_relative "localized_string"
+require_relative "formattedref"
+require_relative "abstract"
 require_relative "date"
 require_relative "locality"
 require_relative "locality_stack"
@@ -59,7 +61,7 @@ module Relaton
       ]
       attribute :schema_version, method: :get_schema_version
       attribute :fetched, :date
-      attribute :formattedref, :string, raw: true
+      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
@@ -72,7 +74,7 @@ module Relaton
       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, LocalizedMarkedUpString, 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
@@ -87,7 +89,7 @@ module Relaton
       attribute :classification, Docidentifier, collection: true, initialize_empty: true
       attribute :keyword, Keyword, collection: true, initialize_empty: true
       attribute :validity, Validity
-      attribute :depiction, Depiction
+      attribute :depiction, Depiction, collection: true, initialize_empty: true
       attribute :ext, Ext
 
       xml do # rubocop:disable Metrics/BlockLength

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

@@ -15,9 +15,9 @@ module Relaton
         end
       end
 
-      attribute :vocab, LocalizedString, collection: true, initialize_empty: true
-      attribute :taxon, LocalizedString, collection: (1..), initialize_empty: true
-      attribute :vocabid, Vocabid
+      attribute :vocab, LocalizedString
+      attribute :taxon, LocalizedString, collection: true, initialize_empty: true
+      attribute :vocabid, Vocabid, collection: true, initialize_empty: true
 
       xml do
         root "keyword"

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

@@ -1,10 +1,12 @@
 module Relaton
   module Bib
     class Logo < Lutaml::Model::Serializable
+      attribute :type, :string
       attribute :image, Image
 
       xml do
         root "logo"
+        map_attribute "type", to: :type
         map_element "image", to: :image
       end
     end

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

@@ -22,7 +22,7 @@ module Relaton
           attribute :subdivision, Subdivision, collection: true, initialize_empty: true
           attribute :abbreviation, LocalizedString
           attribute :identifier, Identifier, collection: true, initialize_empty: true
-          attribute :logo, Logo
+          attribute :logo, Logo, collection: true, initialize_empty: true
 
           xml do
             map_element "name", to: :name

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

@@ -9,8 +9,8 @@ module Relaton
         hasManifestation reproductionOf hasReproduction reprintOf hasReprint
         expressionOf hasExpression translatedFrom hasTranslation arrangementOf
         hasArrangement abridgementOf hasAbridgement annotationOf hasAnnotation
-        draftOfhasDraft preliminaryDraftOf hasPreliminaryDraft revisionDraftOf
-        hasRevisionDraft editionOf hasEdition updates updatedBy derivedFrom
+        draftOf hasDraft predecessorDraftOf hasPredecessorDraft successorDraftOf
+        hasSuccessorDraft editionOf hasEdition updates updatedBy derivedFrom
         derives describes describedBy catalogues cataloguedBy hasSuccessor
         successorOf adaptedFrom hasAdaptation adoptedFrom adoptedAs reviewOf
         hasReview commentaryOf hasCommentary related hasComplement complementOf

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

@@ -4,7 +4,7 @@ module Relaton
   module Bib
     class Series < Lutaml::Model::Serializable
       attribute :type, :string, values: %w[main alt]
-      attribute :formattedref, :string, raw: true
+      attribute :formattedref, Formattedref
       attribute :title, Title, collection: (1..)
       attribute :place, Place
       attribute :organization, :string

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

@@ -1,9 +1,9 @@
 module Relaton
   module Bib
     class Validity < Lutaml::Model::Serializable
-      attribute :begins, :date
-      attribute :ends, :date
-      attribute :revision, :date
+      attribute :begins, :date_time
+      attribute :ends, :date_time
+      attribute :revision, :date_time
 
       xml do
         root "validity"

data/lib/relaton/bib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.6
+  version: 2.0.0.pre.alpha.7
 platform: ruby
 authors:
 - Ribose Inc.
@@ -177,6 +177,7 @@ files:
 - lib/relaton/bib/converter/bibxml/to_rfcxml_referencegroup.rb
 - lib/relaton/bib/hash_parser_v1.rb
 - lib/relaton/bib/item_data.rb
+- lib/relaton/bib/model/abstract.rb
 - lib/relaton/bib/model/address.rb
 - lib/relaton/bib/model/affiliation.rb
 - lib/relaton/bib/model/bibdata.rb
@@ -192,6 +193,7 @@ files:
 - lib/relaton/bib/model/edition.rb
 - lib/relaton/bib/model/ext.rb
 - lib/relaton/bib/model/extent.rb
+- lib/relaton/bib/model/formattedref.rb
 - lib/relaton/bib/model/full_name_type.rb
 - lib/relaton/bib/model/fullname.rb
 - lib/relaton/bib/model/ics.rb