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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7973b1eb433cf15540e396a271ba6982e223ab88c7992d241b408e5e585546b7
-  data.tar.gz: 4b9c3b110d4cfd97190e3b31e9ed24e4713b66eebc607588b2cc9761dc3e05d6
+  metadata.gz: aa9c04a74c8aee3154d05f5031b96f288d45b9b99b8458b1120bbc9a5d86875a
+  data.tar.gz: 22da6e8ac8fec26345906ede9a761b67c4de94154133469568aed02525b6d060
 SHA512:
-  metadata.gz: 971f4d069ab310403636d20d533cc71a3303695cea15f6ad8aae1198ba4e44eaddfa1462b2714f2b5eba9321fa815b36e9114d4bf17ac5fcfe92dc37ac31f6de
-  data.tar.gz: 2c79a4c032bee7b008da3d8b22a31c25927e6783d6cd79c2b195413391f92b5819ee0dab4a38e0da514499eac5e92edc1eb0282b5bc28552bc1d57ccb94ba876
+  metadata.gz: 89e40bcaa367a3801dab14988f78fe61764e323c2f9e0c2b7a65f55fa82824c488205801707149f4fed035dc4efc1b6f808785365954f76f53d9e2fc0ce24592
+  data.tar.gz: 23f050f82a9d012538dd3775fdae607c2fdb8ae602eec94e74213a74797e593d02394e271d9bb4decd9a69e88c39f0bec73a630186bafc252be902ba2abb2e38

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

@@ -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/ietf/data_fetcher.rb

@@ -108,7 +108,7 @@ module Relaton
         rel = vs.map { |v| version_relation v, "includes" }
         last_v = Item.from_yaml(File.read(file, encoding: "UTF-8"))
         bib = ItemData.new(
-          title: last_v.title, abstract: last_v.abstract, formattedref: ref,
+          title: last_v.title, abstract: last_v.abstract, formattedref: Bib::Formattedref.new(content: ref),
           docidentifier: [docid], relation: rel
         )
         save_doc bib
@@ -124,7 +124,7 @@ module Relaton
       #
       def version_relation(ver, type)
         docid = Bib::Docidentifier.new(type: "Internet-Draft", content: ver[:ref], primary: true)
-        bibitem = ItemData.new(formattedref: ver[:ref], docidentifier: [docid], source: ver[:source])
+        bibitem = ItemData.new(formattedref: Bib::Formattedref.new(content: ver[:ref]), docidentifier: [docid], source: ver[:source])
         Bib::Relation.new(type: type, bibitem: bibitem)
       end
 

data/lib/relaton/ietf/rfc/entry.rb

@@ -204,7 +204,7 @@ module Relaton
         end
 
         def build_formattedref
-          anchor
+          Bib::Formattedref.new(content: anchor)
         end
 
         def build_relations(rfc_index = nil, wg_names: {})
@@ -220,7 +220,7 @@ module Relaton
         def build_minimal_bibitem(ref)
           id = ref.sub(/^([A-Z]+)0*(\d+)$/, '\1 \2')
           docid = Bib::Docidentifier.new(type: "IETF", content: id, primary: true)
-          ItemData.new(formattedref: ref, docidentifier: [docid])
+          ItemData.new(formattedref: Bib::Formattedref.new(content: ref), docidentifier: [docid])
         end
 
         def build_series
@@ -310,8 +310,8 @@ module Relaton
 
         def build_rfc_keyword
           (keywords&.kw || []).map do |kw|
-            taxon = Bib::LocalizedString.new(content: kw)
-            Bib::Keyword.new(taxon: [taxon])
+            vocab = Bib::LocalizedString.new(content: kw)
+            Bib::Keyword.new(vocab: vocab)
           end
         end
 
@@ -319,7 +319,7 @@ module Relaton
           return [] unless abstract&.p&.any?
 
           content = abstract.p.map { |para| "<p>#{para.strip}</p>" }.join
-          [Bib::LocalizedMarkedUpString.new(content: content, language: "en", script: "Latn")]
+          [Bib::Abstract.new(content: content, language: "en", script: "Latn")]
         end
 
         def build_rfc_relation
@@ -339,7 +339,7 @@ module Relaton
 
         def build_rfc_doc_relation(ref, type)
           docid = Bib::Docidentifier.new(type: "IETF", content: ref, primary: true)
-          bibitem = ItemData.new(formattedref: ref, docidentifier: [docid])
+          bibitem = ItemData.new(formattedref: Bib::Formattedref.new(content: ref), docidentifier: [docid])
           Bib::Relation.new(type: type, bibitem: bibitem)
         end
 

data/lib/relaton/ietf/version.rb

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

data/relaton_ietf.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 3.2.0")
 
   spec.add_dependency "base64"
-  spec.add_dependency "relaton-bib", "~> 2.0.0-alpha.4"
-  spec.add_dependency "relaton-core", "~> 0.0.9"
+  spec.add_dependency "relaton-bib", "~> 2.0.0-alpha.7"
+  spec.add_dependency "relaton-core", "~> 0.0.13"
   spec.add_dependency "relaton-index", "~> 0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ietf
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.2
+  version: 2.0.0.pre.alpha.3
 platform: ruby
 authors:
 - Ribose Inc.
@@ -29,28 +29,28 @@ 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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.13
 - !ruby/object:Gem::Dependency
   name: relaton-index
   requirement: !ruby/object:Gem::Requirement