harvestdor-indexer 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aaba4e6dc5856b407d053a43875f26dd9f76bf47
-  data.tar.gz: bce6c1c859e20d63e8c7503c49ca7a0f86668f5c
+  metadata.gz: 0bd4c79cdbea501ef4549633064ea37f6de7b913
+  data.tar.gz: 5296b05a6bb874a4484d7b3bd4e2f4096c893727
 SHA512:
-  metadata.gz: faed68b259bd191dee7d54d407a9c0aca9326999bb02b4b34ce035f05ce01a0a2ed9ed35a9b3135824f311d815d6ff158d2f8f5111d2c2db62b33ffed07b11b0
-  data.tar.gz: 1ca560db599096a21e9346404fd00544a2ed35bdb7684c9318f6d4a5e60c10e4b82124ce6edad8346471b5f8903ed73e6fbcd2c6c6926a16de7c30bea3416b48
+  metadata.gz: 4f158a525f96570befbd08eb07dd66d768603babcb13c8c57e9dbcee07bdfc710c61877c6a5d3459984a82f624b118c5ac26d4448ada51c446e71af10b2f3faf
+  data.tar.gz: 2e5cdfe81ad7341eabb4bf8c8f1378f0989ff56d146c64739d833cff2144aee16e4f73f2554cb75ebddd6ff16ce56070c632bc8e85707f55463cc244973406c5

data/.rubocop_todo.yml

@@ -1,12 +1,12 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2015-10-26 16:12:34 -0700 using RuboCop version 0.34.2.
+# on 2016-07-25 14:19:00 -0700 using RuboCop version 0.42.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 4
+# Offense count: 5
 Lint/UselessAssignment:
   Exclude:
     - 'lib/harvestdor/indexer.rb'
@@ -16,16 +16,24 @@ Lint/UselessAssignment:
 Metrics/AbcSize:
   Max: 20
 
-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 105
-
-# Offense count: 96
-# Configuration parameters: AllowURI, URISchemes.
+# Offense count: 107
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
+# URISchemes: http, https
 Metrics/LineLength:
   Max: 207
 
+# Offense count: 2
+RSpec/AnyInstance:
+  Exclude:
+    - 'spec/unit/harvestdor-indexer_spec.rb'
+
+# Offense count: 13
+# Configuration parameters: Max.
+RSpec/ExampleLength:
+  Exclude:
+    - 'spec/unit/harvestdor-indexer-resource_spec.rb'
+    - 'spec/unit/harvestdor-indexer_spec.rb'
+
 # Offense count: 3
 # Configuration parameters: CustomTransform.
 RSpec/FilePath:
@@ -34,40 +42,53 @@ RSpec/FilePath:
     - 'spec/unit/harvestdor-indexer-solr_spec.rb'
     - 'spec/unit/harvestdor-indexer_spec.rb'
 
-# Offense count: 102
+# Offense count: 106
 RSpec/InstanceVariable:
   Exclude:
     - 'spec/unit/harvestdor-indexer-resource_spec.rb'
     - 'spec/unit/harvestdor-indexer_spec.rb'
 
+# Offense count: 1
+# Configuration parameters: IgnoreSymbolicNames.
+RSpec/VerifiedDoubles:
+  Exclude:
+    - 'spec/unit/harvestdor-indexer-solr_spec.rb'
+
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
+# SupportedStyles: line_count_based, semantic, braces_for_chaining
+# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
+# FunctionalMethods: let, let!, subject, watch
+# IgnoredMethods: lambda, proc, it
 Style/BlockDelimiters:
-  Enabled: false
+  Exclude:
+    - 'spec/unit/harvestdor-indexer_spec.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: braces, no_braces, context_dependent
 Style/BracesAroundHashParameters:
   Exclude:
     - 'spec/unit/harvestdor-indexer_spec.rb'
 
 # Offense count: 3
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: nested, compact
 Style/ClassAndModuleChildren:
   Exclude:
     - 'lib/harvestdor/indexer/metrics.rb'
     - 'lib/harvestdor/indexer/resource.rb'
     - 'lib/harvestdor/indexer/solr.rb'
 
-# Offense count: 3
-# Configuration parameters: Exclude.
+# Offense count: 2
 Style/Documentation:
   Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
     - 'lib/harvestdor/indexer/resource.rb'
     - 'lib/harvestdor/indexer/solr.rb'
-    - 'lib/harvestdor/indexer/version.rb'
 
 # Offense count: 1
 Style/DoubleNegation:
@@ -75,21 +96,10 @@ Style/DoubleNegation:
     - 'lib/harvestdor/indexer/resource.rb'
 
 # Offense count: 4
-# Configuration parameters: Exclude.
+# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts.
 Style/FileName:
   Exclude:
     - 'lib/harvestdor-indexer.rb'
     - 'spec/unit/harvestdor-indexer-resource_spec.rb'
     - 'spec/unit/harvestdor-indexer-solr_spec.rb'
     - 'spec/unit/harvestdor-indexer_spec.rb'
-
-# Offense count: 1
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
-  Exclude:
-    - 'lib/harvestdor/indexer.rb'
-
-# Offense count: 1
-Style/MultilineBlockChain:
-  Exclude:
-    - 'lib/harvestdor/indexer.rb'

data/lib/harvestdor/indexer.rb

@@ -103,9 +103,7 @@ module Harvestdor
     end
 
     def resource_error(e)
-      if e.instance_of?(Parallel::Break) || e.instance_of?(Parallel::Kill)
-        fail e
-      end
+      raise e if e.instance_of?(Parallel::Break) || e.instance_of?(Parallel::Kill)
     end
 
     # return Array of druids contained in the DorFetcher pulling indicated by DorFetcher params

data/lib/harvestdor/indexer/metrics.rb

@@ -20,8 +20,8 @@ module Harvestdor
     #
     # @param [Hash] options
     # @option options [#call] Callback that will receive any exception thrown by the block
-    def tally(options = {}, &block)
-      block.call
+    def tally(options = {})
+      yield
       success!
     rescue => e
       error!

data/lib/harvestdor/indexer/resource.rb

@@ -84,7 +84,7 @@ module Harvestdor
     def smods_rec
       @smods_rec ||= benchmark "smods_rec(#{druid})", level: :debug do
         ng_doc = mods
-        fail "Empty MODS metadata for #{druid}: #{ng_doc.to_xml}" if ng_doc.root.xpath('//text()').empty?
+        raise "Empty MODS metadata for #{druid}: #{ng_doc.to_xml}" if ng_doc.root.xpath('//text()').empty?
         mods_rec = Stanford::Mods::Record.new
         mods_rec.from_nk_node(ng_doc.root)
         mods_rec
@@ -100,8 +100,8 @@ module Harvestdor
     def public_xml
       @public_xml ||= benchmark "public_xml(#{druid})", level: :debug do
         ng_doc = harvestdor_client.public_xml bare_druid
-        fail "No public xml for #{druid}" unless ng_doc
-        fail "Empty public xml for #{druid}: #{ng_doc.to_xml}" if ng_doc.root.xpath('//text()').empty?
+        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
       end
     end
@@ -126,41 +126,41 @@ module Harvestdor
     # the contentMetadata for this DOR object, ultimately from the purl public xml
     # @return [Nokogiri::XML::Document] the contentMetadata for the DOR object
     def content_metadata
-      ng_doc = benchmark "content_metadata (#{druid})", level: :debug do
+      @content_metadata ||= benchmark "content_metadata (#{druid})", level: :debug do
         harvestdor_client.content_metadata public_xml_or_druid
       end
-      fail "No contentMetadata for \"#{druid}\"" if !ng_doc || ng_doc.children.empty?
-      ng_doc
+      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
-      ng_doc = benchmark "identity_metadata (#{druid})", level: :debug do
+      @identity_metadata ||= benchmark "identity_metadata (#{druid})", level: :debug do
         harvestdor_client.identity_metadata public_xml_or_druid
       end
-      fail "No identityMetadata for \"#{druid}\"" if !ng_doc || ng_doc.children.empty?
-      ng_doc
+      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
-      ng_doc = benchmark "rights_metadata (#{druid})", level: :debug do
+      @rights_metadata ||= benchmark "rights_metadata (#{druid})", level: :debug do
         harvestdor_client.rights_metadata public_xml_or_druid
       end
-      fail "No rightsMetadata for \"#{druid}\"" if !ng_doc || ng_doc.children.empty?
-      ng_doc
+      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
-      ng_doc = benchmark "rdf (#{druid})", level: :debug do
+      @rdf ||= benchmark "rdf (#{druid})", level: :debug do
         harvestdor_client.rdf public_xml_or_druid
       end
-      fail "No RDF for \"#{druid}\"" if !ng_doc || ng_doc.children.empty?
-      ng_doc
+      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.1'
+    VERSION = '2.3.2'.freeze
   end
 end

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

@@ -81,7 +81,7 @@ describe Harvestdor::Indexer::Resource do
     before(:all) do
       @id_md_xml = "<identityMetadata><objectId>druid:#{@fake_druid}</objectId></identityMetadata>"
       @cntnt_md_xml = "<contentMetadata type='image' objectId='#{@fake_druid}'>foo</contentMetadata>"
-      @rights_md_xml = "<rightsMetadata><access type=\"discover\"><machine><world>bar</world></machine></access></rightsMetadata>"
+      @rights_md_xml = '<rightsMetadata><access type="discover"><machine><world>bar</world></machine></access></rightsMetadata>'
       @rdf_xml = "<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'><rdf:Description rdf:about=\"info:fedora/druid:#{@fake_druid}\">relationship!</rdf:Description></rdf:RDF>"
       @pub_xml = "<publicObject id='druid:#{@fake_druid}'>#{@id_md_xml}#{@cntnt_md_xml}#{@rights_md_xml}#{@rdf_xml}</publicObject>"
       @ng_pub_xml = Nokogiri::XML(@pub_xml)
@@ -186,7 +186,7 @@ describe Harvestdor::Indexer::Resource do
 
     describe '#collections' do
       it 'extracts the collection this resource is a member of and return Resource objects for those collections' do
-        allow(resource).to receive(:public_xml).and_return(Nokogiri::XML <<-EOF
+        allow(resource).to receive(:public_xml).and_return(Nokogiri::XML(<<-EOF)
 <publicObject>
   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:fedora="info:fedora/fedora-system:def/relations-external#">
     <rdf:Description>

data/spec/unit/harvestdor-indexer_spec.rb

@@ -47,7 +47,7 @@ describe Harvestdor::Indexer do
         a = @indexer.resources.first
         b = @indexer.resources.first
 
-        expect(a).to_not eq b
+        expect(a).not_to eq b
       end
     end
   end

data/spec/unit/harvestdor/indexer/metrics_spec.rb

@@ -30,7 +30,7 @@ describe Harvestdor::Indexer::Metrics do
     it 'records an error if the block fails' do
       expect do
         subject.tally do
-          fail 'Broken'
+          raise 'Broken'
         end
       end.to change { subject.error_count }.from(0).to(1)
     end
@@ -39,7 +39,7 @@ describe Harvestdor::Indexer::Metrics do
       x = double
       expect(x).to receive(:call).with(kind_of(RuntimeError))
       subject.tally(on_error: x) do
-        fail 'Broken'
+        raise 'Broken'
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: harvestdor-indexer
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Naomi Dushay
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -308,7 +308,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Harvest DOR object metadata and index it to Solr
@@ -325,4 +325,3 @@ test_files:
 - spec/unit/harvestdor-indexer-solr_spec.rb
 - spec/unit/harvestdor-indexer_spec.rb
 - spec/unit/harvestdor/indexer/metrics_spec.rb
-has_rdoc: