dor-services 5.11.1 → 5.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6d848420be7d6aeffe78e6096112b0725db6757
-  data.tar.gz: 36b2a8d907af029b34f4f215d8b5c3f782b81ed0
+  metadata.gz: 0aff39b53fc6fedf10ff743cb3d278e873283d98
+  data.tar.gz: d1c37b58887fbdc7a2d1c86fe9c689dec9d69023
 SHA512:
-  metadata.gz: f47e46f92857b6e37da48a3373e7ae86f1b5d011c118d2ea6b5936b7fab700412ca50b260b4b34cb4d51244af827d5c6e56e5fc86df94df4fe4536adc59efdf2
-  data.tar.gz: 8d8a9920d96551676bf570e196f4d7c041cd57f10bd57015a948c88ebbefcec3413da663ba6ec3e1f8f45630bec3739481d234578c23f0a3e35dc5f4795139db
+  metadata.gz: edfde3b9ce9e74b4ac8956cc147a194287f5c10fba0458851fdef493e73c5ac67cdd0e69e8654e18e602ed832dd5706d20c345eb6ffde7aa31d69148bbdc8c5a
+  data.tar.gz: 805ade0109e6085e67aedb75e47eadfe9c0c9a22a67ce444f0d1502d7cd2a013e733b069ce74c67ef1c8d68d3d43cd57a699baacedd492f6372a921d91252f30

data/lib/dor/services/indexing_service.rb

@@ -22,14 +22,14 @@ module Dor
     end
 
     # takes a Dor object and indexes it to solr.  doesn't commit automatically.
-    def self.reindex_object(obj)
+    def self.reindex_object(obj, options = {})
       solr_doc = obj.to_solr
-      Dor::SearchService.solr.add(solr_doc)
+      Dor::SearchService.solr.add(solr_doc, options)
       solr_doc
     end
 
     # retrieves a single Dor object by pid, indexes the object to solr, does some logging
-    # (will use a defualt logger if one is not provided).  doesn't commit automatically.
+    # (will use a default logger if one is not provided).  doesn't commit automatically.
     #
     # WARNING/TODO:  the tests indicate that the "rescue Exception" block at the end will
     # get skipped, and the thrown exception (e.g. SystemStackError) will not be logged.  since
@@ -37,10 +37,26 @@ module Dor
     # doesn't seem worth blocking refactoring.  see https://github.com/sul-dlss/dor-services/issues/156
     # extra logging in this case would be nice, but centralized indexing that's otherwise
     # fully functional is nicer.
-    def self.reindex_pid(pid, index_logger = nil, should_raise_errors = true)
-      index_logger ||= default_index_logger
+    #
+    # @overload reindex_pid(pid, index_logger, options = {})
+    # @overload reindex_pid(pid, index_logger, should_raise_errors, options = {})
+    # @overload reindex_pid(pid, options = {})
+    def self.reindex_pid(pid, *args)
+      options = {}
+      options = args.pop if args.last.is_a? Hash
+
+      if args.length > 0
+        warn "Dor::IndexingService.reindex_pid with primitive arguments is deprecated; pass e.g. { logger: logger, raise_errors: bool } instead"
+        index_logger, should_raise_errors = args
+        index_logger ||= default_index_logger
+        should_raise_errors = true if should_raise_errors.nil?
+      else
+        index_logger = options.fetch(:logger, default_index_logger)
+        should_raise_errors = options.fetch(:raise_errors, true)
+      end
+
       obj = Dor.load_instance pid
-      solr_doc = reindex_object obj
+      solr_doc = reindex_object obj, options
       index_logger.info "updated index for #{pid}"
       solr_doc
     rescue StandardError => se
@@ -57,7 +73,7 @@ module Dor
 
     # given a list of pids, retrieve those objects from fedora, index each to solr, optionally commit
     def self.reindex_pid_list(pid_list, should_commit = false)
-      pid_list.each { |pid| reindex_pid pid, nil, false } # use the default logger, don't let individual errors nuke the rest of the batch
+      pid_list.each { |pid| reindex_pid pid, raise_errors: false } # use the default logger, don't let individual errors nuke the rest of the batch
       ActiveFedora.solr.conn.commit if should_commit
     end
   end

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '5.11.1'.freeze
+  VERSION = '5.12.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 5.11.1
+  version: 5.12.0
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -82,14 +82,14 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.1
 - !ruby/object:Gem::Dependency
@@ -139,6 +139,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.7
   type: :runtime
@@ -146,22 +149,31 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.7
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rsolr-ext
   requirement: !ruby/object:Gem::Requirement
@@ -209,6 +221,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.5
   type: :runtime
@@ -216,6 +231,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.5
 - !ruby/object:Gem::Dependency
@@ -366,16 +384,22 @@ dependencies:
   name: modsulator
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: stanford-mods
   requirement: !ruby/object:Gem::Requirement
@@ -452,14 +476,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -652,9 +676,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby implmentation of DOR services used by the SULAIR Digital Library
 test_files: []
-has_rdoc: