serrano 1.0.0 → 1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75729f32a4cfabb79a33d78638a91c253fb76a8ec3abc8d9ecc743056464d38d
-  data.tar.gz: 8e47227794125651a8c35450a8f7f5aaa5c377ac461ea2433836d00b76fdb699
+  metadata.gz: 8b5e125bb4a2745b6dbf520ad692df6817c0e2dc7d6db1ed307bdee243e9c501
+  data.tar.gz: 680c37e478abc9c5213ea7a6db288a3afa9e9f71140e796a7fc5cdb88ef27517
 SHA512:
-  metadata.gz: a1be1549ce95a4fa7bac8d417f28f9c2d70e800b48f1f7b8c4471cf8461ca37288dd9a2f06c5c15376364e3af4f8d4e61589ad0b4e0f8cdbbd6c1bf46fc170db
-  data.tar.gz: d21603574250c471ea20c3fe7f433d5ef56715307442d8067814757b522306afdca717bbcd612eda4055c1e1b41fc2a8a3f9d340d45dd57127c9a3950b24f70a
+  metadata.gz: 82e9496fa1a0737ef3f491f199792c9b8e99a7c90d285a340108014e4a877ab8e38f79bde1d9a95f9999cef262e642a099f433a1ec2441537d677c6ec4ab1b58
+  data.tar.gz: 5ab1e3c2900d546894d0798014cd649b6b5d35e07c69b16565158fa7a4492c8dbdc13be81a7414517395be42b409875b309e232e95d80571398e7f0c0e597873

data/.github/dependabot.yml

@@ -0,0 +1,22 @@
+version: 2
+updates:
+  - package-ecosystem: bundler
+    directory: "/"
+    schedule:
+      interval: weekly
+      time: "13:00"
+    open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: codecov
+        versions:
+          - "> 0.1.17, < 0.2"
+      - dependency-name: codecov
+        versions:
+          - "> 0.2.1, < 0.3"
+      - dependency-name: codecov
+        versions:
+          - 0.4.2
+          - 0.4.3
+      - dependency-name: simplecov
+        versions:
+          - 0.20.0

data/.github/workflows/ruby.yml

@@ -2,29 +2,29 @@ name: Ruby
 
 on:
   push:
-    branches: [ master ]
+    branches: [main]
   pull_request:
-    branches: [ master ]
+    branches: [main]
 
 jobs:
   test:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, macos-latest ]
-        ruby: [ 2.5, 2.6, 2.7 ]
-    runs-on: ${{ matrix.os }}
+        ruby: [3.0, 3.1, 3.2, 3.3, 3.4]
+    runs-on: ubuntu-latest
     env:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: bundle install
-    - name: Run tests
-      run: |
-        bundle exec rake install
-        bundle exec rake test TESTOPTS="-v"
+      - uses: actions/checkout@v4
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: |
+          bundle exec rake install
+          bundle exec rake test TESTOPTS="-v"

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.6 (2025-06-17)
+
+* Fixed filter handling so that the same filter can be used multiple times (#176)
+
+## 1.4 (2022-03-26)
+
+* Moved to faraday > v2. There's no user facing changes here, but let me know if any issues arise (#172)
+* PR by @LocoDelAssembly fixes `Serrano.content_negotiation(format: "citeproc-json")` by having it return `nil` instead of `Resource not found` when no DOI is found, so that the output is more compatible with flows that use serrano to create JSON (#169)
+* PR by @xuanxu adds `REXML` as a runtime dependency (#159)
+
 ## 1.0.0 (2020-10-19)
 
 * updated dependency versions

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2020 Scott Chamberlain
+Copyright (C) 2025 Scott Chamberlain
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/README.md

@@ -2,21 +2,21 @@ serrano
 =========
 
 [![gem version](https://img.shields.io/gem/v/serrano.svg)](https://rubygems.org/gems/serrano)
-[![Ruby](https://github.com/sckott/serrano/workflows/Ruby/badge.svg)](https://github.com/sckott/serrano/actions)
-[![codecov.io](https://codecov.io/github/sckott/serrano/coverage.svg?branch=master)](https://codecov.io/github/sckott/serrano?branch=master)
-[![DOI](https://zenodo.org/badge/2600/sckott/serrano.svg)](https://zenodo.org/badge/latestdoi/2600/sckott/serrano)
+[![Ruby](https://github.com/sckott/serrano/actions/workflows/ruby.yml/badge.svg)](https://github.com/sckott/serrano/actions/workflows/ruby.yml)
+[![codecov.io](https://codecov.io/github/sckott/serrano/coverage.svg?branch=main)](https://codecov.io/github/sckott/serrano?branch=main)
+[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.6386581.svg)](https://zenodo.org/badge/latestdoi/2600/sckott/serrano)
 [![Ruby Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://github.com/testdouble/standard)
 
 `serrano` is a low level client for Crossref APIs
 
-Docs: https://www.rubydoc.info/gems/serrano
+Docs: <https://www.rubydoc.info/gems/serrano>
 
 Other Crossref API clients:
 
 - Python: [habanero](https://github.com/sckott/habanero)
 - R: [rcrossref](https://github.com/ropensci/rcrossref)
 
-Crossref's API issue tracker: https://gitlab.com/crossref/issues
+Crossref's API issue tracker: <https://crossref.atlassian.net/jira/software/c/projects/CR/issues>
 
 ## Changes
 
@@ -47,7 +47,7 @@ Other methods:
 
 Note about searching:
 
-You are using the Crossref search API described at https://github.com/CrossRef/rest-api-doc When you search with query terms, on Crossref servers they are not searching full text, or even abstracts of articles, but only what is available in the data that is returned to you. That is, they search article titles, authors, etc. For some discussion on this, see https://gitlab.com/crossref/issues/issues/101
+You are using the Crossref search API described at https://api.crossref.org When you search with query terms, on Crossref servers they are not searching full text, or even abstracts of articles, but only what is available in the data that is returned to you. That is, they search article titles, authors, etc. For some discussion on this, see https://gitlab.com/crossref/issues/issues/101
 
 Rate limits:
 
@@ -184,6 +184,8 @@ Commands:
 
 # Many DOIs
 ~$ serrano works "10.1007/12080.1874-1746,10.1007/10452.1573-5125"
+## if above two dois in a file called dois.txt
+~$ cat dois.txt | xargs -I{} serrano works {}
 
 # output JSON, then parse with e.g., jq
 ~$ serrano works --filter=has_orcid:true --json --limit=2 | jq '.message.items[].author[].ORCID | select(. != null)'
@@ -194,9 +196,8 @@ Commands:
 * Please note that this project is released with a [Contributor Code of Conduct](CONDUCT.md). By participating in this project you agree to abide by its terms.
 * License: MIT
 
-[crapi]: https://github.com/CrossRef/rest-api-doc/blob/master/rest_api.md
+[crapi]: https://api.crossref.org/
 [cn]: https://citation.crosscite.org/docs.html
-[tdm]: https://www.crossref.org/education/retrieve-metadata/rest-api/text-and-data-mining/
-[ccount]: https://labs.crossref.org/openurl/
+[ccount]: https://www.crossref.org/documentation/retrieve-metadata/openurl/
 [csl]: https://github.com/citation-style-language/styles
-[changelog]: https://github.com/sckott/serrano/blob/master/CHANGELOG.md
+[changelog]: https://github.com/sckott/serrano/blob/main/CHANGELOG.md

data/Rakefile

@@ -44,3 +44,8 @@ desc "Release to Rubygems"
 task release: :build do
   system "gem push serrano-#{Serrano::VERSION}.gem"
 end
+
+desc "open an irb session preloaded with this gem"
+task :console do
+  sh "irb -r pp -r ./lib/serrano.rb"
+end

data/lib/serrano/cnrequest.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "faraday"
-require "faraday_middleware"
+require "faraday/follow_redirects"
 require "multi_json"
 require "serrano/error"
 require "serrano/utils"
@@ -23,7 +23,7 @@ CN_FORMAT_HEADERS = {"rdf-xml" => "application/rdf+xml",
 #
 # Class to perform HTTP requests to the Crossref API
 module Serrano
-  class CNRequest #:nodoc:
+  class CNRequest # :nodoc:
     attr_accessor :ids
     attr_accessor :format
     attr_accessor :style
@@ -47,12 +47,12 @@ module Serrano
       end
 
       conn = Faraday.new "https://doi.org/" do |c|
-        c.use FaradayMiddleware::FollowRedirects
+        c.use Faraday::FollowRedirects::Middleware
         c.adapter :net_http
       end
 
       if ids.length == 1
-        self.ids = ids[0] if ids.class == Array
+        self.ids = ids[0] if ids.instance_of?(Array)
         make_request(conn, ids, format, style, locale)
       else
         coll = []
@@ -87,19 +87,5 @@ def make_request(conn, ids, format, style, locale)
     }
   end
 
-  res.body
+  res.body if res.success?
 end
-
-# parser <- cn_types[[self.format]]
-# if (raw) {
-#   content(response, "text")
-# } else {
-#   out <- content(response, "parsed", parser, "UTF-8")
-#   if (format == "text") {
-#     out <- gsub("\n", "", out)
-#   }
-#   if (format == "bibentry") {
-#     out <- parse_bibtex(out)
-#   }
-#   out
-# }

data/lib/serrano/faraday.rb

@@ -4,69 +4,71 @@ require "faraday"
 require "multi_json"
 
 # @private
-module FaradayMiddleware
-  # @private
-  class RaiseHttpException < Faraday::Middleware
-    def call(env)
-      @app.call(env).on_complete do |response|
-        case response[:status].to_i
-        when 400
-          raise Serrano::BadRequest, error_message_400(response)
-        when 404
-          raise Serrano::NotFound, error_message_400(response)
-        when 500
-          raise Serrano::InternalServerError, error_message_500(response, "Something is technically wrong.")
-        when 502
-          raise Serrano::BadGateway, error_message_500(response, "The server returned an invalid or incomplete response.")
-        when 503
-          raise Serrano::ServiceUnavailable, error_message_500(response, "Crossref is rate limiting your requests.")
-        when 504
-          raise Serrano::GatewayTimeout, error_message_500(response, "504 Gateway Time-out")
+module Faraday
+  module SerranoErrors
+    # @private
+    class Middleware < Faraday::Middleware
+      def call(env)
+        @app.call(env).on_complete do |response|
+          case response[:status].to_i
+          when 400
+            raise Serrano::BadRequest, error_message_400(response)
+          when 404
+            raise Serrano::NotFound, error_message_400(response)
+          when 500
+            raise Serrano::InternalServerError, error_message_500(response, "Something is technically wrong.")
+          when 502
+            raise Serrano::BadGateway, error_message_500(response, "The server returned an invalid or incomplete response.")
+          when 503
+            raise Serrano::ServiceUnavailable, error_message_500(response, "Crossref is rate limiting your requests.")
+          when 504
+            raise Serrano::GatewayTimeout, error_message_500(response, "504 Gateway Time-out")
+          end
         end
       end
-    end
 
-    def initialize(app)
-      super app
-      @parser = nil
-    end
+      def initialize(app)
+        super
+        @parser = nil
+      end
 
-    private
+      private
 
-    def error_message_400(response)
-      "\n   #{response[:method].to_s.upcase} #{response[:url]}\n   Status #{response[:status]}#{error_body(response[:body])}"
-    end
+      def error_message_400(response)
+        "\n   #{response[:method].to_s.upcase} #{response[:url]}\n   Status #{response[:status]}#{error_body(response[:body])}"
+      end
 
-    def error_body(body)
-      if !body.nil? && !body.empty? && body.is_a?(String)
-        if json?(body)
-          body = ::MultiJson.load(body)
-          if body["message"].nil?
-            body = nil
-            elseif body["message"].length == 1
-            body = body["message"]
-          else
-            body = body["message"].collect { |x| x["message"] }.join("; ")
+      def error_body(body)
+        if !body.nil? && !body.empty? && body.is_a?(String)
+          if json?(body)
+            body = ::MultiJson.load(body)
+            if body["message"].nil?
+              body = nil
+              elseif body["message"].length == 1
+              body = body["message"]
+            else
+              body = body["message"].collect { |x| x["message"] }.join("; ")
+            end
           end
         end
-      end
 
-      if body.nil?
-        nil
-      else
-        ": #{body}"
+        if body.nil?
+          nil
+        else
+          ": #{body}"
+        end
       end
-    end
 
-    def error_message_500(response, body = nil)
-      "#{response[:method].to_s.upcase} #{response[:url]}: #{[response[:status].to_s + ":", body].compact.join(" ")}"
-    end
+      def error_message_500(response, body = nil)
+        "#{response[:method].to_s.upcase} #{response[:url]}: #{[response[:status].to_s + ":", body].compact.join(" ")}"
+      end
 
-    def json?(string)
-      MultiJson.load(string)
-      true
-    rescue MultiJson::ParseError
-      false
+      def json?(string)
+        MultiJson.load(string)
+        true
+      rescue MultiJson::ParseError
+        false
+      end
     end
   end
 end

data/lib/serrano/filterhandler.rb

@@ -37,8 +37,13 @@ module Helpers
 
       newnn = nn.collect { |m| m.tr("_", "-") }
       x = rename_keys(x, newnn)
-      x.collect { |k, v| [k, v].join(":") }.join(",")
-
+      x.collect { |k, v|
+        if v.is_a?(Array)
+          v.map { |val| [k, val].join(":") }
+        else
+          [k, v].join(":")
+        end
+      }.join(",")
     end
   end
 
@@ -52,11 +57,11 @@ module Helpers
 end
 
 module Serrano
-  class Request #:nodoc:
+  class Request # :nodoc:
     include Helpers
   end
 
-  class RequestCursor #:nodoc:
+  class RequestCursor # :nodoc:
     include Helpers
   end
 end

data/lib/serrano/request.rb

@@ -12,7 +12,7 @@ require "serrano/helpers/configuration"
 #
 # Class to perform HTTP requests to the Crossref API
 module Serrano
-  class Request #:nodoc:
+  class Request # :nodoc:
     attr_accessor :endpt
     attr_accessor :id
     attr_accessor :query
@@ -32,7 +32,6 @@ module Serrano
     def initialize(endpt, id, query, filter, offset,
       limit, sample, sort, order, facet, select,
       works, agency, options, verbose)
-
       self.endpt = endpt
       self.id = id
       self.query = query
@@ -53,24 +52,21 @@ module Serrano
     def perform
       filt = filter_handler(filter)
 
-      self.select = select.join(",") if select && select.class == Array
+      self.select = select&.instance_of?(Array) ? select.join(",") : select
 
-      args = {query: query, filter: filt, offset: offset,
-              rows: limit, sample: sample, sort: sort,
-              order: order, facet: facet,
+      args = {query: query, filter: filt, offset: offset, rows: limit,
+              sample: sample, sort: sort, order: order, facet: facet,
               select: select}
       opts = args.delete_if { |_k, v| v.nil? }
 
       conn = if verbose
-        Faraday.new(url: Serrano.base_url, request: options || []) do |f|
+        Faraday.new(url: Serrano.base_url, request: options || {}) do |f|
           f.response :logger
-          f.use FaradayMiddleware::RaiseHttpException
-          f.adapter Faraday.default_adapter
+          f.use Faraday::SerranoErrors::Middleware
         end
       else
-        Faraday.new(url: Serrano.base_url, request: options || []) do |f|
-          f.use FaradayMiddleware::RaiseHttpException
-          f.adapter Faraday.default_adapter
+        Faraday.new(url: Serrano.base_url, request: options || {}) do |f|
+          f.use Faraday::SerranoErrors::Middleware
         end
       end
 

data/lib/serrano/request_cursor.rb

@@ -2,12 +2,10 @@
 
 require "erb"
 require "faraday"
-require "faraday_middleware"
 require "multi_json"
 require "serrano/error"
 require "serrano/helpers/configuration"
 require "serrano/filterhandler"
-require "serrano/error"
 require "serrano/faraday"
 require "serrano/utils"
 
@@ -16,7 +14,7 @@ require "serrano/utils"
 #
 # Class to perform HTTP requests to the Crossref API
 module Serrano
-  class RequestCursor #:nodoc:
+  class RequestCursor # :nodoc:
     attr_accessor :endpt
     attr_accessor :id
     attr_accessor :query
@@ -40,7 +38,6 @@ module Serrano
       limit, sample, sort, order, facet, select,
       works, agency, options, verbose, cursor,
       cursor_max, args)
-
       self.endpt = endpt
       self.id = id
       self.query = query
@@ -64,7 +61,7 @@ module Serrano
     def perform
       filt = filter_handler(filter)
       fieldqueries = field_query_handler(args)
-      self.select = select.join(",") if select && select.class == Array
+      self.select = select&.instance_of?(Array) ? select.join(",") : select
 
       unless cursor_max.class.nil?
         raise "cursor_max must be of class int" unless cursor_max.is_a?(Integer)
@@ -78,15 +75,13 @@ module Serrano
       opts = arguments.delete_if { |_k, v| v.nil? }
 
       conn = if verbose
-        Faraday.new(url: Serrano.base_url, request: options || []) do |f|
+        Faraday.new(url: Serrano.base_url, request: options || {}) do |f|
           f.response :logger
-          f.use FaradayMiddleware::RaiseHttpException
-          f.adapter Faraday.default_adapter
+          f.use Faraday::SerranoErrors::Middleware
         end
       else
-        Faraday.new(url: Serrano.base_url, request: options || []) do |f|
-          f.use FaradayMiddleware::RaiseHttpException
-          f.adapter Faraday.default_adapter
+        Faraday.new(url: Serrano.base_url, request: options || {}) do |f|
+          f.use Faraday::SerranoErrors::Middleware
         end
       end
 
@@ -98,7 +93,7 @@ module Serrano
         js = _req(conn, endpt, opts)
         cu = js["message"]["next-cursor"]
         max_avail = js["message"]["total-results"]
-        _redo_req(conn, js, opts, cu, max_avail)
+        _redo_req(conn, js, opts, cu, max_avail, endpt2)
 
       else
         self.id = Array(id)
@@ -119,13 +114,13 @@ module Serrano
           js = _req(conn, endpt2, opts)
           cu = js["message"]["next-cursor"]
           max_avail = js["message"]["total-results"]
-          coll << _redo_req(conn, js, opts, cu, max_avail)
+          coll << _redo_req(conn, js, opts, cu, max_avail, endpt2)
         end
         coll
       end
     end
 
-    def _redo_req(conn, js, opts, cu, max_avail)
+    def _redo_req(conn, js, opts, cu, max_avail, endpt2)
       if !cu.nil? && (cursor_max > js["message"]["items"].length)
         res = [js]
         total = js["message"]["items"].length

data/lib/serrano/styles.rb

@@ -6,8 +6,8 @@ require "multi_json"
 def fetch_styles
   base = "https://api.github.com/repos/citation-style-language/styles"
   conn = Faraday.new(url: base) { |f|
-    f.use FaradayMiddleware::RaiseHttpException
-    f.adapter Faraday.default_adapter
+    f.use Faraday::Response::RaiseError
+    # f.adapter Faraday.default_adapter
   }
   args = {per_page: 1}
   tt = conn.get "commits", args

data/lib/serrano/utils.rb

@@ -24,12 +24,12 @@ end
 
 class Hash
   def tostrings
-    Hash[map { |(k, v)| [k.to_s, v] }]
+    map { |(k, v)| [k.to_s, v] }.to_h
   end
 end
 
 class Hash
   def tosymbols
-    Hash[map { |(k, v)| [k.to_sym, v] }]
+    map { |(k, v)| [k.to_sym, v] }.to_h
   end
 end

data/lib/serrano/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Serrano
-  VERSION = "1.0.0"
+  VERSION = "1.6"
 end

data/lib/serrano.rb

@@ -42,8 +42,7 @@ require "rexml/xpath"
 #   @param cursor [String] Cursor character string to do deep paging. Default is `nil`.
 #       Pass in '*' to start deep paging. Any combination of query, filters and facets may be
 #       used with deep paging cursors. While limit may be specified along with cursor, offset
-#       and sample cannot be used. See
-#       https://github.com/CrossRef/rest-api-doc/blob/master/rest_api.md#deep-paging-with-cursors
+#       and sample cannot be used. See https://api.crossref.org/
 #   @param cursor_max [Fixnum] Max records to retrieve. Only used when cursor
 #       param used. Because deep paging can result in continuous requests until all
 #       are retrieved, use this parameter to set a maximum number of records. Of course,
@@ -63,8 +62,7 @@ require "rexml/xpath"
 #     - oauth [Hash] A hash with OAuth details
 
 # @!macro field_queries
-#   @param [Hash<Object>] args Field queries, as named parameters. See
-#       https://github.com/CrossRef/rest-api-doc/blob/master/rest_api.md#field-queries
+#   @param [Hash<Object>] args Field queries, as named parameters. See https://api.crossref.org/
 #       Field query parameters mut be named, and must start with `query_`. Any dashes or
 #       periods should be replaced with underscores. The options include:
 #       - query_container_title: Query container-title aka. publication name
@@ -99,18 +97,16 @@ require "rexml/xpath"
 # For example, if you want to inspect headers returned from the HTTP request,
 # and parse the raw result in any way you wish.
 #
-# @see https://github.com/CrossRef/rest-api-doc/blob/master/rest_api.md for
-# detailed description of the Crossref API
+# @see https://api.crossref.org for detailed description of the Crossref API
 #
 # What am I actually searching when using the Crossref search API?
 #
-# You are using the Crossref search API described at
-# https://github.com/CrossRef/rest-api-doc/blob/master/rest_api.md.
+# You are using the Crossref search API described at https://api.crossref.org
 # When you search with query terms, on Crossref servers they are not
 # searching full text, or even abstracts of articles, but only what is
 # available in the data that is returned to you. That is, they search
 # article titles, authors, etc. For some discussion on this, see
-# https://gitlab.com/crossref/issues/issues/101
+# https://gitlab.com/crossref/issues/-/issues/101
 #
 #
 # The Polite Pool
@@ -232,7 +228,6 @@ module Serrano
     limit: nil, sample: nil, sort: nil, order: nil, facet: nil,
     select: nil, options: nil, verbose: false, cursor: nil,
     cursor_max: 5000, **args)
-
     assert_valid_filters(filter) if filter
     RequestCursor.new("works", ids, query, filter, offset,
       limit, sample, sort, order, facet, select, nil, nil, options,
@@ -289,7 +284,6 @@ module Serrano
     limit: nil, sample: nil, sort: nil, order: nil, facet: nil,
     select: nil, works: false, options: nil, verbose: false,
     cursor: nil, cursor_max: 5000, **args)
-
     assert_valid_filters(filter) if filter
     RequestCursor.new("members", ids, query, filter, offset,
       limit, sample, sort, order, facet, select, works, nil,
@@ -337,7 +331,6 @@ module Serrano
     limit: nil, sample: nil, sort: nil, order: nil, facet: nil,
     select: nil, works: false, options: nil, verbose: false,
     cursor: nil, cursor_max: 5000, **args)
-
     assert_valid_filters(filter) if filter
     RequestCursor.new("prefixes", ids, nil, filter, offset,
       limit, sample, sort, order, facet, select, works, nil,
@@ -390,7 +383,6 @@ module Serrano
     limit: nil, sample: nil, sort: nil, order: nil, facet: nil,
     select: nil, works: false, options: nil, verbose: false,
     cursor: nil, cursor_max: 5000, **args)
-
     assert_valid_filters(filter) if filter
     RequestCursor.new("funders", ids, query, filter, offset,
       limit, sample, sort, order, facet, select, works, nil, options,
@@ -443,7 +435,6 @@ module Serrano
     limit: nil, sample: nil, sort: nil, order: nil, facet: nil,
     select: nil, works: false, options: nil, verbose: false,
     cursor: nil, cursor_max: 5000, **args)
-
     assert_valid_filters(filter) if filter
     RequestCursor.new("journals", ids, query, filter, offset,
       limit, sample, sort, order, facet, select, works, nil, options,
@@ -486,7 +477,6 @@ module Serrano
   #      Serrano.types(ids: "journal", works: true, select: ['DOI', 'title'], limit: 3)
   def self.types(ids: nil, offset: nil, limit: nil, select: nil, works: false,
     options: nil, verbose: false, cursor: nil, cursor_max: 5000, **args)
-
     RequestCursor.new("types", ids, nil, nil, offset,
       limit, nil, nil, nil, nil, select, works, nil, options,
       verbose, cursor, cursor_max, args).perform
@@ -527,7 +517,6 @@ module Serrano
   def self.licenses(query: nil, offset: nil,
     limit: nil, sample: nil, sort: nil, order: nil,
     facet: nil, options: nil, verbose: false)
-
     Request.new("licenses", nil, query, nil, offset,
       limit, sample, sort, order, facet, nil, nil, nil, options, verbose).perform
   end
@@ -643,7 +632,8 @@ module Serrano
   # @param url [String] the API url for the function (should be left to default)
   # @param key [String] your API key
   #
-  # @see http://labs.crossref.org/openurl/ for more info on this Crossref API service.
+  # @see https://www.crossref.org/documentation/retrieve-metadata/openurl/ for
+  # more info on this Crossref API service.
   #
   # @example
   #   require 'serrano'
@@ -653,7 +643,6 @@ module Serrano
   #   Serrano.citation_count(doi: "10.1016/j.fbr.2012")
   def self.citation_count(doi:, url: "https://www.crossref.org/openurl/",
     key: "cboettig@ropensci.org", options: nil)
-
     args = {id: "doi:" + doi, pid: key, noredirect: true}
     opts = args.delete_if { |_k, v| v.nil? }
     conn = Faraday.new(url: url, request: options)

data/serrano.gemspec

@@ -8,8 +8,7 @@ Gem::Specification.new do |s|
   s.name = "serrano"
   s.version = Serrano::VERSION
   s.platform = Gem::Platform::RUBY
-  s.required_ruby_version = ">= 2.1"
-  s.date = "2020-10-19"
+  s.required_ruby_version = ">= 3.0"
   s.summary = "Crossref Client"
   s.description = "Low Level Ruby Client for the Crossref Search API"
   s.authors = "Scott Chamberlain"
@@ -25,20 +24,21 @@ Gem::Specification.new do |s|
   s.bindir = "bin"
   s.executables = ["serrano"]
 
-  s.add_development_dependency "bundler", '~> 2.1', '>= 2.1.4'
-  s.add_development_dependency "codecov", "~> 0.2.0"
-  s.add_development_dependency "json", '~> 2.3', '>= 2.3.1'
-  s.add_development_dependency "rake", '~> 13.0', '>= 13.0.1'
-  s.add_development_dependency "standard", "~> 0.7"
-  s.add_development_dependency "simplecov", "~> 0.19.0"
-  s.add_development_dependency "test-unit", '~> 3.3', '>= 3.3.6'
-  s.add_development_dependency "vcr", "~> 6.0"
-  s.add_development_dependency "webmock", '~> 3.9', '>= 3.9.3'
+  s.add_development_dependency "bundler", "~> 2.1", ">= 2.1.4"
+  s.add_development_dependency "codecov", "~> 0.5.0"
+  s.add_development_dependency "json", "~> 2.3", ">= 2.3.1"
+  s.add_development_dependency "rake", "~> 13.0", ">= 13.0.1"
+  s.add_development_dependency "standard", "~> 1.0"
+  s.add_development_dependency "simplecov", "~> 0.21.2"
+  s.add_development_dependency "test-unit", "~> 3.3", ">= 3.3.6"
+  s.add_development_dependency "vcr", "~> 6.3", ">= 6.3.1"
+  s.add_development_dependency "webmock", "~> 3.25", ">= 3.25.1"
 
-  s.add_runtime_dependency "faraday", "~> 1.1"
-  s.add_runtime_dependency "faraday_middleware", "~> 1.0"
-  s.add_runtime_dependency "multi_json", '~> 1.15'
-  s.add_runtime_dependency 'thor', '~> 1.0', '>= 1.0.1'
+  s.add_runtime_dependency "faraday", "~> 2.13", ">= 2.13.1"
+  s.add_runtime_dependency "faraday-follow_redirects", ">= 0.1", "< 0.4"
+  s.add_runtime_dependency "multi_json", "~> 1.15"
+  s.add_runtime_dependency "rexml", "~> 3.2", ">= 3.2.5"
+  s.add_runtime_dependency "thor", "~> 1.2", ">= 1.2.1"
 
   s.metadata = {
     "homepage_uri" => "https://github.com/sckott/serrano",

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: serrano
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: '1.6'
 platform: ruby
 authors:
 - Scott Chamberlain
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-19 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -36,14 +35,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -90,28 +89,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.21.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.21.2
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -138,62 +137,80 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.3.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.25'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.9.3
+        version: 3.25.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.25'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.9.3
+        version: 3.25.1
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.13.1
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday-follow_redirects
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -208,26 +225,46 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.15'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.1
 description: Low Level Ruby Client for the Crossref Search API
 email: myrmecocystus@gmail.com
 executables:
@@ -235,6 +272,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - CHANGELOG.md
@@ -264,10 +302,9 @@ licenses:
 metadata:
   homepage_uri: https://github.com/sckott/serrano
   documentation_uri: https://www.rubydoc.info/gems/serrano
-  changelog_uri: https://github.com/sckott/serrano/releases/tag/v1.0.0
+  changelog_uri: https://github.com/sckott/serrano/releases/tag/v1.6
   source_code_uri: https://github.com/sckott/serrano
   bug_tracker_uri: https://github.com/sckott/serrano/issues
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -275,15 +312,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Crossref Client
 test_files: []