relaton-iso 2.0.0.pre.alpha.5 → 2.0.0.pre.alpha.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da51a73ec48407d3ef4d282539f1484cd967fcf49c1903e5af5d68f85d8efeed
-  data.tar.gz: f50534492470af38a24a7c0f0e9478d447050f36b21b0850687b48716092329b
+  metadata.gz: 8e76d7d42d7e6dfbd362753f345eb6fdd66cb10db2cf9453cc1f712d88aefd35
+  data.tar.gz: f7b82618ba1a3d27bb07329643e2319853a801d439c0e1bda43716eb7b30c399
 SHA512:
-  metadata.gz: e21a0a4e2522b0bd8264ad4e6b883518c0d43536c392be0e5f113ad00bc53dc6b2e360962008ee56bc0e528864b41ff1e9a5cbbcb9c676f3c48d7df4a7f81c7e
-  data.tar.gz: 327762296156cfd01cd994f66160989e39e1d89d5d1d2137f72812815b07f575b9753b82e103e75da4408bc4058779b362e726001d664c7e11434d3e7c20b01d
+  metadata.gz: e9339fc84f10f081d9bb498c0d33925e9d648cd2708097150516c33821dd4cd9ec1b28973f1ec3c5803f0faefcbbdb9c6739609a7d97a508406e799021980812
+  data.tar.gz: 26f1afd730ee2a8272c3ad7ad2e073bbe79ced42fcfdfd96ac92f54b98695ef903a2db8c17a0367311391b603156d71ca4134cfa4169ee732dfc27c27ffd3317

data/README.adoc

@@ -244,24 +244,24 @@ Possible options:
 [source,ruby]
 ----
 item.to_xml
-=> "<bibitem id="ISO19115-1-2014" type="standard" schema-version="v1.4.1">
+=> "<bibitem id="ISO19115-1-2014" type="standard" schema-version="v1.5.6">
       <title language="en" script="Latn" type="title-intro" format="text/plain">Geographic information</title>
       <title language="en" script="Latn" type="title-main" format="text/plain">Metadata</title>
       ...
     </bibitem>"
 
 item.to_xml bibdata: true
-=> "<bibdata type="standard" schema-version="v1.4.1">
+=> "<bibdata type="standard" schema-version="v1.5.6">
       <title language="en" script="Latn" type="title-intro" format="text/plain">Geographic information</title>
       ...
-      <ext schema-version="v1.0.5">
+      <ext schema-version="v1.1.2">
         <doctype>international-standard</doctype>
         ...
       </ext>
     </bibdata>"
 
 item.to_xml note: [{ content: "Note", type: "note" }]
-=> "<bibitem id="ISO19115-1-2014" type="standard" schema-version="v1.4.1">
+=> "<bibitem id="ISO19115-1-2014" type="standard" schema-version="v1.5.6">
       ...
       <note type="note">Note</note>
       ...

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

@@ -6,10 +6,6 @@ module Relaton
   module Iso
     # Fetch all the documents from ISO website.
     class DataFetcher < Core::DataFetcher
-      def gh_issue_channel
-        ["relaton/relaton-iso", "Error fetching ISO documents"]
-      end
-
       #
       # The queue is used to store the ICS page paths beeing fetching in the current run.
       #
@@ -55,7 +51,7 @@ module Relaton
         iso_queue.save
         # index.sort! { |a, b| compare_docids a, b }
         index.save
-        repot_errors
+        report_errors
       end
 
       private

data/lib/relaton/iso/hit_collection.rb

@@ -123,7 +123,7 @@ module Relaton
       def create_relation(hit)
         # pubid = Pubid.new hit.pubid
         docid = Docidentifier.new(content: hit.pubid, type: "ISO", primary: true)
-        isobib = ItemData.new(formattedref: hit.pubid.to_s, docidentifier: [docid])
+        isobib = ItemData.new(formattedref: Bib::Formattedref.new(content: hit.pubid.to_s), docidentifier: [docid])
         Relation.new(type: "instanceOf", bibitem: isobib)
       end
     end

data/lib/relaton/iso/model/docidentifier.rb

@@ -26,6 +26,20 @@ module Relaton
 
       attribute :content, Pubid
 
+      # iso-tc identifiers are TC document numbers, not ISO standard
+      # identifiers — parsing them through Pubid adds a spurious
+      # "ISO" prefix (#178)
+      def initialize(arg = nil, **kwargs)
+        if arg.is_a?(Hash)
+          raw_content = arg["content"] if arg["type"] == "iso-tc"
+          super(arg)
+        else
+          raw_content = kwargs[:content] if kwargs[:type] == "iso-tc"
+          super(**kwargs)
+        end
+        @content = raw_content if raw_content.is_a?(String)
+      end
+
       def content_to_xml(model, parent, doc)
         doc.add_xml_fragment parent, model.to_s
       end
@@ -48,41 +62,19 @@ module Relaton
 
       def remove_stage!
         remove_attr! :stage
-        # return if content.is_a? String
-
-        # content.stage = nil
-        # base = content.base
-        # while base
-        #   base.stage = nil
-        #   base = base.base
-        # end
       end
 
       def remove_part!
         remove_attr! :part
-        # return if content.is_a? String
-
-        # content.part = nil
-        # base = content.base
-        # while base
-        #   base.part = nil
-        #   base = base.base
-        # end
       end
 
       def remove_date!
         remove_attr! :year
-        # return if content.is_a? String
-
-        # content.year = nil
-        # base = content.base
-        # while base
-        #   base.year = nil
-        #   base = base.base
-        # end
       end
 
       def exclude_year
+        return content if content.is_a? String
+
         pubid = content.exclude(:year)
         current_pubid = pubid
         while current_pubid.base
@@ -97,23 +89,25 @@ module Relaton
 
         case type
         when "URN" then content.urn
-        when "iso-reference" then iso_reference
+        when "iso-reference", "iso-with-lang" then iso_reference
         else content.to_s with_prf: true
         end
       end
 
       def iso_reference
-        return content.to_s(format: :ref_num_short, with_prf: true) if content.language
+        content.to_s(format: :ref_num_short, with_prf: true)
+
+        # return content.to_s(format: :ref_num_short, with_prf: true) if content.language
 
-        pubid_dup = content.dup
-        pubid_dup.language = "en"
-        pubid_dup.to_s(format: :ref_num_short, with_prf: true)
+        # pubid_dup = content.dup
+        # pubid_dup.language = "en"
+        # pubid_dup.to_s(format: :ref_num_short, with_prf: true)
       end
 
       private
 
       def remove_attr!(attr)
-        return false if content.is_a? String
+        return if content.is_a? String
 
         content.send("#{attr}=", nil)
         base = content.base
@@ -121,7 +115,6 @@ module Relaton
           base.send("#{attr}=", nil)
           base = base.base
         end
-        true
       end
     end
   end

data/lib/relaton/iso/scraper.rb

@@ -132,7 +132,7 @@ module Relaton
       def fetch_relaton_docids
         [
           Docidentifier.new(content: pubid, type: "ISO", primary: true),
-          Docidentifier.new(content: pubid, type: "iso-reference"),
+          Docidentifier.new(content: isoref, type: "iso-reference"),
           Docidentifier.new(content: urn, type: "URN"),
         ]
       end
@@ -175,7 +175,7 @@ module Relaton
         @errors[:abstract] &&= abstract_content.empty?
         return if abstract_content.empty?
 
-        Bib::LocalizedMarkedUpString.new(content: abstract_content, language: lang, script: script(lang))
+        Bib::Abstract.new(content: abstract_content, language: lang, script: script(lang))
       end
 
       # Returns available languages.
@@ -379,7 +379,7 @@ module Relaton
       def create_relations(rel, type, date)
         rel.css("a").map do |rid|
           docid = Docidentifier.new(type: "ISO", content: rid.text, primary: true)
-          bibitem = ItemData.new(docidentifier: [docid], formattedref: rid.text, date: date)
+          bibitem = ItemData.new(docidentifier: [docid], formattedref: Bib::Formattedref.new(content: rid.text), date: date)
           Relation.new type: type, bibitem: bibitem
         end
       end

data/lib/relaton/iso/version.rb

@@ -2,6 +2,6 @@
 
 module Relaton
   module Iso
-    VERSION = "2.0.0-alpha.5"
+    VERSION = "2.0.0-alpha.7"
   end
 end

data/relaton_iso.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "isoics", "~> 0.1.6"
   spec.add_dependency "openssl", "~> 3.3.2" # 3.3.0 raised an error on Ruby 3.4.7
   spec.add_dependency "pubid-iso", "~> 1.15.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.12"
   spec.add_dependency "relaton-index", "~> 0.2.12"
 end

metadata

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