relaton-un 2.0.0.pre.alpha.1 → 2.0.0.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d329d6b49f77f6a2fd2a1ed6b1ccc1204074e5f9415d948de9352361af97cb7b
-  data.tar.gz: 64946c2287d40673e5fbd186c542f9a7e47cf53c0082c0a62f6f150e7af63e80
+  metadata.gz: 37cccd313d3ca90065cc74e0ffe9be80812d56a0ac4a127a8262fae0465cad2d
+  data.tar.gz: b32115bdbdf99a74dcc8af00367cd4ef107e643a9d27b8841b6535295ae9871a
 SHA512:
-  metadata.gz: 485f49c382375e5b4b91775562d62e456b5a9066eb4d728eb8c018b9121fd94c768cfa8f8f4bc7cdfb315f1e78a9d7eafa610f29ecec1f1b711258603dd1ad18
-  data.tar.gz: dbb0cb1629ab456306d0746602e687c3d977b20eadb55331c523ccc7207ee72ed2af4bbe803bf413b39e79b053c7ccccdcb4c203d061d2c57731d99f0880a18a
+  metadata.gz: 671dbf200b4d9928c6364686edf37e136ad04bb7d9d9790f9bb9693cc19aa670265d0d1c8f1a5ebe92b0b1dd7c2fecbcf336e6c021ed32bd7f99463e76aaa2d1
+  data.tar.gz: 8f1e7128367cfd36c61987175080c2fe30f08eccd8652d866adb1992d55eeb602357d8bafe5e0c97155b68c0336186704896282b2db4e3eb635f76617d66bf88

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/grammars/relaton-un.rng

@@ -16,33 +16,21 @@
         <value>resolution</value>
       </choice>
     </define>
-    <define name="BibDataExtensionType">
-      <optional>
-        <attribute name="schema-version"/>
-      </optional>
-      <optional>
-        <ref name="doctype"/>
-      </optional>
-      <optional>
-        <ref name="docsubtype"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="submissionlanguage"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="ics"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="distribution"/>
-      </optional>
-      <optional>
-        <ref name="session"/>
-      </optional>
-      <optional>
-        <ref name="job_number"/>
-      </optional>
-    </define>
   </include>
+  <define name="BibDataExtensionType" combine="interleave">
+    <zeroOrMore>
+      <ref name="submissionlanguage"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="distribution"/>
+    </optional>
+    <optional>
+      <ref name="session"/>
+    </optional>
+    <optional>
+      <ref name="job_number"/>
+    </optional>
+  </define>
   <define name="session">
     <element name="session">
       <optional>

data/lib/relaton/un/ext.rb

@@ -12,11 +12,7 @@ module Relaton
       attribute :job_number, :string
 
       xml do
-        map_attribute "schema-version", to: :schema_version
-        map_element "doctype", to: :doctype
-        map_element "subdoctype", to: :subdoctype
         map_element "submissionlanguage", to: :submissionlanguage
-        map_element "ics", to: :ics
         map_element "distribution", to: :distribution
         map_element "session", to: :session
         map_element "job_number", to: :job_number

data/lib/relaton/un/parser.rb

@@ -74,7 +74,7 @@ module Relaton
       def fetch_keyword
         subjects = english_data&.dig("subjects") || []
         subjects.map do |kw|
-          Bib::Keyword.new(vocab: [Bib::LocalizedString.new(content: kw)])
+          Bib::Keyword.new(vocab: Bib::LocalizedString.new(content: kw))
         end
       end
 

data/lib/relaton/un/version.rb

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

data/relaton_un.gemspec

@@ -34,8 +34,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "addressable", "~> 2.8.0"
   spec.add_dependency "faraday", "~> 2.7"
-  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 "wasmtime", "~> 41.0"
 end
 # rubocop:enable Metrics/BlockLength

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton-un
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.1
+  version: 2.0.0.pre.alpha.2
 platform: ruby
 authors:
 - Ribose Inc.
@@ -43,28 +43,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: wasmtime
   requirement: !ruby/object:Gem::Requirement