blacklight-marc 6.0.0 → 7.0.0

data/spec/lib/tasks/solr_marc_task_spec.rb

@@ -16,15 +16,15 @@ describe "solr:marc:*" do
     ensure
       $stdout = STDOUT
     end
-    
+
     before(:all) do
-      @rake = Rake::Application.new      
+      @rake = Rake::Application.new
       Rake.application = @rake
       Rake.application.rake_require "../lib/railties/solr_marc"
       Rake::Task.define_task(:environment)
     end
 
-    describe 'solr:marc:index_test_data' do        
+    describe 'solr:marc:index_test_data' do
       it 'should print out usage using NOOP=true' do
         root = Rails.root
         ENV['NOOP'] = "true"
@@ -33,9 +33,9 @@ describe "solr:marc:*" do
         end
 
         expect(o).to match(Regexp.escape("Possible environment variables, with settings as invoked"))
-      end    
+      end
     end
-    
+
     describe "solr:marc:index" do
       after do
         SolrMarc.indexer= nil
@@ -50,7 +50,7 @@ describe "solr:marc:*" do
           @rake['solr:marc:index:work'].invoke
         end
       end
-      
-    end  
+
+    end
   end
 

data/spec/lib/traject_indexer_spec.rb

@@ -70,7 +70,7 @@ module TestIndexer
       store "marc_source.type", "xml"
       store "writer_class_name", "TestIndexer::Writer"
     end
-    to_field "id", trim(extract_marc("001"), :first => true)
+    to_field "id", extract_marc("001"), first_only, trim
     to_field "format", extract_marc('007[0-1]') do |rec, acc|
       legacy_formats = Traject::TranslationMap.new("test_formats")
       acc << rec.leader[6..7]
@@ -80,7 +80,9 @@ module TestIndexer
       acc << 'Unknown' # the default
       acc.replace Array(acc[0]) # just take the first
     end
-    to_field "mapped", map_value(literal('k'),translation_map:"test_formats")
+    to_field "mapped", literal('k'), translation_map("test_formats","test_dewey")
+    to_field "mapped_second", literal('000'), translation_map("test_dewey","test_formats")
+    to_field "mapped_third", literal('000'), translation_map("test_dewey")
   end
   class Writer
     def self.accumulator=(acc)
@@ -127,6 +129,8 @@ describe Blacklight::Marc::Indexer do
       json = vals.first
       expect(json['format']).to eql(['Sound Disc'])
       expect(json['mapped']).to eql(['Image'])
+      expect(json['mapped_second']).to eql(['Bad Metadata'])
+      expect(json['mapped_third']).to eql(['000s - Computer Science, Information & General Works'])
     end
   end
 end

data/spec/routing/routes_spec.rb

@@ -6,11 +6,5 @@ describe "Routing" do
       expect({ :get => "/catalog/111/librarian_view" }).to route_to(:controller => 'catalog', :action => 'librarian_view', :id => "111")
       expect({ :get => librarian_view_solr_document_path('111') }).to route_to(:controller => 'catalog', :action => 'librarian_view', :id => "111")
     end
-    it "should map {:controller => 'catalog', :action => 'endnote'} to /catalog/endnote" do
-      expect({ :get => "/catalog/endnote" }).to route_to(:controller => 'catalog', :action => 'endnote')
-      expect({ :get => endnote_solr_document_path }).to route_to(:controller => 'catalog', :action => 'endnote')
-    end
   end
 end
-
-

data/spec/spec_helper.rb

@@ -20,8 +20,8 @@ require 'rspec/active_model/mocks'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-# Blacklight, again, make sure we're looking in the right place for em. 
-# Relative to HERE, NOT to Rails.root, which is off somewhere else. 
+# Blacklight, again, make sure we're looking in the right place for em.
+# Relative to HERE, NOT to Rails.root, which is off somewhere else.
 Dir[Pathname.new(File.expand_path("../support/**/*.rb", __FILE__))].each {|f| require f}
 
 RSpec.configure do |config|

data/spec/test_app_templates/Gemfile.extra

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

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -1,35 +1,36 @@
 require 'rails/generators'
 
 class TestAppGenerator < Rails::Generators::Base
-  def fix_travis_rails_4 
+  def fix_travis_rails_4
     if ENV['TRAVIS']
-      insert_into_file 'app/assets/stylesheets/application.css', :before =>'/*' do      
+      insert_into_file 'app/assets/stylesheets/application.css', :before =>'/*' do
         "@charset \"UTF-8\";\n"
       end
     end
   end
 
-  def remove_index 
-    remove_file "public/index.html"
-  end
-  
-  def run_blacklight_generator
-    say_status("warning", "GENERATING BL", :yellow) 
-    gem 'blacklight'
-    gem "traject", '~>2.0'
+  def add_gems
+    gem 'rsolr', '>= 1.0', '< 3'
     Bundler.with_clean_env do
-      run "bundle install"
+      run 'bundle install'
     end
+  end
 
-    generate 'blacklight:install', '--devise --jettywrapper'
+  def remove_index
+    remove_file "public/index.html"
+  end
+
+  def run_blacklight_generator
+    say_status("warning", "GENERATING BL", :yellow)
+    generate 'blacklight:install', '--devise'
   end
 
   def run_test_support_generator
-    say_status("warning", "GENERATING test_support", :yellow)       
+    say_status("warning", "GENERATING test_support", :yellow)
 
     generate 'blacklight:test_support'
   end
-  
+
   def run_blacklight_marc_generator
     generate 'blacklight:marc:install'
   end

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

@@ -1,13 +1,23 @@
 require 'spec_helper'
 
-describe 'bookmarks/_endnote.html.erb' do
+RSpec.describe 'bookmarks/_endnote.html.erb' do
   before do
-    allow(controller).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)
+    allow(controller).to receive(:blacklight_config)
+      .and_return(CatalogController.blacklight_config)
+    assign(:response, response)
+    render
   end
 
-  it "should have a link" do
-    assign(:document_list, [mock_model(Bookmark, document_id: 7, exports_as?: true), mock_model(Bookmark, document_id: 8, exports_as?: true)])
-    render
-    expect(rendered).to have_link "Export to EndNote"
+  let(:response) do
+    instance_double(Blacklight::Solr::Response,
+                    documents: documents)
+  end
+  let(:documents) do
+    [mock_model(Bookmark, document_id: 7, exports_as?: true),
+     mock_model(Bookmark, document_id: 8, exports_as?: true)]
+  end
+
+  it 'has a link' do
+    expect(rendered).to have_link 'Export to EndNote'
   end
 end

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

@@ -1,15 +1,25 @@
 require 'spec_helper'
 
-describe 'bookmarks/_refworks.html.erb' do
+RSpec.describe 'bookmarks/_refworks.html.erb' do
   before do
-    allow(controller).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)
-  end
-
-  it "should have a link" do
+    allow(controller).to receive(:blacklight_config)
+      .and_return(CatalogController.blacklight_config)
     allow(view).to receive_messages(encrypt_user_id: 1)
     allow(view).to receive_messages(current_or_guest_user: mock_model(User))
-    assign(:document_list, [mock_model(Bookmark, document_id: 7, exports_as?: true), mock_model(Bookmark, document_id: 8, exports_as?: true)])
+    assign(:response, response)
     render
-    expect(rendered).to have_link "Export to Refworks"
+  end
+
+  let(:response) do
+    instance_double(Blacklight::Solr::Response,
+                    documents: documents)
+  end
+  let(:documents) do
+    [mock_model(Bookmark, document_id: 7, exports_as?: true),
+     mock_model(Bookmark, document_id: 8, exports_as?: true)]
+  end
+
+  it 'has a link' do
+    expect(rendered).to have_link 'Export to Refworks'
   end
 end

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'rexml/document'
 
-describe "catalog/index" do  
+describe "catalog/index" do
 
   before(:all) do
     @config = Blacklight::Configuration.new.configure do |config|
@@ -10,34 +10,31 @@ describe "catalog/index" do
         :rows => 10
       }
     end
-    
-    @params = { 'content_format' => 'marc', :f => { :format => ['Book'] }, :page => 2 }
 
-    # run a solr query to get our data
-    c = CatalogController.new
-    c.blacklight_config = @config
-    @response, @document_list = c.search_results(@params)
+    @params = { :content_format => 'marc', :f => { :format => ['Book'] }, :page => 2 }
 
-    # munge the solr response to match test expectations
-    @document_list[1] = SolrDocument.new(@document_list[1].with_indifferent_access.reject! { |k,v| k == "author_display" })
-    @document_list[5] = SolrDocument.new(@document_list[1].with_indifferent_access.reject! { |k,v| k == "marc_display" })
+    # run a solr query to get our data
+    service = CatalogController.search_service_class.new(config: @config, user_params: @params)
+    @response, _ = service.search_results
+    @document_list = @response.documents
   end
+
   before(:each) do
     # Not sure what Assigns was doing here ... dhf
     #    assigns[:response] = @rsolr_response
     #    assigns[:document_list] = @document_list
     # not sure why we can't use assigns for 'params', instead this weird way,
-    # but okay. 
+    # but okay.
 
     params.merge!( @params )
     allow(view).to receive(:blacklight_config).and_return(@config)
     allow(view).to receive(:search_field_options_for_select).and_return([])
 
-    render :template => 'catalog/index', :formats => [:atom] 
+    render :template => 'catalog/index', :formats => [:atom]
 
-    # We need to use rexml to test certain things that have_tag wont' test    
-    # note that response is depricated rails 3, use "redered" instead. 
-    @response_xml = REXML::Document.new(rendered)   
+    # We need to use rexml to test certain things that have_tag wont' test
+    # note that response is depricated rails 3, use "redered" instead.
+    @response_xml = REXML::Document.new(rendered)
   end
 
   describe "when content_format is specified" do
@@ -54,5 +51,3 @@ describe "catalog/index" do
     end
   end
 end
-
-

data/test_support/config/translation_maps/test_formats.properties

@@ -19,4 +19,6 @@ m = Computer File
 #    007[0]  when it doesn't clash with above
 h = Microform
 q = Musical Score
-v = Video
+v = Video
+# a check to make sure precedence works
+000 = Bad Metadata

metadata

@@ -1,57 +1,51 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-marc
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2020-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.0.0.pre3
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.0.0.pre3
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: library_stdnums
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -59,13 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: marc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: traject
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -73,13 +87,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rspec-activemodel-mocks
+  name: marc-fastxmlwriter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -87,7 +101,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jettywrapper
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,7 +115,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,27 +129,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: engine_cart
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: library_stdnums
+  name: rspec-activemodel-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -143,13 +157,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -157,53 +171,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: marc
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: traject
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: marc-fastxmlwriter
+  name: engine_cart
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '2.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 description: MARC support for Blacklight
 email:
 - justin@curationexperts.com
@@ -212,13 +220,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".solr_wrapper.yaml"
 - ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - app/assets/stylesheets/blacklight_marc.scss
-- app/helpers/blacklight_bookmarks_helper.rb
 - app/helpers/blacklight_marc_helper.rb
 - app/models/concerns/blacklight/solr/document/marc.rb
 - app/models/concerns/blacklight/solr/document/marc_export.rb
@@ -231,7 +239,6 @@ files:
 - app/views/catalog/librarian_view.html.erb
 - app/views/catalog/show.refworks.erb
 - blacklight-marc.gemspec
-- config/jetty.yml
 - config/locales/blacklight_marc.de.yml
 - config/locales/blacklight_marc.en.yml
 - config/locales/blacklight_marc.es.yml
@@ -246,6 +253,7 @@ files:
 - lib/blacklight/marc/indexer/dewey.rb
 - lib/blacklight/marc/indexer/formats.rb
 - lib/blacklight/marc/routes.rb
+- lib/blacklight/marc/routes/marc_viewable.rb
 - lib/blacklight/marc/version.rb
 - lib/generators/blacklight/marc/install_generator.rb
 - lib/generators/blacklight/marc/templates/app/models/marc_indexer.rb
@@ -257,6 +265,22 @@ files:
 - lib/generators/blacklight/marc/templates/config/translation_maps/instrument_map.properties
 - lib/generators/blacklight/marc/templates/config/translation_maps/language_map.properties
 - lib/railties/solr_marc.rake
+- solr/conf/_rest_managed.json
+- solr/conf/admin-extra.html
+- solr/conf/elevate.xml
+- solr/conf/mapping-ISOLatin1Accent.txt
+- solr/conf/protwords.txt
+- solr/conf/schema.xml
+- solr/conf/scripts.conf
+- solr/conf/solrconfig.xml
+- solr/conf/spellings.txt
+- solr/conf/stopwords.txt
+- solr/conf/stopwords_en.txt
+- solr/conf/synonyms.txt
+- solr/conf/xslt/example.xsl
+- solr/conf/xslt/example_atom.xsl
+- solr/conf/xslt/example_rss.xsl
+- solr/conf/xslt/luke.xsl
 - spec/controllers/catalog_controller_spec.rb
 - spec/features/bookmarks_spec.rb
 - spec/features/librarian_view_spec.rb
@@ -273,6 +297,7 @@ files:
 - spec/routing/routes_spec.rb
 - spec/spec_helper.rb
 - spec/support/controller_level_helpers.rb
+- spec/test_app_templates/Gemfile.extra
 - 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
@@ -283,7 +308,7 @@ files:
 - test_support/data/test_data.utf8.mrc
 homepage: https://github.com/projectblacklight/blacklight-marc
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -300,8 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: MARC support for Blacklight
@@ -322,6 +346,7 @@ test_files:
 - spec/routing/routes_spec.rb
 - spec/spec_helper.rb
 - spec/support/controller_level_helpers.rb
+- spec/test_app_templates/Gemfile.extra
 - 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