blacklight-marc 6.2.0 → 7.0.0.rc1

data/spec/features/bookmarks_spec.rb

@@ -12,6 +12,7 @@ describe "Bookmark tools" do
     visit solr_document_path('2007020969')
     click_button 'Bookmark'
     visit "/bookmarks.refworks_marc_txt?q="
-    expect(page).to have_content "LEADER 01490cam a2200361 a 4500001      2007020969"
+    # modern capybara normalizes whitespace so don't check for strict nbsp
+    expect(page).to have_content "LEADER 01490cam a2200361 a 4500001"
   end
 end

data/spec/features/search_formats_spec.rb

@@ -10,7 +10,7 @@ describe "Search Formats" do
   end
 
   it "should return new-line separated RIS records" do
-    visit "/catalog.endnote?q=" 
+    visit "/catalog.endnote?q="
     expect(page.status_code).to eq 200
     rmt_regex = /^%0/
     expect(page).to have_content "%A Bstan-ʼdzin-rgya-mtsho,"
@@ -20,12 +20,12 @@ describe "Search Formats" do
   end
 
   it "should return new-line separated MARC records" do
-    visit "/catalog.refworks_marc_txt?q=" 
+    visit "/catalog.refworks_marc_txt?q="
     expect(page.status_code).to eq 200
     rmt_regex = /LEADER .+\n(\d\d\d .. .+\n)+/
     expect(page).to have_content "LEADER 01221cam a22002534a 4500001"
     expect(page).to have_content "LEADER 01127cam a22002895a 4500001"
     expect(page.body).to match rmt_regex
-    expect(page.body.scan(rmt_regex).length).to eq 10 
+    expect(page.body.scan(rmt_regex).length).to eq 10
   end
 end

data/spec/integration/solr_document_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 # WARNING!!!
 # If you set any values in Blacklight here, you must reset them to the original
-# values in an after() block so other tests get expected results. 
+# values in an after() block so other tests get expected results.
 # Blacklight is a Singleton for application configuration.
 
 ## TODO: ALL these specs probably really ought to be on the modules
@@ -24,45 +24,45 @@ def get_hash_with_bad_marcxml
 end
 
   describe SolrDocument do
-    
+    # SolrDocument leaks to other classes, so subclass here to test extension behavior
+    let(:test_rig) { Class.new(SolrDocument) }
+    before do
+      test_rig.extension_parameters[:marc_source_field]  = :marc_display
+      test_rig.extension_parameters[:marc_format_type]   = :marcxml
+
+      test_rig.registered_extensions = nil
+      test_rig.use_extension( Blacklight::Solr::Document::Marc ) { |document| document.has_key?(:marc_display)}
+    end
+
     before(:each) do
       @hash_with_marcxml = get_hash_with_marcxml['response']['docs'][0]
-      SolrDocument.extension_parameters[:marc_source_field]  = :marc_display
-      SolrDocument.extension_parameters[:marc_format_type]   = :marcxml
-
-      # rsolr seems to reload SolrDocument from time to time, so we can't
-      # count on the initializer to register the extension, need to re-register
-      # it.
-      SolrDocument.registered_extensions = nil
-      SolrDocument.use_extension( Blacklight::Solr::Document::Marc ) { |document| document.has_key?(:marc_display)}
       
-      @solrdoc = SolrDocument.new(@hash_with_marcxml)
-
+      @solrdoc = test_rig.new(@hash_with_marcxml)
     end
 
     describe "ruby marc creation" do
- 
+
       it "should have a valid to_marc" do
-        @solrdoc = SolrDocument.new(@hash_with_marcxml)
+        @solrdoc = test_rig.new(@hash_with_marcxml)
 
         expect(@solrdoc).to respond_to(:to_marc)
-        expect(@solrdoc.to_marc).to be_kind_of(MARC::Record)        
+        expect(@solrdoc.to_marc).to be_kind_of(MARC::Record)
       end
-      
+
       it "should not try to create marc for objects w/out stored marc (marcxml test only at this time)" do
         @hash_without_marcxml = get_hash_without_marcxml['response']['docs'][0]
-        @solrdoc_without_marc = SolrDocument.new(@hash_without_marcxml)
+        @solrdoc_without_marc = test_rig.new(@hash_without_marcxml)
 
         expect(@solrdoc_without_marc).not_to respond_to(:to_marc)
       end
 
       it "should fail gracefully when given bad marc xml" do
         hash_with_bad_marcxml = get_hash_with_bad_marcxml['response']['docs'][0]
-        @solrdoc = SolrDocument.new(hash_with_bad_marcxml)
+        @solrdoc = test_rig.new(hash_with_bad_marcxml)
         expect(Rails.logger).to receive(:error).with(/Blacklight failed to parse MARC record. Exception was: Missing end tag for 'blarg'/)
         expect(@solrdoc).to respond_to(:to_marc)
         expect(@solrdoc.to_marc).to be_nil
       end
 
-    end 
+    end
 end

data/spec/lib/blacklight_solr_document_marc_spec.rb

@@ -8,12 +8,12 @@ describe "Blacklight::Solr::Document::Marc" do
       include Blacklight::Solr::Document
     end
     @mock_class.use_extension( Blacklight::Solr::Document::Marc )
-    @mock_class.extension_parameters[:marc_source_field] = :marc      
+    @mock_class.extension_parameters[:marc_source_field] = :marc
   end
 
   describe "marc binary mode" do
     before(:each) do
-      @mock_class.extension_parameters[:marc_format_type] = :marc21      
+      @mock_class.extension_parameters[:marc_format_type] = :marc21
     end
     it "should read and parse a marc binary file" do
       document = @mock_class.new(:marc => sample_marc_binary )
@@ -43,7 +43,7 @@ describe "Blacklight::Solr::Document::Marc" do
 
   it "should register all its export formats" do
     document = @mock_class.new
-    expect(Set.new(document.export_formats.keys)).to  be_superset(Set.new([:marc, :marcxml, :openurl_ctx_kev, :refworks_marc_txt, :endnote, :xml]))    
+    expect(Set.new(document.export_formats.keys)).to  be_superset(Set.new([:marc, :marcxml, :openurl_ctx_kev, :refworks_marc_txt, :endnote, :xml]))
   end
 
 
@@ -54,26 +54,26 @@ describe "Blacklight::Solr::Document::Marc" do
       <controlfield tag=\"001\">a4802615</controlfield>
       <controlfield tag=\"003\">SIRSI</controlfield>
       <controlfield tag=\"008\">020828s2003    enkaf    b    001 0 eng  </controlfield>
-    
+
       <datafield tag=\"245\" ind1=\"0\" ind2=\"0\">
         <subfield code=\"a\">Apples :</subfield>
         <subfield code=\"b\">botany, production, and uses /</subfield>
         <subfield code=\"c\">edited by D.C. Ferree and I.J. Warrington.</subfield>
       </datafield>
-    
+
       <datafield tag=\"260\" ind1=\" \" ind2=\" \">
         <subfield code=\"a\">Oxon, U.K. ;</subfield>
         <subfield code=\"a\">Cambridge, MA :</subfield>
         <subfield code=\"b\">CABI Pub.,</subfield>
         <subfield code=\"c\">c2003.</subfield>
       </datafield>
-    
+
       <datafield tag=\"700\" ind1=\"1\" ind2=\" \">
         <subfield code=\"a\">Ferree, David C.</subfield>
         <subfield code=\"q\">(David Curtis),</subfield>
         <subfield code=\"d\">1943-</subfield>
       </datafield>
-    
+
       <datafield tag=\"700\" ind1=\"1\" ind2=\" \">
         <subfield code=\"a\">Warrington, I. J.</subfield>
         <subfield code=\"q\">(Ian J.)</subfield>

data/spec/lib/indexer/dewey_spec.rb

@@ -32,7 +32,7 @@ describe Blacklight::Marc::Indexer::Dewey do
     it 'should map valid dewey' do
       record = double('Record')
       # just return bytes for control field, subfield array for data
-      expect(record).to receive(:fields).with(['082','880']).exactly(2).times.and_return([dewey]) 
+      expect(record).to receive(:fields).with(['082','880']).exactly(2).times.and_return([dewey])
       val = []
       subject.dewey_facets(base: :hundreds, translation_map: 'test_dewey').call(record,val,subject)
       expect(val).to eql(['300s - Social Sciences'])
@@ -43,7 +43,7 @@ describe Blacklight::Marc::Indexer::Dewey do
     it 'should ignore invalid dewey' do
       record = double('Record')
       # just return bytes for control field, subfield array for data
-      expect(record).to receive(:fields).with(['082','880']).exactly(2).times.and_return([huey]) 
+      expect(record).to receive(:fields).with(['082','880']).exactly(2).times.and_return([huey])
       val = []
       subject.dewey_facets(base: :hundreds, translation_map: 'test_dewey').call(record,val,subject)
       expect(val).to eql([])
@@ -59,7 +59,7 @@ describe Blacklight::Marc::Indexer::Dewey do
     it 'should generate formatted, unmapped text' do
       record = double('Record')
       # just return bytes for control field, subfield array for data
-      expect(record).to receive(:fields).with(['082','880']).and_return([dewey]) 
+      expect(record).to receive(:fields).with(['082','880']).and_return([dewey])
       val = []
       subject.dewey_text.call(record,val,subject)
       expect(val).to eql(['343 13'])
@@ -67,7 +67,7 @@ describe Blacklight::Marc::Indexer::Dewey do
     it 'should ignore invalid dewey' do
       record = double('Record')
       # just return bytes for control field, subfield array for data
-      expect(record).to receive(:fields).with(['082','880']).times.and_return([huey]) 
+      expect(record).to receive(:fields).with(['082','880']).times.and_return([huey])
       val = []
       subject.dewey_text.call(record,val,subject)
       expect(val).to eql([])

data/spec/lib/indexer/formats_spec.rb

@@ -28,7 +28,7 @@ describe Blacklight::Marc::Indexer::Formats do
     it 'should map for 245h fields' do
       record = double('Record')
       # just return bytes for control field, subfield array for data
-      expect(record).to receive(:fields).with(['245','880']).and_return([electronic]) 
+      expect(record).to receive(:fields).with(['245','880']).and_return([electronic])
       val = []
       subject.get_format.call(record,val,subject)
       expect(val).to eql(['Electronic'])

data/spec/lib/marc_export_spec.rb

@@ -1,11 +1,11 @@
 # -*- encoding : utf-8 -*-
 require 'spec_helper'
 
-def marc_from_xml(string)    
+def marc_from_xml(string)
   reader = MARC::XMLReader.new(StringIO.new(string))
   reader.each {|rec| return rec }
 end
-  
+
 
 def standard_citation
 "<record>
@@ -110,7 +110,7 @@ def utf8_decomposed_record_xml
  "<record>
     <leader>01341nam  2200301 a 450 </leader>
     <controlfield tag=\"005\">19971120234400.0</controlfield>
-    <controlfield tag=\"008\">890316s1988    caua     b    101 0 eng  </controlfield>    
+    <controlfield tag=\"008\">890316s1988    caua     b    101 0 eng  </controlfield>
     <datafield tag=\"245\" ind1=\"0\" ind2=\"0\">
       <subfield code=\"a\">Sharīʻat and ambiguity in South Asian Islam /</subfield>
       <subfield code=\"c\">edited by Katherine P. Ewing.</subfield>
@@ -188,7 +188,7 @@ def year_range_xml
        <subfield code=\"b\">Batsford,</subfield>
        <subfield code=\"c\">1988-2000</subfield>
      </datafield>
-     
+
   </record>"
 end
 
@@ -213,7 +213,7 @@ def no_date_xml
        <subfield code=\"b\">Batsford,</subfield>
        <subfield code=\"c\">n.d.</subfield>
      </datafield>
-     
+
   </record>"
 end
 
@@ -240,7 +240,7 @@ def section_title_xml
        <subfield code=\"b\">Batsford,</subfield>
        <subfield code=\"c\">2001</subfield>
      </datafield>
-     
+
   </record>"
 end
 
@@ -256,7 +256,7 @@ def dissertation_note_xml
   <datafield tag=\"260\" ind1=\" \" ind2=\" \">
     <subfield code=\"c\">2009</subfield>
   </datafield>
-  
+
   <datafield tag=\"502\" ind1=\"0\" ind2=\"0\">
     <subfield code=\"a\">Phd Thesis -- Goodenough College, 2009</subfield>
   </datafield>
@@ -267,11 +267,11 @@ def special_contributor_with_author_xml
 "<record>
   <leader>00903nam a2200253   4500</leader>
   <controlfield tag=\"008\">730111s1971    ohu      b    000 0 eng  </controlfield>
-  
+
   <datafield tag=\"100\" ind1=\"0\" ind2=\"0\">
     <subfield code=\"a\">Doe, John</subfield>
   </datafield>
-  
+
   <datafield tag=\"245\" ind1=\"0\" ind2=\"0\">
     <subfield code=\"a\">Title of item.</subfield>
   </datafield>
@@ -281,22 +281,22 @@ def special_contributor_with_author_xml
     <subfield code=\"b\">Place</subfield>
     <subfield code=\"c\">2009</subfield>
   </datafield>
-  
+
   <datafield tag=\"700\" ind1=\" \" ind2=\" \">
     <subfield code=\"a\">Schmoe, Joe</subfield>
     <subfield code=\"e\">trl.</subfield>
   </datafield>
-  
+
   <datafield tag=\"700\" ind1=\" \" ind2=\" \">
     <subfield code=\"a\">Schmoe, Bill</subfield>
     <subfield code=\"4\">edt</subfield>
   </datafield>
-  
+
   <datafield tag=\"700\" ind1=\" \" ind2=\" \">
     <subfield code=\"a\">Schmoe, Susie</subfield>
     <subfield code=\"e\">com.</subfield>
   </datafield>
-  
+
 </record>"
 end
 
@@ -304,11 +304,11 @@ def three_authors_xml
 "<record>
   <leader>00903nam a2200253   4500</leader>
   <controlfield tag=\"008\">730111s1971    ohu      b    000 0 eng  </controlfield>
-  
+
   <datafield tag=\"100\" ind1=\"0\" ind2=\"0\">
     <subfield code=\"a\">Doe, John</subfield>
   </datafield>
-  
+
   <datafield tag=\"245\" ind1=\"0\" ind2=\"0\">
     <subfield code=\"a\">Title of item.</subfield>
   </datafield>
@@ -318,15 +318,15 @@ def three_authors_xml
     <subfield code=\"b\">Place</subfield>
     <subfield code=\"c\">2009</subfield>
   </datafield>
-  
+
   <datafield tag=\"700\" ind1=\" \" ind2=\" \">
     <subfield code=\"a\">Schmoe, Joe</subfield>
   </datafield>
-  
+
   <datafield tag=\"700\" ind1=\" \" ind2=\" \">
     <subfield code=\"a\">Schmoe, Bill</subfield>
   </datafield>
-  
+
 </record>"
 end
 
@@ -334,7 +334,7 @@ def special_contributor_no_author_xml
 "<record>
   <leader>00903nam a2200253   4500</leader>
   <controlfield tag=\"008\">730111s1971    ohu      b    000 0 eng  </controlfield>
-  
+
   <datafield tag=\"245\" ind1=\"0\" ind2=\"0\">
     <subfield code=\"a\">Title of item.</subfield>
   </datafield>
@@ -344,22 +344,22 @@ def special_contributor_no_author_xml
     <subfield code=\"b\">Place</subfield>
     <subfield code=\"c\">2009</subfield>
   </datafield>
-  
+
   <datafield tag=\"700\" ind1=\" \" ind2=\" \">
     <subfield code=\"a\">Schmoe, Joe</subfield>
     <subfield code=\"e\">trl.</subfield>
   </datafield>
-  
+
   <datafield tag=\"700\" ind1=\" \" ind2=\" \">
     <subfield code=\"a\">Schmoe, Bill</subfield>
     <subfield code=\"4\">edt</subfield>
   </datafield>
-  
+
   <datafield tag=\"700\" ind1=\" \" ind2=\" \">
     <subfield code=\"a\">Schmoe, Susie</subfield>
     <subfield code=\"e\">com.</subfield>
   </datafield>
-  
+
 </record>"
 end
 
@@ -422,23 +422,23 @@ def record3_xml
     <subfield code=\"m\">horn, piano,</subfield>
     <subfield code=\"r\">F major.</subfield>
   </datafield>
-  
+
   <datafield tag=\"700\" ind1=\"1\" ind2=\"2\">
     <subfield code=\"a\">Doe, John</subfield>
   </datafield>
-  
+
   <datafield tag=\"700\" ind1=\"1\" ind2=\"2\">
     <subfield code=\"a\">Doe, Jane</subfield>
   </datafield>
-  
+
   <datafield tag=\"700\" ind1=\"1\" ind2=\"2\">
     <subfield code=\"a\">Smith, John</subfield>
   </datafield>
-  
+
   <datafield tag=\"700\" ind1=\"1\" ind2=\"2\">
     <subfield code=\"a\">Smith, Jane</subfield>
   </datafield>
-  
+
   <datafield tag=\"700\" ind1=\"1\" ind2=\"2\">
     <subfield code=\"a\">Smith, James</subfield>
   </datafield>
@@ -453,7 +453,7 @@ def no_good_data_xml
   <controlfield tag=\"003\">SIRSI</controlfield>
   <controlfield tag=\"007\">sd fungnnmmned</controlfield>
   <controlfield tag=\"008\">020117p20011990xxuzz    h              d</controlfield>
-  
+
   <datafield tag=\"024\" ind1=\"1\" ind2=\" \">
     <subfield code=\"a\">713746703721</subfield>
   </datafield>
@@ -514,7 +514,7 @@ def bad_author_xml
 end
 
 describe Blacklight::Solr::Document::MarcExport do
-  
+
   before(:all) do
     dclass = Class.new do
       include Blacklight::Solr::Document::MarcExport
@@ -541,7 +541,7 @@ describe Blacklight::Solr::Document::MarcExport do
     @record_utf8_decomposed             = dclass.new( utf8_decomposed_record_xml )
 
   end
-  
+
   describe "export_as_chicago_citation_txt" do
     it "should handle a typical record correclty" do
       expect(@typical_record.export_as_chicago_citation_txt).to eq("Ferree, David C., and I. J Warrington. <i>Apples: Botany, Production, and Uses.</i> Oxon, U.K.: CABI Pub., 2003.")
@@ -583,20 +583,20 @@ describe Blacklight::Solr::Document::MarcExport do
       expect(@record_without_citable_data.export_as_chicago_citation_txt).to eq("")
     end
   end
-  
+
   describe "export_as_apa_citation_txt" do
     it "should format a standard citation correctly" do
       expect(@typical_record.export_as_apa_citation_txt).to eq("Ferree, D. C, &amp; Warrington, I. J. (2003). <i>Apples : botany, production, and uses.</i> Oxon, U.K.: CABI Pub.")
     end
-    
+
     it "should format a citation without a 245b field correctly" do
       expect(@record_without_245b.export_as_apa_citation_txt).to eq("Janetzky, K., &amp; Brüchle, B. (1988). <i>The horn.</i> London: Batsford.")
     end
-    
+
     it "should format a citation without any authors correctly" do
       expect(@record_without_authors.export_as_apa_citation_txt).to eq("(1971). <i>Final report to the Honorable John J. Gilligan, Governor.</i> [Columbus: Printed by the State of Ohio, Dept. of Urban Affairs.")
     end
-    
+
     it "should not fail if there is no citation data" do
       expect(@record_without_citable_data.export_as_apa_citation_txt).to eq("")
     end
@@ -604,31 +604,31 @@ describe Blacklight::Solr::Document::MarcExport do
     it "should not bomb with a null pointer if there if author data is empty" do
       expect(@record_with_bad_author.export_as_apa_citation_txt).to eq("Brüchle, B. (1988). <i>The horn.</i> London: Batsford.")
     end
-    
+
   end
-  
+
   describe "export_as_mla_citation_txt" do
     it "should format a standard citation correctly" do
       expect(@typical_record.export_as_mla_citation_txt).to eq("Ferree, David C, and I. J Warrington. <i>Apples : Botany, Production, and Uses.</i> Oxon, U.K.: CABI Pub., 2003.")
     end
-    
+
     it "should format a citation without a 245b field correctly" do
       expect(@record_without_245b.export_as_mla_citation_txt).to eq("Janetzky, Kurt, and Bernhard Brüchle. <i>The Horn.</i> London: Batsford, 1988.")
     end
-    
+
     it "should format a citation without any authors correctly" do
       expect(@record_without_authors.export_as_mla_citation_txt).to eq("<i>Final Report to the Honorable John J. Gilligan, Governor.</i> [Columbus: Printed by the State of Ohio, Dept. of Urban Affairs, 1971.")
     end
-    
+
     it "should format a citation with 4+ authors correctly" do
       expect(@record_with_10plus_authors.export_as_mla_citation_txt).to eq("Greer, Lowell, et al. <i>Music for Horn.</i> [United States]: Harmonia Mundi USA, 2001.")
     end
-    
+
     it "should not fail if there is no citation data" do
-      expect(@record_without_citable_data.export_as_mla_citation_txt).to eq("")      
+      expect(@record_without_citable_data.export_as_mla_citation_txt).to eq("")
     end
   end
-  
+
   describe "export_as_openurl_ctx_kev" do
     it "should create the appropriate context object for books" do
       record = @typical_record.export_as_openurl_ctx_kev('Book')
@@ -673,7 +673,7 @@ describe Blacklight::Solr::Document::MarcExport do
       expect(@music_record.export_as_refworks_marc_txt).to eq("LEADER 01828cjm a2200409 a 4500001    a4768316\n003    SIRSI\n007    sd fungnnmmned\n008    020117p20011990xxuzz    h              d\n245 00 Music for horn |h[sound recording] / |cBrahms, Beethoven, von Krufft.\n260    [United States] : |bHarmonia Mundi USA, |cp2001.\n700 1  Greer, Lowell.\n700 1  Lubin, Steven.\n700 1  Chase, Stephanie, |d1957-\n700 12 Brahms, Johannes, |d1833-1897. |tTrios, |mpiano, violin, horn, |nop. 40, |rE? major.\n700 12 Beethoven, Ludwig van, |d1770-1827. |tSonatas, |mhorn, piano, |nop. 17, |rF major.\n700 12 Krufft, Nikolaus von, |d1779-1818. |tSonata, |mhorn, piano, |rF major.\n")
     end
     describe "for UTF-8 record" do
-      it "should export in Unicode normalized C form" do        
+      it "should export in Unicode normalized C form" do
         @utf8_exported = @record_utf8_decomposed.export_as_refworks_marc_txt
 
         if defined? Unicode
@@ -702,12 +702,12 @@ describe Blacklight::Solr::Document::MarcExport do
       expect(endnote_entries["T"]).to eq(Set.new(["Music for horn "]))
 
       #nothing extra
-      expect(Set.new(endnote_entries.keys)).to eq(Set.new(["0", "C", "D", "E", "I", "T"]))      
+      expect(Set.new(endnote_entries.keys)).to eq(Set.new(["0", "C", "D", "E", "I", "T"]))
     end
   end
 
   describe "Citation title transformation" do
-    before(:each) do 
+    before(:each) do
       class CitationTitleTest
         include Blacklight::Solr::Document::MarcExport
         def transform_title(text)