blacklight-marc 8.0.0 → 8.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 510b8f1ae8d1d7752d0dbeadf0db9e4cc5003d88dd25c7b4a9e76ba1757c2d4e
-  data.tar.gz: 61ffc549983a3e3ca3fe0497cfcac437bac64318fba45d7836ad0307d2f1a83a
+  metadata.gz: 483538c623aaace602da20c35e7b3fc349ac18e06ffe4277ac9a14f14eff237e
+  data.tar.gz: cfbc11131199f2895db722e609a23dfa4cec8be8e27781f542076931988aaf5c
 SHA512:
-  metadata.gz: cc9bacb9622c2e4f68f2ff7058d9ce8495e2667ab7b8fae7c5495e571a11e82ccd9699bb73237aad5935f6d47a229e651671158eb22fe686816b14c520adaf09
-  data.tar.gz: b8127b909fd370507c3a7a59860ae395abe2f7b23828e18dfae1c54042507ee7c7c8f7b03f7986e58d308f855ca38fad0851b1f93b6d5aab7e3ef31c632555e7
+  metadata.gz: bc6f9437f9c3a53fe810cf7f1fe1a831e7d6c1de22e9ab04927a0702163e4ef474c4868f322ce8bf2374a4a36fd4354a748a26788001e73b46bbe7dd8e85fe9d
+  data.tar.gz: 41943dec1aef4930cfb7ee783dadb6ba63d097882486547f292bb14c2e1f088685f17080a60483f2f08080878ebd61020d48a4ca739a1d0b247ee6f00ad270e6

data/.github/workflows/ruby.yml

@@ -1,26 +1,41 @@
----
 name: CI
 
 on:
   push:
-    branches: [main]
+    branches: [ main ]
   pull_request:
-    branches: [main]
+    branches: [ main ]
 
 jobs:
   test:
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        rails_version: [6.1.4.7, 7.0.2.3]
-        ruby: [2.7, '3.0']
+        ruby: ['3.2']
+        rails_version: ['7.1.3']
+        blacklight_version: ['~> 8.1']
+        experimental: [false]
         include:
-          - rails_version: 5.2.4.4
-            ruby: 2.7
-          - rails_version: 6.0.3.4
-            ruby: 2.7
+        - ruby: '2.7'
+          rails_version: '6.1.7.6'
+          blacklight_version: '~> 7.0'
+          experimental: false
+        - ruby: '3.0'
+          rails_version: '7.0.8'
+          blacklight_version: '~> 7.0'
+          experimental: false
+        - ruby: '3.1'
+          rails_version: '7.0.8'
+          blacklight_version: '~> 8.1'
+          experimental: false
+        - ruby: '3.2'
+          rails_version: '7.1.3'
+          blacklight_version: 'github'
+          experimental: true
     env:
       RAILS_VERSION: ${{ matrix.rails_version }}
+      BLACKLIGHT_VERSION: ${{ matrix.blacklight_version }}
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby ${{ matrix.ruby }}

data/README.md

@@ -35,7 +35,7 @@ include Blacklight::Marc::Catalog
 and the following code is generated into SolrDocument:
 
 ```ruby
-use_extension( Blacklight::Solr::Document::Marc) do |document|
+use_extension( Blacklight::Marc::DocumentExtension) do |document|
   document.key?( :marc_display  )
 end
 ```

data/app/helpers/blacklight_marc_helper.rb

@@ -12,8 +12,8 @@ module BlacklightMarcHelper
   end
 
   # For exporting a single endnote document. (endnote_catalog_path is defined by blacklight-marc and it is used for multiple document export)
-  def single_endnote_catalog_path opts = {}, *_
-    solr_document_path(opts.merge(format: 'endnote'))
+  def single_endnote_catalog_path opts = {}, **kwargs
+    solr_document_path(opts['id'], **kwargs.merge(opts).merge(format: 'endnote').except('id'))
   end
 
 

data/app/models/concerns/blacklight/marc/document_export.rb

@@ -62,40 +62,40 @@ module Blacklight::Marc::DocumentExport
     edition = to_marc.find{|field| field.tag == '250'}
     isbn = to_marc.find{|field| field.tag == '020'}
     issn = to_marc.find{|field| field.tag == '022'}
-    unless format.nil?
-      format.is_a?(Array) ? format = format[0].downcase.strip : format = format.downcase.strip
+    format = format.first if format.is_a?(Array)
+    format = format.downcase.strip unless format.nil?
+    
+    export_text = ""
+    if format == 'book'
+      export_text << "ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rfr_id=info%3Asid%2Fblacklight.rubyforge.org%3Agenerator&amp;rft.genre=book&amp;"
+      export_text << "rft.btitle=#{(title.nil? or title['a'].nil?) ? "" : CGI::escape(title['a'])}+#{(title.nil? or title['b'].nil?) ? "" : CGI::escape(title['b'])}&amp;"
+      export_text << "rft.title=#{(title.nil? or title['a'].nil?) ? "" : CGI::escape(title['a'])}+#{(title.nil? or title['b'].nil?) ? "" : CGI::escape(title['b'])}&amp;"
+      export_text << "rft.au=#{(author.nil? or author['a'].nil?) ? "" : CGI::escape(author['a'])}&amp;"
+      export_text << "rft.aucorp=#{CGI::escape(corp_author['a']) if corp_author['a']}+#{CGI::escape(corp_author['b']) if corp_author['b']}&amp;" unless corp_author.blank?
+      export_text << "rft.date=#{(publisher_info.nil? or publisher_info['c'].nil?) ? "" : CGI::escape(publisher_info['c'])}&amp;"
+      export_text << "rft.place=#{(publisher_info.nil? or publisher_info['a'].nil?) ? "" : CGI::escape(publisher_info['a'])}&amp;"
+      export_text << "rft.pub=#{(publisher_info.nil? or publisher_info['b'].nil?) ? "" : CGI::escape(publisher_info['b'])}&amp;"
+      export_text << "rft.edition=#{(edition.nil? or edition['a'].nil?) ? "" : CGI::escape(edition['a'])}&amp;"
+      export_text << "rft.isbn=#{(isbn.nil? or isbn['a'].nil?) ? "" : isbn['a']}"
+    elsif (format =~ /journal/i) # checking using include because institutions may use formats like Journal or Journal/Magazine
+      export_text << "ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Ajournal&amp;rfr_id=info%3Asid%2Fblacklight.rubyforge.org%3Agenerator&amp;rft.genre=article&amp;"
+      export_text << "rft.title=#{(title.nil? or title['a'].nil?) ? "" : CGI::escape(title['a'])}+#{(title.nil? or title['b'].nil?) ? "" : CGI::escape(title['b'])}&amp;"
+      export_text << "rft.atitle=#{(title.nil? or title['a'].nil?) ? "" : CGI::escape(title['a'])}+#{(title.nil? or title['b'].nil?) ? "" : CGI::escape(title['b'])}&amp;"
+      export_text << "rft.aucorp=#{CGI::escape(corp_author['a']) if corp_author['a']}+#{CGI::escape(corp_author['b']) if corp_author['b']}&amp;" unless corp_author.blank?
+      export_text << "rft.date=#{(publisher_info.nil? or publisher_info['c'].nil?) ? "" : CGI::escape(publisher_info['c'])}&amp;"
+      export_text << "rft.issn=#{(issn.nil? or issn['a'].nil?) ? "" : issn['a']}"
+    else
+      export_text << "ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Adc&amp;rfr_id=info%3Asid%2Fblacklight.rubyforge.org%3Agenerator&amp;"
+      export_text << "rft.title=" + ((title.nil? or title['a'].nil?) ? "" : CGI::escape(title['a']))
+      export_text <<  ((title.nil? or title['b'].nil?) ? "" : CGI.escape(" ") + CGI::escape(title['b']))
+      export_text << "&amp;rft.creator=" + ((author.nil? or author['a'].nil?) ? "" : CGI::escape(author['a']))
+      export_text << "&amp;rft.aucorp=#{CGI::escape(corp_author['a']) if corp_author['a']}+#{CGI::escape(corp_author['b']) if corp_author['b']}" unless corp_author.blank?
+      export_text << "&amp;rft.date=" + ((publisher_info.nil? or publisher_info['c'].nil?) ? "" : CGI::escape(publisher_info['c']))
+      export_text << "&amp;rft.place=" + ((publisher_info.nil? or publisher_info['a'].nil?) ? "" : CGI::escape(publisher_info['a']))
+      export_text << "&amp;rft.pub=" + ((publisher_info.nil? or publisher_info['b'].nil?) ? "" : CGI::escape(publisher_info['b']))
+      export_text << "&amp;rft.format=" + (format.nil? ? "" : CGI::escape(format))
     end
-      export_text = ""
-      if format == 'book'
-        export_text << "ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rfr_id=info%3Asid%2Fblacklight.rubyforge.org%3Agenerator&amp;rft.genre=book&amp;"
-        export_text << "rft.btitle=#{(title.nil? or title['a'].nil?) ? "" : CGI::escape(title['a'])}+#{(title.nil? or title['b'].nil?) ? "" : CGI::escape(title['b'])}&amp;"
-        export_text << "rft.title=#{(title.nil? or title['a'].nil?) ? "" : CGI::escape(title['a'])}+#{(title.nil? or title['b'].nil?) ? "" : CGI::escape(title['b'])}&amp;"
-        export_text << "rft.au=#{(author.nil? or author['a'].nil?) ? "" : CGI::escape(author['a'])}&amp;"
-        export_text << "rft.aucorp=#{CGI::escape(corp_author['a']) if corp_author['a']}+#{CGI::escape(corp_author['b']) if corp_author['b']}&amp;" unless corp_author.blank?
-        export_text << "rft.date=#{(publisher_info.nil? or publisher_info['c'].nil?) ? "" : CGI::escape(publisher_info['c'])}&amp;"
-        export_text << "rft.place=#{(publisher_info.nil? or publisher_info['a'].nil?) ? "" : CGI::escape(publisher_info['a'])}&amp;"
-        export_text << "rft.pub=#{(publisher_info.nil? or publisher_info['b'].nil?) ? "" : CGI::escape(publisher_info['b'])}&amp;"
-        export_text << "rft.edition=#{(edition.nil? or edition['a'].nil?) ? "" : CGI::escape(edition['a'])}&amp;"
-        export_text << "rft.isbn=#{(isbn.nil? or isbn['a'].nil?) ? "" : isbn['a']}"
-      elsif (format =~ /journal/i) # checking using include because institutions may use formats like Journal or Journal/Magazine
-        export_text << "ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Ajournal&amp;rfr_id=info%3Asid%2Fblacklight.rubyforge.org%3Agenerator&amp;rft.genre=article&amp;"
-        export_text << "rft.title=#{(title.nil? or title['a'].nil?) ? "" : CGI::escape(title['a'])}+#{(title.nil? or title['b'].nil?) ? "" : CGI::escape(title['b'])}&amp;"
-        export_text << "rft.atitle=#{(title.nil? or title['a'].nil?) ? "" : CGI::escape(title['a'])}+#{(title.nil? or title['b'].nil?) ? "" : CGI::escape(title['b'])}&amp;"
-        export_text << "rft.aucorp=#{CGI::escape(corp_author['a']) if corp_author['a']}+#{CGI::escape(corp_author['b']) if corp_author['b']}&amp;" unless corp_author.blank?
-        export_text << "rft.date=#{(publisher_info.nil? or publisher_info['c'].nil?) ? "" : CGI::escape(publisher_info['c'])}&amp;"
-        export_text << "rft.issn=#{(issn.nil? or issn['a'].nil?) ? "" : issn['a']}"
-      else
-         export_text << "ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Adc&amp;rfr_id=info%3Asid%2Fblacklight.rubyforge.org%3Agenerator&amp;"
-         export_text << "rft.title=" + ((title.nil? or title['a'].nil?) ? "" : CGI::escape(title['a']))
-         export_text <<  ((title.nil? or title['b'].nil?) ? "" : CGI.escape(" ") + CGI::escape(title['b']))
-         export_text << "&amp;rft.creator=" + ((author.nil? or author['a'].nil?) ? "" : CGI::escape(author['a']))
-         export_text << "&amp;rft.aucorp=#{CGI::escape(corp_author['a']) if corp_author['a']}+#{CGI::escape(corp_author['b']) if corp_author['b']}" unless corp_author.blank?
-         export_text << "&amp;rft.date=" + ((publisher_info.nil? or publisher_info['c'].nil?) ? "" : CGI::escape(publisher_info['c']))
-         export_text << "&amp;rft.place=" + ((publisher_info.nil? or publisher_info['a'].nil?) ? "" : CGI::escape(publisher_info['a']))
-         export_text << "&amp;rft.pub=" + ((publisher_info.nil? or publisher_info['b'].nil?) ? "" : CGI::escape(publisher_info['b']))
-         export_text << "&amp;rft.format=" + (format.nil? ? "" : CGI::escape(format))
-     end
-     export_text.html_safe unless export_text.blank?
+    export_text.html_safe unless export_text.blank?
   end
 
 
@@ -299,6 +299,10 @@ module Blacklight::Marc::DocumentExport
       pub_info << clean_end_punctuation(marc["260"]["a"]).strip if marc["260"]["a"]
       pub_info << ": #{clean_end_punctuation(marc["260"]["b"]).strip}" if marc["260"]["b"]
       pub_info << ", #{setup_pub_date(marc)}" if marc["260"]["c"]
+    elsif marc["264"] and (marc["264"]["a"] or marc["264"]["b"])
+      pub_info << clean_end_punctuation(marc["264"]["a"]).strip if marc["264"]["a"]
+      pub_info << ": #{clean_end_punctuation(marc["264"]["b"]).strip}" if marc["264"]["b"]
+      pub_info << ", #{setup_pub_date(marc)}" if marc["264"]["c"]
     elsif marc["502"] and marc["502"]["a"] # MARC 502 is the Dissertation Note.  This holds the correct pub info for these types of records.
       pub_info << marc["502"]["a"]
     elsif marc["502"] and (marc["502"]["b"] or marc["502"]["c"] or marc["502"]["d"]) #sometimes the dissertation note is encoded in pieces in the $b $c and $d sub fields instead of lumped into the $a
@@ -414,8 +418,8 @@ module Blacklight::Marc::DocumentExport
     text
   end
   def setup_pub_date(record)
-    if !record.find{|f| f.tag == '260'}.nil?
-      pub_date = record.find{|f| f.tag == '260'}
+    if !record.find{|f| ['260', '264'].include?(f.tag)}.nil?
+      pub_date = record.find{|f| ['260', '264'].include?(f.tag)}
       if pub_date.find{|s| s.code == 'c'}
         date_value = pub_date.find{|s| s.code == 'c'}.value.gsub(/[^0-9|n\.d\.]/, "")[0,4] unless pub_date.find{|s| s.code == 'c'}.value.gsub(/[^0-9|n\.d\.]/, "")[0,4].blank?
       end
@@ -425,7 +429,7 @@ module Blacklight::Marc::DocumentExport
   end
   def setup_pub_info(record)
     text = ''
-    pub_info_field = record.find{|f| f.tag == '260'}
+    pub_info_field = get_publication_data(record)
     if !pub_info_field.nil?
       a_pub_info = pub_info_field.find{|s| s.code == 'a'}
       b_pub_info = pub_info_field.find{|s| s.code == 'b'}
@@ -551,6 +555,10 @@ module Blacklight::Marc::DocumentExport
     {:primary_authors => primary_authors, :translators => translators, :editors => editors, :compilers => compilers}
   end
 
+  def get_publication_data(record)
+    publication_data = record.find{|field| field.tag == '260'} || record.find{|field| field.tag == '264'}
+  end
+
   def abbreviate_name(name)
     name_parts = name.split(", ")
     first_name_parts = name_parts.last.split(" ")

data/app/views/catalog/librarian_view.html.erb

@@ -1,5 +1,5 @@
 <%= render Blacklight::System::ModalComponent.new do |component| %>
-  <% component.title { t('blacklight.search.librarian_view.title') } %>
+  <% component.with_title { t('blacklight.search.librarian_view.title') } %>
   <%- if @document.respond_to?(:to_marc) -%>
     <%= render "marc_view", document: @document %>
   <%- else %>

data/blacklight-marc.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec-rails", '~> 4.0'
+  spec.add_development_dependency "rspec-rails", '~> 6.1'
   spec.add_development_dependency "rspec-activemodel-mocks"
   spec.add_development_dependency "solr_wrapper"
   spec.add_development_dependency "capybara"

data/lib/blacklight/marc/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Marc
-    VERSION = '8.0.0'
+    VERSION = '8.1.1'
   end
 end

data/lib/railties/solr_marc.rake

@@ -106,7 +106,7 @@ def compute_arguments
       File.join( plugin_site_path, "config-#{::Rails.env}.properties"),
       File.join( plugin_site_path, "config.properties"),
     ].each do |file_path|
-      if File.exists?(file_path)
+      if File.exist?(file_path)
         arguments[:config_properties_path] = file_path
         break
       end
@@ -147,7 +147,7 @@ def locate_path(*subpath_fragments)
   local_root = File.expand_path File.join(File.dirname(__FILE__), '..', '..')
   subpath = subpath_fragments.join('/')
   base_match = [Rails.root, local_root].find do |base|
-    File.exists? File.join(base, subpath)
+    File.exist? File.join(base, subpath)
   end
   File.join(base_match.to_s, subpath) if base_match
 end

data/spec/features/record_view_spec.rb

@@ -9,5 +9,10 @@ describe "Record View" do
       link = find_link("Export to Refworks")
       expect(link['href']).to include CGI.escape(solr_document_path('2008305903', format: :refworks_marc_txt))
     end
+
+    it 'has an endnote link' do
+      visit solr_document_path('2008305903')
+      expect(page).to have_link "Export to EndNote", href: solr_document_path('2008305903', format: :endnote)
+    end
   end
 end

data/spec/helpers/blacklight_marc_helper_spec.rb

@@ -23,25 +23,6 @@ describe BlacklightMarcHelper do
       expect(helper.render_endnote_texts([one, two])).to eq "one\ntwo\n"
     end
   end
-  require 'spec_helper'
-
-  describe '#document_action_path' do
-    before do
-      allow(helper).to receive_messages(controller_name: 'catalog')
-    end
-
-    let(:document_action_config) { Blacklight::Configuration::ToolConfig.new(tool_config) }
-    let(:document) { SolrDocument.new(id: '123') }
-
-    subject { helper.document_action_path(document_action_config, id: document) }
-
-    context "for endnote" do
-      let(:tool_config) { { if: :render_refworks_action?, partial: "document_action",
-        name: :endnote, key: :endnote, path: :single_endnote_catalog_path } }
-
-      it { is_expected.to eq '/catalog/123.endnote' }
-    end
-  end
 
   describe "#bookmarks_export_url" do
     it "is the bookmark url with an encrypted user token" do

data/spec/lib/marc_export_spec.rb

@@ -629,24 +629,62 @@ describe Blacklight::Solr::Document::MarcExport do
     end
   end
 
-  describe "export_as_openurl_ctx_kev" do
-    it "should create the appropriate context object for books" do
-      record = @typical_record.export_as_openurl_ctx_kev('Book')
-      expect(record).to match(/.*mtx%3Abook.*rft.genre=book.*rft.btitle=Apples\+%3A\+botany%2C\+production%2C\+and\+uses.*rft.aucorp=Bobs\+Your\+Uncle.*rft.date=c2003.*rft.place=Oxon%2C\+U.K.*rft.pub=CABI\+Pub.*rft.isbn=/) and
-      expect(record).not_to match(/.*rft.genre=article.*rft.issn=.*/)
-    end
-    it "should create the appropriate context object for journals" do
-      record = @typical_record.export_as_openurl_ctx_kev('Journal')
-      record_journal_other = @typical_record.export_as_openurl_ctx_kev('Journal/Magazine')
-      expect(record).to match(/.*mtx%3Ajournal.*rft.genre=article.*rft.title=Apples\+%3A\+botany%2C\+production%2C\+and\+uses.*rft.atitle=Apples\+%3A\+botany%2C\+production%2C\+and\+uses.*rft.aucorp=Bobs\+Your\+Uncle.*rft.date=c2003.*rft.issn=/) and
-      expect(record_journal_other).to eq(record) and
-      expect(record).not_to match(/.*rft.genre=book.*rft.isbn=.*/)
-    end
-    it "should create the appropriate context object for other content" do
-      record = @typical_record.export_as_openurl_ctx_kev('NotARealFormat')
-      expect(record).to match(/.*mtx%3Adc.*rft.title=Apples\+%3A\+botany%2C\+production%2C\+and\+uses.*rft.creator=.*rft.aucorp=Bobs\+Your\+Uncle.*rft.date=c2003.*rft.place=Oxon%2C\+U.K.*rft.pub=CABI\+Pub.*rft.format=notarealformat/) and
-      expect(record).not_to match(/.*rft.isbn=.*/) and
-      expect(record).not_to match(/.*rft.issn=.*/)
+  describe "#export_as_openurl_ctx_kev" do
+    subject(:record) { @typical_record.export_as_openurl_ctx_kev(format) }
+
+    context 'with a Book' do
+      let(:format) { 'Book' }
+      it "creates the appropriate context object" do
+        expect(record).to match(/.*mtx%3Abook.*rft.genre=book.*rft.btitle=Apples\+%3A\+botany%2C\+production%2C\+and\+uses.*rft.aucorp=Bobs\+Your\+Uncle.*rft.date=c2003.*rft.place=Oxon%2C\+U.K.*rft.pub=CABI\+Pub.*rft.isbn=/)
+        expect(record).not_to match(/.*rft.genre=article.*rft.issn=.*/)
+      end
+    end
+
+    context 'with a Journal' do
+      let(:format) { 'Journal' }
+      it "creates the appropriate context object" do
+        expect(record).to match(/.*mtx%3Ajournal.*rft.genre=article.*rft.title=Apples\+%3A\+botany%2C\+production%2C\+and\+uses.*rft.atitle=Apples\+%3A\+botany%2C\+production%2C\+and\+uses.*rft.aucorp=Bobs\+Your\+Uncle.*rft.date=c2003.*rft.issn=/)
+        expect(record).not_to match(/.*rft.genre=book.*rft.isbn=.*/)
+      end
+    end
+
+    context 'with a Journal/Magazine' do
+      let(:format) { 'Journal/Magazine' }
+      it "creates the appropriate context object" do
+        expect(record).to match(/.*mtx%3Ajournal.*rft.genre=article.*rft.title=Apples\+%3A\+botany%2C\+production%2C\+and\+uses.*rft.atitle=Apples\+%3A\+botany%2C\+production%2C\+and\+uses.*rft.aucorp=Bobs\+Your\+Uncle.*rft.date=c2003.*rft.issn=/)
+        expect(record).not_to match(/.*rft.genre=book.*rft.isbn=.*/)
+      end
+    end
+
+    context 'with other formats' do
+      let(:format) { 'NotARealFormat' }
+      it "creates the appropriate context object" do
+        expect(record).to match(/.*mtx%3Adc.*rft.title=Apples\+%3A\+botany%2C\+production%2C\+and\+uses.*rft.creator=.*rft.aucorp=Bobs\+Your\+Uncle.*rft.date=c2003.*rft.place=Oxon%2C\+U.K.*rft.pub=CABI\+Pub.*rft.format=notarealformat/)
+        expect(record).not_to match(/.*rft.isbn=.*/)
+        expect(record).not_to match(/.*rft.issn=.*/)
+      end
+    end
+
+    context 'with an array' do
+      let(:format) { ['Journal'] }
+      it "creates the appropriate context object" do
+        expect(record).to match(/.*mtx%3Ajournal.*rft.genre=article.*rft.title=Apples\+%3A\+botany%2C\+production%2C\+and\+uses.*rft.atitle=Apples\+%3A\+botany%2C\+production%2C\+and\+uses.*rft.aucorp=Bobs\+Your\+Uncle.*rft.date=c2003.*rft.issn=/)
+        expect(record).not_to match(/.*rft.genre=book.*rft.isbn=.*/)
+      end
+    end
+
+    context 'with a nil format' do
+      let(:format) { nil }
+      it "creates the appropriate context object" do
+        expect(record).to match(/.*mtx%3Adc.*rft.title=Apples\+%3A\+botany%2C\+production%2C\+and\+uses.*rft.creator=.*rft.aucorp=Bobs\+Your\+Uncle.*rft.date=c2003.*rft.place=Oxon%2C\+U.K.*rft.pub=CABI\+Pub.*rft.format=/)
+      end
+    end
+
+    context 'with an empty array' do
+      let(:format) { [] }
+      it "creates the appropriate context object" do
+        expect(record).to match(/.*mtx%3Adc.*rft.title=Apples\+%3A\+botany%2C\+production%2C\+and\+uses.*rft.creator=.*rft.aucorp=Bobs\+Your\+Uncle.*rft.date=c2003.*rft.place=Oxon%2C\+U.K.*rft.pub=CABI\+Pub.*rft.format=/)
+      end
     end
   end
 

data/spec/models/concerns/blacklight/marc/document_export_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+class MockClass260
+  include Blacklight::Marc::DocumentExport
+
+  def to_marc
+    fields = [
+      { "100" => { "subfields" => [{ "a" => "Borja, Ronaldo I." }]}},
+      { "245" => { "ind1" => " ", "ind2" => " ", "subfields" => [{ "a" => "Plasticity : ", "b" => "modeling & computation /", "c" => "Ronaldo I. Borja." }] } },
+      { "260" => { "ind1" => " ", "ind2" => " ", "subfields" => [{ "a" => "Berlin :", "b" => "Springer,", "c" => "[2013]" }] } }
+    ]
+    MARC::Record.new_from_hash('fields' => fields)
+  end
+end
+
+class MockClass264
+  include Blacklight::Marc::DocumentExport
+
+  def to_marc
+    fields = [
+      { "100" => { "subfields" => [{ "a" => "Borja, Ronaldo I." }]}},
+      { "245" => { "ind1" => " ", "ind2" => " ", "subfields" => [{ "a" => "Plasticity : ", "b" => "modeling & computation /", "c" => "Ronaldo I. Borja." }] } },
+      { "264" => { "ind1" => " ", "ind2" => " ", "subfields" => [{ "a" => "Berlin :", "b" => "Springer,", "c" => "[2013]" }] } }
+    ]
+    MARC::Record.new_from_hash('fields' => fields)
+  end
+end
+
+RSpec.describe Blacklight::Marc::DocumentExport do
+  describe 'export citiations from 260 field' do
+    it 'exports citations in apa format' do
+      expect(MockClass260.new.export_as_apa_citation_txt).to include('(2013)')
+      expect(MockClass260.new.export_as_apa_citation_txt).to include('Berlin: Springer.')
+    end
+
+    it 'exports citations in mla format' do
+      expect(MockClass260.new.export_as_mla_citation_txt).to include('2013.')
+      expect(MockClass260.new.export_as_mla_citation_txt).to include('Berlin: Springer,')
+    end
+
+    it 'exports citations in Chicago format' do
+      expect(MockClass260.new.export_as_chicago_citation_txt).to include('2013.')
+      expect(MockClass260.new.export_as_chicago_citation_txt).to include('Berlin: Springer,')
+    end
+  end
+
+  describe 'export citations from 264 field' do
+    it 'exports citations in apa format' do
+      expect(MockClass264.new.export_as_apa_citation_txt).to include('(2013)')
+      expect(MockClass264.new.export_as_apa_citation_txt).to include('Berlin: Springer.')
+    end
+
+    it 'exports citations in mla format' do
+      expect(MockClass264.new.export_as_mla_citation_txt).to include('2013.')
+      expect(MockClass264.new.export_as_mla_citation_txt).to include('Berlin: Springer,')
+    end
+
+    it 'exports citations in Chicago format' do
+      expect(MockClass264.new.export_as_chicago_citation_txt).to include('2013.')
+      expect(MockClass264.new.export_as_chicago_citation_txt).to include('Berlin: Springer,')
+    end
+  end
+end

data/spec/support/controller_level_helpers.rb

@@ -1,7 +1,5 @@
 module ControllerLevelHelpers
   module ControllerViewHelpers
-    include Blacklight::Facet
-
     def blacklight_config
       controller.blacklight_config
     end
@@ -18,4 +16,4 @@ module ControllerLevelHelpers
   def initialize_controller_helpers(helper)
     helper.extend ControllerViewHelpers
   end
-end
+end

data/spec/test_app_templates/Gemfile.extra

@@ -1 +1,7 @@
 gem "traject", '~>3.0'
+
+if ENV['BLACKLIGHT_VERSION'] == 'github'
+  gem 'blacklight', github: 'projectblacklight/blacklight'
+elsif ENV['BLACKLIGHT_VERSION'] && !ENV['BLACKLIGHT_VERSION'].empty?
+  gem 'blacklight', ENV['BLACKLIGHT_VERSION']
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-marc
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.1.1
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-07 00:00:00.000000000 Z
+date: 2024-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -140,14 +140,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: rspec-activemodel-mocks
   requirement: !ruby/object:Gem::Requirement
@@ -300,6 +300,7 @@ files:
 - spec/lib/marc_export_spec.rb
 - spec/lib/tasks/solr_marc_task_spec.rb
 - spec/lib/traject_indexer_spec.rb
+- spec/models/concerns/blacklight/marc/document_export_spec.rb
 - spec/routing/routes_spec.rb
 - spec/spec_helper.rb
 - spec/support/controller_level_helpers.rb
@@ -307,7 +308,6 @@ files:
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/views/bookmarks/_endnote.html.erb_spec.rb
 - spec/views/bookmarks/_refworks.html.erb_spec.rb
-- spec/views/catalog/_document_action.html.erb_spec.rb
 - spec/views/catalog/index.atom.builder_spec.rb
 - test_support/config/translation_maps/test_dewey.properties
 - test_support/config/translation_maps/test_formats.properties
@@ -331,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: MARC support for Blacklight
@@ -349,6 +349,7 @@ test_files:
 - spec/lib/marc_export_spec.rb
 - spec/lib/tasks/solr_marc_task_spec.rb
 - spec/lib/traject_indexer_spec.rb
+- spec/models/concerns/blacklight/marc/document_export_spec.rb
 - spec/routing/routes_spec.rb
 - spec/spec_helper.rb
 - spec/support/controller_level_helpers.rb
@@ -356,5 +357,4 @@ test_files:
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/views/bookmarks/_endnote.html.erb_spec.rb
 - spec/views/bookmarks/_refworks.html.erb_spec.rb
-- spec/views/catalog/_document_action.html.erb_spec.rb
 - spec/views/catalog/index.atom.builder_spec.rb

data/spec/views/catalog/_document_action.html.erb_spec.rb

@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-describe 'catalog/_document_action' do
-  let(:document_action_config) { Blacklight::Configuration::ToolConfig.new(tool_config) }
-  let(:document) { SolrDocument.new(id: '123') }
-
-  before do
-    allow(view).to receive_messages(controller_name: 'catalog')
-    render 'catalog/document_action', document_action_config: document_action_config, document: document
-  end
-
-  context "for refworks" do
-    let(:tool_config) { { if: :render_refworks_action?, partial: "document_action",
-      name: :refworks, key: :refworks, modal: false } }
-
-    it "should not be modal" do
-      expect(rendered).to have_link('Export to Refworks')
-      expect(rendered).not_to have_selector('a[data-ajax-modal]')
-    end
-  end
-end