relaton-doi 2.0.0.pre.alpha.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f7e17ade3de5350425a977bc98d1138372e8bc488b1d2167f01faf9005ef25a
-  data.tar.gz: 6073344cefc01c1d6c4927e6e8d1244479e78412fe2a6161aadf5eedb150f7a6
+  metadata.gz: b256f738a69cec57a4e6debe0f9cf68c868aaf0cc7cd5cfe95c134e8503dd1ba
+  data.tar.gz: 2f6f8ef49e0fce868e1e359594a98b1d52b892ab505dd9c241aeb032623f5925
 SHA512:
-  metadata.gz: 828e003d8e8aee68503d099d3935cebc5c8d5efcd7fb6662734dec73e95f6b4c21011dbee3822130169c914bcdefa6a4be167d8b9d00b15fe75c21ead14530c7
-  data.tar.gz: 5c36820805071f3b77af5158ed542aaab498ba03724df8f912e6cc75ec4f8a7d9406124cc2fd26dacf03dfb5fc0d9c2f9f1fb27c7e685863a49965d64fb92496
+  metadata.gz: d481613fa9518026a02b18dd8ffce3d21dbf70930a227c4b9bc208ba36c2ea2859cb80a417e30f10c0f50a30fc3e7ec4acd49c1db60c9a0605d561ee3081452f
+  data.tar.gz: dd3c1567ffed897a5c9051a6a00f7f974ac405dcebc32beefdc3a48a5d057226c8d7dd536c0b7c858269a5c6dd66e1cc19447cd0a7391ea9fa2233deade2d05a

data/.github/workflows/rake.yml

@@ -7,6 +7,7 @@ on:
     branches: [ master, main ]
     tags: [ v* ]
   pull_request:
+  workflow_dispatch:
 
 jobs:
   rake:

data/lib/relaton/doi/crossref.rb

@@ -1,13 +1,11 @@
-require "faraday"
+require "mechanize"
 
 module Relaton
   module Doi
     module Crossref
       extend self
 
-      HEADER = {
-        "User-Agent" => "Relaton::Doi (https://www.relaton.org/guides/doi/; mailto:open.source@ribose.com)"
-      }.freeze
+      USER_AGENT = "Relaton::Doi (https://www.relaton.org/guides/doi/; mailto:open.source@ribose.com)"
 
       #
       # Get a document by DOI from the CrossRef API.
@@ -39,24 +37,34 @@ module Relaton
       # @return [Hash] The document.
       #
       def get_by_id(id) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-        # resp = Serrano.works ids: id
         n = 0
         url = "https://api.crossref.org/works/#{CGI.escape(id)}"
         loop do
-          resp = Faraday.get url, nil, HEADER
-          case resp.status
-          when 200
-            work = JSON.parse resp.body
-            return work["message"] if work["status"] == "ok"
-          when 404 then return nil
-          end
+          resp = agent.get url
+          work = JSON.parse resp.body
+          return work["message"] if work["status"] == "ok"
 
           if n > 1
             raise Relaton::RequestError, "Crossref error: #{resp.body}"
           end
 
           n += 1
-          sleep resp.headers["x-rate-limit-interval"].to_i * n
+          sleep resp.response["x-rate-limit-interval"].to_i * n
+        rescue Mechanize::ResponseCodeError => e
+          return nil if e.response_code == "404"
+
+          if n > 1
+            raise Relaton::RequestError, "Crossref error: #{e.page.body}"
+          end
+
+          n += 1
+          sleep e.page.response["x-rate-limit-interval"].to_i * n
+        end
+      end
+
+      def agent
+        @agent ||= Mechanize.new do |a|
+          a.user_agent = USER_AGENT
         end
       end
     end

data/lib/relaton/doi/parser.rb

@@ -304,7 +304,7 @@ module Relaton
         return [] unless @src["abstract"]
 
         content = @src["abstract"]
-        abstract = Bib::LocalizedMarkedUpString.new(
+        abstract = Bib::Abstract.new(
           content: content, language: "en", script: "Latn",
         )
         [abstract]
@@ -805,16 +805,13 @@ module Relaton
         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 Relaton::RequestError, "Crossref request failed: #{resp.status} #{resp.body}"
-          end
-        rescue Faraday::Error => e
+          resp = Crossref.agent.get url
+          JSON.parse(resp.body).dig("message", "items")
+        rescue Mechanize::ResponseCodeError => e
+          return nil if e.response_code.start_with?("4")
+
+          raise Relaton::RequestError, "Crossref request failed: #{e.response_code} #{e.page.body}"
+        rescue Net::HTTP::Persistent::Error, Net::HTTPError, Errno::ECONNREFUSED => e
           retries += 1
           retry if retries <= MAX_RETRIES
           raise Relaton::RequestError, "Crossref network error after #{MAX_RETRIES} retries: #{e.message}"

data/lib/relaton/doi/version.rb

@@ -2,6 +2,6 @@
 
 module Relaton
   module Doi
-    VERSION = "2.0.0-alpha.1"
+    VERSION = "2.0.0"
   end
 end

data/relaton-doi.gemspec

@@ -34,13 +34,12 @@ 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", "~> 2.0.0-alpha.4"
-  spec.add_dependency "relaton-bipm", "~> 2.0.0-alpha.1"
-  spec.add_dependency "relaton-ieee", "~> 2.0.0-alpha.1"
-  spec.add_dependency "relaton-ietf", "~> 2.0.0-alpha.2"
-  spec.add_dependency "relaton-nist", "~> 2.0.0-alpha.2"
+  spec.add_dependency "relaton-bipm", "~> 2.0.0"
+  spec.add_dependency "relaton-ieee", "~> 2.0.0"
+  spec.add_dependency "relaton-ietf", "~> 2.0.0"
+  spec.add_dependency "relaton-nist", "~> 2.0.0"
   # spec.add_dependency "relaton-w3c", "~> 1.10.0"
-  spec.add_dependency "faraday", "~> 2.7"
+  spec.add_dependency "mechanize", "~> 2.0"
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton-doi
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Ribose Inc.
@@ -9,90 +9,76 @@ bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: relaton-bib
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.4
 - !ruby/object:Gem::Dependency
   name: relaton-bipm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.1
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.1
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: relaton-ieee
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.1
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.1
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: relaton-ietf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.2
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.2
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: relaton-nist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.2
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.2
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: mechanize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.0'
 description: 'RelatonDOI: retrieve Standards for bibliographic using DOI through Crossrefand
   provide Relaton object.'
 email: