relaton-iso 1.14.3 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 221eb3ce361eb4eea8b9d17164a183441b34af84bcaeaebdba8a9f2080450aeb
-  data.tar.gz: 0c9d6648aabd06054ec6d19830e15eb1e1428412c1ce06369218da81ccb83594
+  metadata.gz: 1966b5eb0acc358cee2af36c4ff33104e2174a85cdaa95a28293f6d949b57758
+  data.tar.gz: 722d7543449cb075e437147d5a13ac7bf24eac473451e67cb18445339c900ae4
 SHA512:
-  metadata.gz: 3965dcadd64ed7677822ffb8387fde7c1505ec8a864da2dbe0bc0b5922bea452aacfec24394daa5c50a3ed74df6e9eee1033d643718d63b9262e701aef65f193
-  data.tar.gz: 66e2bf35de5ea76483fbe9f35ad13d3d9d09aeae480e19d852a06265a7d4537978719f20451ac844d42521b1dc9665d73ca704129d26ca1ed56150306ba5f769
+  metadata.gz: 0e011446f93dddbc0c3395e70ac9789e2377fa0cb90061972b135c62854e8c3998d9f392d2dd40014c375e10fd5fe1ad6e20372554154342dedc6506938aedf9
+  data.tar.gz: '009732dfec3d23d8b1d40b4ff9ec46f46a3b21f0c6e07ef9f0963aaf2cb73fa52e8e0ed99048ebb96b03fa8a44b5c35280740e0ac801bb5c37b22118157d061c'

data/bin/bundle

@@ -41,7 +41,7 @@ m = Module.new do
     gemfile = ENV["BUNDLE_GEMFILE"]
     return gemfile if gemfile && !gemfile.empty?
 
-    File.expand_path("../../Gemfile", __FILE__)
+    File.expand_path("../Gemfile", __dir__)
   end
 
   def lockfile
@@ -60,24 +60,19 @@ m = Module.new do
     Regexp.last_match(1)
   end
 
-  def bundler_version
-    @bundler_version ||=
-      env_var_version || cli_arg_version ||
-        lockfile_version
-  end
-
   def bundler_requirement
-    return "#{Gem::Requirement.default}.a" unless bundler_version
-
-    bundler_gem_version = Gem::Version.new(bundler_version)
-
-    requirement = bundler_gem_version.approximate_recommendation
+    @bundler_requirement ||=
+      env_var_version ||
+      cli_arg_version ||
+      bundler_requirement_for(lockfile_version)
+  end
 
-    return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0")
+  def bundler_requirement_for(version)
+    return "#{Gem::Requirement.default}.a" unless version
 
-    requirement += ".a" if bundler_gem_version.prerelease?
+    bundler_gem_version = Gem::Version.new(version)
 
-    requirement
+    bundler_gem_version.approximate_recommendation
   end
 
   def load_bundler!

data/bin/byebug

@@ -8,14 +8,12 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path("bundle", __dir__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

data/bin/coderay

@@ -8,14 +8,12 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path("bundle", __dir__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

data/bin/htmldiff

@@ -8,14 +8,12 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path("bundle", __dir__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

data/bin/ldiff

@@ -8,14 +8,12 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path("bundle", __dir__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

data/bin/nokogiri

@@ -8,14 +8,12 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path("bundle", __dir__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

data/bin/pry

@@ -8,14 +8,12 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path("bundle", __dir__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

data/bin/racc

@@ -8,14 +8,12 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path("bundle", __dir__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

data/bin/rake

@@ -8,14 +8,12 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path("bundle", __dir__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

data/bin/rspec

@@ -8,14 +8,12 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path("bundle", __dir__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

data/bin/rubocop

@@ -8,14 +8,12 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path("bundle", __dir__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

data/bin/ruby-parse

@@ -8,14 +8,12 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path("bundle", __dir__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

data/bin/ruby-rewrite

@@ -8,14 +8,12 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path("bundle", __dir__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

data/bin/thor

@@ -8,14 +8,12 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path("bundle", __dir__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

data/lib/relaton_iso/hit_collection.rb

@@ -18,7 +18,7 @@ module RelatonIso
     # @return [RelatonIsoBib::IsoBibliographicItem, nil]
     def to_all_parts(lang = nil) # rubocop:disable Metrics/CyclomaticComplexity
       # parts = @array.reject { |h| h.hit["docPart"]&.empty? }
-      hit = @array.min_by { |h| h.pubid.part }
+      hit = @array.min_by { |h| h.pubid.part.to_i }
       return @array.first&.fetch lang unless hit
 
       bibitem = hit.fetch(lang)

data/lib/relaton_iso/iso_bibliography.rb

@@ -59,8 +59,7 @@ module RelatonIso
         # puts "xxxxx #{ret.docidentifier.first.id.inspect}"
         response_docid = ret.docidentifier.first.id.sub(" (all parts)", "")
         response_pubid = Pubid::Iso::Identifier.parse(response_docid)
-
-        puts "xxxxx query_pubid(#{query_pubid}) response_pubid(#{response_pubid})"
+        # puts "xxxxx query_pubid(#{query_pubid}) response_pubid(#{response_pubid})"
 
         if query_pubid.to_s == response_pubid.to_s
           warn "[relaton-iso] (\"#{query_pubid}\") Found exact match."
@@ -161,7 +160,7 @@ module RelatonIso
         else
           warn "[relaton-iso] (\"#{query_pubid}\") TIP: " \
                "If you wish to cite all document parts for the reference, " \
-               "use (\"#{query_pubid.to_s(with_date: false)} (all parts)\")."
+               "use (\"#{query_pubid.to_s(format: :ref_undated)} (all parts)\")."
         end
 
         unless %w(TS TR PAS Guide).include?(query_pubid.type)
@@ -219,7 +218,7 @@ module RelatonIso
         query_pubid_without_year = query_pubid.dup
         # remove year for query
         query_pubid_without_year.year = nil
-        hit_collection = search(query_pubid_without_year.to_s(with_date: false))
+        hit_collection = search(query_pubid_without_year.to_s)
 
         # filter only matching hits
         res = filter_hits hit_collection, query_pubid, all_parts: opts[:all_parts]

data/lib/relaton_iso/scrapper.rb

@@ -57,11 +57,13 @@ module RelatonIso
         # path = "/contents/data/standard#{hit_data['splitPath']}/"\
         # "#{hit_data['csnumber']}.html"
 
-        doc, url = get_page "#{hit.hit[:path].sub '/sites/isoorg', ''}.html"
+        path = hit.hit[:path].sub("/sites/isoorg", "")
+        doc, url = get_page "#{path}.html"
 
         # Fetch edition.
         edition = doc.at("//div[div[.='Edition']]/text()[last()]")
           &.text&.match(/\d+$/)&.to_s
+        hit.pubid.base.edition ||= edition if hit.pubid.base
 
         titles, abstract, langs = fetch_titles_abstract(doc, lang)
 
@@ -97,7 +99,7 @@ module RelatonIso
       # @return [Array<RelatonBib::DocumentIdentifier>]
       #
       def fetch_relaton_docids(doc, pubid)
-        pubid.stage = Pubid::Iso::Stage.new(harmonized_code: stage_code(doc))
+        pubid.stage ||= Pubid::Iso::Stage.new(harmonized_code: stage_code(doc))
         [
           RelatonIso::DocumentIdentifier.new(id: pubid, type: "ISO", primary: true),
           RelatonIso::DocumentIdentifier.new(id: pubid, type: "URN"),
@@ -155,35 +157,57 @@ module RelatonIso
         lgs
       end
 
-      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       # Get page.
       # @param path [String] page's path
       # @return [Array<Nokogiri::HTML::Document, String>]
       def get_page(path)
-        url = DOMAIN + path
-        uri = URI url
-        resp = Net::HTTP.get_response(uri) # .encode("UTF-8")
-        case resp.code
-        when "301"
-          path = resp["location"]
-          url = DOMAIN + path
-          uri = URI url
-          resp = Net::HTTP.get_response(uri) # .encode("UTF-8")
-        when "404", "302"
-          raise RelatonBib::RequestError, "#{url} not found."
-        end
-        n = 0
-        while resp.body !~ /<strong/ && n < 10
-          resp = Net::HTTP.get_response(uri) # .encode("UTF-8")
-          n += 1
-        end
-        [Nokogiri::HTML(resp.body), url]
+        resp, uri = get_redirection path
+        doc = try_if_fail resp, uri
+        [doc, uri.to_s]
       rescue SocketError, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET,
              EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
              Net::ProtocolError, Errno::ETIMEDOUT
-        raise RelatonBib::RequestError, "Could not access #{url}"
+        raise RelatonBib::RequestError, "Could not access #{uri}"
+      end
+
+      #
+      # Get the page from the given path. If the page is redirected, get the
+      # page from the new path.
+      #
+      # @param [String] path path to the page
+      #
+      # @return [Array<Net::HTTPOK, URI>] HTTP response and URI
+      # @raise [RelatonBib::RequestError] if the page is not found
+      #
+      def get_redirection(path)
+        url = DOMAIN + path
+        uri = URI url
+        resp = Net::HTTP.get_response(uri)
+        raise RelatonBib::RequestError, "#{url} not found." if %w[404 302].include? resp.code
+
+        resp.code == "301" ? get_redirection(resp["location"]) : [resp, uri]
+      end
+
+      #
+      # The iso.org site fails to respond sometimes. This method tries to get
+      # the response again.
+      #
+      # @param [Net::HTTPOK] resp HTTP response
+      # @param [URI::HTTPS] uri URI of the page
+      #
+      # @return [Nokogiri::HTML4::Document] document
+      # @raise [RelatonBib::RequestError] if the page could not be parsed
+      #
+      def try_if_fail(resp, uri)
+        10.times do
+          doc = Nokogiri::HTML(resp.body)
+          # stop trying if page has a document id
+          return doc if doc.at("//main/div/section/div/div/div/nav/h1")
+
+          resp = Net::HTTP.get_response(uri)
+        end
+        raise RelatonBib::RequestError, "Could not parse the page #{uri}"
       end
-      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
       #
       # Generate docnumber.
@@ -206,7 +230,7 @@ module RelatonIso
       def fetch_structuredidentifier(pubid) # rubocop:disable Metrics/MethodLength
         RelatonIsoBib::StructuredIdentifier.new(
           project_number: "#{pubid.publisher} #{pubid.number}",
-          part: pubid&.part&.sub(/^-/, ""),
+          part: pubid.part&.to_s, # &.sub(/^-/, ""),
           type: pubid.publisher,
         )
       end
@@ -399,12 +423,16 @@ module RelatonIso
       # Fetch copyright.
       # @param doc [Nokogiri::HTML::Document]
       # @return [Array<Hash>]
-      def fetch_copyright(doc)
+      def fetch_copyright(doc) # rubocop:disable Metrics/MethodLength
         ref = item_ref doc
         owner_name = ref.match(/.*?(?=\s)/).to_s
         from = ref.match(/(?<=:)\d{4}/).to_s
         if from.empty?
-          from = doc.xpath("//span[@itemprop='releaseDate']").text.match(/\d{4}/).to_s
+          date = doc.at(
+            "//span[@itemprop='releaseDate']",
+            "//ul[@id='stages']/li[contains(@class,'active')]/ul/li[@class='active']/a/span[@class='stage-date']",
+          )
+          from = date.text.match(/\d{4}/).to_s
         end
         [{ owner: [{ name: owner_name }], from: from }]
       end

data/lib/relaton_iso/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonIso
-  VERSION = "1.14.3"
+  VERSION = "1.15.0"
 end

data/relaton_iso.gemspec

@@ -39,6 +39,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "algolia"
-  spec.add_dependency "pubid-iso", "~> 0.3.0"
+  spec.add_dependency "pubid-iso", "~> 0.4.0"
   spec.add_dependency "relaton-iso-bib", "~> 1.14.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso
 version: !ruby/object:Gem::Version
-  version: 1.14.3
+  version: 1.15.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-18 00:00:00.000000000 Z
+date: 2023-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: relaton-iso-bib
   requirement: !ruby/object:Gem::Requirement