blacklight-marc 7.0.0.rc1 → 7.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4887a886da30b95852771567286d61c0ff76aba5
-  data.tar.gz: b68946eb8cab229c5ae349e9fe7df6a42d8be336
+SHA256:
+  metadata.gz: 7c8cfea333dd144499e53e391fe0cb08fe57cb8f77a208fd855a2bb384389fa7
+  data.tar.gz: f21d7a0e17b3620cd75362f61b4c3c8ee202f6da9706906a56d1614348acc996
 SHA512:
-  metadata.gz: e3e409ff533c30f4c875fb8927663cb25186b3d010743b623ed5f41c46ad6742aed1e0c7ba477eb2b018677acde0cee147398fe8db9847e7747833fc4ea77c45
-  data.tar.gz: 3de4701ed0a5df51bc9227ffd95b5e5434f074910dd3e4e6739c444264641c430804d4eb85923ecd9f3a11fa04b6299254760f52b5d5553c5b78c6bcdf0efccb
+  metadata.gz: '068fc78f8e7e22f46028b21a0b80c2328a00ec0052d4c4f6c0e7dbd5214d6746414446387d764f656e4d2eb6839a5c90fe9ddeb2ab9e3a800bf504d66ccaefb4'
+  data.tar.gz: 56c70c31d927d4b77cbfdb01a2aa695ded5dc847e13b387cb24a9634f68a5aa0a097800e9911909e1166f7c7b58835c9dbb04c04245837e4a175e8f9d30e29bf

data/.github/workflows/ruby.yml

@@ -0,0 +1,45 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    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]
+    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/Gemfile

@@ -33,6 +33,11 @@ else
   end
 
   case ENV['RAILS_VERSION']
+  when /^6.0/
+    gem 'sass-rails', '>= 6'
+    gem 'webpacker', '~> 4.0'
+  when /^5.[12]/
+    gem 'sass-rails', '~> 5.0'
   when /^4.2/
     gem 'responders', '~> 2.0'
     gem 'sass-rails', '>= 5.0'

data/app/helpers/blacklight_marc_helper.rb

@@ -1,18 +1,18 @@
 module BlacklightMarcHelper
 
   # This method should move to BlacklightMarc in Blacklight 6.x
-  def refworks_export_url params = {}
+  def refworks_export_url params = {}, *_
     "http://www.refworks.com/express/expressimport.asp?vendor=#{CGI.escape(params[:vendor] || application_name)}&filter=#{CGI.escape(params[:filter] || "MARC Format")}&encoding=65001" + (("&url=#{CGI.escape(params[:url])}" if params[:url]) || "")
   end
 
-  def refworks_solr_document_path opts = {}
+  def refworks_solr_document_path opts = {}, *_
     if opts[:id]
       refworks_export_url(url: solr_document_url(opts[:id], format: :refworks_marc_txt))
     end
   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 = {}
+  def single_endnote_catalog_path opts = {}, *_
     solr_document_path(opts.merge(format: 'endnote'))
   end
 

data/app/models/concerns/blacklight/solr/document/marc.rb

@@ -59,7 +59,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

data/app/models/concerns/blacklight/solr/document/marc_export.rb

@@ -126,9 +126,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/blacklight-marc.gemspec

@@ -18,22 +18,19 @@ 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.0.0.a', '< 8.a'
+  spec.add_dependency 'blacklight', '~> 7.0'
   spec.add_dependency "library_stdnums"
   spec.add_dependency "rails"
-  # Let's allow future versions of marc, count on
-  # them to be backwards compat until 1.1
-  spec.add_dependency "marc",      ">= 0.4.3", "< 1.1"  # Marc record parser.
+  spec.add_dependency "marc",      ">= 0.4.3", "< 2.0"  # Marc record parser.
   spec.add_dependency "traject", "~>3.0"
   spec.add_dependency 'marc-fastxmlwriter' # NO REXML
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec-rails", '~> 3.0'
+  spec.add_development_dependency "rspec-rails", '~> 4.0'
   spec.add_development_dependency "rspec-activemodel-mocks"
   spec.add_development_dependency "solr_wrapper"
   spec.add_development_dependency "capybara"
-  spec.add_development_dependency "coveralls"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "engine_cart", "~> 2.0"
 end

data/lib/blacklight/marc/engine.rb

@@ -14,6 +14,8 @@ module Blacklight::Marc
     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

data/lib/blacklight/marc/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Marc
-    VERSION = '7.0.0.rc1'
+    VERSION = '7.1.1'
   end
 end

data/solr/conf/schema.xml

@@ -71,7 +71,7 @@
     <dynamicField name="*_isi" type="int" stored="true" indexed="true" multiValued="false"/>
     <dynamicField name="*_isim" type="int" stored="true" indexed="true" multiValued="true"/>
 
-    <!-- trie integer (_it...) (for faster range queries) -->
+    <!-- IntegerPointField (_it...) (for faster range queries) -->
 
     <dynamicField name="*_iti" type="tint" stored="false" indexed="true" multiValued="false"/>
     <dynamicField name="*_itim" type="tint" stored="false" indexed="true" multiValued="true"/>
@@ -93,7 +93,7 @@
     <dynamicField name="*_dtsi" type="date" stored="true" indexed="true" multiValued="false"/>
     <dynamicField name="*_dtsim" type="date" stored="true" indexed="true" multiValued="true"/>
 
-    <!-- trie date (_dtt...) (for faster range queries) -->
+    <!-- DatePointField (_dtt...) (for faster range queries) -->
 
     <dynamicField name="*_dtti" type="tdate" stored="false" indexed="true" multiValued="false"/>
     <dynamicField name="*_dttim" type="tdate" stored="false" indexed="true" multiValued="true"/>
@@ -113,7 +113,7 @@
     <dynamicField name="*_lsi" type="long" stored="true" indexed="true" multiValued="false"/>
     <dynamicField name="*_lsim" type="long" stored="true" indexed="true" multiValued="true"/>
 
-    <!-- trie long (_lt...) (for faster range queries) -->
+    <!-- LongPointField (_lt...) (for faster range queries) -->
 
     <dynamicField name="*_lti" type="tlong" stored="false" indexed="true" multiValued="false"/>
     <dynamicField name="*_ltim" type="tlong" stored="false" indexed="true" multiValued="true"/>
@@ -133,7 +133,7 @@
     <dynamicField name="*_dbsi" type="double" stored="true" indexed="true" multiValued="false"/>
     <dynamicField name="*_dbsim" type="double" stored="true" indexed="true" multiValued="true"/>
 
-    <!-- trie double (_dbt...) (for faster range queries) -->
+    <!-- DoublePointField (_dbt...) (for faster range queries) -->
 
     <dynamicField name="*_dbti" type="tdouble" stored="false" indexed="true" multiValued="false"/>
     <dynamicField name="*_dbtim" type="tdouble" stored="false" indexed="true" multiValued="true"/>
@@ -153,7 +153,7 @@
     <dynamicField name="*_fsi" type="float" stored="true" indexed="true" multiValued="false"/>
     <dynamicField name="*_fsim" type="float" stored="true" indexed="true" multiValued="true"/>
 
-    <!-- trie float (_ft...) (for faster range queries) -->
+    <!-- FloatPointField (_ft...) (for faster range queries) -->
 
     <dynamicField name="*_fti" type="tfloat" stored="false" indexed="true" multiValued="false"/>
     <dynamicField name="*_ftim" type="tfloat" stored="false" indexed="true" multiValued="true"/>
@@ -231,23 +231,23 @@
     <fieldType name="rand" class="solr.RandomSortField" omitNorms="true"/>
 
     <!-- Default numeric field types.  -->
-    <fieldType name="int" class="solr.TrieIntField" precisionStep="0" positionIncrementGap="0"/>
-    <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" positionIncrementGap="0"/>
-    <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
-    <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" positionIncrementGap="0"/>
+    <fieldType name="int" class="solr.IntPointField" docValues="true"/>
+    <fieldType name="float" class="solr.FloatPointField" docValues="true"/>
+    <fieldType name="long" class="solr.LongPointField" docValues="true"/>
+    <fieldType name="double" class="solr.DoublePointField" docValues="true"/>
 
-    <!-- trie numeric field types for faster range queries -->
-    <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" positionIncrementGap="0"/>
-    <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" positionIncrementGap="0"/>
-    <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" positionIncrementGap="0"/>
-    <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
+    <!-- PointField numeric field types for faster range queries -->
+    <fieldType name="tint" class="solr.IntPointField" docValues="true"/>
+    <fieldType name="tfloat" class="solr.FloatPointField" docValues="true"/>
+    <fieldType name="tlong" class="solr.LongPointField" docValues="true"/>
+    <fieldType name="tdouble" class="solr.DoublePointField" docValues="true"/>
 
     <!-- The format for this date field is of the form 1995-12-31T23:59:59Z
          Optional fractional seconds are allowed: 1995-12-31T23:59:59.999Z
       -->
-    <fieldType name="date" class="solr.TrieDateField" precisionStep="0" positionIncrementGap="0"/>
-    <!-- A Trie based date field for faster date range queries and date faceting. -->
-    <fieldType name="tdate" class="solr.TrieDateField" precisionStep="6" positionIncrementGap="0"/>
+    <fieldType name="date" class="solr.DatePointField" docValues="true"/>
+    <!-- A PointField based date field for faster date range queries and date faceting. -->
+    <fieldType name="tdate" class="solr.DatePointField" docValues="true"/>
 
 
     <!-- This point type indexes the coordinates as separate fields (subFields)
@@ -263,8 +263,8 @@
      -->
     <fieldType name="point" class="solr.PointType" dimension="2" subFieldSuffix="_d"/>
 
-    <!-- A specialized field for geospatial search. If indexed, this fieldType must not be multivalued. -->
-    <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
+    <!-- A specialized field for geospatial search filters and distance sorting. -->
+    <fieldType name="location" class="solr.LatLonPointSpatialField" docValues="true"/>
 
     <!-- An alternative geospatial field type new to Solr 4.  It supports multiValued and polygon shapes.
       For more information about this and other Spatial fields new to Solr 4, see:
@@ -276,7 +276,7 @@
     <field name="bbox" type="bbox" />
     <fieldType name="bbox" class="solr.BBoxField"
                geo="true" distanceUnits="kilometers" numberType="_bbox_coord" storeSubFields="false"/>
-    <fieldType name="_bbox_coord" class="solr.TrieDoubleField" precisionStep="8" docValues="true" stored="false"/>
+    <fieldType name="_bbox_coord" class="solr.DoublePointField" docValues="true" stored="false"/>
 
     <fieldType name="text" class="solr.TextField" omitNorms="false">
       <analyzer>
@@ -350,7 +350,6 @@
       <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
-        <filter class="solr.StandardFilterFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
       </analyzer>
@@ -359,7 +358,6 @@
     <fieldType  name="textSuggest" class="solr.TextField" positionIncrementGap="100">
        <analyzer>
           <tokenizer class="solr.KeywordTokenizerFactory"/>
-          <filter class="solr.StandardFilterFactory"/>
           <filter class="solr.LowerCaseFilterFactory"/>
           <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
        </analyzer>

data/spec/controllers/catalog_controller_spec.rb

@@ -22,7 +22,7 @@ describe CatalogController do
   describe "#librarian_view" do
     it "is successful" do
       get :librarian_view, params: { id: '86207417' }
-      expect(response).to be_success
+      expect(response).to be_successful
     end
   end
 end

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

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

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-marc
 version: !ruby/object:Gem::Version
-  version: 7.0.0.rc1
+  version: 7.1.1
 platform: ruby
 authors:
 - Justin Coyne
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-10-29 00:00:00.000000000 Z
+date: 2021-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 7.0.0.a
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.a
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 7.0.0.a
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.a
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: library_stdnums
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +61,7 @@ dependencies:
         version: 0.4.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -77,7 +71,7 @@ dependencies:
         version: 0.4.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: traject
   requirement: !ruby/object:Gem::Requirement
@@ -110,16 +104,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -140,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec-activemodel-mocks
   requirement: !ruby/object:Gem::Requirement
@@ -190,20 +184,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -239,9 +219,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".solr_wrapper.yaml"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -330,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
@@ -341,13 +321,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.2.29
+signing_key:
 specification_version: 4
 summary: MARC support for Blacklight
 test_files:

data/.travis.yml

@@ -1,23 +0,0 @@
-language: ruby
-sudo: false
-
-notifications:
-  email: false
-
-rvm:
-  - 2.3.4
-  - 2.4.4
-  - 2.5.1
-
-before_install:
-  - gem install bundler
-
-notifications:
-  irc: "irc.freenode.org#blacklight"
-  email:
-      - blacklight-commits@googlegroups.com
-
-global_env:
-  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-  
-jdk: oraclejdk8