relaton-gb 1.16.2 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77a65c710fb3f90a55360e83741f5fabe4e19cd5e7af7c7f3c9fe9407b0da29e
-  data.tar.gz: 81b88ce4507b1d6b91ea4dcee2179369b9139a1cc6799ec52d179bbc8c15db16
+  metadata.gz: 53cd256c857a13c478b3d76fed719c5aab7a1ab716efafec164013da692d0c6e
+  data.tar.gz: b6d73b1296ac658de87cda32b776f11d69bb28b3b0e665843089c8e719113c80
 SHA512:
-  metadata.gz: 8bf26e37145d5c50a3f55e90d6d330adb9f76b1e9faa9670eda7629174355c793c5b3182e791d42ac346c17275d5d393b776ed31ebf920fca6408e72a6172295
-  data.tar.gz: 7bbdae2269caf3045f7af542700d0366a46733561135c5704c52fef0be2d0e8ca79bc19a59e9bb28396267fa2aa9bd8fbd68ac9522eda80f685bc3fd537168a9
+  metadata.gz: 207fd52a45bcaaa959d951639fb0a16dcdace2be5db19e50c6f56bad479a7c9b3f2755dd125daaac67731907caa2a93da0878b0421b9556da50d32cb762f75c6
+  data.tar.gz: ee2a7ab80c231ad97382670840d78d14768c11a92dc53aa43fcf6b056a3d9e7d8dd3de48d37c31685304725a035f23bd100338fb614a88c96c9befd188c44c16

data/grammars/basicdoc.rng

@@ -346,6 +346,8 @@
           <ref name="keyword"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </oneOrMore>
     </element>
@@ -623,6 +625,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -636,6 +640,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -648,6 +654,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -655,7 +663,11 @@
   <define name="keyword">
     <element name="keyword">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -676,7 +688,11 @@
   <define name="strike">
     <element name="strike">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>

data/grammars/biblio.rng

@@ -942,6 +942,7 @@
       <value>obsoleted</value>
       <value>confirmed</value>
       <value>updated</value>
+      <value>corrected</value>
       <value>issued</value>
       <value>transmitted</value>
       <value>copied</value>

data/lib/relaton_gb/document_type.rb

@@ -0,0 +1,16 @@
+module RelatonGb
+  class DocumentType < RelatonBib::DocumentType
+    DOCTYPES = %w[standard reccomendation].freeze
+
+    def initialize(type:, abbreviation: nil)
+      check_type type
+      super
+    end
+
+    def check_type(type)
+      unless DOCTYPES.include? type
+        Util.warn "WARNING: invalid doctype: `#{type}`"
+      end
+    end
+  end
+end

data/lib/relaton_gb/gb_bibliographic_item.rb

@@ -9,7 +9,7 @@ require "relaton_gb/ccs"
 module RelatonGb
   # GB bibliographic item class.
   class GbBibliographicItem < RelatonIsoBib::IsoBibliographicItem
-    DOCTYPES = %w[standard reccomendation].freeze
+    SUBDOCTYPES = %w[specification method-of-test vocabulary code-of-practice].freeze
 
     # @return [RelatonGb::GbTechnicalCommittee]
     attr_reader :committee
@@ -59,7 +59,7 @@ module RelatonGb
       super(**opts) do |b|
         if opts[:bibdata] && has_ext_attrs?
           ext = b.ext do
-            b.doctype doctype if doctype
+            doctype&.to_xml b
             b.horizontal horizontal unless horizontal.nil?
             # b.docsubtype docsubtype if docsubtype
             committee&.to_xml b

data/lib/relaton_gb/gb_scrapper.rb

@@ -15,8 +15,8 @@ module RelatonGb
       # @param text [Strin] code of standard for serarch
       # @return [RelatonGb::HitCollection]
       def scrape_page(text) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-        host = "http://openstd.samr.gov.cn/bzgk/gb/std_list"
-        search_html = OpenURI.open_uri("#{host}?p.p2=#{text}")
+        host = "https://openstd.samr.gov.cn/bzgk/gb/std_list"
+        search_html = OpenURI.open_uri("#{host}?p.p2=#{text}", ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE)
         result = Nokogiri::HTML search_html
         hits = result.xpath(
           "//table[contains(@class, 'result_list')]/tbody[2]/tr",
@@ -35,7 +35,7 @@ module RelatonGb
       # @return [RelatonGb::GbBibliographicItem]
       def scrape_doc(hit)
         src = "http://openstd.samr.gov.cn/bzgk/gb/newGbInfo?hcno=#{hit.pid}"
-        doc = Nokogiri::HTML OpenURI.open_uri(src)
+        doc = Nokogiri::HTML OpenURI.open_uri(src, ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE)
         GbBibliographicItem.new(**scrapped_data(doc, src, hit))
       rescue OpenURI::HTTPError, SocketError, OpenSSL::SSL::SSLError, Net::OpenTimeout
         raise RelatonBib::RequestError, "Cannot access #{src}"

data/lib/relaton_gb/hash_converter.rb

@@ -1,36 +1,39 @@
-require "yaml"
-
 module RelatonGb
-  class HashConverter < RelatonIsoBib::HashConverter
-    class << self
-      # @override RelatonBib::HashConverter.hash_to_bib
-      # @param args [Hash]
-      # @param nested [TrueClass, FalseClass]
-      # @return [Hash]
-      def hash_to_bib(args)
-        ret = super
-        return if ret.nil?
+  module HashConverter
+    include RelatonIsoBib::HashConverter
+    extend self
 
-        ccs_hash_to_bib(ret)
-        ret
-      end
+    # @override RelatonBib::HashConverter.hash_to_bib
+    # @param args [Hash]
+    # @param nested [TrueClass, FalseClass]
+    # @return [Hash]
+    def hash_to_bib(args)
+      ret = super
+      return if ret.nil?
 
-      private
+      ccs_hash_to_bib(ret)
+      ret
+    end
 
-      #
-      # Ovverides superclass's method
-      #
-      # @param item [Hash]
-      # @retirn [RelatonGb::GbBibliographicItem]
-      def bib_item(item)
-        GbBibliographicItem.new(item)
-      end
+    private
 
-      def ccs_hash_to_bib(ret)
-        ret[:ccs] = RelatonBib.array(ret[:ccs]).map do |ccs|
-          (ccs[:code] && Cnccs.fetch(ccs[:code])) || Cnccs.fetch(ccs)
-        end
+    #
+    # Ovverides superclass's method
+    #
+    # @param item [Hash]
+    # @retirn [RelatonGb::GbBibliographicItem]
+    def bib_item(item)
+      GbBibliographicItem.new(item)
+    end
+
+    def ccs_hash_to_bib(ret)
+      ret[:ccs] = RelatonBib.array(ret[:ccs]).map do |ccs|
+        (ccs[:code] && Cnccs.fetch(ccs[:code])) || Cnccs.fetch(ccs)
       end
     end
+
+    def create_doctype(**args)
+      DocumentType.new(**args)
+    end
   end
 end

data/lib/relaton_gb/scrapper.rb

@@ -92,7 +92,7 @@ module RelatonGb
     end
 
     def get_type
-      "standard"
+      DocumentType.new type: "standard"
     end
 
     # @param doc [Nokogiri::HTML::Document]

data/lib/relaton_gb/version.rb

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

data/lib/relaton_gb.rb

@@ -4,6 +4,7 @@ require "cnccs"
 require "relaton_gb/version"
 require "relaton_gb/config"
 require "relaton_gb/util"
+require "relaton_gb/document_type"
 require "relaton_gb/gb_bibliography"
 
 # if defined? Relaton

data/relaton_gb.gemspec

@@ -26,5 +26,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.16.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.17.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-gb
 version: !ruby/object:Gem::Version
-  version: 1.16.2
+  version: 1.17.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-11 00:00:00.000000000 Z
+date: 2023-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cnccs
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.17.0
 description: 'RelatonGb: retrieve Chinese GB Standards for bibliographic use using
   the BibliographicItem model.'
 email:
@@ -81,6 +81,7 @@ files:
 - lib/relaton_gb.rb
 - lib/relaton_gb/ccs.rb
 - lib/relaton_gb/config.rb
+- lib/relaton_gb/document_type.rb
 - lib/relaton_gb/gb_bibliographic_item.rb
 - lib/relaton_gb/gb_bibliography.rb
 - lib/relaton_gb/gb_scrapper.rb