blacklight-marc 8.0.0 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 510b8f1ae8d1d7752d0dbeadf0db9e4cc5003d88dd25c7b4a9e76ba1757c2d4e
-  data.tar.gz: 61ffc549983a3e3ca3fe0497cfcac437bac64318fba45d7836ad0307d2f1a83a
+  metadata.gz: 23e9d46508c9e92c90ad0f589728440809b003db1ada7744b35961d393a7b17d
+  data.tar.gz: a7760905d39e8540bf22a6adb5ce6883de27c02796569f2469b1c3008d52e89a
 SHA512:
-  metadata.gz: cc9bacb9622c2e4f68f2ff7058d9ce8495e2667ab7b8fae7c5495e571a11e82ccd9699bb73237aad5935f6d47a229e651671158eb22fe686816b14c520adaf09
-  data.tar.gz: b8127b909fd370507c3a7a59860ae395abe2f7b23828e18dfae1c54042507ee7c7c8f7b03f7986e58d308f855ca38fad0851b1f93b6d5aab7e3ef31c632555e7
+  metadata.gz: c80948cb35c420f12a658f36084856113d5e240843fc78534b45f678985000b19b3d16830d2660edbfebd9a7fdb6ea9cc31089fe5d2885c7d47628b5dea7ffab
+  data.tar.gz: f5909facef040f97f73d2071876e2c93a1cdb2cdbae2da9985b4e074780eb0fda021fdc902e7fcb8617387861c37d59d8340de5fc0fc562bfdf9715ce0b49260

data/.github/workflows/ruby.yml

@@ -1,26 +1,37 @@
----
 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']
+        rails_version: ['6.1.7', '7.0.4']
+        blacklight_version: ['~> 7.0']
+        experimental: [false]
         include:
-          - rails_version: 5.2.4.4
-            ruby: 2.7
-          - rails_version: 6.0.3.4
-            ruby: 2.7
+        - ruby: '3.1'
+          rails_version: '7.0.4'
+          blacklight_version: '~> 7.0'
+          experimental: false
+        - ruby: '3.1'
+          rails_version: '7.0.4'
+          blacklight_version: '8.0.0.beta4'
+          experimental: false
+        - ruby: '3.1'
+          rails_version: '7.0.4'
+          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

@@ -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/lib/blacklight/marc/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Marc
-    VERSION = '8.0.0'
+    VERSION = '8.1.0'
   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/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.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-07 00:00:00.000000000 Z
+date: 2023-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -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.3.3
 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