relaton-ccsds 2.0.0.pre.alpha.2 → 2.0.0.pre.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca1d83dae265efa50b2dd67e5b53744f2d40c54779e88462b5d7256ffa3a9697
-  data.tar.gz: dd405986f3ec69cc03e23fb7efc2ab4f0dc2ba85c366a8f4db936c59aa30050a
+  metadata.gz: 3399494175ab697251039d9cc57ba8e38576bb6321cd45d5fd65d8deba83a422
+  data.tar.gz: e665114a021d30748e744fa4212d41b7b9d9c881599f7a7bd65c9eebf1ce78b4
 SHA512:
-  metadata.gz: a0b4b31e16bc01d52e8f5df780c0c3e14e1b7f625d88b2ef49402bb8019cf2a61995e43d5dcdcf6cba2e83b754c2249f616d69a235ec557372101638049fac6e
-  data.tar.gz: c6bd7db83c568129ed9f434cd25646ff340e265d5133e90c6cef0235fd203c72f73e442629e11819562224e7cb148da5dfc5f9cac236f20c728a1e775069b3f9
+  metadata.gz: 02e2bc9c9cb19435b0272c54627e325682175d88b80d926315f02e0e7a13a4e670c6e3f7b608fdf53ebec670e4f24fc6e62fe2a0984b8a87bb77f6cb56e3d555
+  data.tar.gz: f06b872936f9616a7dac470a0ffd999e13a4551edbb746c4ce8ba7d5847a6e10e798e7e4a2b29cf3cfbb816c9808f57e734377679db80bb95d435fb595a4b838

data/README.adoc

@@ -52,7 +52,7 @@ item = Relaton::Ccsds::Bibliography.get("CCSDS 230.2-G-1")
 [source,ruby]
 ----
 item.to_xml
-=> "<bibitem id="CCSDS2302G1" schema-version="v1.4.1">
+=> "<bibitem id="CCSDS2302G1" schema-version="v1.5.6">
       <fetched>2025-12-03</fetched>
       <title language="en" script="Latn">Next Generation Uplink</title>
       <uri type="src">https://ccsds.org/publications/ccsdsallpubs/entry/3224/</uri>
@@ -65,7 +65,7 @@ With argument `bibdata: true` it outputs XML wrapped by `bibdata` element and ad
 [source,ruby]
 ----
 item.to_xml bibdata: true
-=> "<bibdata schema-version="v1.4.1">
+=> "<bibdata schema-version="v1.5.6">
       <fetched>2025-12-03</fetched>
       <title language="en" script="Latn">Next Generation Uplink</title>
       <uri type="src">https://ccsds.org/publications/ccsdsallpubs/entry/3224/</uri>

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-compile.rng

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar xmlns="http://relaxng.org/ns/structure/1.0">
+  <include href="basicdoc.rng"/>
+  <include href="biblio-standoc.rng"/>
+  <start>
+    <choice>
+      <ref name="bibitem"/>
+      <ref name="bibdata"/>
+    </choice>
+  </start>
+</grammar>

data/grammars/biblio.rng

@@ -1142,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
@@ -1939,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>
@@ -2063,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/lib/relaton/ccsds/data/fetcher.rb

@@ -200,7 +200,7 @@ module Relaton
         return unless bib_docid
 
         docid = Bib::Docidentifier.from_yaml(bib_docid.to_yaml)
-        rel = Relaton::Bib::ItemData.new docidentifier: [docid], formattedref: bib_docid.content.dup
+        rel = Relaton::Bib::ItemData.new docidentifier: [docid], formattedref: Relaton::Bib::Formattedref.new(content: bib_docid.content.dup)
         yield Relaton::Bib::Relation.new(type: type, bibitem: rel)
       end
 

data/lib/relaton/ccsds/data/parser.rb

@@ -64,7 +64,7 @@ module Relaton
 
       def parse_abstract
         a = @doc[7]
-        [Bib::LocalizedMarkedUpString.new(content: a, language: "en", script: "Latn")]
+        [Bib::Abstract.new(content: a, language: "en", script: "Latn")]
       end
 
       def parse_doctype
@@ -160,7 +160,7 @@ module Relaton
       def create_relation(type, rel_id, uri = nil, id_type = "CCSDS")
         id = Bib::Docidentifier.new content: rel_id, type: id_type, primary: true
         source = array(uri).map { |u| Bib::Uri.new(type: "src", content: u) }
-        bibitem = Bib::ItemData.new docidentifier: [id], source: source, formattedref: rel_id
+        bibitem = Bib::ItemData.new docidentifier: [id], source: source, formattedref: Bib::Formattedref.new(content: rel_id)
         Bib::Relation.new type: type, bibitem: bibitem
       end
 

data/lib/relaton/ccsds/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Ccsds
-    VERSION = "2.0.0-alpha.2".freeze
+    VERSION = "2.0.0-alpha.3".freeze
   end
 end

data/relaton_ccsds.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "mechanize", "~> 2.10"
   spec.add_dependency "openssl", "~> 3.3.2"
   spec.add_dependency "pubid-ccsds", "~> 1.15.2"
-  spec.add_dependency "relaton-bib", "~> 2.0.0-alpha.4"
+  spec.add_dependency "relaton-bib", "~> 2.0.0-alpha.7"
   spec.add_dependency "relaton-core", "~> 0.0.9"
   spec.add_dependency "relaton-index", "~> 0.2.16"
   # For more information and examples about making a new gem, check out our

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ccsds
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.2
+  version: 2.0.0.pre.alpha.3
 platform: ruby
 authors:
 - Ribose Inc.
@@ -71,14 +71,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.4
+        version: 2.0.0.pre.alpha.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.4
+        version: 2.0.0.pre.alpha.7
 - !ruby/object:Gem::Dependency
   name: relaton-core
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +127,7 @@ files:
 - bin/setup
 - ccsdsallpubs.html
 - grammars/basicdoc.rng
+- grammars/biblio-compile.rng
 - grammars/biblio-standoc.rng
 - grammars/biblio.rng
 - grammars/relaton-ccsds-compile.rng