harvestdor-indexer 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bd4c79cdbea501ef4549633064ea37f6de7b913
-  data.tar.gz: 5296b05a6bb874a4484d7b3bd4e2f4096c893727
+  metadata.gz: b4450922f3ca88b01fa640e422b3034573d8ffcd
+  data.tar.gz: 982f4537396650e5df6b180335bd8243dc7d8212
 SHA512:
-  metadata.gz: 4f158a525f96570befbd08eb07dd66d768603babcb13c8c57e9dbcee07bdfc710c61877c6a5d3459984a82f624b118c5ac26d4448ada51c446e71af10b2f3faf
-  data.tar.gz: 2e5cdfe81ad7341eabb4bf8c8f1378f0989ff56d146c64739d833cff2144aee16e4f73f2554cb75ebddd6ff16ce56070c632bc8e85707f55463cc244973406c5
+  metadata.gz: f82640a960c1274a685c65499f49f8e1b432fb8f95bc2e7a5d45f83bae007c8dba3c92c03c33d4a1311399657f83c012e3c08499c45d1f44bce93c726ee8f528
+  data.tar.gz: 17b1176e6de1ccdaae08b09fb8190615bfc4c7e6768ed5762b25fee7abdc77cdeb4ad41d73125bc6ef1e02bd648f70be071b12dff8e94de4eb07044d1302065b

data/lib/harvestdor/indexer/resource.rb

@@ -1,4 +1,3 @@
-# rubocop:disable Metrics/ClassLength
 require 'active_support/benchmarkable'
 
 module Harvestdor
@@ -99,15 +98,13 @@ module Harvestdor
     # @return [Nokogiri::XML::Document] the public xml for the DOR object
     def public_xml
       @public_xml ||= benchmark "public_xml(#{druid})", level: :debug do
-        ng_doc = harvestdor_client.public_xml bare_druid
-        raise "No public xml for #{druid}" unless ng_doc
-        raise "Empty public xml for #{druid}: #{ng_doc.to_xml}" if ng_doc.root.xpath('//text()').empty?
-        ng_doc
+        harvestdor_client.public_xml bare_druid
       end
     end
 
     ##
     # Has the public_xml been previously retrieved?
+    # @deprecated
     def public_xml?
       !!@public_xml
     end
@@ -115,6 +112,7 @@ module Harvestdor
     ##
     # Get the public_xml, if retrieved, or the druid. This is used to short-circuit
     # retrieving metadata out of the public xml.
+    # @deprecated
     def public_xml_or_druid
       if public_xml?
         public_xml
@@ -127,40 +125,32 @@ module Harvestdor
     # @return [Nokogiri::XML::Document] the contentMetadata for the DOR object
     def content_metadata
       @content_metadata ||= benchmark "content_metadata (#{druid})", level: :debug do
-        harvestdor_client.content_metadata public_xml_or_druid
+        harvestdor_client.content_metadata public_xml
       end
-      raise "No contentMetadata for \"#{druid}\"" if !@content_metadata || @content_metadata.children.empty?
-      @content_metadata
     end
 
     # the identityMetadata for this DOR object, ultimately from the purl public xml
     # @return [Nokogiri::XML::Document] the identityMetadata for the DOR object
     def identity_metadata
       @identity_metadata ||= benchmark "identity_metadata (#{druid})", level: :debug do
-        harvestdor_client.identity_metadata public_xml_or_druid
+        harvestdor_client.identity_metadata public_xml
       end
-      raise "No identityMetadata for \"#{druid}\"" if !@identity_metadata || @identity_metadata.children.empty?
-      @identity_metadata
     end
 
     # the rightsMetadata for this DOR object, ultimately from the purl public xml
     # @return [Nokogiri::XML::Document] the rightsMetadata for the DOR object
     def rights_metadata
       @rights_metadata ||= benchmark "rights_metadata (#{druid})", level: :debug do
-        harvestdor_client.rights_metadata public_xml_or_druid
+        harvestdor_client.rights_metadata public_xml
       end
-      raise "No rightsMetadata for \"#{druid}\"" if !@rights_metadata || @rights_metadata.children.empty?
-      @rights_metadata
     end
 
     # the RDF for this DOR object, ultimately from the purl public xml
     # @return [Nokogiri::XML::Document] the RDF for the DOR object
     def rdf
       @rdf ||= benchmark "rdf (#{druid})", level: :debug do
-        harvestdor_client.rdf public_xml_or_druid
+        harvestdor_client.rdf public_xml
       end
-      raise "No RDF for \"#{druid}\"" if !@rdf || @rdf.children.empty?
-      @rdf
     end
 
     def eql?(other)

data/lib/harvestdor/indexer/version.rb

@@ -1,6 +1,6 @@
 module Harvestdor
   class Indexer
     # this is the Ruby Gem version
-    VERSION = '2.3.2'.freeze
+    VERSION = '2.3.3'.freeze
   end
 end

data/spec/unit/harvestdor-indexer-resource_spec.rb

@@ -19,6 +19,8 @@ describe Harvestdor::Indexer::Resource do
     described_class.new(@indexer, @fake_druid)
   end
 
+  let(:blank_public_xml) { Nokogiri::XML::Document.new }
+
   subject { resource }
 
   describe '#items' do
@@ -98,14 +100,6 @@ describe Harvestdor::Indexer::Resource do
         expect(px.root.name).to eq('publicObject')
         expect(px.root.attributes['id'].text).to eq("druid:#{@fake_druid}")
       end
-      it 'raises exception if public xml for the druid is empty' do
-        expect(@hdor_client).to receive(:public_xml).with(@fake_druid).and_return(Nokogiri::XML('<publicObject/>'))
-        expect { resource.public_xml }.to raise_error(RuntimeError, Regexp.new("^Empty public xml for #{@fake_druid}: <"))
-      end
-      it 'raises error if there is no public_xml page for the druid' do
-        expect(@hdor_client).to receive(:public_xml).with(@fake_druid).and_return(nil)
-        expect { resource.public_xml }.to raise_error(RuntimeError, "No public xml for #{@fake_druid}")
-      end
     end
     context '#content_metadata' do
       it 'returns a Nokogiri::XML::Document derived from the public xml if a druid is passed' do
@@ -117,10 +111,6 @@ describe Harvestdor::Indexer::Resource do
         expect(cm.root.attributes['objectId'].text).to eq(@fake_druid)
         expect(cm.root.text.strip).to eq('foo')
       end
-      it 'raises RuntimeError if nil is returned by Harvestdor::Client.contentMetadata for the druid' do
-        expect(@hdor_client).to receive(:content_metadata).with(@fake_druid).and_return(nil)
-        expect { resource.content_metadata }.to raise_error(RuntimeError, "No contentMetadata for \"#{@fake_druid}\"")
-      end
     end
     context '#identity_metadata' do
       it 'returns a Nokogiri::XML::Document derived from the public xml if a druid is passed' do
@@ -131,10 +121,6 @@ describe Harvestdor::Indexer::Resource do
         expect(im.root.name).to eq('identityMetadata')
         expect(im.root.text.strip).to eq("druid:#{@fake_druid}")
       end
-      it 'raises RuntimeError if nil is returned by Harvestdor::Client.identityMetadata for the druid' do
-        expect(@hdor_client).to receive(:identity_metadata).with(@fake_druid).and_return(nil)
-        expect { resource.identity_metadata }.to raise_error(RuntimeError, "No identityMetadata for \"#{@fake_druid}\"")
-      end
     end
     context '#rights_metadata' do
       it 'returns a Nokogiri::XML::Document derived from the public xml if a druid is passed' do
@@ -145,10 +131,6 @@ describe Harvestdor::Indexer::Resource do
         expect(im.root.name).to eq('rightsMetadata')
         expect(im.root.text.strip).to eq('bar')
       end
-      it 'raises RuntimeError if nil is returned by Harvestdor::Client.rightsMetadata for the druid' do
-        expect(@hdor_client).to receive(:rights_metadata).with(@fake_druid).and_return(nil)
-        expect { resource.rights_metadata }.to raise_error(RuntimeError, "No rightsMetadata for \"#{@fake_druid}\"")
-      end
     end
     context '#rdf' do
       it 'returns a Nokogiri::XML::Document derived from the public xml if a druid is passed' do
@@ -159,10 +141,6 @@ describe Harvestdor::Indexer::Resource do
         expect(im.root.name).to eq('RDF')
         expect(im.root.text.strip).to eq('relationship!')
       end
-      it 'raises RuntimeError if nil is returned by Harvestdor::Client.rdf for the druid' do
-        expect(@hdor_client).to receive(:rdf).with(@fake_druid).and_return(nil)
-        expect { resource.rdf }.to raise_error(RuntimeError, "No RDF for \"#{@fake_druid}\"")
-      end
     end
 
     describe '#public_xml_or_druid' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: harvestdor-indexer
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - Naomi Dushay
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-25 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr