blacklight-marc 5.4.0 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f0fb70263ceb51ccdd8cd3d861101dbc74bf1df
-  data.tar.gz: 7ef0b31a16dbcaafa8a4afa3c09c523f766e00aa
+  metadata.gz: 75e8d8a88f4be661346d59f902344e109f02e672
+  data.tar.gz: 024738cc6d5c0e46cee5c91f2881afc7d3569f61
 SHA512:
-  metadata.gz: 77bdd9fd66ca82d8f11fcde0c392105327772ba0eb44bc665aa9c868ad3df7d8e96f0a836139519055e74dfdcc42349ed573b061c3a91b357e944eb4af605389
-  data.tar.gz: 23bdcd829106648025d26239dd506ccbde04901707cf46ee354d3ea8bff32f25cee9bc3bbdb43e383fea4ad1dc4bd8779d97a12d1d5bc6f44203b9d833598ba8
+  metadata.gz: a1ce25d123310609c7fd38aa374bc9128a5c439974f5944285120b14501f69826cd559d2537e6b6c5cd1533cdc494ee0dfdbe05a7a9a142785f1595f6233b9ce
+  data.tar.gz: ddb00a986af2a989198c6def0b246858e0b501f57416805f056315f476bbede3622a52cde86420d9466ae7619b70a3e029bd119d5a09325c2aecfe7cbac94aab

data/.travis.yml

@@ -1,15 +1,30 @@
 notifications:
   email: false
 
+
 rvm:
-  - 2.1.1
-  - 2.0.0
-  - 1.9.3
-  - jruby-19mode
+  - 2.1.4
+
+matrix:
+  include:
+    - rvm: 2.1.4
+      env: "RAILS_VERSION=4.0.12"
+    - rvm: 2.0.0
+      env: "RAILS_VERSION=4.1.8"
+    - rvm: 1.9.3
+      env: "RAILS_VERSION=4.1.8"
+    - rvm: jruby
+      env: "RAILS_VERSION=4.1.8 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
+    - rvm: 2.1.4
+      env: "RAILS_VERSION=4.2.0.rc3"
 
 before_install:
   - gem install bundler
 
+env:
+ - "RAILS_VERSION=3.2.21"
+ - "RAILS_VERSION=4.1.8"
+
 notifications:
   irc: "irc.freenode.org#blacklight"
   email:

data/Gemfile

@@ -9,19 +9,20 @@ gemspec path: File.expand_path('..', __FILE__)
 gem 'simplecov', '~> 0.7.1', require: false
 gem 'coveralls', require: false
 
-gem 'engine_cart', '~> 0.3.0'
-
-# pin to known-working versions of rails and dependencies
-gem 'rails', '4.0.4'
-gem 'sass', '~> 3.2.15'
-gem 'sprockets', '~> 2.11.0'
-
-group :test do
-  gem 'activerecord-jdbcsqlite3-adapter', :platforms => :jruby
-end
-
 file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path("../spec/internal", __FILE__))
 if File.exists?(file)
   puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
   instance_eval File.read(file)
+else
+  gem 'rails', ENV['RAILS_VERSION']
+
+  # explicitly include sass-rails to get compatible sprocket dependencies
+  if ENV['RAILS_VERSION'] and ENV['RAILS_VERSION'] =~ /^4.2/
+    gem 'sass-rails', ">= 5.0.0.beta1"
+    gem 'responders', "~> 2.0"
+  else
+    gem 'sass-rails', "< 5.0"
+    gem 'coffee-rails', "~> 4.0.0"
+  end
 end
+gem 'transpec'

data/Rakefile

@@ -1,5 +1,5 @@
 require "bundler/gem_tasks"
-ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.0.0.zip"
+ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.2.zip"
 
 require 'jettywrapper'
 require 'rspec/core/rake_task'

data/blacklight-marc.gemspec

@@ -17,14 +17,16 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "blacklight", ">= 5.4.0.rc1", "< 6.0"
+  spec.add_dependency "blacklight", "~> 5.8"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rspec-rails"
+  spec.add_development_dependency "rspec-rails", '~> 3.0'
+  spec.add_development_dependency "rspec-activemodel-mocks"
   spec.add_development_dependency "jettywrapper"
   spec.add_development_dependency "capybara"
+  spec.add_development_dependency "engine_cart", "~> 0.4"
+
   spec.add_dependency "rails"
   # Let's allow future versions of marc, count on
   # them to be backwards compat until 1.1

data/lib/blacklight/marc/catalog.rb

@@ -1,7 +1,7 @@
 module Blacklight::Marc
   module Catalog
     def librarian_view
-      @response, @document = get_solr_response_for_doc_id
+      @response, @document = get_solr_response_for_doc_id params[:id]
 
       respond_to do |format|
         format.html
@@ -11,7 +11,7 @@ module Blacklight::Marc
 
     # grabs a bunch of documents to export to endnote
     def endnote
-      @response, @documents = get_solr_response_for_field_values(SolrDocument.unique_key,params[:id])
+      @response, @documents = get_solr_response_for_document_ids(params[:id])
       respond_to do |format|
         format.endnote { render :layout => false }
       end

data/lib/blacklight/marc/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Marc
-    VERSION = "5.4.0"
+    VERSION = "5.5.0"
   end
 end

data/lib/blacklight/solr/document/marc.rb

@@ -43,17 +43,23 @@ module Blacklight::Solr::Document::Marc
   def load_marc
     case _marc_format_type.to_s
     when 'marcxml'
-      records = MARC::XMLReader.new(StringIO.new( fetch(_marc_source_field) )).to_a
-      return records[0]
+      marc_record_from_marcxml
     when 'marc21'
-      return MARC::Record.new_from_marc( fetch(_marc_source_field) )          
+      return MARC::Record.new_from_marc( fetch(_marc_source_field) )
+    when 'json'
+      return MARC::Record.new_from_hash( JSON.parse( fetch(_marc_source_field) ) )
     else
-
-      raise UnsupportedMarcFormatType.new("Only marcxml and marc21 are supported, this documents format is #{_marc_format_type} and the current extension parameters are #{self.class.extension_parameters.inspect}")
+      raise UnsupportedMarcFormatType.new("Only marcxml, marc21, and json are supported, this documents format is #{_marc_format_type} and the current extension parameters are #{self.class.extension_parameters.inspect}")
     end      
+  rescue Exception => e
+    raise e if e.is_a? UnsupportedMarcFormatType
+
+    Rails.logger.error("Blacklight failed to parse MARC record. Exception was: #{e}")
   end
   
-  
+  def marc_record_from_marcxml
+    MARC::XMLReader.new(StringIO.new( fetch(_marc_source_field) )).to_a.first
+  end
   
   def _marc_helper
     @_marc_helper ||= (

data/spec/helpers/blacklight_marc_helper_spec.rb

@@ -5,8 +5,8 @@ describe BlacklightMarcHelper do
   let(:two) { SolrDocument.new }
   describe "render_refworks_texts" do
     before do
-      one.stub(:export_as_refworks_marc_txt => 'one')
-      two.stub(:export_as_refworks_marc_txt => 'two')
+      allow(one).to receive_messages(export_as_refworks_marc_txt: 'one')
+      allow(two).to receive_messages(export_as_refworks_marc_txt: 'two')
     end
     it "should render_refworks_texts" do
       expect(helper.render_refworks_texts([one, two])).to eq "one\ntwo\n"
@@ -16,8 +16,8 @@ describe BlacklightMarcHelper do
 
   describe "render_endnote_texts" do
     before do
-      one.stub(:export_as_endnote => 'one')
-      two.stub(:export_as_endnote => 'two')
+      allow(one).to receive_messages(export_as_endnote: 'one')
+      allow(two).to receive_messages(export_as_endnote: 'two')
     end
     it "should render_endnote_texts" do
       expect(helper.render_endnote_texts([one, two])).to eq "one\ntwo\n"

data/spec/integration/solr_document_spec.rb

@@ -19,6 +19,10 @@ def get_hash_without_marcxml
   {'responseHeader'=>{'status'=>0,'QTime'=>0,'params'=>{'q'=>'id:00282214','wt'=>'ruby'}},'response'=>{'numFound'=>1,'start'=>0,'docs'=>[{'id'=>'00282214','timestamp'=>'2009-03-26T18:15:31.074Z','material_type_display'=>['375 p'],'title_display'=>['Fikr-i Ayāz'],'author_display'=>['Farruk̲h̲ī, Āṣif','Pīrzādah, Shāh Muḥammad'],'language_facet'=>['Urdu'],'format'=>['Book'],'published_display'=>['Karācī']}]}}
 end
 
+def get_hash_with_bad_marcxml
+  {'responseHeader'=>{'status'=>0,'QTime'=>0,'params'=>{'q'=>'id:00282214','wt'=>'ruby'}},'response'=>{'numFound'=>1,'start'=>0,'docs'=>[{'id'=>'00282214', "marc_display" =>'<record xmlns=\'http://www.loc.gov/MARC21/slim\'><leader>00799cam a2200241 a 4500</leader><blarg tag=\'001\'>   00282214 </controlfield><controlfield tag=\'003\'>DLC</controlfield><controlfield tag=\'005\'>20090120022042.0</controlfield><controlfield tag=\'008\'>000417s1998    pk            000 0 urdo </controlfield><datafield tag=\'010\' ind1=\' \' ind2=\' \'><subfield code=\'a\'>   00282214 </subfield></datafield><datafield tag=\'025\' ind1=\' \' ind2=\' \'><subfield code=\'a\'>P-U-00282214; 05; 06</subfield></datafield><datafield tag=\'040\' ind1=\' \' ind2=\' \'><subfield code=\'a\'>DLC</subfield><subfield code=\'c\'>DLC</subfield><subfield code=\'d\'>DLC</subfield></datafield><datafield tag=\'041\' ind1=\'1\' ind2=\' \'><subfield code=\'a\'>urd</subfield><subfield code=\'h\'>snd</subfield></datafield><datafield tag=\'042\' ind1=\' \' ind2=\' \'><subfield code=\'a\'>lcode</subfield></datafield><datafield tag=\'050\' ind1=\'0\' ind2=\'0\'><subfield code=\'a\'>PK2788.9.A9</subfield><subfield code=\'b\'>F55 1998</subfield></datafield><datafield tag=\'100\' ind1=\'1\' ind2=\' \'><subfield code=\'a\'>Ayaz, Shaikh,</subfield><subfield code=\'d\'>1923-1997.</subfield></datafield><datafield tag=\'245\' ind1=\'1\' ind2=\'0\'><subfield code=\'a\'>Fikr-i Ayāz /</subfield><subfield code=\'c\'>murattibīn, Āṣif Farruk̲h̲ī, Shāh Muḥammad Pīrzādah.</subfield></datafield><datafield tag=\'260\' ind1=\' \' ind2=\' \'><subfield code=\'a\'>Karācī :</subfield><subfield code=\'b\'>Dāniyāl,</subfield><subfield code=\'c\'>[1998]</subfield></datafield><datafield tag=\'300\' ind1=\' \' ind2=\' \'><subfield code=\'a\'>375 p. ;</subfield><subfield code=\'c\'>23 cm.</subfield></datafield><datafield tag=\'546\' ind1=\' \' ind2=\' \'><subfield code=\'a\'>In Urdu.</subfield></datafield><datafield tag=\'520\' ind1=\' \' ind2=\' \'><subfield code=\'a\'>Selected poems and articles from the works of renowned Sindhi poet; chiefly translated from Sindhi.</subfield></datafield><datafield tag=\'700\' ind1=\'1\' ind2=\' \'><subfield code=\'a\'>Farruk̲h̲ī, Āṣif,</subfield><subfield code=\'d\'>1959-</subfield></datafield><datafield tag=\'700\' ind1=\'1\' ind2=\' \'><subfield code=\'a\'>Pīrzādah, Shāh Muḥammad.</subfield></datafield></record>','timestamp'=>'2009-03-26T18:15:31.074Z','material_type_display'=>['375 p'],'title_display'=>['Fikr-i Ayāz'],'author_display'=>['Farruk̲h̲ī, Āṣif','Pīrzādah, Shāh Muḥammad'],'language_facet'=>['Urdu'],'format'=>['Book'],'published_display'=>['Karācī']}]}}
+end
+
   describe SolrDocument do
     
     before(:each) do
@@ -41,19 +45,24 @@ end
       it "should have a valid to_marc" do
         @solrdoc = SolrDocument.new(@hash_with_marcxml)
 
-        @solrdoc.should respond_to(:to_marc)
-        @solrdoc.to_marc.should be_kind_of(MARC::Record)        
+        expect(@solrdoc).to respond_to(:to_marc)
+        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
-        # TODO: Create another double object that does not have marc-xml in it and make
-        # sure everything fails gracefully
         @hash_without_marcxml = get_hash_without_marcxml['response']['docs'][0]
         @solrdoc_without_marc = SolrDocument.new(@hash_without_marcxml)
-        @solrdoc_without_marc.should_not respond_to(:to_marc)
-        # legacy check
-      #        @solrdoc_without_marc.should respond_to(:marc)
-      #        @solrdoc_without_marc.marc.should == nil
+
+        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)
+        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

@@ -17,7 +17,7 @@ describe "Blacklight::Solr::Document::Marc" do
     end
     it "should read and parse a marc binary file" do
       document = @mock_class.new(:marc => sample_marc_binary )
-      document.to_marc.should == marc_from_string(:binary => sample_marc_binary )
+      expect(document.to_marc).to eq(marc_from_string(:binary => sample_marc_binary ))
     end
   end
 
@@ -27,13 +27,23 @@ describe "Blacklight::Solr::Document::Marc" do
     end
     it "should read and parse a marc xml file" do
       document = @mock_class.new(:marc => sample_marc_xml)
-      document.to_marc.should == marc_from_string(:xml => sample_marc_xml)
+      expect(document.to_marc).to eq(marc_from_string(:xml => sample_marc_xml))
+    end
+  end
+
+  describe "marc json mode" do
+    before(:each) do
+      @mock_class.extension_parameters[:marc_format_type] = :json
+    end
+    it "should read and parse a marc json file" do
+      document = @mock_class.new(:marc => sample_marc_json)
+      expect(document.to_marc).to eq(marc_from_string(:json => sample_marc_json))
     end
   end
 
   it "should register all its export formats" do
     document = @mock_class.new
-    Set.new(document.export_formats.keys).should  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
 
 
@@ -75,6 +85,11 @@ describe "Blacklight::Solr::Document::Marc" do
   def sample_marc_binary
     "00386pam a22001094a 4500001000900000003000600009008004100015245008900056260005400145700004500199700003200244\036a4802615\036SIRSI\036020828s2003    enkaf    b    001 0 eng  \03600\037aApples :\037bbotany, production, and uses /\037cedited by D.C. Ferree and I.J. Warrington.\036  \037aOxon, U.K. ;\037aCambridge, MA :\037bCABI Pub.,\037cc2003.\0361 \037aFerree, David C.\037q(David Curtis),\037d1943-\0361 \037aWarrington, I. J.\037q(Ian J.)\036\035"
   end
+
+  def sample_marc_json
+    "{\"leader\":\"00386pam a22001094a 4500\",\"fields\":[{\"001\":\"a4802615\"},{\"003\":\"SIRSI\"},{\"008\":\"020828s2003    enkaf    b    001 0 eng  \"},{\"245\":{\"ind1\":\"0\",\"ind2\":\"0\",\"subfields\":[{\"a\":\"Apples :\"},{\"b\":\"botany, production, and uses /\"},{\"c\":\"edited by D.C. Ferree and I.J. Warrington.\"}]}},{\"260\":{\"ind1\":\" \",\"ind2\":\" \",\"subfields\":[{\"a\":\"Oxon, U.K. ;\"},{\"a\":\"Cambridge, MA :\"},{\"b\":\"CABI Pub.,\"},{\"c\":\"c2003.\"}]}},{\"700\":{\"ind1\":\"1\",\"ind2\":\" \",\"subfields\":[{\"a\":\"Ferree, David C.\"},{\"q\":\"(David Curtis),\"},{\"d\":\"1943-\"}]}},{\"700\":{\"ind1\":\"1\",\"ind2\":\" \",\"subfields\":[{\"a\":\"Warrington, I. J.\"},{\"q\":\"(Ian J.)\"}]}}]}"
+  end
+
   def marc_from_string(args = {})
     if args[:binary]
       reader = MARC::Reader.new(StringIO.new(args[:binary]))
@@ -82,6 +97,9 @@ describe "Blacklight::Solr::Document::Marc" do
     elsif args[:xml]
       reader = MARC::XMLReader.new(StringIO.new(args[:xml]))
       reader.each {|rec| return rec }
+    elsif args[:json]
+      rec = MARC::Record.new_from_hash(JSON.parse(args[:json]))
+      return rec
     end
     return nil
   end