relaton-cen 1.20.0 → 1.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a93d5f1165f0c4d201921354ee23f3380f0bdac391a8d0312badc5ac8284af5
-  data.tar.gz: b7f3ce94a3499f88b8cc1af7777f2cfe1dd0aedac1d6a105a2227de4fe161681
+  metadata.gz: 138f97cf5a761e41c5d9e38173a2930038fefa61950b220c9e5967c01f6cb89d
+  data.tar.gz: 45516da4516514dcaefb3714bbdefcf8bc779249fa675bb8ef51dcfa08088e08
 SHA512:
-  metadata.gz: 0d6d9d0562c691385be169a61c73776c130c5bdf9efafbba6a3c94605bd9e71a6259b06a91792ac4fc2a237f83dcd9625acdfa18c94183f06e33e0e308025f15
-  data.tar.gz: 459d19933617e74c43f8b8d2aa1b7efeeebde2bfaa1737162dc766cd15fe2cebebf70fed9f20f908de1b2264ed65a620113a9eb2ef5d451e0ef8d06f8b888dbf
+  metadata.gz: 0fc4b5e4e9ed4d13103b34e7208c9c15cdbbef82a54274ff7d6ef0b8cbe8a8a97773eb9d477d01f5109784af0d2bbc5bbe54c67f32eb870295f3b544c383e8e0
+  data.tar.gz: 70839a7adfc5ac3723b65f8142d84c6766bebfe84c07c74a30cddbdfb096ec138cb6dd7d8256cce43eb31e27d1e960844ac4917acb256e0bb8bb0bb0ba8f0213

data/lib/relaton_cen/cen_bibliography.rb

@@ -9,7 +9,7 @@ module RelatonCen
       def search(text, year = nil)
         # /^C?EN\s(?<code>.+)/ =~ text
         HitCollection.new text, year
-      rescue Mechanize::ResponseCodeError => e
+      rescue Mechanize::ResponseCodeError, Net::ReadTimeout => e
         raise RelatonBib::RequestError, e.message
       end
 
@@ -110,7 +110,7 @@ module RelatonCen
           Util.info "Found: `#{bib.docidentifier.first&.id}`", key: ref
           bib
         else
-          Util.info "No found.", key: ref
+          Util.info "Not found.", key: ref
           fetch_ref_err(code, year, ret[:years])
         end
       end

data/lib/relaton_cen/hit_collection.rb

@@ -3,7 +3,7 @@
 module RelatonCen
   # Page of hit collection.
   class HitCollection < RelatonBib::HitCollection
-    DOMAIN = "https://standards.cencenelec.eu/dyn/www/"
+    DOMAIN = "https://standards.cencenelec.eu"
 
     # @return [Mechanize]
     attr_reader :agent
@@ -19,28 +19,35 @@ module RelatonCen
         return
       end
 
-      search_page = agent.get "#{DOMAIN}f?p=205:105:0:::::"
-      form = search_page.at "//form[@id='wwvFlowForm']"
-      skip_inputs = %w[f11 essentialCookies]
-      req_body = form.xpath(".//input").filter_map do |f|
-        next if f[:name].empty? || skip_inputs.include?(f[:name])
+      redirect_page = agent.get DOMAIN
+      redirect_url = redirect_page.body.slice(/(?<=follow the <a href=')#{DOMAIN}[^']+/)
+      search_page = agent.get redirect_url
+      form = search_page.form_with(id: "wwvFlowForm")
+      ref_field = form.field_with(id: "STAND_REF")
+      ref_field.value = ref
+      resp = agent.submit form
 
-        val = case f[:value]
-              when "LANGUAGE_LIST" then 0
-              when "STAND_REF" then CGI.escape(ref)
-              else
-                case f[:name]
-                when "p_request" then "S1-S2-S3-S4-S5-S6-S7-CEN-CLC-"
-                when "f10" then ""
-                else f[:value]
-                end
-              end
-        if f[:name] == "f10" then "f10=#{f[:value]}&f11=#{val}"
-        else
-          "#{f[:name]}=#{val}"
-        end
-      end.join("&")
-      resp = agent.post form[:action], req_body
+      # form = search_page.at "//form[@id='wwvFlowForm']"
+      # skip_inputs = %w[f11 essentialCookies]
+      # req_body = form.xpath(".//input").filter_map do |f|
+      #   next if f[:name].empty? || skip_inputs.include?(f[:name])
+
+      #   val = case f[:value]
+      #         when "LANGUAGE_LIST" then 0
+      #         when "STAND_REF" then CGI.escape(ref)
+      #         else
+      #           case f[:name]
+      #           when "p_request" then "S1-S2-S3-S4-S5-S6-S7-CEN-CLC-"
+      #           when "f10" then ""
+      #           else f[:value]
+      #           end
+      #         end
+      #   if f[:name] == "f10" then "f10=#{f[:value]}&f11=#{val}"
+      #   else
+      #     "#{f[:name]}=#{val}"
+      #   end
+      # end.join("&")
+      # resp = agent.post form[:action], req_body
       @array = hits resp
       sort
     end

data/lib/relaton_cen/scrapper.rb

@@ -110,28 +110,33 @@ module RelatonCen
       # Fetch relations.
       # @param doc [Mechanize::Page]
       # @return [Array<Hash>]
-      def fetch_relations(doc) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
+      def fetch_relations(doc)
         doc.xpath(
           "//div[@id='DASHBOARD_LISTRELATIONS']/table/tr[th[.!='Sales Points']]",
         ).each_with_object([]) do |rt, a|
-          t = rt.at("th").text
-          type = case t
-                 when "Supersedes" then "obsoletes"
-                 when /Normative reference/ then "cites"
-                 else t.downcase
-                 end
+          type = relation_type rt.at("th").text.downcase
           rt.xpath("td/a").each do |r|
-            fref = RelatonBib::FormattedRef.new(content: r.text, language: "en",
-                                                script: "Latn")
-            link = fetch_link HitCollection::DOMAIN + r[:href]
-            bibitem = RelatonBib::BibliographicItem.new(
-              formattedref: fref, type: "standard", link: link,
-            )
-            a << { type: type, bibitem: bibitem }
+            a << { type: type, bibitem: create_relation(r) }
           end
         end
       end
 
+      def relation_type(type)
+        case type
+        when "supersedes" then "obsoletes"
+        when "superseded by" then "obsoletedBy"
+        when /bibliographic references/ then "cites"
+        when /normative reference/ then "cites"
+        else type
+        end
+      end
+
+      def create_relation(rel)
+        fref = RelatonBib::FormattedRef.new(content: rel.text, language: "en", script: "Latn")
+        link = fetch_link HitCollection::DOMAIN + rel[:href]
+        BibliographicItem.new(formattedref: fref, type: "standard", link: link)
+      end
+
       # Fetch titles.
       # @param doc [Mechanize::Page]
       # @return [RelatonBib::TypedTitleStringCollection]

data/lib/relaton_cen/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonCen
-  VERSION = "1.20.0"
+  VERSION = "1.20.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-cen
 version: !ruby/object:Gem::Version
-  version: 1.20.0
+  version: 1.20.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-12 00:00:00.000000000 Z
+date: 2026-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.19
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: 'RelatonCen: retrieve Cenelec Standards for bibliographic use using the IsoBibliographicItem