blacklight-marc 7.0.1 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 432d7a660db81b2bbeca3baec8b83caba9a5a774cc3d0e81aba21f9ed14299dd
-  data.tar.gz: e86995f1d734859fa0c498bc84620fa7e0452ccd48b21b78b4a2be0cc880ef06
+  metadata.gz: 4c370b1c69a4ed2a7c2e77de6dbdeedbf6314fa1334ae1c3f88f216bd7dad23a
+  data.tar.gz: cf92a4865a958b67d9f9eec4f352e5cc666f5b1c052661d2e1d0899ce1e45419
 SHA512:
-  metadata.gz: a088b5bc21a4ff7325e552b07ef618e5ed60a09b74ba409277b14dea661616bd6a4999d25f090505ec46644a489f4651afce800a63c47d5f9e0b09ca5c432b49
-  data.tar.gz: 71712bc65b078fa2ad1c32b75e5aa2cbbf98e1ac3f0a4bc3784ff13991656ced7076fe729955d607fd9679c4bc618051ad639a15b184435692b641d46e57e7e7
+  metadata.gz: 54ddf02511c8fa185842d66f0f1f30a9ae988485fc0108e7f099fc6b4a8b4be83b56f96c6757949d7b3c95b9e1444fb08c219e68c3c5d2c1a81c560d092848e8
+  data.tar.gz: f1d1c86c9635a4519c898763d7a6fc80a05088a3060c4dd41dae28d2b7b763806cd3f577094d9d69f4760a9dbbf26944ac47bf92ef6181c144e96711d8acff1c

data/.github/workflows/ruby.yml

@@ -0,0 +1,32 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        rails_version: [6.1.4.7, 7.0.2.3]
+        ruby: [2.7, '3.0']
+        include:
+          - rails_version: 5.2.4.4
+            ruby: 2.7
+          - rails_version: 6.0.3.4
+            ruby: 2.7
+    env:
+      RAILS_VERSION: ${{ matrix.rails_version }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby ${{ matrix.ruby }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies with Rails ${{ matrix.rails_version }}
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake

data/app/models/concerns/blacklight/{solr/document/marc_export.rb → marc/document_export.rb}

@@ -1,11 +1,12 @@
 # -*- encoding : utf-8 -*-
 # -*- coding: utf-8 -*-
-# Written for use with Blacklight::Solr::Document::Marc, but you can use
+
+# Written for use with Blacklight::Marc::DocumentExtension, but you can use
 # it for your own custom Blacklight document Marc extension too -- just
 # include this module in any document extension (or any other class)
 # that provides a #to_marc returning a ruby-marc object.  This module will add
 # in export_as translation methods for a variety of formats.
-module Blacklight::Solr::Document::MarcExport
+module Blacklight::Marc::DocumentExport
 
   def self.register_export_formats(document)
     document.will_export_as(:xml)
@@ -126,9 +127,7 @@ module Blacklight::Solr::Document::MarcExport
     # As of 11 May 2010, Refworks has a problem with UTF-8 if it's decomposed,
     # it seems to want C form normalization, although RefWorks support
     # couldn't tell me that. -jrochkind
-    text = ActiveSupport::Multibyte::Unicode.normalize(text, :c)
-
-    return text
+    text.unicode_normalize(:nfc)
   end
 
   # Endnote Import Format. See the EndNote User Guide at:

data/app/models/concerns/blacklight/{solr/document/marc.rb → marc/document_extension.rb}

@@ -9,7 +9,7 @@
 # This extension would normally be registered using
 # Blacklight::Solr::Document#use_extension.  eg:
 #
-# SolrDocument.use_extension( Blacklight::Solr::Document::Marc ) { |document| my_logic_for_document_has_marc?( document ) }
+# SolrDocument.use_extension( Blacklight::Marc::DocumentExtension ) { |document| my_logic_for_document_has_marc?( document ) }
 #
 # This extension also expects a :marc_source_field and :marc_format_type to
 # be registered with the hosting classes extension_parameters. In an initializer
@@ -18,15 +18,16 @@
 # SolrDocument.extension_parameters[:marc_format_type] = :marc21 # or :marcxml
 require 'marc'
 
-module Blacklight::Solr::Document::Marc
+module Blacklight::Marc
+  module DocumentExtension
 
-  include Blacklight::Solr::Document::MarcExport # All our export_as stuff based on to_marc.
+  include Blacklight::Marc::DocumentExport # All our export_as stuff based on to_marc.
 
   class UnsupportedMarcFormatType < RuntimeError; end
 
   def self.extended(document)
     # Register our exportable formats, we inherit these from MarcExport
-    Blacklight::Solr::Document::MarcExport.register_export_formats( document )
+    Blacklight::Marc::DocumentExport.register_export_formats( document )
   end
 
   # ruby-marc object
@@ -59,7 +60,9 @@ module Blacklight::Solr::Document::Marc
   end
 
   def marc_record_from_marcxml
-    MARC::XMLReader.new(StringIO.new( fetch(_marc_source_field) )).to_a.first
+    marcxml = fetch(_marc_source_field)
+    marcxml = marcxml.first if marcxml.kind_of? Array
+    MARC::XMLReader.new(StringIO.new(marcxml)).to_a.first
   end
 
   def _marc_helper
@@ -76,4 +79,5 @@ module Blacklight::Solr::Document::Marc
     self.class.extension_parameters[:marc_format_type]
   end
 
+  end
 end

data/lib/blacklight/marc/engine.rb

@@ -1,21 +1,10 @@
-require "blacklight/marc"
-require "rails"
-
 module Blacklight::Marc
   class Engine < Rails::Engine
-    config.autoload_paths += %W(
-      #{config.root}/app/presenters
-      #{config.root}/app/controllers/concerns
-      #{config.root}/app/models/concerns
-    )
-
     rake_tasks do
       load "railties/solr_marc.rake"
     end
 
     initializer 'blacklight_marc.initialize' do |app|
-      require 'blacklight/solr/document'
-
       Mime::Type.register_alias "text/plain", :refworks_marc_txt
       Mime::Type.register_alias "text/plain", :openurl_kev
       Mime::Type.register "application/x-endnote-refer", :endnote
@@ -23,6 +12,13 @@ module Blacklight::Marc
       Mime::Type.register "application/marcxml+xml", :marcxml,
       ["application/x-marc+xml", "application/x-marcxml+xml",
        "application/marc+xml"]
+
+       # these are here for backwards compatibility with the old class names,
+       # which zeitwerk didn't care for
+       config.after_initialize do
+         Blacklight::Solr::Document::Marc = Blacklight::Marc::DocumentExtension
+         Blacklight::Solr::Document::MarcExport = Blacklight::Marc::DocumentExport
+       end
      end
   end
 end

data/lib/blacklight/marc/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Marc
-    VERSION = '7.0.1'
+    VERSION = '7.2.0'
   end
 end

data/lib/generators/blacklight/marc/install_generator.rb

@@ -40,11 +40,11 @@ EOF
       # The following shows how to setup this blacklight document to display marc documents
   extension_parameters[:marc_source_field] = :marc_ss
   extension_parameters[:marc_format_type] = :marcxml
-  use_extension( Blacklight::Solr::Document::Marc) do |document|
-    document.key?( SolrDocument.extension_parameters[:marc_source_field] )
+  use_extension(Blacklight::Marc::DocumentExtension) do |document|
+    document.key?(SolrDocument.extension_parameters[:marc_source_field])
   end
-  
-  field_semantics.merge!(    
+
+  field_semantics.merge!(
                          :title => "title_ssm",
                          :author => "author_ssm",
                          :language => "language_ssim",

data/spec/test_app_templates/Gemfile.extra

@@ -1,2 +1 @@
-gem 'blacklight', github: 'projectblacklight/blacklight'
 gem "traject", '~>3.0'

data/spec/views/bookmarks/_endnote.html.erb_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe 'bookmarks/_endnote.html.erb' do
+RSpec.describe 'bookmarks/_endnote' do
   before do
     allow(controller).to receive(:blacklight_config)
       .and_return(CatalogController.blacklight_config)

data/spec/views/bookmarks/_refworks.html.erb_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe 'bookmarks/_refworks.html.erb' do
+RSpec.describe 'bookmarks/_refworks' do
   before do
     allow(controller).to receive(:blacklight_config)
       .and_return(CatalogController.blacklight_config)

data/spec/views/catalog/index.atom.builder_spec.rb

@@ -29,7 +29,7 @@ describe "catalog/index" do
     params.merge!( @params )
     allow(view).to receive(:blacklight_config).and_return(@config)
     allow(view).to receive(:search_field_options_for_select).and_return([])
-
+    allow(controller).to receive(:search_state_class).and_return(Blacklight::SearchState)
     render :template => 'catalog/index', :formats => [:atom]
 
     # We need to use rexml to test certain things that have_tag wont' test

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-marc
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.2.0
 platform: ruby
 authors:
 - Justin Coyne
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-16 00:00:00.000000000 Z
+date: 2022-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -219,17 +219,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".solr_wrapper.yaml"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - app/assets/stylesheets/blacklight_marc.scss
 - app/helpers/blacklight_marc_helper.rb
-- app/models/concerns/blacklight/solr/document/marc.rb
-- app/models/concerns/blacklight/solr/document/marc_export.rb
+- app/models/concerns/blacklight/marc/document_export.rb
+- app/models/concerns/blacklight/marc/document_extension.rb
 - app/views/bookmarks/_endnote.html.erb
 - app/views/bookmarks/_marc_tools.html.erb
 - app/views/bookmarks/_refworks.html.erb
@@ -310,7 +310,7 @@ homepage: https://github.com/projectblacklight/blacklight-marc
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -325,8 +325,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: MARC support for Blacklight
 test_files:

data/.travis.yml

@@ -1,27 +0,0 @@
-language: ruby
-sudo: false
-
-notifications:
-  email: false
-
-matrix:
-  include:
-    - rvm: 2.7.1
-      env: "RAILS_VERSION=6.0.3.2"
-    - rvm: 2.6.6
-      env: "RAILS_VERSION=6.0.3.2"
-    - rvm: 2.6.6
-      env: "RAILS_VERSION=5.2.4.3"
-
-before_install:
-  - gem install bundler
-
-notifications:
-  irc: "irc.freenode.org#blacklight"
-  email:
-      - blacklight-commits@googlegroups.com
-
-global_env:
-  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-
-jdk: openjdk11