Skip to content

Allow hsh_to_spdx to accept rightsUri as well as rightsURI. #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
svogt0511 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Allow hsh_to_spdx to accept rightsUri as well as rightsURI. #205

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5190548
Allow hsh_to_spdx to accept rightsUri as well as rightsURI. Note: it…
svogt0511 Jul 25, 2025
b8016b8
Update version.
svogt0511 Jul 25, 2025
89765f1
Make sure the correct version is reflected.
svogt0511 Jul 25, 2025
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 lib/bolognese/utils.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1293,7 +1293,7 @@ def name_to_spdx(name)

def hsh_to_spdx(hsh)
spdx = resource_json(:spdx).fetch("licenses")
license = spdx.find { |l| l["licenseId"].casecmp?(hsh["rightsIdentifier"]) || l["seeAlso"].first == normalize_cc_url(hsh["rightsURI"]) || l["name"] == hsh["rights"] || l["seeAlso"].first == normalize_cc_url(hsh["rights"]) }
license = spdx.find { |l| l["licenseId"].casecmp?(hsh["rightsIdentifier"]) || l["seeAlso"].first == normalize_cc_url(hsh["rightsUri"]) || l["seeAlso"].first == normalize_cc_url(hsh["rightsURI"]) || l["name"] == hsh["rights"] || l["seeAlso"].first == normalize_cc_url(hsh["rights"]) }
Copy link

Copilot AI Jul 25, 2025

Choose a reason for hiding this comment

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

The expression l["seeAlso"].first is called three times in this condition chain. Consider extracting it to a variable to avoid repeated array access and potential nil errors if seeAlso is empty.

Suggested change
license = spdx.find { |l| l["licenseId"].casecmp?(hsh["rightsIdentifier"]) || l["seeAlso"].first == normalize_cc_url(hsh["rightsUri"]) || l["seeAlso"].first == normalize_cc_url(hsh["rightsURI"]) || l["name"] == hsh["rights"] || l["seeAlso"].first == normalize_cc_url(hsh["rights"]) }
license = spdx.find do |l|
see_also_first = l["seeAlso"].first
l["licenseId"].casecmp?(hsh["rightsIdentifier"]) ||
see_also_first == normalize_cc_url(hsh["rightsUri"]) ||
see_also_first == normalize_cc_url(hsh["rightsURI"]) ||
l["name"] == hsh["rights"] ||
see_also_first == normalize_cc_url(hsh["rights"])
end

Copilot uses AI. Check for mistakes.

if license
{
Expand Down