serrano - rubygems Package Compare versions

Comparing version 1.4 to 1.6

.github/dependabot.yml

 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

.github/workflows/ruby.yml

@@ -5,5 +5,5 @@ name: Ruby
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
@@ -15,18 +15,18 @@ jobs:
       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"

CHANGELOG.md

@@ -0,1 +1,5 @@
+## 1.6 (2025-06-17)
+
+* Fixed filter handling so that the same filter can be used multiple times (#176)
+
 ## 1.4 (2022-03-26)
@@ -2,0 +6,0 @@

lib/serrano.rb

@@ -231,3 +231,2 @@ # frozen_string_literal: true
     cursor_max: 5000, **args)
-
     assert_valid_filters(filter) if filter
@@ -289,3 +288,2 @@ RequestCursor.new("works", ids, query, filter, offset,
     cursor: nil, cursor_max: 5000, **args)
-
     assert_valid_filters(filter) if filter
@@ -338,3 +336,2 @@ RequestCursor.new("members", ids, query, filter, offset,
     cursor: nil, cursor_max: 5000, **args)
-
     assert_valid_filters(filter) if filter
@@ -392,3 +389,2 @@ RequestCursor.new("prefixes", ids, nil, filter, offset,
     cursor: nil, cursor_max: 5000, **args)
-
     assert_valid_filters(filter) if filter
@@ -446,3 +442,2 @@ RequestCursor.new("funders", ids, query, filter, offset,
     cursor: nil, cursor_max: 5000, **args)
-
     assert_valid_filters(filter) if filter
@@ -490,3 +485,2 @@ RequestCursor.new("journals", ids, query, filter, offset,
     options: nil, verbose: false, cursor: nil, cursor_max: 5000, **args)
-
     RequestCursor.new("types", ids, nil, nil, offset,
@@ -532,3 +526,2 @@ limit, nil, nil, nil, nil, select, works, nil, options,
     facet: nil, options: nil, verbose: false)
-
     Request.new("licenses", nil, query, nil, offset,
@@ -660,3 +653,2 @@ limit, sample, sort, order, facet, nil, nil, nil, options, verbose).perform
     key: "[e-mail]", options: nil)
-
     args = {id: "doi:" + doi, pid: key, noredirect: true}
@@ -663,0 +655,0 @@ opts = args.delete_if { |_k, v| v.nil? }

lib/serrano/faraday.rb

@@ -31,3 +31,3 @@ # frozen_string_literal: true
       def initialize(app)
-        super app
+        super
         @parser = nil
@@ -34,0 +34,0 @@ end

lib/serrano/filterhandler.rb

@@ -40,4 +40,9 @@ # frozen_string_literal: true
       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
@@ -44,0 +49,0 @@ end

lib/serrano/request_cursor.rb

@@ -41,3 +41,2 @@ # frozen_string_literal: true
       cursor_max, args)
-
       self.endpt = endpt
@@ -44,0 +43,0 @@ self.id = id

lib/serrano/request.rb

@@ -35,3 +35,2 @@ # frozen_string_literal: true
       works, agency, options, verbose)
-
       self.endpt = endpt
@@ -38,0 +37,0 @@ self.id = id

lib/serrano/version.rb

 # frozen_string_literal: true
 
 module Serrano
-  VERSION = "1.4"
+  VERSION = "1.6"
 end

LICENSE

@@ -1,2 +0,2 @@
-Copyright (C) 2022 Scott Chamberlain
+Copyright (C) 2025 Scott Chamberlain
 
@@ -3,0 +3,0 @@ 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:

README.md

@@ -5,5 +5,5 @@ 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)
@@ -13,3 +13,3 @@
 
-Docs: https://www.rubydoc.info/gems/serrano
+Docs: <https://www.rubydoc.info/gems/serrano>
 
@@ -21,3 +21,3 @@ Other Crossref API clients:
 
-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>
 
@@ -190,3 +190,3 @@ ## Changes
 ~$ 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 {}
@@ -193,0 +193,0 @@

serrano.gemspec

@@ -11,3 +11,3 @@ # frozen_string_literal: true
   s.platform = Gem::Platform::RUBY
-  s.required_ruby_version = ">= 2.1"
+  s.required_ruby_version = ">= 3.0"
   s.summary = "Crossref Client"
@@ -35,7 +35,7 @@ s.description = "Low Level Ruby Client for the Crossref Search API"
   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"
@@ -42,0 +42,0 @@ s.add_runtime_dependency "rexml", "~> 3.2", ">= 3.2.5"

No alert changes

No metric changes