Skip to content
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.

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

Remove COinS entirely #412

Merged
merged 1 commit into from
Feb 6, 2024
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
1 change: 0 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ AllCops:
- 'lib/trln_argon/version.rb'
- 'lib/trln_argon/item_deserializer.rb'
- 'trln_argon.gemspec'
- 'config/initializers/openurl.rb'
- 'lib/trln_argon/argon_search_builder/add_query_to_solr.rb'
- 'lib/generators/trln_argon/remove_solr_marc_generator.rb'

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.16
2.2.17
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ module SolrDocumentBehavior
repository.blacklight_config.document_solr_path = :document
repository.blacklight_config.document_solr_request_handler = nil
use_extension(TrlnArgon::DocumentExtensions::Ris)
use_extension(TrlnArgon::DocumentExtensions::OpenurlCtxKev)
use_extension(TrlnArgon::DocumentExtensions::Email)
use_extension(TrlnArgon::DocumentExtensions::Sms)
use_extension(Blacklight::Document::DublinCore)
Expand Down
1 change: 0 additions & 1 deletion lib/generators/trln_argon/upgrade_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ def cleanup_solr_document
solr_document = 'app/models/solr_document.rb'

lines_to_remove = [/ +SolrDocument.use_extension(TrlnArgon::Document::Ris).*$/,
/ +SolrDocument.use_extension(TrlnArgon::Document::OpenurlCtxKev).*$/,
/ +SolrDocument.use_extension(TrlnArgon::Document::Email).*$/]
lines_to_remove.each do |remove_marker|
gsub_file(solr_document, /#{remove_marker}/, '')
Expand Down
3 changes: 1 addition & 2 deletions lib/trln_argon/document_extensions.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
module TrlnArgon
# The DocumentExtensions module contains document extensions
# added as extensions to the host application's SolrDocument class.
# e.g. SolrDocument.use_extension(TrlnArgon::DocumentExtensions::OpenurlCtxKev)
# e.g. SolrDocument.use_extension(TrlnArgon::DocumentExtensions::Ris)
module DocumentExtensions
autoload :Email, 'trln_argon/document_extensions/email'
autoload :OpenurlCtxKev, 'trln_argon/document_extensions/openurl_ctx_kev'
autoload :Ris, 'trln_argon/document_extensions/ris'
autoload :Sms, 'trln_argon/document_extensions/sms'
end
Expand Down
44 changes: 0 additions & 44 deletions lib/trln_argon/document_extensions/openurl_ctx_kev.rb

This file was deleted.

1 change: 0 additions & 1 deletion lib/trln_argon/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
require 'blacklight_range_limit'
require 'rails_autolink'
require 'library_stdnums'
require 'openurl'
require 'font-awesome-rails'
require 'chosen-rails'
require 'rsolr'
Expand Down
2 changes: 0 additions & 2 deletions lib/trln_argon/solr_document.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
require 'trln_argon/solr_document/expand_document'
require 'trln_argon/solr_document/field_deserializer'
require 'trln_argon/solr_document/imprint'
require 'trln_argon/solr_document/openurl_ctx_kev_field_mapping'
require 'trln_argon/solr_document/ris_field_mapping'
require 'trln_argon/solr_document/sms_field_mapping'
require 'trln_argon/solr_document/syndetics_data'
Expand All @@ -20,7 +19,6 @@ module SolrDocument
include ExpandDocument
include FieldDeserializer
include Imprint
include OpenurlCtxKevFieldMapping
include RisFieldMapping
include SmsFieldMapping
include SyndeticsData
Expand Down
43 changes: 0 additions & 43 deletions lib/trln_argon/solr_document/openurl_ctx_kev_field_mapping.rb

This file was deleted.

46 changes: 0 additions & 46 deletions spec/lib/trln_argon/solr_document_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -459,52 +459,6 @@ class SolrDocumentTestClass
end
end

########################
# Open CTX KEV Field
########################

describe 'export as openurl_ctx_kev' do
subject(:ctx_kev) do
SolrDocument.new(YAML.safe_load(
file_fixture('documents/DUKE002952265.yml').read
).first).export_as_openurl_ctx_kev
end

it 'contains a url_ver' do
expect(ctx_kev).to match('url_ver=Z39.88-2004')
end

it 'contains a url_ctx_fmt' do
expect(ctx_kev).to match('url_ctx_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Actx')
end

it 'contains a ctx_ver' do
expect(ctx_kev).to match('ctx_ver=Z39.88-2004')
end

it 'contains an rft.title' do
expect(ctx_kev).to match('rft.title=Revision\+of\+the\+Atlantic\+Brisingida\+'\
'%28Echinodermata%3AAsteroidea%29%2C\+with\+description\+'\
'of\+a\+new\+genus\+and\+family\+%2F')
end

it 'contains an rft.date' do
expect(ctx_kev).to match('rft.date=1986')
end

it 'contains an rft.au' do
expect(ctx_kev).to match('rft.au=Maureen\+E.\+Downey.')
end

it 'contains an rft_val_fmt' do
expect(ctx_kev).to match('rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook')
end

it 'contains an rft_id' do
expect(ctx_kev).to match('rft_id=https%3A%2F%2Fdiscovery.trln.org%2Fcatalog%2FDUKE002952265')
end
end

########################
# Email Field Mapping
########################
Expand Down
6 changes: 0 additions & 6 deletions spec/models/solr_document_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,6 @@
)
end

it 'registers OpenurlCtxKev as a document extension' do
expect(described_class.registered_extensions).to include(
module_obj: TrlnArgon::DocumentExtensions::OpenurlCtxKev, condition_proc: nil
)
end

it 'registers Email as a document extension' do
expect(described_class.registered_extensions).to include(
module_obj: TrlnArgon::DocumentExtensions::Email, condition_proc: nil
Expand Down
1 change: 0 additions & 1 deletion trln_argon.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ Gem::Specification.new do |s|
s.add_dependency 'git', '>= 1.11.0', "< 2"
s.add_dependency 'rails_autolink', '~> 1.1'
s.add_dependency 'library_stdnums', '~> 1.6'
s.add_dependency 'openurl', '~>1.0'
s.add_dependency 'font-awesome-rails', '~> 4.7'
s.add_dependency 'chosen-rails', '~> 1.10'
s.add_dependency 'coffee-rails', '~> 4.2'
Expand Down
Loading