relaton-doi 1.19.0 → 1.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e538770eb9a82088798f558cda642323ee84380d9ecd56e5ce37efc02f7202f
-  data.tar.gz: ec5587181416122694e351a5183112be91d342fd59c2c00eb50075cece268efb
+  metadata.gz: 5c4c9621e29ce8c9e21c5a87dc09a40ee02dbbda06339c629eb89dafc4ad198b
+  data.tar.gz: 220d1d32f0cf84917922683c5f6e6eeea6731d2d01e668e2336116d82c4f62ea
 SHA512:
-  metadata.gz: bc7c3a8df13e5ebabd5a05104365a9c0aeb06d1cd5e811ef45947faddfe4eb68212d534bd90ee263cf2adb4acc947fa2545328984f0504cbdc56cfd4b9e4a5d6
-  data.tar.gz: 82eb7f142beb2fed9e58fb04e3137a7be43cd62e5ec5afb3b3f02590187a1742d52fbb5369b244817b51bdc5f69120029c1bd87a7c23b24b40f26b57fa211a5c
+  metadata.gz: 625c124cd3d8711cd8fdb1e9eeb546ef76686a5b5abd4988545590e201127b24e162f5c1e5279c204ada49abd8cf865da013ecab18032d061810a9c8ff093bf4
+  data.tar.gz: 8e3e98bdd1d71630252a59e4ce033ea3f8f3572ec01d312a3cfb772a79c101dd44410b1182d8055399ce8442895bf22c152c78ee5ba68765dfcd9a397fcf254e

data/.gitignore

@@ -10,6 +10,6 @@
 
 # rspec failure tracking
 .rspec_status
-.rubocop-https---raw-githubusercontent-com-riboseinc-oss-guides-master-ci-rubocop-yml
 Gemfile.lock
 .vscode/
+.rubocop-remote-87c7cdd254a8d09d005ee06efac7acc0.yml

data/lib/relaton_doi/parser.rb

@@ -72,6 +72,9 @@ module RelatonDoi
     ATTRS = %i[type fetched title docid date link abstract contributor place
                doctype relation extent series medium].freeze
 
+    CROSSREF_API_URL = "https://api.crossref.org/works?query=%{query}&filter=%{filter}".freeze
+    MAX_RETRIES = 3
+
     #
     # Initialize instance.
     #
@@ -384,13 +387,12 @@ module RelatonDoi
     #
     # @return [Hash, nil] parent item
     #
-    def parent_item # rubocop:disable Metrics/AbcSize
+    def parent_item
       @parent_item ||= begin
-        query = [@src["container-title"][0], fetch_year].compact.join "+"
+        query = CGI.escape [@src["container-title"][0], fetch_year].compact.join("+")
         filter = "type:#{%w[book book-set edited-book monograph reference-book].join ',type:'}"
-        resp = Faraday.get "https://api.crossref.org/works?query=#{query}&filter=#{filter}"
-        json = JSON.parse resp.body
-        json["message"]["items"].detect { |i| i["title"].include? @src["container-title"][0] }
+        items = fetch_crossref(query: query, filter: filter)
+        items&.detect { |i| i["title"].include? @src["container-title"][0] }
       end
     end
 
@@ -644,14 +646,13 @@ module RelatonDoi
     #
     # @return [String, nil] The location.
     #
-    def fetch_location # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    def fetch_location
       title = @item[:title].first&.title&.content
       qparts = [title, fetch_year, @src["publisher"]]
       query = CGI.escape qparts.compact.join("+").gsub(" ", "+")
       filter = "type:#{%w[book-chapter book-part book-section book-track].join(',type:')}"
-      resp = Faraday.get "https://api.crossref.org/works?query=#{query}&filter=#{filter}"
-      json = JSON.parse resp.body
-      json["message"]["items"].detect do |i|
+      items = fetch_crossref(query: query, filter: filter)
+      items&.detect do |i|
         i["publisher-location"] && i["container-title"].include?(title)
       end&.dig("publisher-location")
     end
@@ -732,7 +733,7 @@ module RelatonDoi
         from, to = @src["page"].split("-")
         extent << RelatonBib::Locality.new("page", from, to)
       end
-      extent.any? ? [RelatonBib::LocalityStack.new(extent)] : []
+      extent.any? ? [RelatonBib::Extent.new(extent)] : []
     end
 
     #
@@ -769,5 +770,37 @@ module RelatonDoi
 
       RelatonBib::Medium.new genre: genre
     end
+
+    #
+    # Fetch data from Crossref API with retry logic.
+    #
+    # @param [String] query The query string.
+    # @param [String] filter The filter string.
+    #
+    # @return [Array<Hash>, nil] Items array from response or nil for 4xx responses.
+    #
+    # @raise [RelatonBib::RequestError] If request fails after retries.
+    #
+    def fetch_crossref(query:, filter:) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
+      url = format(CROSSREF_API_URL, query: query, filter: filter)
+      retries = 0
+      begin
+        resp = Faraday.get url
+        case resp.status
+        when 200..299
+          JSON.parse(resp.body).dig("message", "items")
+        when 400..499
+          nil
+        else
+          raise RelatonBib::RequestError, "Crossref request failed: #{resp.status} #{resp.body}"
+        end
+      rescue Faraday::Error => e
+        retries += 1
+        retry if retries <= MAX_RETRIES
+        raise RelatonBib::RequestError, "Crossref network error after #{MAX_RETRIES} retries: #{e.message}"
+      rescue JSON::ParserError => e
+        raise RelatonBib::RequestError, "Crossref JSON parsing error: #{e.message}"
+      end
+    end
   end
 end

data/lib/relaton_doi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonDoi
-  VERSION = "1.19.0"
+  VERSION = "1.20.1"
 end

data/relaton-doi.gemspec

@@ -34,11 +34,11 @@ Gem::Specification.new do |spec|
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"
 
-  spec.add_dependency "relaton-bib", "~> 1.19.0"
-  spec.add_dependency "relaton-bipm", "~> 1.19.0"
-  spec.add_dependency "relaton-ieee", "~> 1.19.0"
-  spec.add_dependency "relaton-ietf", "~> 1.19.0"
-  spec.add_dependency "relaton-nist", "~> 1.19.0"
+  spec.add_dependency "relaton-bib", "~> 1.20.0"
+  spec.add_dependency "relaton-bipm", "~> 1.20.0"
+  spec.add_dependency "relaton-ieee", "~> 1.20.0"
+  spec.add_dependency "relaton-ietf", "~> 1.20.0"
+  spec.add_dependency "relaton-nist", "~> 1.20.0"
   # spec.add_dependency "relaton-w3c", "~> 1.10.0"
   spec.add_dependency "faraday", "~> 2.7"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-doi
 version: !ruby/object:Gem::Version
-  version: 1.19.0
+  version: 1.20.1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-04 00:00:00.000000000 Z
+date: 2026-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: relaton-bib
@@ -16,70 +16,70 @@ 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-bipm
   requirement: !ruby/object:Gem::Requirement
     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-ieee
   requirement: !ruby/object:Gem::Requirement
     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-ietf
   requirement: !ruby/object:Gem::Requirement
     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-nist
   requirement: !ruby/object:Gem::Requirement
     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: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +126,7 @@ licenses:
 - BSD-2-Clause
 metadata:
   homepage_uri: https://github.com/relaton/relaton-doi
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -141,8 +141,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: 'RelatonDOI: retrieve Standards for bibliographic using DOI through Crossrefand
   provide Relaton object.'