harvestdor-indexer 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 867ec6824294513fc2de79faec05696d8b3e8b8c
-  data.tar.gz: 00f41d75cf475adb322c324efb28d0a1af18846a
+  metadata.gz: 3088417ff80fa408e42f434dc8f55cf10010fa88
+  data.tar.gz: 390fb594e23b05bcaadbd5b498a205c31ada7cda
 SHA512:
-  metadata.gz: 7f0cf5fe83102478428dfd470f5fbb050e6fe373c6c56fcd7c5321341c397704a34a230d58506ff0d8a4279edc113f2e8be28b4ae9af9d6316b03b1466eeb742
-  data.tar.gz: 032017da7dd560e3b03299a457cb1d0dacccd59b79881123bfaeb015547b7248059af672badd6806c3cf6da467ab97596f5a63cb61042096a967013877d362e1
+  metadata.gz: eb7b00d94dbd7a2266ffa10e469694cafe59ed7dacc99a1eaebe28f7a9452381855cfb7a5c940518450c8d8a01d1ac161a5e4eeb796d5828e2ddfb82f9e4619b
+  data.tar.gz: 294304cf33a1af2540f07edcb3a138c2f50040d48264f8223e4b9936b17d7305d063d458fd4f7b09ab84d290b8ac69f5b119da873bc7b0f0134b125d221d6d78

data/.rubocop.yml

@@ -8,5 +8,10 @@ Style/EmptyLinesAroundBlockBody:
 Style/EmptyLinesAroundClassBody:
   Enabled: false
 
+# shut hound up
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: single_quotes
+
 Style/TrailingBlankLines:
   Enabled: false

data/.rubocop_todo.yml

@@ -1,29 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2015-10-21 18:25:46 -0700 using RuboCop version 0.34.2.
+# on 2015-10-26 16:12:34 -0700 using RuboCop version 0.34.2.
 # 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: 1
-# Cop supports --auto-correct.
-Lint/DeprecatedClassMethods:
-  Exclude:
-    - 'spec/unit/harvestdor-indexer_spec.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Lint/UnusedBlockArgument:
-  Exclude:
-    - 'lib/harvestdor/indexer/solr.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Lint/UnusedMethodArgument:
-  Exclude:
-    - 'lib/harvestdor/indexer.rb'
-
 # Offense count: 4
 Lint/UselessAssignment:
   Exclude:
@@ -39,25 +21,11 @@ Metrics/AbcSize:
 Metrics/ClassLength:
   Max: 105
 
-# Offense count: 101
+# Offense count: 96
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Max: 207
 
-# Offense count: 11
-RSpec/DescribedClass:
-  Exclude:
-    - 'spec/unit/harvestdor-indexer-resource_spec.rb'
-    - 'spec/unit/harvestdor-indexer-solr_spec.rb'
-    - 'spec/unit/harvestdor-indexer_spec.rb'
-
-# Offense count: 15
-# Configuration parameters: CustomTransform, IgnoredWords.
-RSpec/ExampleWording:
-  Exclude:
-    - 'spec/unit/harvestdor-indexer-resource_spec.rb'
-    - 'spec/unit/harvestdor/indexer/metrics_spec.rb'
-
 # Offense count: 3
 # Configuration parameters: CustomTransform.
 RSpec/FilePath:
@@ -72,14 +40,6 @@ RSpec/InstanceVariable:
     - 'spec/unit/harvestdor-indexer-resource_spec.rb'
     - 'spec/unit/harvestdor-indexer_spec.rb'
 
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/AndOr:
-  Exclude:
-    - 'lib/harvestdor/indexer.rb'
-    - 'lib/harvestdor/indexer/resource.rb'
-
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
@@ -101,18 +61,6 @@ Style/ClassAndModuleChildren:
     - 'lib/harvestdor/indexer/resource.rb'
     - 'lib/harvestdor/indexer/solr.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/ClosingParenthesisIndentation:
-  Exclude:
-    - 'spec/unit/harvestdor-indexer-resource_spec.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/CommentIndentation:
-  Exclude:
-    - 'harvestdor-indexer.gemspec'
-
 # Offense count: 3
 # Configuration parameters: Exclude.
 Style/Documentation:
@@ -126,18 +74,6 @@ Style/DoubleNegation:
   Exclude:
     - 'lib/harvestdor/indexer/resource.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/EmptyLines:
-  Exclude:
-    - 'lib/harvestdor/indexer/resource.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/EmptyLinesAroundMethodBody:
-  Exclude:
-    - 'lib/harvestdor/indexer.rb'
-
 # Offense count: 4
 # Configuration parameters: Exclude.
 Style/FileName:
@@ -153,162 +89,7 @@ Style/GuardClause:
   Exclude:
     - 'lib/harvestdor/indexer.rb'
 
-# Offense count: 15
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues.
-Style/HashSyntax:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: MaxLineLength.
-Style/IfUnlessModifier:
-  Exclude:
-    - 'lib/harvestdor/indexer.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/IndentationConsistency:
-  Exclude:
-    - 'harvestdor-indexer.gemspec'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: Width.
-Style/IndentationWidth:
-  Exclude:
-    - 'spec/unit/harvestdor-indexer_spec.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/LeadingCommentSpace:
-  Exclude:
-    - 'spec/unit/harvestdor/indexer/metrics_spec.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-Style/MethodCallParentheses:
-  Exclude:
-    - 'spec/unit/harvestdor-indexer_spec.rb'
-
-# Offense count: 8
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/MethodDefParentheses:
-  Enabled: false
-
 # Offense count: 1
 Style/MultilineBlockChain:
   Exclude:
     - 'lib/harvestdor/indexer.rb'
-
-# Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/MultilineOperationIndentation:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/NegatedIf:
-  Exclude:
-    - 'lib/harvestdor/indexer/resource.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: PreferredDelimiters.
-Style/PercentLiteralDelimiters:
-  Exclude:
-    - 'harvestdor-indexer.gemspec'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/Proc:
-  Exclude:
-    - 'lib/harvestdor/indexer/solr.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/RedundantBegin:
-  Exclude:
-    - 'lib/harvestdor/indexer/metrics.rb'
-
-# Offense count: 10
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/SignalException:
-  Exclude:
-    - 'lib/harvestdor/indexer.rb'
-    - 'lib/harvestdor/indexer/resource.rb'
-    - 'spec/unit/harvestdor/indexer/metrics_spec.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: MultiSpaceAllowedForOperators.
-Style/SpaceAroundOperators:
-  Exclude:
-    - 'lib/harvestdor/indexer/metrics.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/SpaceBeforeBlockBraces:
-  Enabled: false
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
-Style/SpaceInsideBlockBraces:
-  Enabled: false
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/SpaceInsideBrackets:
-  Exclude:
-    - 'Rakefile'
-
-# Offense count: 8
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SupportedStyles.
-Style/SpaceInsideHashLiteralBraces:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/SpecialGlobalVars:
-  Exclude:
-    - 'harvestdor-indexer.gemspec'
-
-# Offense count: 147
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/StringLiterals:
-  Enabled: false
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: IgnoredMethods.
-Style/SymbolProc:
-  Exclude:
-    - 'lib/harvestdor/indexer.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/Tab:
-  Exclude:
-    - 'harvestdor-indexer.gemspec'
-
-# Offense count: 11
-# Cop supports --auto-correct.
-Style/TrailingWhitespace:
-  Exclude:
-    - 'lib/harvestdor/indexer/metrics.rb'
-    - 'spec/unit/harvestdor-indexer-resource_spec.rb'
-    - 'spec/unit/harvestdor/indexer/metrics_spec.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/UnneededPercentQ:
-  Exclude:
-    - 'harvestdor-indexer.gemspec'

data/README.rdoc

@@ -31,26 +31,15 @@ Create a yml config file for your collection going to a Solr index.
 See  spec/config/ap.yml for an example.
 You will want to copy that file and change the following settings:
 
-# whitelist
-# dor fetcher service_url
-# solr url
-# harvestdor log_dir, log_nam
-
-Note: Because of an update to underlying HTTP libraries, versions of this gem > 0.0.12 require an updated syntax. Errors like "unknown method timeout" might be because you're using an older version of a config file. The new configuration looks like this:
-
-  http_options:
-    ssl:
-      verify: false
-    # timeouts are in seconds;  timeout -> open/read, open_timeout -> connection open
-    request:
-      timeout: 180
-      open_timeout: 180
+* whitelist
+* dor fetcher service_url
+* solr url
+* harvestdor log_dir, log_nam
 
 
 ==== Whitelist
 
-Note: the whitelist is how you specify which objects to index.  The whitelist
-can be
+The whitelist is how you specify which objects to index.  The whitelist can be
 
 * an Array of druids inline in the config yml file
 * a filename containing a list of druids (one per line)
@@ -107,32 +96,15 @@ You may want to write a script to run the code.  Your script might look like thi
 
 Then you run the script like so:
 
-	 ./bin/indexer config/(your coll).yml
+	 $ ./bin/indexer config/(your coll).yml
 
 Run from deployed instance, as that box is already set up to be able to talk to DOR Fetcher service and to SUL Solr indexes.
 
 == Contributing
 
-# Fork it
-# Create your feature branch (`git checkout -b my-new-feature`)
-# Write code and tests.
-# Commit your changes (`git commit -am 'Added some feature'`)
-# Push to the branch (`git push origin my-new-feature`)
-# Create new Pull Request
-
-== Releases
-
-* <b>2.0.0</b> Complete refactor to update APIs, merge configuration yml files, update to rspec 3
-* <b>1.0.4</b> Set skip_heartbeat to true in the initialization of the DorFetcher::Client for ease of testing
-* <b>1.0.3</b> Implemented class level config so anything that inherits from Harvestdor::Indexer can share configuration settings
-* <b>1.0.0</b> Replaced OAI harvesting mechanism with dor-fetcher
-* <b>0.0.13</b> Upgrade to latest faraday HTTP client syntax; Use retries gem (https://github.com/ooyala/retries) to make retrying of index process more robust
-* <b>0.0.12</b> fix total_object nil error
-* <b>0.0.11</b> fix error_count and success_count, allow setting of max-tries (retry solr add if error)
-* <b>0.0.7</b> adding additional logging of error, success counts, and time to index and harvest
-* <b>0.0.6</b> tweak error handling for public xml pieces
-* <b>0.0.5</b> make rake release a no-op
-* <b>0.0.4</b> add confstruct runtime dependency
-* <b>0.0.3</b> add methods for public_xml, content_metadata, identity_metadata ...
-* <b>0.0.2</b> better model code for index method (thanks, Bess!)
-* <b>0.0.1</b> initial commit
+* Fork it (https://help.github.com/articles/fork-a-repo/)
+* Create your feature branch (`git checkout -b my-new-feature`)
+* Write code and tests.
+* Commit your changes (`git commit -am 'Added some feature'`)
+* Push to the branch (`git push origin my-new-feature`)
+* Create new Pull Request (https://help.github.com/articles/creating-a-pull-request/)

data/Rakefile

@@ -1,4 +1,4 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
 require 'rake'
 require 'bundler'
@@ -7,26 +7,26 @@ begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
   $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
+  $stderr.puts 'Run `bundle install` to install missing gems'
   exit e.status_code
 end
 
-task :default => [:rspec, :rubocop]
+task default: [:rspec, :rubocop]
 
-desc "run continuous integration suite (tests, coverage, docs)"
-task :ci => [:rspec, :doc, :rubocop]
+desc 'run continuous integration suite (tests, coverage, docs)'
+task ci: [:rspec, :doc, :rubocop]
 
 require 'rspec/core/rake_task'
 
-task :spec => :rspec
+task spec: :rspec
 
-desc "run specs EXCEPT integration specs"
+desc 'run specs EXCEPT integration specs'
 RSpec::Core::RakeTask.new(:spec_fast) do |spec|
-  spec.rspec_opts = ["-c", "-f progress", "--tty", "-t ~integration", "-r ./spec/spec_helper.rb"]
+  spec.rspec_opts = ['-c', '-f progress', '--tty', '-t ~integration', '-r ./spec/spec_helper.rb']
 end
 
 RSpec::Core::RakeTask.new(:rspec) do |spec|
-  spec.rspec_opts = ["-c", "-f progress", "--tty", "-r ./spec/spec_helper.rb"]
+  spec.rspec_opts = ['-c', '-f progress', '--tty', '-r ./spec/spec_helper.rb']
 end
 
 require 'rubocop/rake_task'
@@ -41,12 +41,12 @@ begin
 
   YARD::Rake::YardocTask.new(:doc) do |yt|
     yt.files = Dir.glob(File.join(project_root, 'lib', '**', '*.rb')) +
-                 [ File.join(project_root, 'README.rdoc') ]
+      [File.join(project_root, 'README.rdoc')]
     yt.options = ['--output-dir', doc_dest_dir, '--readme', 'README.rdoc', '--title', 'Harvestdor Gem Documentation']
   end
 rescue LoadError
-  desc "Generate YARD Documentation"
+  desc 'Generate YARD Documentation'
   task :doc do
-    abort "Please install the YARD gem to generate rdoc."
+    abort 'Please install the YARD gem to generate rdoc.'
   end
 end

data/harvestdor-indexer.gemspec

@@ -4,38 +4,38 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'harvestdor/indexer/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "harvestdor-indexer"
+  gem.name          = 'harvestdor-indexer'
   gem.version       = Harvestdor::Indexer::VERSION
-  gem.authors       = ["Naomi Dushay", "Bess Sadler", "Laney McGlohon"]
-  gem.email         = ["ndushay@stanford.edu", "bess@stanford.edu", "laneymcg@stanford.edu"]
-  gem.description   = %q{Harvest DOR object metadata by the item or collection, plus code framework to write Solr docs to index}
-  gem.summary       = %q{Harvest DOR object metadata and index it to Solr}
-  gem.homepage      = "https://github.com/sul-dlss/harvestdor-indexer"
+  gem.authors       = ['Naomi Dushay', 'Bess Sadler', 'Laney McGlohon']
+  gem.email         = ['ndushay@stanford.edu', 'bess@stanford.edu', 'laneymcg@stanford.edu']
+  gem.description   = 'Harvest DOR object metadata by the item or collection, plus code framework to write Solr docs to index'
+  gem.summary       = 'Harvest DOR object metadata and index it to Solr'
+  gem.homepage      = 'https://github.com/sul-dlss/harvestdor-indexer'
 
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^spec/})
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 
   gem.add_dependency 'rsolr'
   gem.add_dependency 'retries'
   gem.add_dependency 'harvestdor', '>=0.0.14'
   gem.add_dependency 'stanford-mods'
   gem.add_dependency 'dor-fetcher', '=1.0.5'
-  gem.add_dependency "activesupport"
-  gem.add_dependency "parallel"
+  gem.add_dependency 'activesupport'
+  gem.add_dependency 'parallel'
 
   # Runtime dependencies
   gem.add_runtime_dependency 'confstruct'
 
   # Development dependencies
-  gem.add_development_dependency "rake"
+  gem.add_development_dependency 'rake'
   # docs
-  gem.add_development_dependency "rdoc"
-  gem.add_development_dependency "yard"
+  gem.add_development_dependency 'rdoc'
+  gem.add_development_dependency 'yard'
   # tests
-	gem.add_development_dependency 'rspec', "~> 3.0"
-	gem.add_development_dependency 'coveralls'
+  gem.add_development_dependency 'rspec', '~> 3.0'
+  gem.add_development_dependency 'coveralls'
   gem.add_development_dependency 'rubocop'
   gem.add_development_dependency 'rubocop-rspec'
   gem.add_development_dependency 'vcr'

data/lib/harvestdor/indexer/metrics.rb

@@ -4,15 +4,15 @@ module Harvestdor
   class Indexer::Metrics
     attr_accessor :error_count, :success_count, :logger
 
-    def initialize options = {}
-      @success_count=0    # the number of objects successfully indexed
-      @error_count=0      # the number of objects that failed
+    def initialize(options = {})
+      @success_count = 0    # the number of objects successfully indexed
+      @error_count = 0      # the number of objects that failed
       @logger = options[:logger] || Logger.new(STDERR)
     end
 
     ##
     # Wrap an operation in tally block; if the block completes without throwing
-    # an exception, tally a success. If the block throws an exception, catch it 
+    # an exception, tally a success. If the block throws an exception, catch it
     # and tally a failure.
     #
     # Callers can provide an :on_error handler to receive the exception and process
@@ -20,15 +20,13 @@ module Harvestdor
     #
     # @param [Hash] options
     # @option options [#call] Callback that will receive any exception thrown by the block
-    def tally options = {}, &block      
-      begin
-        block.call
-        success!
-      rescue => e
-        error!
-        logger.error "Failed to process: #{e.message}"
-        options[:on_error].call e if options[:on_error]
-      end
+    def tally(options = {}, &block)
+      block.call
+      success!
+    rescue => e
+      error!
+      logger.error "Failed to process: #{e.message}"
+      options[:on_error].call e if options[:on_error]
     end
 
     ##

data/lib/harvestdor/indexer/resource.rb

@@ -1,3 +1,4 @@
+# rubocop:disable Metrics/ClassLength
 require 'active_support/benchmarkable'
 
 module Harvestdor
@@ -7,16 +8,16 @@ module Harvestdor
     attr_reader :indexer, :druid, :options
 
     # @param [Harvestdor::Indexer] indexer an instance of Harvestdor::Indexer
-    # @param [String] coll_druid a collection druid of the form 'druid:oo123oo1234'
-    def initialize indexer, coll_druid, options = {}
+    # @param [String] druid a druid of the form 'druid:oo123oo1234'
+    def initialize(indexer, druid, options = {})
       @indexer = indexer
-      @druid = coll_druid
+      @druid = druid
       @options = options
     end
 
     # @return [String] string of form  oo123oo1234
     def bare_druid
-      @bare_druid ||= druid.gsub("druid:", "")
+      @bare_druid ||= druid.gsub('druid:', '')
     end
 
     ##
@@ -38,18 +39,18 @@ module Harvestdor
     ##
     # Is this resource a collection?
     def collection?
-      identity_metadata.xpath("/identityMetadata/objectType").any? { |x| x.text == "collection" }
+      identity_metadata.xpath('/identityMetadata/objectType').any? { |x| x.text == 'collection' }
     end
 
     # get the druids from isMemberOfCollection relationships in rels-ext from public_xml
     # @return [Array<String>] the druids (e.g. ww123yy1234) this object has isMemberOfColletion relationship with, or nil if none
     def collections
       @collections ||= begin
-        ns_hash = {'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#', 'fedora' => "info:fedora/fedora-system:def/relations-external#", '' => ''}
+        ns_hash = { 'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#', 'fedora' => 'info:fedora/fedora-system:def/relations-external#', '' => '' }
         is_member_of_nodes ||= public_xml.xpath('/publicObject/rdf:RDF/rdf:Description/fedora:isMemberOfCollection/@rdf:resource', ns_hash)
 
         is_member_of_nodes.reject { |n| n.value.empty? }.map do |n|
-          Harvestdor::Indexer::Resource.new(indexer, n.value.gsub("info:fedora/", ""))
+          Harvestdor::Indexer::Resource.new(indexer, n.value.gsub('info:fedora/', ''))
         end
       end
     end
@@ -57,12 +58,18 @@ module Harvestdor
     ##
     # Return the items in this collection
     def items
-      @items ||= begin
-        druids = dor_fetcher_client.druid_array(dor_fetcher_client.get_collection(bare_druid, {}))
-        druids.map { |x| Harvestdor::Indexer::Resource.new(indexer, x) }
+      return [] unless collection?
+      return to_enum(:items) unless block_given?
+
+      items_druids.each do |x|
+        yield Harvestdor::Indexer::Resource.new(indexer, x)
       end
     end
 
+    def items_druids
+      @items_druids ||= dor_fetcher_client.druid_array(dor_fetcher_client.get_collection(bare_druid, {}))
+    end
+
     # given a druid, get its objectLabel from its purl page identityMetadata
     # @return [String] the value of the <objectLabel> element in the identityMetadata for the object
     def identity_md_obj_label
@@ -70,13 +77,12 @@ module Harvestdor
       identity_metadata.xpath('identityMetadata/objectLabel').text
     end
 
-
     # return the MODS for the druid as a Stanford::Mods::Record object
     # @return [Stanford::Mods::Record] created from the MODS xml for the druid
     def smods_rec
       @smods_rec ||= benchmark "smods_rec(#{druid})", level: :debug do
         ng_doc = mods
-        raise "Empty MODS metadata for #{druid}: #{ng_doc.to_xml}" if ng_doc.root.xpath('//text()').empty?
+        fail "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
@@ -92,8 +98,8 @@ module Harvestdor
     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}" if !ng_doc
-        raise "Empty public xml for #{druid}: #{ng_doc.to_xml}" if ng_doc.root.xpath('//text()').empty?
+        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?
         ng_doc
       end
     end
@@ -121,7 +127,7 @@ module Harvestdor
       ng_doc = benchmark "content_metadata (#{druid})", level: :debug do
         harvestdor_client.content_metadata public_xml_or_druid
       end
-      raise "No contentMetadata for \"#{druid}\"" if !ng_doc || ng_doc.children.empty?
+      fail "No contentMetadata for \"#{druid}\"" if !ng_doc || ng_doc.children.empty?
       ng_doc
     end
 
@@ -131,7 +137,7 @@ module Harvestdor
       ng_doc = benchmark "identity_metadata (#{druid})", level: :debug do
         harvestdor_client.identity_metadata public_xml_or_druid
       end
-      raise "No identityMetadata for \"#{druid}\"" if !ng_doc || ng_doc.children.empty?
+      fail "No identityMetadata for \"#{druid}\"" if !ng_doc || ng_doc.children.empty?
       ng_doc
     end
 
@@ -141,7 +147,7 @@ module Harvestdor
       ng_doc = benchmark "rights_metadata (#{druid})", level: :debug do
         harvestdor_client.rights_metadata public_xml_or_druid
       end
-      raise "No rightsMetadata for \"#{druid}\"" if !ng_doc || ng_doc.children.empty?
+      fail "No rightsMetadata for \"#{druid}\"" if !ng_doc || ng_doc.children.empty?
       ng_doc
     end
 
@@ -151,12 +157,12 @@ module Harvestdor
       ng_doc = benchmark "rdf (#{druid})", level: :debug do
         harvestdor_client.rdf public_xml_or_druid
       end
-      raise "No RDF for \"#{druid}\"" if !ng_doc || ng_doc.children.empty?
+      fail "No RDF for \"#{druid}\"" if !ng_doc || ng_doc.children.empty?
       ng_doc
     end
 
     def eql?(other)
-      other.is_a? Harvestdor::Indexer::Resource and other.indexer == indexer and other.druid == druid
+      other.is_a?(Harvestdor::Indexer::Resource) && other.indexer == indexer && other.druid == druid
     end
 
     def hash

data/lib/harvestdor/indexer/solr.rb

@@ -23,7 +23,7 @@ module Harvestdor
     def add(doc)
       id = doc[:id]
 
-      handler = Proc.new do |exception, attempt_number, total_delay|
+      handler = proc do |exception, attempt_number, _total_delay|
         logger.debug "#{exception.class} on attempt #{attempt_number} for #{id}"
         # logger.debug exception.backtrace
       end