relaton-cie 1.19.1 → 1.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 627b1bcb3a18832150a60b686359abb325bdaa25301642e70dcfbc42d002f18e
-  data.tar.gz: 3bdf913d421a7e46a36104b2a11a3ae64a4fd0c1f64ca683c9530eced7562a05
+  metadata.gz: dd5511102fe58e22ea8bc53bab129f8ae6fc00b9fb5fd7647d4ff20e12f1a912
+  data.tar.gz: f7e2cb38965575cfe36976076cf08014d6d695a36452daef02634cef6dfaace1
 SHA512:
-  metadata.gz: 50b3583178756e980ef3cf7e22deff8a960d6d5a962d1c50ecad44cff4a051b4786e37d5dc9cccc891809cf7ca7115cc29d5783808db43b8af7ad2a184512378
-  data.tar.gz: aa3b3187b62363dda6e32c5aa174f63fa0a337b3384d5e84307d5dbaffa5799fa274de0cc461987271207af7e457391ba32a0310d92d4156afc0167ff79f6b5b
+  metadata.gz: f3f17b076c36358e79ad828500f727ff102938461826fd54b844a09db211befe4c40a6b9321269b6e9f0a553abd0fadaeb77342f8f5e418e811d7eff31917a9c
+  data.tar.gz: dede39458440d919b9babdfb95909503e2ddfcbeb5902c37e78617002793b869f41ab41b21971dac07c95f445a33a0b0866cabcae229a3f86d943336ddcbf7fe

data/lib/relaton_cie/data_fetcher.rb

@@ -17,7 +17,18 @@ module RelatonCie
     end
 
     def agent
-      @agent ||= Mechanize.new
+      return @agent if @agent
+
+      @agent = Mechanize.new
+      @agent.request_headers = {
+        "Accept" => "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8",
+        "Accept-Language" => "en-US,en;q=0.5",
+        "Connection" => "keep-alive",
+        "sec-ch-ua" => '"Chromium";v="91", "Google Chrome";v="91", ";Not A Brand";v="99"',
+        "Sec-Fetch-Dest" => "document"
+      }
+      @agent.user_agent_alias = "Linux Firefox"
+      @agent
     end
 
     def index
@@ -139,17 +150,18 @@ module RelatonCie
         (?:,?\s(?<sname2>[\w-]{2,})(?=,\s+\w\.))?
         (?:,?\s(?<fname>[\w-]{2,})(?!,\s+\w\.))?
         (?:(?:\s?,\s?|\s)(?<init>(?:\w(?:\s?\.|\s|,|$)[\s-]?)+))?
-        (?:(?:,\s*|\s+|\.|(?<=\s))(?:and\s)?)?/x =~ authors
+        (?:(?:[,;]\s*|\s+|\.|(?<=\s))(?:and\s)?)?/x =~ authors
         raise StandardError, "Author name not found in \"#{authors}\"" unless $LAST_MATCH_INFO
 
         authors.sub! $LAST_MATCH_INFO.to_s, ""
         sname = [sname1, sname2].compact.join " "
         surname = RelatonBib::LocalizedString.new sname, "en", "Latn"
-        initial = (init&.strip || "").split(/(?:,|\.)(?:-|\s)?/).map do |int|
-          RelatonBib::LocalizedString.new(int.strip, "en", "Latn")
+        forename = []
+        forename << RelatonBib::Forename.new(content: fname, language: "en", script: "Latn") if fname
+        (init&.strip || "").split(/(?:,|\.)(?:-|\s)?/).each do |int|
+          forename << RelatonBib::Forename.new(content: "", initial: int.strip, language: "en", script: "Latn")
         end
-        forename = fname ? [RelatonBib::LocalizedString.new(fname, "en", "Latn")] : []
-        fullname = RelatonBib::FullName.new surname: surname, forename: forename, initial: initial
+        fullname = RelatonBib::FullName.new surname: surname, forename: forename
         person = RelatonBib::Person.new name: fullname
         contribs << { entity: person, role: [{ type: "author" }] }
       end
@@ -189,7 +201,7 @@ module RelatonCie
 
     # @param hit [Nokogiri::HTML::Element]
     def parse_page(hit) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-      url = "https://www.techstreet.com#{hit.at('h3/a')[:href]}"
+      url = hit.at('h3/a')[:href]
       doc = time_req { agent.get url }
       item = BibliographicItem.new(
         type: "standard", link: fetch_link(url), docnumber: fetch_docnumber(hit),
@@ -220,8 +232,8 @@ module RelatonCie
     def time_req
       t1 = Time.now
       result = yield
-      t = 1 - (Time.now - t1)
-      sleep t if t.positive?
+      t = [4 - (Time.now - t1), 2].max
+      sleep t
       result
     end
 

data/lib/relaton_cie/scrapper.rb

@@ -11,22 +11,30 @@ module RelatonCie
         row = index.search(code).min_by { |r| r[:id] }
         return unless row
 
-        parse_page "#{ENDPOINT}#{row[:file]}"
-      rescue OpenURI::HTTPError => e
-        return if e.io.status.first == "404"
+        parse_page "#{ENDPOINT}#{row[:file]}", code
+      # rescue OpenURI::HTTPError => e
+      #   return if e.io.status.first == "404"
 
-        raise RelatonBib::RequestError, "No document found for #{code} reference. #{e.message}"
+      #   raise RelatonBib::RequestError, "No document found for #{code} reference. #{e.message}"
       end
 
       private
 
       # @param url [String]
       # @retrurn [RelatoCie::BibliographicItem]
-      def parse_page(url)
-        doc = OpenURI.open_uri url
-        bib_hash = RelatonBib::HashConverter.hash_to_bib YAML.safe_load(doc)
+      def parse_page(url, code)
+        resp = Mechanize.new.get url
+        bib_hash = RelatonBib::HashConverter.hash_to_bib YAML.safe_load(resp.body)
         bib_hash[:fetched] = Date.today.to_s
         RelatonCie::BibliographicItem.new(**bib_hash)
+      rescue Mechanize::ResponseCodeError => e
+        return if e.response_code == "404"
+
+        raise RelatonBib::RequestError, "No document found for #{code} reference. #{e.message}"
+      rescue Mechanize::RedirectLimitReachedError, Timeout::Error,
+          Mechanize::UnauthorizedError, Mechanize::UnsupportedSchemeError,
+          Mechanize::ResponseReadError, Mechanize::ChunkedTerminationError => e
+        raise RelatonBib::RequestError, "No document found for #{code} reference. #{e.message}"
       end
     end
   end

data/lib/relaton_cie/version.rb

@@ -1,3 +1,3 @@
 module RelatonCie
-  VERSION = "1.19.1".freeze
+  VERSION = "1.20.1".freeze
 end

data/relaton_cie.gemspec

@@ -31,6 +31,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "mechanize", "~> 2.10"
   spec.add_dependency "parslet", "~> 2.0.0"
-  spec.add_dependency "relaton-bib", "~> 1.19.0"
+  spec.add_dependency "relaton-bib", "~> 1.20.0"
   spec.add_dependency "relaton-index", "~> 0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-cie
 version: !ruby/object:Gem::Version
-  version: 1.19.1
+  version: 1.20.1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-31 00:00:00.000000000 Z
+date: 2026-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.20.0
 - !ruby/object:Gem::Dependency
   name: relaton-index
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ licenses:
 - BSD-2-Clause
 metadata:
   homepage_uri: https://github.com/metanorma/relaton-cie
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -124,8 +124,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: 'RelatonEcma: retrieve CIE Standards for bibliographic use using the BibliographicItem
   model.'