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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc45456d59ae3857a4161bcf3ecff02c96a35e6919b53f1a7d2b4d7d386ddcd1
-  data.tar.gz: df75a3aa8d81d04a4a1f8f80f38346202eb38bf4b5b5ea1a0681b896e66571e3
+  metadata.gz: 1b120cebe494766b26bb882d0b0ea16adc56c3ac35b02c57425ea6af994d8ad1
+  data.tar.gz: 19f0ce8e61e8110ab1e73bd6a6d04cfc9ced139443321360110c9f6688432cd8
 SHA512:
-  metadata.gz: 9c54eb6f16e435a14f387714c5bfc048a929e859c31f915dde57318cb7c49887dd2340d0646051f51ef2df97281530550c1863ddb4b5eefa838e216a5cf3edf7
-  data.tar.gz: 0f529d1464a0317358c5e4c632b6f5f7517e8667110b6102992ebb83d3908c6f521fe6cb7eaabefa165695890ecacf85fc1250f08cd02f39ef038ce9d6c7d5bf
+  metadata.gz: 8c5a8bfd2c7b2862ad026c046056d210283565213b6f9dcdfc6957ec85868eb0529dd0f1a5155d2647073bff667e80d971a9889b60bf90cd55757d7d57b20dfb
+  data.tar.gz: 13e570342c2efb011eb2ff71f0f0fb56916d4a73b5037a5c7f53012a8fb284234b83e7a804def400b3c05d6e6f6aa7f34a4405605ec720e6546651cc3d7024d6

data/README.adoc

@@ -128,7 +128,7 @@ Relaton::Gb::Item.from_yaml File.read('spec/fixtures/item.yaml')
 [source,ruby]
 ----
 hit_collection.first.item.to_xml
-=> "<bibitem id="GBT202232006" type="standard" schema-version="v1.4.1">
+=> "<bibitem id="GBT202232006" type="standard" schema-version="v1.5.6">
       <fetched>2026-01-26</fetched>
       <title language="zh" script="Hans" type="title-main">棉短绒</title>
       <title language="zh" script="Hans" type="main">棉短绒</title>
@@ -145,7 +145,7 @@ With `bibdata: true` option XML output is wrapped with `bibdata` element and `ex
 [source,ruby]
 ----
 hit_collection.first.item.to_xml bibdata: true
-=> "<bibdata type="standard" schema-version="v1.4.1">
+=> "<bibdata type="standard" schema-version="v1.5.6">
       <fetched>2026-01-26</fetched>
       <title language="zh" script="Hans" type="title-main">棉短绒</title>
       <title language="zh" script="Hans" type="main">棉短绒</title>
@@ -154,7 +154,7 @@ hit_collection.first.item.to_xml bibdata: true
       <uri type="src">http://openstd.samr.gov.cn/bzgk/gb/newGbInfo?hcno=083B48FA72DBD3B9BDE74507BC31736A</uri>
       <docidentifier type="Chinese Standard" primary="true">GB/T 20223-2006</docidentifier>
       ...
-      <ext schema-version="v1.0.0">
+      <ext schema-version="v1.1.2">
         <doctype>standard</doctype>
         ...
       </ext>

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

@@ -1,31 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="biblio-standoc.rng">
-    <define name="BibDataExtensionType">
-      <optional>
-        <attribute name="schema-version"/>
-      </optional>
-      <optional>
-        <ref name="doctype"/>
-      </optional>
-      <optional>
-        <ref name="docsubtype"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="ics"/>
-      </zeroOrMore>
-      <ref name="structuredidentifier"/>
-      <optional>
-        <ref name="stagename"/>
-      </optional>
-      <ref name="gbtype"/>
-      <oneOrMore>
-        <ref name="gbccs"/>
-      </oneOrMore>
-      <optional>
-        <ref name="gbplannumber"/>
-      </optional>
-    </define>
     <define name="bdate">
       <element name="date">
         <attribute name="type">
@@ -83,6 +58,18 @@
       </element>
     </define>
   </include>
+  <define name="BibDataExtensionType" combine="interleave">
+    <optional>
+      <ref name="stagename"/>
+    </optional>
+    <ref name="gbtype"/>
+    <oneOrMore>
+      <ref name="gbccs"/>
+    </oneOrMore>
+    <optional>
+      <ref name="gbplannumber"/>
+    </optional>
+  </define>
   <define name="updates_document_type">
     <element name="updates-document-type">
       <ref name="DocumentType"/>

data/lib/relaton/gb/ext.rb

@@ -7,12 +7,11 @@ require_relative "ccs"
 
 module Relaton
   module Gb
-    class Ext < Lutaml::Model::Serializable
+    class Ext < Bib::Ext
       attribute :schema_version, method: :get_schema_version
       attribute :doctype, Doctype
       attribute :subdoctype, :string, values: %w[specification method-of-test vocabulary code-of-practice]
       # attribute :gbcommittee, Committee, collection: true
-      attribute :ics, Bib::ICS, collection: true
       attribute :structuredidentifier, StructuredIdentifier
       attribute :stagename, StageName
       attribute :gbtype, GbType
@@ -20,12 +19,7 @@ module Relaton
       attribute :plannumber, :string
 
       xml do
-        map_attribute "schema-version", to: :schema_version
-        map_element "doctype", to: :doctype
-        map_element "subdoctype", to: :subdoctype
         # map_element "gbcommittee", to: :gbcommittee
-        map_element "ics", to: :ics
-        map_element "structuredidentifier", to: :structuredidentifier
         map_element "stagename", to: :stagename
         map_element "gbtype", to: :gbtype
         map_element "ccs", to: :ccs

data/lib/relaton/gb/scraper.rb

@@ -162,6 +162,7 @@ module Relaton
         Ext.new(
           doctype: get_type,
           gbtype: get_gbtype(doc, docref),
+          flavor: "gb",
           # gbcommittee: get_committee(doc, docref),
           ccs: get_ccs(doc),
           ics: get_ics(doc),

data/lib/relaton/gb/version.rb

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

data/relaton_gb.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "cnccs", "~> 0.1.1"
   spec.add_dependency "gb-agencies", "~> 0.0.1"
   spec.add_dependency "mechanize", "~> 2.10"
-  spec.add_dependency "relaton-core", "~> 0.0.9"
-  spec.add_dependency "relaton-iso", "~> 2.0.0-alpha.2"
+  spec.add_dependency "relaton-core", "~> 0.0.13"
+  spec.add_dependency "relaton-iso", "~> 2.0.0-alpha.7"
   spec.add_dependency "csv", "~> 3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton-gb
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.1
+  version: 2.0.0.pre.alpha.2
 platform: ruby
 authors:
 - Ribose Inc.
@@ -57,28 +57,28 @@ dependencies:
     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-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.2
+        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.2
+        version: 2.0.0.pre.alpha.7
 - !ruby/object:Gem::Dependency
   name: csv
   requirement: !ruby/object:Gem::Requirement