relaton-oasis 1.18.0 → 1.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7af584f19a16f6f912b1242faab1684145903c6692e296dcfb22a8d447ec4111
-  data.tar.gz: 9cbcfa115749c4b3437d8779b1e629d9091626c63bb0acee052e477eb90bc8bb
+  metadata.gz: dac6ccdcd3852748aecbcc84c9ed6e5228fe321ab6659de9d7bf2233f9850c5a
+  data.tar.gz: 285d6b583d9ba375a41be2c82dc1c025353cb39e160c76652eef266170fbbf69
 SHA512:
-  metadata.gz: 1e16bd7e46e2b93ae7302d8a05e440dd16aa546eca389424f14f316bea536ac4ce99fdb73bac4d3ddf0ec1041f84cedd0e17eec26216157d4b0619dfee6ee86f
-  data.tar.gz: e7d0d75e90aea7b43ad3c16f02ac2656cdcca891ad935629ed1a3c68b88fc3b3a864426c744185c15ab9999ae55397d13af1b363485a4fd587aa98b04cf9a0ee
+  metadata.gz: a9ff1cebaef0e7b8ea8e995aa47b9686042ff3e7ceb764dd6abbb4b60f3f16eee529514bd3a029d818ed55c1e1d05f214c578a4430592dc2f8231d356a94db66
+  data.tar.gz: d814e66a65fb439b70ba32ce02942d26c20ea83c741f0ebb14b9299eb38ada6ae90367db992554c168f7f4d04f556501ca9e6eaedf8d2e043473faad1a7dae4a

data/grammars/basicdoc.rng

@@ -244,6 +244,9 @@
         <data type="ID"/>
       </attribute>
       <attribute name="reviewer"/>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="date">
           <data type="dateTime"/>

data/lib/relaton_oasis/data_parser.rb

@@ -165,14 +165,17 @@ module RelatonOasis
 
     #
     # Parse document number.
+    # If the docuemnt has no parts, the document number is constructed from the title.
+    # If the document had one part, the document number is constructed from the part.
+    # If the document has parts, the document number is constructed from the parts.
     #
     # @return [String] document number
     #
     def parse_docnumber
       parts = document_part_refs
       case parts.size
-      when 0 then title_to_docid @node.at("./summary/div/h2").text
-      when 1 then parse_spec(parts[0])
+      when 0 then parse_spec title_to_docid(@node.at("./summary/div/h2").text)
+      when 1 then parse_part parse_spec(parts[0])
       else parts_to_docid parts
       end
     end
@@ -194,7 +197,7 @@ module RelatonOasis
           end
         end
       end.join("-")
-      parse_spec(id)
+      parse_part parse_spec(id)
     end
 
     #

data/lib/relaton_oasis/data_parser_utils.rb

@@ -34,12 +34,30 @@ module RelatonOasis
       if link_node && link_node[:href].match?(/\.html$/)
         agent = Mechanize.new
         agent.agent.allowed_error_codes = [404]
-        sleep 1 # to avoid 429 error
-        resp = agent.get link_node[:href]
-        @page = resp if resp.code == "200"
+        resp = retry_page(link_node[:href], agent)
+        @page = resp if resp && resp.code == "200"
       end
     end
 
+    #
+    # Retry to get page.
+    #
+    # @param [String] url page URL
+    # @param [Mechanize] agent HTTP client
+    # @param [Integer] retries number of retries
+    #
+    # @return [Mechanize::Page, nil] page or nil
+    #
+    def retry_page(url, agent, retries = 3)
+      sleep 1 # to avoid 429 error
+      agent.get url
+    rescue Errno::ETIMEDOUT, Net::OpenTimeout => e
+      retry if (retries -= 1).positive?
+      Util.error "Failed to get page `#{url}`"
+      Util.error e.message
+      nil
+    end
+
     def parse_chairs
       return [] unless page
 
@@ -96,12 +114,11 @@ module RelatonOasis
     # @return [String] document identifier with specification if needed
     #
     def parse_spec(num)
-      id = case text
-           when /OASIS Project Specification (\d+)/ then "#{num}-PS#{$1}"
-           when /Committee Specification (\d+)/ then "#{num}-CS#{$1}"
-           else num
-           end
-      parse_part(id)
+      case text
+      when /OASIS Project Specification (\d+)/ then "#{num}-PS#{$1}"
+      when /Committee Specification (\d+)/ then "#{num}-CS#{$1}"
+      else num
+      end
     end
 
     #
@@ -169,9 +186,9 @@ module RelatonOasis
     # @return [Array<String>] technology areas
     #
     def parse_technology_area(node)
-      node.xpath(
-        "./summary/div/div/ul[@class='technology-areas__list']/li/a",
-      ).map { |ta| ta.text.strip.gsub(/\s/, "-") }
+      node.xpath("./summary/div/div/ul[@class='technology-areas__list']/li/a").map do |ta|
+        ta.text.strip.gsub(/\s/, "-").sub("development", "Development")
+      end
     end
   end
 end

data/lib/relaton_oasis/data_part_parser.rb

@@ -13,9 +13,15 @@ module RelatonOasis
     end
 
     def text
-      @text ||= @node.xpath(
-        "./strong/following-sibling::text()|./span/strong/../following-sibling::text()",
-      ).text.strip
+      return @text if @text
+
+      if @node.at("./strong/following-sibling::text()|./span[strong]/following-sibling::text()")
+        @text = @node.xpath(
+          "./strong/following-sibling::node()|./span[strong]/following-sibling::node()",
+        ).text.strip
+      else
+        @text = @node.xpath("./following-sibling::p[1][em]").text.strip
+      end
     end
 
     def title
@@ -72,7 +78,7 @@ module RelatonOasis
       id = parse_errata(num)
       # some part references need to be added by "Pt" to be distinguishable from root doc
       id += "-Pt" if %w[CMIS-v1.1 DocBook-5.0 XACML-V3.0 mqtt-v3.1.1 OData-JSON-Format-v4.0].include?(id)
-      parse_spec id
+      parse_part parse_spec id
     end
 
     #
@@ -81,8 +87,7 @@ module RelatonOasis
     # @return [Array<RelatonBib::TypedTitleString>] link
     #
     def parse_link
-      l = @node.at("./a")
-      [RelatonBib::TypedUri.new(type: "src", content: l[:href])]
+      [RelatonBib::TypedUri.new(type: "src", content: link_node[:href])]
     end
 
     #
@@ -139,7 +144,7 @@ module RelatonOasis
     end
 
     def link_node
-      @link_node = @node.at("./a")
+      @link_node = @node.at("./a|./following-sibling::p[1]/a")
     end
 
     #

data/lib/relaton_oasis/version.rb

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

data/relaton_oasis.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "mechanize", "~> 2.8.0"
+  spec.add_dependency "mechanize", "~> 2.10"
   spec.add_dependency "multi_json", "~> 1.15.0"
   spec.add_dependency "relaton-bib", "~> 1.18.0"
   spec.add_dependency "relaton-index", "~> 0.2.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-oasis
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.18.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-08 00:00:00.000000000 Z
+date: 2024-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '2.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +128,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: 'RelatonOasis: retrieve OASIS Standards for bibliographic use using the BibliographicItem