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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 225388efdbed90395039c1f28bd0694182730f06cd60e5afb8333985d1a7aa11
-  data.tar.gz: 62a961cd80770fd534128ddc36f42b3b465ffba58dfb668a15eacf8a0cb0ee71
+  metadata.gz: a943d384450993990abd3c4d4da67975d7e9e94240a8546ea4561415eb2d7d5c
+  data.tar.gz: 51b184d350aed3a230cfceb3fc4f8076874a7740bea1064f87865f2bf4d54c51
 SHA512:
-  metadata.gz: a7b7956b637f1f53b723cb90d5db542c88c1c01cfc45191e211be05f25db63e9caaf75f3a72239bc51fa25058c59d5659ba8a17514031e6177d08663d3a417a5
-  data.tar.gz: 1c6493afcafb8b039b6836abf66802c10c0501239d86bbd8dbf9e58b5beab1dff9b0b0e2737a64cf89174a659c0e2790772f049c72225cbfced092e94891e88d
+  metadata.gz: c0cb26edb804d43869057cbde0f20d27d7928565b0abd57e9835ee6032b8a77eefd392aa2d8f2c3efbe0b4cc07153f79ceac5b60f4be08665c75a7a852bc652c
+  data.tar.gz: 4494d755e60de27ebd0e8c6bbb796f953c0937b18a8f6a2d1bd05814a7b0624243eae34d59f2c2aab59bfdac4e1baeb2e1de0d9565bd1dc3e8cb5243012f7c6f

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/omg/scraper.rb

@@ -69,7 +69,7 @@ module Relaton
 
       def fetch_abstract
         content = @doc.at('//section[@id="document-metadata"]/div/div/p').text
-        [Bib::LocalizedMarkedUpString.new(content: content, language: "en", script: "Latn")]
+        [Bib::Abstract.new(content: content, language: "en", script: "Latn")]
       end
 
       def fetch_version
@@ -118,7 +118,7 @@ module Relaton
             acronym = row.at("td[3]/a")[:href].split("/")[4]
             id = ["OMG", acronym, ver].join(" ")
             docid = Bib::Docidentifier.new(content: id, type: "OMG")
-            bibitem = Bib::ItemBase.new(formattedref: id, docidentifier: [docid])
+            bibitem = Bib::ItemBase.new(formattedref: Bib::Formattedref.new(content: id), docidentifier: [docid])
             mem << Bib::Relation.new(type: "obsoletes", bibitem: bibitem)
           end
           mem
@@ -127,7 +127,7 @@ module Relaton
 
       def fetch_keyword
         @doc.xpath('//dt[.="Categories:"]/following-sibling::dd/ul/li/a/em').map do |kw|
-          Bib::Keyword.new(taxon: [Bib::LocalizedString.new(content: kw.text)])
+          Bib::Keyword.new(vocab: Bib::LocalizedString.new(content: kw.text))
         end
       end
 

data/lib/relaton/omg/version.rb

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

data/relaton_omg.gemspec

@@ -28,6 +28,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "base64"
   spec.add_dependency "mechanize", "~> 2.8"
-  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"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton-omg
 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
 description: 'Relaton::Omg: retrieve OMG Standards for bibliographic using the IsoBibliographicItem
   model'
 email: