Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ["3.0", "3.1", "3.2", "3.3"]
ruby: ["3.1", "3.2", "3.3"]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
22 changes: 13 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ PATH
specs:
orcid_client (0.16.0)
activesupport (>= 7, < 8)
bolognese (~> 2.3.2)
bolognese (~> 2.5.1)
builder (~> 3.2, >= 3.2.2)
dotenv (~> 2.1, >= 2.1.1)
maremma (>= 5.0)
Expand All @@ -13,26 +13,29 @@ PATH
GEM
remote: https://rubygems.org/
specs:
activesupport (7.1.3.2)
activesupport (7.2.3)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
amazing_print (1.4.0)
base64 (0.2.0)
benchmark (0.5.0)
benchmark_methods (0.7)
bibtex-ruby (6.0.0)
latex-decode (~> 0.0)
bigdecimal (3.1.7)
bolognese (2.3.2)
activesupport (>= 4.2.5)
bolognese (2.5.1)
activesupport (= 7.2.3)
benchmark_methods (~> 0.7)
bibtex-ruby (>= 5.1.0)
builder (~> 3.2, >= 3.2.2)
Expand Down Expand Up @@ -62,7 +65,7 @@ GEM
citeproc (~> 1.0, >= 1.0.9)
csl (~> 1.6)
colorize (0.8.1)
concurrent-ruby (1.2.3)
concurrent-ruby (1.3.6)
connection_pool (2.4.1)
crack (0.4.5)
rexml
Expand Down Expand Up @@ -128,6 +131,7 @@ GEM
optimist (~> 3)
latex-decode (0.4.0)
link_header (0.0.8)
logger (1.7.0)
loofah (2.19.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
Expand All @@ -149,7 +153,6 @@ GEM
minitest (5.22.3)
multi_json (1.15.0)
multipart-post (2.2.3)
mutex_m (0.2.0)
namae (1.0.2)
nokogiri (1.16.4-arm64-darwin)
racc (~> 1.4)
Expand Down Expand Up @@ -208,6 +211,7 @@ GEM
rspec-support (3.12.0)
ruby2_keywords (0.0.5)
scanf (1.0.0)
securerandom (0.4.1)
simplecov (0.21.2)
docile (~> 1.1)
simplecov-html (~> 0.11)
Expand Down
4 changes: 4 additions & 0 deletions lib/orcid_client/work_type.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ module WorkType
'Model' => 'other',
'OutputManagementPlan' => 'data-management-plan',
'PeerReview' => 'review',
'Poster' => 'conference-poster',
'Preprint' => 'preprint',
'Presentation' => 'conference-presentation',
'PhysicalObject' => 'physical-object',
'Report' => 'report',
'Service' => 'other',
Expand Down Expand Up @@ -59,6 +61,8 @@ def orcid_work_type(internal_work_type, internal_work_subtype)
'conference-paper'
when /^(poster|Conference poster)$/i
'conference-poster'
when /^(presentation|Conference presentation)$/i
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I'm remembering correctly, this section of the code attempts to match free-text resourceType values to ORCID work types. If a resourceType contains only "poster" or "presentation", should we assume that the work is a conference poster or conference presentation? A question for @KellyStathis , I think.

Noting that this only would trigger when resourceTypeGeneral is "Text".

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For resourceTypeGeneral "Poster" and "Presentation", we are mapping these to "conference poster" and "conference presentation" in ORCID.

When resourceTypeGeneral is "Text", it looks like we already had the mapping for "poster" or "conference presentation" to "conference presentation" in ORCID. Since we have this in place already, it makes sense for me to also have the equivalent for "presentation" and "conference presentation".

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good! My hesitation with adding the resourceType "presentation" -> ORCID "conference-presentation" mapping is because not all presentations are necessarily conference presentations. We could remove resourceType "presentation" -> ORCID "conference-presentation" and resourceType "poster" -> ORCID "conference-poster", but happy to continue supporting both if that makes sense to you. I doubt this affects that many record regardless.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense! Though since this is the same mapping we're using at the resourceTypeGeneral level, the same concern could apply there. We deliberately used a similar definition to ORCID's (which comes from the COAR work types) but scoped to not be specific to conferences.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me know if we need changes because of this. I merged this pull request a minute ago.

'conference-presentation'
when /^(working paper|workingpaper)$/i
'working-paper'
when /^(preprint)$/i
Expand Down
2 changes: 1 addition & 1 deletion orcid_client.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Gem::Specification.new do |s|

# Declary dependencies here, rather than in the Gemfile
s.add_dependency 'activesupport', '>= 7', '< 8'
s.add_dependency 'bolognese', '~> 2.3.2'
s.add_dependency 'bolognese', '~> 2.5.1'
s.add_dependency 'builder', '~> 3.2', '>= 3.2.2'
s.add_dependency 'dotenv', '~> 2.1', '>= 2.1.1'
s.add_dependency 'maremma', '>= 5.0'
Expand Down