Skip to content
This repository has been archived by the owner on May 14, 2022. It is now read-only.

Removing link to copyright website, making more statements notable #928

Merged
merged 1 commit into from
Jan 4, 2017
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
4 changes: 2 additions & 2 deletions config/authorities/licenses.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ terms:
<br/>For other uses you need to obtain permission from the rightsholder(s).
- id: http://rightsstatements.org/vocab/NoC-CR/1.0/
term: No Copyright - Contractual Restrictions
notable: false
notable: true
active: true
scopeNote: |
This Rights Statement can only be used for Items that are in the Public
Expand All @@ -94,7 +94,7 @@ terms:
cultural protections, digitization agreements or donor agreements.
- id: http://rightsstatements.org/vocab/NoC-OKLR/1.0/
term: No Copyright - Other Known Legal Restrictions
notable: false
notable: true
active: true
scopeNote: |
This Rights Statement should be used for Items that are in the public
Expand Down
2 changes: 0 additions & 2 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ en:
Princeton University Library claims no copyright governing this digital resource. It is provided for free, on a non-commercial, open-access basis, for fair-use academic and research purposes only. Anyone who claims copyright over any part of these resources and feels that they should not be presented in this manner is invited to contact Princeton University Library, who will in turn consider such concerns and make every effort to respond appropriately.
boilerplate: |
Princeton University Library claims no copyright governing this digital resource. It is provided for free, on a non-commercial, open-access basis, for fair-use academic and research purposes only. Anyone who claims copyright over any part of these resources and feels that they should not be presented in this manner is invited to contact Princeton University Library, who will in turn consider such concerns and make every effort to respond appropriately. We request that users reproducing this resource cite it according the guidelines described at <a href="http://rbsc.princeton.edu/policies/forms-citation" >http://rbsc.princeton.edu/policies/forms-citation</a>.

Princeton users with copyright questions or concerns should refer to <a href="http://www.princeton.edu/copyright/">http://www.princeton.edu/copyright/</a>.
simple_form:
labels:
defaults:
Expand Down
11 changes: 11 additions & 0 deletions spec/features/scanned_resource_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,15 @@
expect(page).to have_selector "a", text: I18n.t('blacklight.back_to_search')
end
end

context "an anonymous user" do
let(:scanned_resource) { FactoryGirl.create(:scanned_resource, title: ["first title", "second title"], user: user) }

scenario "viewing a scanned resource it should display rights boilerplate" do
visit polymorphic_path [scanned_resource]
expect(page).to have_selector "h1", text: "first title"
expect(page).to have_text "Princeton University Library claims no copyright governing"
expect(page).not_to have_text "Princeton users with copyright questions or concerns"
end
end
end
6 changes: 6 additions & 0 deletions spec/services/rights_statement_service_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

RSpec.describe RightsStatementService do
let(:uri) { 'http://rightsstatements.org/vocab/InC/1.0/' }
let(:noc_cr_uri) { 'http://rightsstatements.org/vocab/NoC-CR/1.0/' }
let(:desc) { 'This Item is protected by copyright and/or related rights.' }
let(:valid_statements) {
[
Expand All @@ -21,6 +22,11 @@
expect(described_class.new.definition(uri)).to include('<br/>')
end

it "indicates which statements should have notes enabled" do
expect(described_class.new.notable?(uri)).to be false
expect(described_class.new.notable?(noc_cr_uri)).to be true
end

it "lists all valid rights statements" do
expect(described_class.new.valid_statements).to eq(valid_statements)
end
Expand Down