relaton-gb 1.11.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0470cbbe2153e0cc1a2db7896c448ea8e7be493bcecc269d3f41022fdca177f4
-  data.tar.gz: 119b0f70211a09d2b887ae84d5c33fd436aa59225fcdadd990ef680aa6046c86
+  metadata.gz: 2f3844801b9c641a154e348f6353bd015852bb2397188c78cf0eff2db6195a4b
+  data.tar.gz: 4dabafff1ae9b09e935e0c4f1942ba4db625b9321cdfe64bda829dc2aa2e64fb
 SHA512:
-  metadata.gz: 326808b402ad9761c13694dc2a427ca259e28f76f905aa312a8e7d62d2aaf6c1f85bb679ebcc316559c676c9706ec96f2644b2a70388714ee5556eeab72f9665
-  data.tar.gz: ee7f27430114ac8dd44a604e7031fec267170e82e26e160d32525cecc7fae610be0ecc5478fc122f7c0ecc7ff562aeed8cabce6c6370d8a17799295270f95b60
+  metadata.gz: ffd17de2c4b98e5a75d538d85d0cb21b612a46f911af2ebf4e05a61e4d8e839956c1f3bb54a9aa02bd954ac0ebfd937b0a9614ed952d896c9c487abab2ce5b8a
+  data.tar.gz: 587cfd65266caf303f1b5ceb2a67288411c23fba83bf06057ee0aed2b071e8f5c44bf34e6444ed2e4490ffaf771955d9c46ce3db2a475955c843b2b07473776e

data/.github/workflows/rake.yml

@@ -10,27 +10,4 @@ on:
 
 jobs:
   rake:
-    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-        experimental: [ false ]
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-
-      # https://github.com/ruby-debug/debase/issues/89#issuecomment-686827382
-      - if: matrix.os == 'macos-latest' && matrix.ruby == '2.5'
-        run: echo BUNDLE_BUILD__DEBASE="--with-cflags=\"-Wno-error=implicit-function-declaration\"" >> $GITHUB_ENV
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-
-      - run: bundle exec rake
+    uses: relaton/support/.github/workflows/rake.yml@master

data/grammars/biblio.rng

@@ -225,9 +225,9 @@
         <zeroOrMore>
           <ref name="forename"/>
         </zeroOrMore>
-        <zeroOrMore>
-          <ref name="initial"/>
-        </zeroOrMore>
+        <optional>
+          <ref name="formatted-initials"/>
+        </optional>
         <ref name="surname"/>
         <zeroOrMore>
           <ref name="addition"/>
@@ -247,8 +247,8 @@
       <ref name="LocalizedString"/>
     </element>
   </define>
-  <define name="initial">
-    <element name="initial">
+  <define name="formatted-initials">
+    <element name="formatted-initials">
       <ref name="LocalizedString"/>
     </element>
   </define>
@@ -264,6 +264,9 @@
   </define>
   <define name="forename">
     <element name="forename">
+      <optional>
+        <attribute name="initial"/>
+      </optional>
       <ref name="LocalizedString"/>
     </element>
   </define>
@@ -527,7 +530,7 @@
   </define>
   <define name="LocalityType">
     <data type="string">
-      <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
+      <param name="pattern">section|clause|part|paragraph|chapter|page|title|line|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
     </data>
   </define>
   <define name="referenceFrom">
@@ -614,12 +617,103 @@
     <optional>
       <ref name="fetched"/>
     </optional>
-    <choice>
-      <oneOrMore>
-        <ref name="btitle"/>
-      </oneOrMore>
+    <optional>
       <ref name="formattedref"/>
-    </choice>
+    </optional>
+    <oneOrMore>
+      <ref name="btitle"/>
+    </oneOrMore>
+    <zeroOrMore>
+      <ref name="bsource"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="docidentifier"/>
+    </oneOrMore>
+    <optional>
+      <ref name="docnumber"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="bdate"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="contributor"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="edition"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="version"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="biblionote"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="language"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="script"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bibabstract"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="status"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="copyright"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="docrelation"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="series"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="medium"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="bplace"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bprice"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="extent"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="accesslocation"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="license"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bclassification"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bkeyword"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="validity"/>
+    </optional>
+  </define>
+  <define name="ReducedBibliographicItem">
+    <optional>
+      <attribute name="type">
+        <ref name="BibItemType"/>
+      </attribute>
+    </optional>
+    <optional>
+      <ref name="fetched"/>
+    </optional>
+    <optional>
+      <ref name="formattedref"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="btitle"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="bsource"/>
     </zeroOrMore>
@@ -638,9 +732,9 @@
     <optional>
       <ref name="edition"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="version"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="biblionote"/>
     </zeroOrMore>
@@ -833,6 +927,12 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -851,17 +951,46 @@
   </define>
   <define name="bplace">
     <element name="place">
-      <optional>
-        <attribute name="uri">
-          <data type="anyURI"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="region"/>
-      </optional>
+      <choice>
+        <text/>
+        <group>
+          <ref name="bibliocity"/>
+          <zeroOrMore>
+            <ref name="biblioregion"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="bibliocountry"/>
+          </zeroOrMore>
+        </group>
+      </choice>
+    </element>
+  </define>
+  <define name="bibliocity">
+    <element name="city">
       <text/>
     </element>
   </define>
+  <define name="biblioregion">
+    <element name="region">
+      <ref name="RegionType"/>
+    </element>
+  </define>
+  <define name="bibliocountry">
+    <element name="country">
+      <ref name="RegionType"/>
+    </element>
+  </define>
+  <define name="RegionType">
+    <optional>
+      <attribute name="iso"/>
+    </optional>
+    <optional>
+      <attribute name="recommended">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <text/>
+  </define>
   <define name="bprice">
     <element name="price">
       <attribute name="currency"/>
@@ -957,36 +1086,34 @@
           <ref name="SeriesType"/>
         </attribute>
       </optional>
-      <choice>
+      <optional>
         <ref name="formattedref"/>
-        <group>
-          <ref name="btitle"/>
-          <optional>
-            <ref name="bplace"/>
-          </optional>
-          <optional>
-            <ref name="seriesorganization"/>
-          </optional>
-          <optional>
-            <ref name="abbreviation"/>
-          </optional>
-          <optional>
-            <ref name="seriesfrom"/>
-          </optional>
-          <optional>
-            <ref name="seriesto"/>
-          </optional>
-          <optional>
-            <ref name="seriesnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriespartnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriesrun"/>
-          </optional>
-        </group>
-      </choice>
+      </optional>
+      <ref name="btitle"/>
+      <optional>
+        <ref name="bplace"/>
+      </optional>
+      <optional>
+        <ref name="seriesorganization"/>
+      </optional>
+      <optional>
+        <ref name="abbreviation"/>
+      </optional>
+      <optional>
+        <ref name="seriesfrom"/>
+      </optional>
+      <optional>
+        <ref name="seriesto"/>
+      </optional>
+      <optional>
+        <ref name="seriesnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriespartnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriesrun"/>
+      </optional>
     </element>
   </define>
   <define name="SeriesType">
@@ -1145,7 +1272,7 @@
         </element>
       </optional>
       <element name="bibitem">
-        <ref name="BibliographicItem"/>
+        <ref name="ReducedBibliographicItem"/>
       </element>
       <choice>
         <zeroOrMore>
@@ -1170,9 +1297,9 @@
       <optional>
         <ref name="revision-date"/>
       </optional>
-      <zeroOrMore>
+      <optional>
         <ref name="draft"/>
-      </zeroOrMore>
+      </optional>
     </element>
   </define>
   <define name="vedition">

data/grammars/isodoc.rng

@@ -32,6 +32,54 @@
         <ref name="DocumentType"/>
       </element>
     </define>
+    <define name="admonition">
+      <element name="admonition">
+        <attribute name="type">
+          <ref name="AdmonitionType"/>
+        </attribute>
+        <optional>
+          <attribute name="class"/>
+        </optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="uri">
+            <data type="anyURI"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="coverpage">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="notag">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
+        <zeroOrMore>
+          <ref name="paragraph-with-footnote"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="AdmonitionType">
+      <choice>
+        <value>warning</value>
+        <value>note</value>
+        <value>tip</value>
+        <value>important</value>
+        <value>caution</value>
+        <value>statement</value>
+        <value>editorial</value>
+      </choice>
+    </define>
     <define name="index">
       <element name="index">
         <optional>
@@ -79,6 +127,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="suppress_identifier">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <ref name="BibliographicItem"/>
       </element>
     </define>
@@ -245,6 +298,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="ul_li"/>
         </oneOrMore>
@@ -287,6 +343,9 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="li"/>
         </oneOrMore>
@@ -323,6 +382,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -657,6 +719,9 @@
       <optional>
         <attribute name="tag"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="multilingual-rendering">
           <ref name="MultilingualRenderingType"/>
@@ -692,6 +757,9 @@
         <optional>
           <attribute name="tag"/>
         </optional>
+        <optional>
+          <attribute name="type"/>
+        </optional>
         <optional>
           <attribute name="multilingual-rendering">
             <ref name="MultilingualRenderingType"/>
@@ -851,6 +919,16 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="coverpage">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="notag">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <choice>
             <ref name="paragraph"/>
@@ -1178,6 +1256,7 @@
       <ref name="concept"/>
       <ref name="add"/>
       <ref name="del"/>
+      <ref name="span"/>
     </choice>
   </define>
   <define name="add">
@@ -1204,6 +1283,19 @@
       </choice>
     </element>
   </define>
+  <define name="span">
+    <element name="span">
+      <optional>
+        <attribute name="class"/>
+      </optional>
+      <optional>
+        <attribute name="style"/>
+      </optional>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>
@@ -1994,6 +2086,7 @@
       <value>compare</value>
       <value>contrast</value>
       <value>see</value>
+      <value>seealso</value>
     </choice>
   </define>
   <define name="deprecates">
@@ -2416,6 +2509,16 @@
           <text/>
         </element>
       </optional>
+      <optional>
+        <element name="amendment">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="corrigendum">
+          <text/>
+        </element>
+      </optional>
       <optional>
         <element name="language">
           <text/>

data/grammars/isostandard.rng

@@ -45,6 +45,9 @@
         <ref name="horizontal"/>
       </optional>
       <ref name="editorialgroup"/>
+      <optional>
+        <ref name="approvalgroup"/>
+      </optional>
       <zeroOrMore>
         <ref name="ics"/>
       </zeroOrMore>
@@ -249,6 +252,7 @@
         <value>warning</value>
         <value>important</value>
         <value>safety precautions</value>
+        <value>editorial</value>
       </choice>
     </define>
     <define name="preface">
@@ -308,18 +312,7 @@
     </define>
     <define name="editorialgroup">
       <element name="editorialgroup">
-        <oneOrMore>
-          <ref name="technical-committee"/>
-        </oneOrMore>
-        <zeroOrMore>
-          <ref name="subcommittee"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="workgroup"/>
-        </zeroOrMore>
-        <optional>
-          <ref name="secretariat"/>
-        </optional>
+        <ref name="ISOProjectGroup"/>
       </element>
     </define>
     <define name="Content-Section">
@@ -367,6 +360,33 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="ISOProjectGroup">
+    <zeroOrMore>
+      <ref name="agency"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="technical-committee"/>
+    </oneOrMore>
+    <zeroOrMore>
+      <ref name="subcommittee"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="workgroup"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="secretariat"/>
+    </optional>
+  </define>
+  <define name="approvalgroup">
+    <element name="approvalgroup">
+      <ref name="ISOProjectGroup"/>
+    </element>
+  </define>
+  <define name="agency">
+    <element name="agency">
+      <text/>
+    </element>
+  </define>
   <!--
     We display the Normative References between scope and terms; but to keep the
     grammar simple, we keep the references together

data/lib/relaton_gb/gb_scrapper.rb

@@ -47,7 +47,7 @@ module RelatonGb
       #   * :type [String]
       #   * :name [String]
       def get_committee(doc, _ref)
-        name = doc.at("//div[contains(text(), '归口单位')]/following-sibling::div")
+        name = doc.at("//div[contains(., '归口单位') or contains(., '归口部门')]/following-sibling::div")
         { type: "technical", name: name.text.delete("\r\n\t\t") }
       end
     end

data/lib/relaton_gb/hash_converter.rb

@@ -7,7 +7,7 @@ module RelatonGb
       # @param args [Hash]
       # @param nested [TrueClass, FalseClass]
       # @return [Hash]
-      def hash_to_bib(args, nested = false)
+      def hash_to_bib(args)
         ret = super
         return if ret.nil?
 
@@ -27,8 +27,8 @@ module RelatonGb
       end
 
       def ccs_hash_to_bib(ret)
-        ret[:ccs] = array(ret[:ccs]).map do |ccs|
-          ccs[:code] ? Cnccs.fetch(ccs[:code]) : Cnccs.fetch(ccs)
+        ret[:ccs] = RelatonBib.array(ret[:ccs]).map do |ccs|
+          (ccs[:code] && Cnccs.fetch(ccs[:code])) || Cnccs.fetch(ccs)
         end
       end
     end

data/lib/relaton_gb/hit.rb

@@ -38,9 +38,9 @@ module RelatonGb
 
     # @return [String]
     def inspect
-      "<#{self.class}:#{format('%<id>#.14x', id: object_id << 1)} "\
-      "@fullIdentifier=\"#{@fetch&.shortref}\" "\
-      "@docref=\"#{docref}\">"
+      "<#{self.class}:#{format('%<id>#.14x', id: object_id << 1)} " \
+        "@fullIdentifier=\"#{@fetch&.shortref}\" " \
+        "@docref=\"#{docref}\">"
     end
   end
 end

data/lib/relaton_gb/scrapper.rb

@@ -14,12 +14,11 @@ module RelatonGb
 
     @prefixes = nil
 
-    # rubocop:disable Metrics/MethodLength
     # @param doc [Nokogiri::HTML::Document]
     # @param src [String]
     # @param hit [RelatonGb::Hit]
     # @return [Hash]
-    def scrapped_data(doc, src, hit)
+    def scrapped_data(doc, src, hit) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       {
         fetched: Date.today.to_s,
         committee: get_committee(doc, hit.docref),
@@ -38,7 +37,6 @@ module RelatonGb
         structuredidentifier: fetch_structuredidentifier(hit.docref),
       }
     end
-    # rubocop:enable Metrics/MethodLength
 
     # @param docref [String]
     # @return [Array<RelatonBib::DocumentIdentifier>]

data/lib/relaton_gb/t_scrapper.rb

@@ -20,8 +20,8 @@ module RelatonGb
       # @return [RelatonGb::HitCollection]
       def scrape_page(text)
         search_html = OpenURI.open_uri(
-          "http://www.ttbz.org.cn/Home/Standard?searchType=2&key=" +
-          CGI.escape(text.tr("-", [8212].pack("U")))
+          "http://www.ttbz.org.cn/Home/Standard?searchType=2&key=" \
+          "#{CGI.escape(text.tr('-', [8212].pack('U')))}",
         ).read
         header = Nokogiri::HTML search_html
         xpath = '//table[contains(@class, "standard_list_table")]/tr/td/a'
@@ -29,7 +29,7 @@ module RelatonGb
         hits = header.xpath(xpath).map do |h|
           docref = h.at(t_xpath).text.gsub(/â\u0080\u0094/, "-")
           status = h.at("../preceding-sibling::td[1]").text.delete "\r\n"
-          pid = h[:href].sub(%r{\/$}, "")
+          pid = h[:href].sub(%r{/$}, "")
           Hit.new pid: pid, docref: docref, status: status, scrapper: self
         end
         HitCollection.new hits
@@ -43,7 +43,7 @@ module RelatonGb
       def scrape_doc(hit)
         src = "http://www.ttbz.org.cn#{hit.pid}"
         doc = Nokogiri::HTML OpenURI.open_uri(src), nil, Encoding::UTF_8.to_s
-        GbBibliographicItem.new **scrapped_data(doc, src, hit)
+        GbBibliographicItem.new(**scrapped_data(doc, src, hit))
       rescue OpenURI::HTTPError, SocketError, OpenSSL::SSL::SSLError, Net::OpenTimeout
         raise RelatonBib::RequestError, "Cannot access #{src}"
       end

data/lib/relaton_gb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonGb
-  VERSION = "1.11.0"
+  VERSION = "1.13.0"
 end

data/relaton_gb.gemspec

@@ -35,5 +35,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "cnccs", "~> 0.1.1"
   spec.add_dependency "gb-agencies", "~> 0.0.1"
-  spec.add_dependency "relaton-iso-bib", "~> 1.11.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-gb
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-10 00:00:00.000000000 Z
+date: 2022-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.13.0
 description: 'RelatonGb: retrieve Chinese GB Standards for bibliographic use using
   the BibliographicItem model.'
 email: