blacklight-marc 7.1.1 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c8cfea333dd144499e53e391fe0cb08fe57cb8f77a208fd855a2bb384389fa7
-  data.tar.gz: f21d7a0e17b3620cd75362f61b4c3c8ee202f6da9706906a56d1614348acc996
+  metadata.gz: 4c370b1c69a4ed2a7c2e77de6dbdeedbf6314fa1334ae1c3f88f216bd7dad23a
+  data.tar.gz: cf92a4865a958b67d9f9eec4f352e5cc666f5b1c052661d2e1d0899ce1e45419
 SHA512:
-  metadata.gz: '068fc78f8e7e22f46028b21a0b80c2328a00ec0052d4c4f6c0e7dbd5214d6746414446387d764f656e4d2eb6839a5c90fe9ddeb2ab9e3a800bf504d66ccaefb4'
-  data.tar.gz: 56c70c31d927d4b77cbfdb01a2aa695ded5dc847e13b387cb24a9634f68a5aa0a097800e9911909e1166f7c7b58835c9dbb04c04245837e4a175e8f9d30e29bf
+  metadata.gz: 54ddf02511c8fa185842d66f0f1f30a9ae988485fc0108e7f099fc6b4a8b4be83b56f96c6757949d7b3c95b9e1444fb08c219e68c3c5d2c1a81c560d092848e8
+  data.tar.gz: f1d1c86c9635a4519c898763d7a6fc80a05088a3060c4dd41dae28d2b7b763806cd3f577094d9d69f4760a9dbbf26944ac47bf92ef6181c144e96711d8acff1c

data/.github/workflows/ruby.yml

@@ -11,26 +11,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        rails_version: [6.1.1]
-        ruby: [2.7, 3.0]
-    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
-  test_rails52:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        rails_version: [5.2.4.4, 6.0.3.4]
-        ruby: [2.7]
+        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:

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)

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
@@ -78,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.1.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.1.1
+  version: 7.2.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-20 00:00:00.000000000 Z
+date: 2022-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -228,8 +228,8 @@ files:
 - 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
@@ -325,7 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.29
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: MARC support for Blacklight