serrano 1.4 → 1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cfcf7f23380a97af986d90644b8ab541f89c14e5df46485ad84fbcff437a361
-  data.tar.gz: ff3571fbbe79b62cb203e54887c09a0f5af81838a7e0e7aec8c2cb3fa1376890
+  metadata.gz: 8b5e125bb4a2745b6dbf520ad692df6817c0e2dc7d6db1ed307bdee243e9c501
+  data.tar.gz: 680c37e478abc9c5213ea7a6db288a3afa9e9f71140e796a7fc5cdb88ef27517
 SHA512:
-  metadata.gz: 057e9ff07332d37fcd6711695ddd2648d7fd76f74a87585c795a9412883ee4346cf0868b5819f6025e8fee3ef687ac1da035f8ecbfb07424450f5a161daa88a2
-  data.tar.gz: a47b838e2812df16d600df5530175d31682679e2070e78ad0c8c6250f6b65c1e67d71d6a9cc31fefc055caa59de40148f842ec607b68264845eca55ab1a9cfab
+  metadata.gz: 82e9496fa1a0737ef3f491f199792c9b8e99a7c90d285a340108014e4a877ab8e38f79bde1d9a95f9999cef262e642a099f433a1ec2441537d677c6ec4ab1b58
+  data.tar.gz: 5ab1e3c2900d546894d0798014cd649b6b5d35e07c69b16565158fa7a4492c8dbdc13be81a7414517395be42b409875b309e232e95d80571398e7f0c0e597873

data/.github/dependabot.yml

@@ -1,22 +1,22 @@
 version: 2
 updates:
-- package-ecosystem: bundler
-  directory: "/"
-  schedule:
-    interval: daily
-    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
+  - 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: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 jobs:
   test:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, macos-11 ]
-        ruby: [ 2.6, 2.7, 3.0, 3.1 ]
-    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,7 @@
+## 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)

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2022 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)
+[![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/2600/sckott/serrano.svg)](https://zenodo.org/badge/latestdoi/2600/sckott/serrano)
+[![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
 
@@ -184,7 +184,7 @@ 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 
+## 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

data/lib/serrano/faraday.rb

@@ -28,7 +28,7 @@ module Faraday
       end
 
       def initialize(app)
-        super app
+        super
         @parser = nil
       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
 

data/lib/serrano/request.rb

@@ -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

data/lib/serrano/request_cursor.rb

@@ -38,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

data/lib/serrano/version.rb

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

data/lib/serrano.rb

@@ -228,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,
@@ -285,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,
@@ -333,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,
@@ -386,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,
@@ -439,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,
@@ -482,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
@@ -523,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
@@ -650,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,7 +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.required_ruby_version = ">= 3.0"
   s.summary = "Crossref Client"
   s.description = "Low Level Ruby Client for the Crossref Search API"
   s.authors = "Scott Chamberlain"
@@ -31,11 +31,11 @@ Gem::Specification.new do |s|
   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.1"
-  s.add_development_dependency "webmock", "~> 3.14"
+  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", "~> 2.2"
-  s.add_runtime_dependency "faraday-follow_redirects", "~> 0.1.0"
+  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"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: serrano
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: '1.6'
 platform: ruby
 authors:
 - Scott Chamberlain
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -138,56 +137,80 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        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.1'
+        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.14'
+        version: '3.25'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.25.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.25'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.25.1
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        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: '2.2'
+        version: '2.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.13.1
 - !ruby/object:Gem::Dependency
   name: faraday-follow_redirects
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.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: '0.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -279,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.4
+  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
@@ -290,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.3.3
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Crossref Client
 test_files: []