gdor-indexer 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64f3819be05778daa18edefbef0db3c415d8a7af
-  data.tar.gz: 379426de04d4160b4f2334a54d3308fc8d798edd
+  metadata.gz: f5512304eceff43f6099aa3de8864b61d587a6cc
+  data.tar.gz: 3e9e662af728c9d6de0291bff59e9e1cf41b2173
 SHA512:
-  metadata.gz: d42cbf9c5d8ee8b9a2038b2ea77d0b51dc89f0fe7633ab2a6b5b17039fd25544c8e6397ae8c6e29b648cc5ae5ba3580bbe2f17ef9f708dc1134dc3414e13f8f6
-  data.tar.gz: 4c44ff23c66af8336d00ef80b747dc28a833a9bc1bbf564c0fd048c0cd4b33f022c7ef4338015f5e1a9181f107ae490eb821afd125f6c6eaa6551d6f8630880e
+  metadata.gz: 0caa4dada6bbde97f147b3630683ed6b689309fc78584ca1aba47eea7421980e7a0ac6835ab55cef50398e8b03d6eca4d480601ffe2ba567c2e399e8f9aa27d5
+  data.tar.gz: 2b3e81c2b3693f4722359ca80efbece1e15b05cd14226986ef1c6bc6578eadcea42a33f1ccb859281c035e3836b0eeed4c8948eeb1444e3f8530f09d910a1b38

data/.rubocop_todo.yml

@@ -37,7 +37,8 @@ Metrics/AbcSize:
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 242
+  Exclude:
+    - 'lib/gdor/indexer.rb'
 
 # Offense count: 5
 Metrics/CyclomaticComplexity:

data/lib/gdor/indexer.rb

@@ -39,6 +39,7 @@ module GDor
       options = args.extract_options!
       yml_path = args.first
 
+      @solr_client = options.delete(:solr_client)
       @success_count = 0
       @error_count = 0
       @total_time_to_solr = 0
@@ -66,7 +67,7 @@ module GDor
     end
 
     def solr_client
-      harvestdor.solr
+      @solr_client ||= harvestdor.solr
     end
 
     def metrics

data/lib/gdor/indexer/public_xml_fields.rb

@@ -29,11 +29,11 @@ module GDor::Indexer::PublicXmlFields
       ids = []
       if content_md
         if display_type == 'image'
-          content_md.xpath('./resource[@type="image"]/file/@id').each do |node|
+          content_md.root.xpath('resource[@type="image"]/file/@id').each do |node|
             ids << node.text unless node.text.empty?
           end
         elsif display_type == 'file'
-          content_md.xpath('./resource/file/@id').each do |node|
+          content_md.root.xpath('resource/file/@id').each do |node|
             ids << node.text unless node.text.empty?
           end
         end
@@ -61,7 +61,7 @@ module GDor::Indexer::PublicXmlFields
   # @return [String]
   def dor_content_type
     @dor_content_type ||= begin
-      dct = content_md ? content_md.xpath('@type').text : nil
+      dct = content_md ? content_md.root.xpath('@type').text : nil
       logger.error "#{druid} has no DOR content type (<contentMetadata> element may be missing type attribute)" if !dct || dct.empty?
       dct
     end

data/lib/gdor/indexer/version.rb

@@ -1,5 +1,5 @@
 module GDor
   class Indexer
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/spec/unit/indexer_spec.rb

@@ -419,6 +419,19 @@ describe GDor::Indexer do
     end
   end
 
+  describe '#solr_client' do
+    it 'defaults to the harvestdor-configured client' do
+      expect(@indexer.solr_client).to eq @indexer.harvestdor.solr
+    end
+
+    it 'can be set as an option' do
+      solr_client = double
+      @indexer = described_class.new(solr_client: solr_client)
+
+      expect(@indexer.solr_client).to eq solr_client
+    end
+  end
+
   # context "skip heartbeat" do
   #   it "allows me to use a fake url for dor-fetcher-client" do
   #     expect {GDor::Indexer.new(@config_yml_path)}.not_to raise_error

data/spec/unit/public_xml_fields_spec.rb

@@ -19,7 +19,7 @@ describe GDor::Indexer::PublicXmlFields do
 
   def sdb_for_content_md(m)
     resource = Harvestdor::Indexer::Resource.new(double, @fake_druid)
-    allow(resource).to receive(:content_metadata).and_return(Nokogiri::XML(m).root)
+    allow(resource).to receive(:content_metadata).and_return(Nokogiri::XML(m))
     allow(resource).to receive(:public_xml).and_return(@empty_pub_xml)
     allow(resource).to receive(:mods).and_return(@mods_xml)
     GDor::Indexer::SolrDocBuilder.new(resource, logger)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gdor-indexer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Naomi Dushay
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: harvestdor-indexer