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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9fa6a9815305c42544d6c12ccd53db7160466467497791e19c083b28174b944
-  data.tar.gz: '09217f90eb63cbb4bdc7d63b429b58458fb5e95db5175998eb4ce92426a2df70'
+  metadata.gz: 69b71b734f820604e3f3f6ace17de60b9b8e4502f263e374fae88dfa8a48b781
+  data.tar.gz: aaa0ae4e1837db334cc20d44a7fd7bc1fd5b381cfeb408e0e033f20deb97456a
 SHA512:
-  metadata.gz: 4b16cb3e76c40b0d82d40706e107433e252b8072310440d14bea7a15e79ffed8e56daf4d08935d9d70467d2364a1e76932faacb3ce6c0aee256ae0973fe63d7e
-  data.tar.gz: ed8bee5a4aad1e3a569dec6e71c10c9aaf6579ecb22ce241997aefac1370433b054b199e94addf7db99446f4fa10262116ccf9eb3ee99f2fc69aa9a95e06b47f
+  metadata.gz: b62aa1655cbd39d73def4a93c998cac9d7818bc0d1ebd45d0543c43c472c60875c797b7b5f5233f52911f2e27bbaf99917d33a91646afcb37a84d89c417f1aa0
+  data.tar.gz: 3f752a2a86b2b899eb6f99fad6ac823569b59eb5536422b936350dab65c7ebaab6e884de07896ce98930f1a2dca86dccbe31bd5887f789ff6d727b723afd3c85

data/README.adoc

@@ -54,7 +54,7 @@ Relaton::Cie::Bibliography.get '1111'
 [source,ruby]
 ----
 item.to_xml
-=> "<bibitem id="CIE0011980" type="standard" schema-version="v1.4.1">
+=> "<bibitem id="CIE0011980" type="standard" schema-version="v1.5.6">
       <fetched>2025-12-23</fetched>
       <title type="title-main">Guidelines for minimizing urban sky glow near astronomical observatories (Joint Publication IAU/CIE)</title>
       <title type="main">Guidelines for minimizing urban sky glow near astronomical observatories (Joint Publication IAU/CIE)</title>
@@ -67,7 +67,7 @@ With `bibdata: true` option XML output is wrapped with `bibdata` element and `ex
 [source,ruby]
 ----
 item.to_xml bibdata: true
-=> "<bibdata type="standard" schema-version="v1.4.1">
+=> "<bibdata type="standard" schema-version="v1.5.6">
       <fetched>2025-12-23</fetched>
       <title type="title-main">Guidelines for minimizing urban sky glow near astronomical observatories (Joint Publication IAU/CIE)</title>
       <title type="main">Guidelines for minimizing urban sky glow near astronomical observatories (Joint Publication IAU/CIE)</title>

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

@@ -466,11 +466,11 @@ Editorial and advisory groups are represented as consecutive subdivisions of the
         <a:documentation>Contact information for the organization, including address, phone number, and email</a:documentation>
       </ref>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="logo">
         <a:documentation>A logo for the organization</a:documentation>
       </ref>
-    </optional>
+    </zeroOrMore>
   </define>
   <define name="orgname">
     <element name="name">
@@ -502,6 +502,11 @@ Editorial and advisory groups are represented as consecutive subdivisions of the
   </define>
   <define name="logo">
     <element name="logo">
+      <optional>
+        <attribute name="type">
+          <a:documentation>The type of logo</a:documentation>
+        </attribute>
+      </optional>
       <ref name="image-no-id"/>
     </element>
   </define>
@@ -513,6 +518,11 @@ Editorial and advisory groups are represented as consecutive subdivisions of the
           <a:documentation>Description of what is being depicted</a:documentation>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="type">
+          <a:documentation>Description of what kind of depiction this</a:documentation>
+        </attribute>
+      </optional>
       <zeroOrMore>
         <ref name="image-no-id">
           <a:documentation>A visual depiction of the bibliographic item</a:documentation>
@@ -690,7 +700,7 @@ Examples include GRID, LEI, CrossRef, and Ringgold</a:documentation>
   <define name="CitationType">
     <attribute name="bibitemid">
       <a:documentation>Bibliographic item that the citation applies to, referenced as the anchor of a bibliographic description</a:documentation>
-      <data type="IDREF"/>
+      <ref name="IdRefType"/>
     </attribute>
     <choice>
       <zeroOrMore>
@@ -1132,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
@@ -1236,9 +1246,9 @@ Refer to `BibliographicItem` for definitions</a:documentation>
     <optional>
       <ref name="validity"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="depiction"/>
-    </optional>
+    </zeroOrMore>
   </define>
   <define name="btitle">
     <a:documentation>A title of a bibliographic item, associated with a type of title</a:documentation>
@@ -1296,17 +1306,17 @@ for which this claim of validity is made, if applicable</a:documentation>
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="TypedTitleString">
@@ -1929,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>
@@ -2053,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/cie/data_fetcher.rb

@@ -32,18 +32,36 @@ module Relaton
         @index ||= Index.find_or_create :cie, file: "index-v1.yaml"
       end
 
+      def log_error(msg)
+        Util.error msg
+      end
+
       # @param hit [Nokogiri::HTML::Document]
       # @param doc [Mechanize::Page]
       # @return [Array<Relaton::Bib::Docidentifier>]
       def fetch_docid(hit, doc)
         code, code2 = parse_code hit, doc
-        docid = [Bib::Docidentifier.new(type: "CIE", content: code, primary: true)]
-        if code2
+        docid = []
+        if code && !code.strip.empty?
+          docid << Bib::Docidentifier.new(type: "CIE", content: code, primary: true)
+          @errors[:docid_1] &&= false
+        else
+          @errors[:docid_1] &&= true
+        end
+        if code2 && !code2.strip.empty?
           type2 = code2.match(/\w+/).to_s
           docid << Relaton::Bib::Docidentifier.new(type: type2, content: code2.strip)
+          @errors[:docid_2] &&= false
+        else
+          @errors[:docid_2] &&= true
+        end
+        isbn = doc.at('//h3[contains(.,"ISBN")]/following-sibling::span')&.text
+        if isbn && !isbn.strip.empty?
+          docid << Bib::Docidentifier.new(type: "ISBN", content: isbn)
+          @errors[:docid_isbn] &&= false
+        else
+          @errors[:docid_isbn] &&= true
         end
-        isbn = doc.at('//h3[contains(.,"ISBN")]/following-sibling::span')
-        docid << Bib::Docidentifier.new(type: "ISBN", content: isbn.text.strip) if isbn
         docid
       end
 
@@ -82,35 +100,46 @@ module Relaton
       # @return [Array<Relaton::Bib::Title>]
       def fetch_title(doc)
         t = doc.at("//hgroup/h2/text()", "//hgroup/h1/text()")
-        return [] unless t
+        unless t && !t.text.strip.empty?
+          @errors[:title] &&= true
+          return []
+        end
 
-        Bib::Title.from_string t.text.strip
+        result = Bib::Title.from_string t.text.strip
+        @errors[:title] &&= result.empty?
+        result
       end
 
       # @param doc [Mechanize::Page]
       # @return [Array<Relaton::Bib::Date>]
       def fetch_date(doc)
-        doc.xpath("//h3[.='Published:']/following-sibling::span").map do |d|
+        result = doc.xpath("//h3[.='Published:']/following-sibling::span").map do |d|
           pd = d.text.strip
           on = pd.match?(/^\d{4}(?:[^-]|$)/) ? pd : Date.strptime(pd, "%m/%d/%Y").strftime("%Y-%m-%d")
           Bib::Date.new(type: "published", at: on)
         end
+        @errors[:date] &&= result.empty?
+        result
       end
 
       # @param doc [Mechanize::Page]
       # @return [String]
       def fetch_edition(doc)
         ed = doc.at("//h3[.='Edition:']/following-sibling::span")
+        @errors[:edition] &&= true
         return unless ed
 
         content = ed.text.slice(/^\d+(?=(st|nd|rd|th))/)
-        Bib::Edition.new(content: content) if content
+        if content
+          @errors[:edition] = false
+          Bib::Edition.new(content: content)
+        end
       end
 
       # @param doc [Mechanize::Page]
       # @return [Array<Relaton::Cie::Relation>]
       def fetch_relation(doc) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-        doc.xpath('//section[@class="history"]/ol/li[not(contains(@class,"selected-product"))]').map do |rel|
+        rels = doc.xpath('//section[@class="history"]/ol/li[not(contains(@class,"selected-product"))]').map do |rel|
           ref = rel.at("a")
           url = "https://www.techstreet.com#{ref[:href]}"
           title = Bib::Title.from_string ref.at('p/span[@class="title"]').text
@@ -123,11 +152,16 @@ module Relaton
           type = ref.at('//li/i[contains(@class,"historical")]') ? "updates" : "updatedBy"
           Bib::Relation.new(type: type, bibitem: bibitem)
         end
+        @errors[:relation] &&= rels.empty?
+        rels
       end
 
       # @param url [String]
       # @return [Array<Relaton::Bib::Uri>]
       def fetch_source(url)
+        @errors[:source] &&= url.nil? || url.empty?
+        return [] if url.nil? || url.empty?
+
         [Bib::Uri.new(type: "src", content: url)]
       end
 
@@ -135,9 +169,14 @@ module Relaton
       # @return [Array<Relaton::Bib::LocalizedMarkedUpString>]
       def fetch_abstract(doc)
         content = doc.at('//div[contains(@class,"description")]')&.text&.strip
-        return [] if content.nil? || content.empty?
+        if content.nil? || content.empty?
+          @errors[:abstract] &&= true
+          return []
+        end
 
-        [Bib::LocalizedMarkedUpString.new(content: content, language: "en", script: "Latn")]
+        result = [Bib::Abstract.new(content: content, language: "en", script: "Latn")]
+        @errors[:abstract] &&= result.empty?
+        result
       end
 
       # @param doc [Mechanize::Page]
@@ -165,6 +204,7 @@ module Relaton
           person = Bib::Person.new name: fullname
           role = Bib::Contributor::Role.new type: "author"
           contribs << Bib::Contributor.new(person: person, role: [role])
+          @errors[:contributor_author] &&= contribs.empty?
         end
         org_name = Bib::TypedLocalizedString.new(content: "Commission Internationale de L'Eclairage")
         abbrev = Bib::LocalizedString.new content: "CIE"
@@ -226,6 +266,7 @@ module Relaton
 
       def fetch(_source = nil)
         fetch_doc
+        report_errors
       end
 
       def fetch_doc(url = URL)

data/lib/relaton/cie/version.rb

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

data/relaton_cie.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "mechanize", "~> 2.10"
   spec.add_dependency "parslet", "~> 2.0.0"
-  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.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton-cie
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.2
+  version: 2.0.0.pre.alpha.3
 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.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