relaton-gb 1.18.1 → 1.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a44c8b9396c30bc3aa644a45da432d5327bff2954af18af1f22fbe416b694b38
-  data.tar.gz: c9a157c81de458c6d76c8980a1f68cadb222b3c1a1ef1e8e8ae6de4e005cd739
+  metadata.gz: c4e2a76bd47e6b265cce01a1ba065fdc4490735855e9e2bb67a1c96255806a06
+  data.tar.gz: 827223b0f3d44cd5df21894f60161aadb6efb149bda9f01748ed8e93bb437eb9
 SHA512:
-  metadata.gz: 322268f34b944fdccc2b0500fd599a9866e28ee84123b8990d34a032d6321909a509991c75c781dbd91afc50eb9b72e29c3b6c7c0cbf9bbd413ee4e07dbea35f
-  data.tar.gz: ac2e1c9efc5df285e1f11f792e62b45241f615ed579017d1365738cda504143c53925ff3d4baee89389198554d8ce99e9a6a27d5d50f89e3b36b5dbfac2b15a8
+  metadata.gz: 61885e81838c7f922eafc1847d32db3eed5e82a7c6514858c1f05b298a7a1bc7eee2aafe43bddde644684187e5ef65e279000c0df6c25eb75bba8f97ffae95c5
+  data.tar.gz: d04bdc20de49043e9238f357535e2752d7be37dc552f70f7c66272f37af084f6e506bc5d7f13b2abbaeee0928d61652fa63287a669025932c314b38b642b3a6f

data/lib/relaton_gb/gb_scrapper.rb

@@ -10,15 +10,15 @@ module RelatonGb
   # National standard scrapper.
   module GbScrapper
     extend Scrapper
+    SEARCH_URL = "https://openstd.samr.gov.cn/bzgk/gb/std_list"
+    DOC_URL = "http://openstd.samr.gov.cn/bzgk/gb/newGbInfo?hcno="
 
     class << self
       # @param text [Strin] code of standard for serarch
       # @return [RelatonGb::HitCollection]
       def scrape_page(text) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-        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(
+        doc = agent.get("#{SEARCH_URL}?p.p2=#{CGI.escape(text)}")
+        hits = doc.xpath(
           "//table[contains(@class, 'result_list')]/tbody[2]/tr",
         ).map do |h|
           ref = h.at "./td[2]/a"
@@ -27,18 +27,22 @@ module RelatonGb
           Hit.new pid: pid, docref: ref.text, scrapper: self, release_date: rdate
         end
         HitCollection.new hits.sort_by(&:release_date).reverse
-      rescue OpenURI::HTTPError, SocketError, OpenSSL::SSL::SSLError, Net::OpenTimeout
-        raise RelatonBib::RequestError, "Cannot access #{host}"
+      rescue Mechanize::Error => e
+        raise RelatonBib::RequestError, e.message
+      end
+
+      def agent
+        @agent ||= Mechanize.new
       end
 
       # @param hit [RelatonGb::Hit] standard's page id
       # @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, ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE)
+        src = DOC_URL + hit.pid
+        doc = agent.get src
         GbBibliographicItem.new(**scrapped_data(doc, src, hit))
-      rescue OpenURI::HTTPError, SocketError, OpenSSL::SSL::SSLError, Net::OpenTimeout
-        raise RelatonBib::RequestError, "Cannot access #{src}"
+      rescue Mechanize::Error => e
+        raise RelatonBib::RequestError, e.message
       end
 
       # @param doc [Nokogiri::HTML]

data/lib/relaton_gb/scrapper.rb

@@ -99,7 +99,9 @@ module RelatonGb
     # @param status [String, NilClass]
     # @return [RelatonBib::DocumentStatus]
     def get_status(doc, status = nil)
-      status ||= doc.at("//td[contains(., '标准状态')]/span")&.text
+      status ||= doc.at("//td[contains(., '标准状态')]/span")&.text&.strip
+      return unless STAGES[status]
+
       RelatonBib::DocumentStatus.new stage: STAGES[status]
     end
 

data/lib/relaton_gb/version.rb

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

data/lib/relaton_gb.rb

@@ -1,4 +1,5 @@
 require "digest/md5"
+require "mechanize"
 require "relaton_iso_bib"
 require "cnccs"
 require "relaton_gb/version"

data/relaton_gb.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-gb
 version: !ruby/object:Gem::Version
-  version: 1.18.1
+  version: 1.18.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-16 00:00:00.000000000 Z
+date: 2024-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cnccs
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.1
+- !ruby/object:Gem::Dependency
+  name: mechanize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: relaton-iso-bib
   requirement: !ruby/object:Gem::Requirement
@@ -118,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: 'RelatonGb: retrieve Chinese GB Standards for bibliographic use using the