relaton-gb 1.4.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6fad471830e1c0f9172e7edd3b06affad5aca2da674e83dbe2faa8c098e7b8b
-  data.tar.gz: e0ac69e2e95a397c038538a4c6e1e7dd66c80d9732403ab3971329d955a63d95
+  metadata.gz: 8aecc3ac0ccd54e50b1040011e5e134a760081cca158085cf1ee72765788075d
+  data.tar.gz: e193dc6d10e45f348ce68308954ffddb7944ca87359be7b4d70031efc4cea647
 SHA512:
-  metadata.gz: 9b960cff84c679239f909ea92fc4ac36ab2c4ab40c6446f065cd4d633df492a81898865f5fafaa4d172fad3c63fe2bfa381d95c3c4378acc7deda90ac3c1440a
-  data.tar.gz: b8b755a5d5e9d86627d56254038b57cbd7fa9656bf2d277f99e3792ef76b76046b73880efc7c25173d621e0d6cc5039630b860c12306baccf1a11b17e7dd6a84
+  metadata.gz: 8113fb3674db10343c7c46a731af5c5fa274d3ea18a85461602f4629467306dff91026bca86d41768912a4910622d3821c32f25631d3d6d674615bc9047e4bed
+  data.tar.gz: 71c26d2b131adca579a1c21e8582a96b003f62c43af794a337e7906f75b51745ab8a27760352e947ad3c5326596239c769b9a56187c4e092e7e696bec232a1b3

data/.github/workflows/macos.yml

@@ -26,6 +26,8 @@ jobs:
       - name: Update gems
         run: |
           sudo gem install bundler --force
+          ruby -v | grep 2.5 && bundle config set build.debase --with-cflags="-Wno-error=implicit-function-declaration"
+          ruby -v | grep 2.5 && bundle config set build.ruby-debug-ide --with-cflags="-Wno-error=implicit-function-declaration"
           bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |

data/grammars/gbstandard.rng

@@ -183,6 +183,13 @@
   <!-- identical structure to iso-standard -->
   <define name="gb-standard">
     <element name="gb-standard">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/grammars/isodoc.rng

@@ -24,6 +24,14 @@
     <start>
       <ref name="standard-document"/>
     </start>
+    <define name="doctype">
+      <element name="doctype">
+        <optional>
+          <attribute name="abbreviation"/>
+        </optional>
+        <ref name="DocumentType"/>
+      </element>
+    </define>
     <define name="hyperlink">
       <element name="link">
         <attribute name="target">
@@ -42,7 +50,6 @@
     </define>
     <define name="xref">
       <element name="xref">
-        <!-- attribute target { xsd:IDREF }, -->
         <attribute name="target">
           <data type="string">
             <param name="pattern">\i\c*|\c+#\c+</param>
@@ -142,6 +149,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="key">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -864,6 +876,13 @@
   </define>
   <define name="standard-document">
     <element name="standard-document">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <optional>
         <ref name="boilerplate"/>
@@ -1158,49 +1177,7 @@
   </define>
   <define name="annex">
     <element name="annex">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
-      <optional>
-        <attribute name="inline-header">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <attribute name="obligation">
-        <choice>
-          <value>normative</value>
-          <value>informative</value>
-        </choice>
-      </attribute>
-      <optional>
-        <ref name="section-title"/>
-      </optional>
-      <group>
-        <group>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
-        <zeroOrMore>
-          <choice>
-            <ref name="annex-subsection"/>
-            <ref name="terms"/>
-            <ref name="definitions"/>
-            <ref name="references"/>
-          </choice>
-        </zeroOrMore>
-      </group>
+      <ref name="Annex-Section"/>
     </element>
   </define>
   <define name="terms">

data/grammars/isostandard.rng

@@ -405,6 +405,13 @@
   -->
   <define name="iso-standard">
     <element name="iso-standard">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/lib/relaton_gb/gb_bibliographic_item.rb

@@ -31,27 +31,25 @@ module RelatonGb
 
     def initialize(**args)
       super
-      args[:committee] && @committee = GbTechnicalCommittee.new(args[:committee])
+      @committee = GbTechnicalCommittee.new args[:committee] if args[:committee]
       @ccs = args[:ccs].map { |c| c.is_a?(Cnccs::Ccs) ? c : Cnccs.fetch(c) }
       @gbtype = GbStandardType.new args[:gbtype]
-      @gbplannumber = args[:gbplannumber] || structuredidentifier&.project_number
-      # @doctype = args[:doctype]
+      @gbplannumber = args[:gbplannumber] ||
+        structuredidentifier&.project_number
     end
 
-    # @param builder [Nokogiri::XML::Builder]
-    # @return [String]
-    def to_xml(builder = nil, **opts)
-      if builder
-        super(builder, **opts) { |xml| render_gbxml(xml) }
-      else
-        Nokogiri::XML::Builder.new(encoding: "UTF-8") do |bldr|
-          super(bldr, **opts) { |xml| render_gbxml(xml) }
-        end.doc.root.to_xml
-      end
+    # @param opts [Hash]
+    # @option opts [Nokogiri::XML::Builder] :builder XML builder
+    # @option opts [Boolean] :bibdata
+    # @option opts [Symbol, NilClass] :date_format (:short), :full
+    # @option opts [String, Symbol] :lang language
+    # @return [String] XML
+    def to_xml(**opts)
+      super(**opts) { |xml| render_gbxml(xml) }
     end
 
     # @return [Hash]
-    def to_hash
+    def to_hash # rubocop:disable Metrics/AbcSize
       hash = super
       hash["ccs"] = single_element_array(ccs) if ccs&.any?
       hash["committee"] = committee.to_hash if committee

data/lib/relaton_gb/gb_bibliography.rb

@@ -63,17 +63,20 @@ module RelatonGb
 
       def fetch_ref_err(code, year, missed_years)
         id = year ? "#{code}:#{year}" : code
-        warn "[relaton-gb] WARNING: no match found on the GB website for #{id}. "\
-          "The code must be exactly like it is on the website."
-        warn "[relaton-gb] (There was no match for #{year}, though there were matches "\
-          "found for #{missed_years.join(', ')}.)" unless missed_years.empty?
-        if /\d-\d/ =~ code
-          warn "[relaton-gb] The provided document part may not exist, or the document "\
-            "may no longer be published in parts."
+        warn "[relaton-gb] WARNING: no match found on the GB website "\
+          "for #{id}. The code must be exactly like it is on the website."
+        unless missed_years.empty?
+          warn "[relaton-gb] (There was no match for #{year}, though there "\
+            "were matches found for #{missed_years.join(', ')}.)"
+        end
+        if /\d-\d/.match? code
+          warn "[relaton-gb] The provided document part may not exist, or the "\
+            "document may no longer be published in parts."
         else
-          warn "[relaton-gb] If you wanted to cite all document parts for the reference, "\
-            "use \"#{code} (all parts)\".\nIf the document is not a standard, "\
-            "use its document type abbreviation (TS, TR, PAS, Guide)."
+          warn "[relaton-gb] If you wanted to cite all document parts for the "\
+            "reference, use \"#{code} (all parts)\".\nIf the document is not "\
+            "a standard, use its document type abbreviation (TS, TR, PAS, "\
+            "Guide)."
         end
         nil
       end
@@ -103,20 +106,22 @@ module RelatonGb
 
       # Sort through the results from Isobib, fetching them three at a time,
       # and return the first result that matches the code,
-      # matches the year (if provided), and which # has a title (amendments do not).
+      # matches the year (if provided), and which # has a title (amendments do
+      # not).
       # Only expects the first page of results to be populated.
       # Does not match corrigenda etc (e.g. ISO 3166-1:2006/Cor 1:2007)
-      # If no match, returns any years which caused mismatch, for error reporting
-      def results_filter(result, year)
+      # If no match, returns any years which caused mismatch, for error
+      # reporting
+      def results_filter(result, year) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength
         missed_years = []
         result.each_slice(3) do |s| # ISO website only allows 3 connections
-          fetch_pages(s, 3).each_with_index do |r, i|
+          fetch_pages(s, 3).each do |r|
             return { ret: r } if !year
 
             r.date.select { |d| d.type == "published" }.each do |d|
-              return { ret: r } if year.to_i == d.on.year
+              return { ret: r } if year.to_i == d.on(:year)
 
-              missed_years << d.on.year
+              missed_years << d.on(:year)
             end
           end
         end

data/lib/relaton_gb/version.rb

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

data/relaton_gb.gemspec

@@ -37,5 +37,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.4.0"
+  spec.add_dependency "relaton-iso-bib", ">= 1.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-gb
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2020-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.7.0
 description: 'RelatonGb: retrieve Chinese GB Standards for bibliographic use using
   the BibliographicItem model.'
 email: