blacklight-marc 8.1.4 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26890c07eb8b77f83b81a48582cf7451939bf2bed0f3644cc722fd027cc574d5
-  data.tar.gz: 0be9945673a7cf3eaab696c4d119a749cfdb99e87eccc5acd6f1bddc7aee600a
+  metadata.gz: 7ee15ad609aa69929e84fcba4ee7095fa651a7818fcbce00c256a1a4cfa3c505
+  data.tar.gz: c7c11ceb576fd3f97d9035fde69c30fedf72d14396f12ddd0e1d99f348e68380
 SHA512:
-  metadata.gz: 306be94c943c13ae14b2be90c420005cf7a4051675b0cd25e1bfab2f2f5396cce150c7a12186ecf8dd17f34ad84159eb49b7da9017febdf8104e529b12fc6599
-  data.tar.gz: 1f1d30b14b328bdbccf966fb8ee87a84adf8236cbc15f1ceb26eb963a7feca7c8a15874c467759bff095cd1168ec1d8156d350cc9e6ff4b4545d7538963f6089
+  metadata.gz: 3c154842d4142fecec23c94542c08714ba79445e97e5d480830c7d33f403c30d3cc785c79fc886d8301e9535712b8bd188a14285331027a77bbbded696e69300
+  data.tar.gz: 99bace3a0eb1e458f56c366be4cc48b032852fe19aef76dc2788fdd343aa3fea9d5d8bfee985b05d9eb60179ad3aceafb64b4bc252c359daede56951e9187f13

data/.github/workflows/ruby.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 jobs:
   test:
@@ -12,33 +12,39 @@ jobs:
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        ruby: ['3.2']
-        rails_version: ['7.1.3', '7.2.0']
-        blacklight_version: ['~> 8.1']
+        ruby: ["3.4"]
+        rails_version: ["8.0.1"]
+        blacklight_version: ["~> 8.1"]
         experimental: [false]
         include:
-        - ruby: '2.7'
-          rails_version: '6.1.7.6'
-          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
+          - ruby: "3.4"
+            rails_version: "8.1.1"
+            blacklight_version: "~> 9.0"
+            experimental: false
+          - ruby: "3.4"
+            rails_version: "8.0.1"
+            blacklight_version: "github"
+            experimental: true
+          - ruby: "3.3"
+            rails_version: "7.2.2.1"
+            blacklight_version: "~> 8.1"
+            experimental: false
+          - ruby: "3.2"
+            rails_version: "7.2.2.1"
+            blacklight_version: "~> 8.1"
+            experimental: false
+
     env:
       RAILS_VERSION: ${{ matrix.rails_version }}
       BLACKLIGHT_VERSION: ${{ matrix.blacklight_version }}
+      ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-listen --skip-spring --skip-keeps --skip-kamal --skip-solid --skip-coffee --skip-test -a propshaft --css=bootstrap"
     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
+      - 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/{.solr_wrapper.yaml → .solr_wrapper.yml}

@@ -3,3 +3,5 @@
 collection:
   dir: solr/conf/
   name: blacklight-core
+port: 8983
+version: 9.6.1

data/Rakefile

@@ -8,7 +8,7 @@ task :default => [:ci]
 
 task :ci => ['engine_cart:generate'] do
   require 'solr_wrapper'
-  SolrWrapper.wrap(port: '8983') do |solr|
+  SolrWrapper.wrap do |solr|
     solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path(File.dirname(__FILE__)), "solr", "conf")) do
       Rake::Task["blacklight_marc:fixtures"].invoke
       Rake::Task['spec'].invoke

data/app/assets/stylesheets/blacklight_marc.css

@@ -0,0 +1,18 @@
+.marc_view {
+  .field {
+    align-items: flex-start;
+    border-bottom: 1px solid var(--bs-gray-600);
+    display: flex;
+    gap: 2em;
+  }
+
+  .ind1,
+  .ind2 {
+    display: inline;
+    padding: 0 0.5rem;
+  }
+
+  .tag_ind {
+    flex-shrink: 0;
+  }
+}

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

@@ -1,4 +1,4 @@
-<div id="marc_view" class="marc_view">
+<div id="marc_view" class="marc_view font-monospace">
   <div class="field"><%= t('blacklight.search.librarian_view.leader', :leader => document.to_marc.leader) %></div>
   <%- document.to_marc.each do |field| -%>
     <div class="field">

data/blacklight-marc.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'blacklight', '>= 7.11', '< 9'
+  spec.add_dependency 'blacklight', '>= 7.11', '< 10'
   spec.add_dependency "library_stdnums"
   spec.add_dependency "rails"
   spec.add_dependency "marc",      ">= 0.4.3", "< 2.0"  # Marc record parser.
@@ -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", '~> 6.1'
+  spec.add_development_dependency "rspec-rails", '~> 7.0'
   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.1.4'
+    VERSION = '9.0.0'
   end
 end

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

@@ -16,7 +16,7 @@ module Blacklight::Marc
     source_root File.expand_path('../templates', __FILE__)
 
     def assets
-      insert_into_file "app/assets/stylesheets/blacklight.scss", after: "@import 'blacklight/blacklight';" do
+      append_to_file "app/assets/stylesheets/application.bootstrap.scss" do
 <<-EOF
 
 @import 'blacklight_marc';

data/lib/railties/solr_marc.rake

@@ -27,7 +27,8 @@ namespace :solr do
 
 
     desc "Index the supplied test data into Solr"
-    task :index_test_data => :environment do
+    task :index_test_data do
+      Rake::Task[ "environment" ].invoke
       # for now we are assuming test data is located in BL source checkout.
       ENV['MARC_FILE'] = File.expand_path("../../../test_support/data/test_data.utf8.mrc", __FILE__ )
 
@@ -48,7 +49,6 @@ namespace :solr do
         if  (ENV["NOOP"] || (!solrmarc_arguments["MARC_FILE"]))
           Rake::Task[ "solr:marc:index:info" ].execute
         else
-          require './app/models/marc_indexer' unless defined?(MarcIndexer)
           open(solrmarc_arguments['MARC_FILE']) do |io|
             SolrMarc.indexer.process(io)
           end
@@ -151,5 +151,3 @@ def locate_path(*subpath_fragments)
   end
   File.join(base_match.to_s, subpath) if base_match
 end
-
-

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

@@ -12,9 +12,10 @@ describe "catalog/index" do
     end
 
     @params = { :content_format => 'marc', :f => { :format => ['Book'] }, :page => 2 }
+    search_state = Blacklight::SearchState.new(@params, @config)
 
     # run a solr query to get our data
-    service = CatalogController.search_service_class.new(config: @config, user_params: @params)
+    service = CatalogController.search_service_class.new(config: @config, user_params: @params, search_state: search_state)
     @response, _ = service.search_results
     @document_list = @response.documents
   end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-marc
 version: !ruby/object:Gem::Version
-  version: 8.1.4
+  version: 9.0.0
 platform: ruby
 authors:
 - Justin Coyne
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-19 00:00:00.000000000 Z
+date: 2025-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -19,7 +18,7 @@ dependencies:
         version: '7.11'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '9'
+        version: '10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +28,7 @@ dependencies:
         version: '7.11'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '9'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: library_stdnums
   requirement: !ruby/object:Gem::Requirement
@@ -140,14 +139,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rspec-activemodel-mocks
   requirement: !ruby/object:Gem::Requirement
@@ -227,12 +226,12 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".solr_wrapper.yaml"
+- ".solr_wrapper.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- app/assets/stylesheets/blacklight_marc.scss
+- app/assets/stylesheets/blacklight_marc.css
 - app/controllers/concerns/blacklight/marc/catalog.rb
 - app/helpers/blacklight_marc_helper.rb
 - app/models/concerns/blacklight/marc/document_export.rb
@@ -316,7 +315,6 @@ homepage: https://github.com/projectblacklight/blacklight-marc
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -331,8 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.15
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: MARC support for Blacklight
 test_files:

data/app/assets/stylesheets/blacklight_marc.scss

@@ -1,23 +0,0 @@
-/* border between items on marc view */
-$marc_item_separator: 1px solid $text-muted !default;
-
-.marc_view {
-	font-family: $font-family-monospace;
-
-  .field {
-		align-items: flex-start;
-    border-bottom: $marc_item_separator;
-		display: flex;
-		gap: 2em;
-  }
-
-  .ind1, .ind2
-  {
-    display:inline;
-    padding: 0 ($spacer / 2);
-  }
-
-	.tag_ind {
-		flex-shrink: 0;
-	}
-}