dor-services 6.7.0 → 6.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49efa35d39eee0748121dad21f44e871d6ea38eff28dc1719f7d13061eaab269
-  data.tar.gz: d1e0418a853a958966e7247e9c2ca0ceaf0739784ee3da2e3a0ab1a4f8a2f67d
+  metadata.gz: 85d61e2ff2890b4d25489c7dd7ecdd696d29b6dc1fc71939045cdb5ce801d914
+  data.tar.gz: 27b4b9d65371523af32aa306670d783e8da0abc9f04e44d3a001ad99ba2b7f6f
 SHA512:
-  metadata.gz: 37ac6a9d98625fb2272a5e541d6cf99d4b3f6d7e615c000b22aa6c51b49ed917b912a30f77c293da356107f2418fa60d5c70a5a3b84f31bb52fa149b13f3601d
-  data.tar.gz: 2401c8bfef4aa070e5672227e67c53a29dee353dbe58fa73922f4a3409d1b23f0ad8baf9d5e30fa4c4e0d87062e0c38d37fbc0ac74cf31fd740d6d33fba84fea
+  metadata.gz: f44b068a8964f6873fd493d3ef274cc98dd8faa9ba619ade56197892d3783a82ab83a9dae62edfd3cc5c7ef6c183f37ae8ed012ad2544941d31e51498d7e260d
+  data.tar.gz: cf2d94e214f0d002d64d01003cb52e8952167fa310c641f3809a4bcc8dd7235924d6461ca7cb42644b8c7e12c5f95a36c215ba69e1839f6703d555692e0ba9df

data/lib/dor-services.rb

@@ -22,16 +22,16 @@ module Dor
     # index is missing the objectType property.
     # @param [String] pid The object's PID
     def load_instance(pid)
-      Dor::Abstract.find pid, cast: true
+      Deprecation.warn(self, 'load_instance is deprecated, use Dor.find instead')
+      find(pid)
     end
 
-    # Get objectType information from solr and load the correct class the first time,
-    # saving the overhead of using ActiveFedora::Base#adapt_to. It falls back to
-    # Dor.load_instance() if the item is not in the index, or is improperly indexed.
+    # Load an object and inspect its identityMetadata to figure out what class
+    # to adapt it to.
     # @param [String] pid The object's PID
     # @return [Object] the ActiveFedora-modeled object
     def find(pid, _opts = {})
-      load_instance(pid)
+      Dor::Abstract.find pid, cast: true
     end
 
     # TODO: return enumerable and lazy load_instance

data/lib/dor/services/indexing_service.rb

@@ -4,6 +4,8 @@ require 'benchmark'
 
 module Dor
   class IndexingService
+    extend Deprecation
+
     class ReindexError < RuntimeError; end
 
     ##
@@ -11,6 +13,7 @@ module Dor
     # @yield attempt to execute 'entry_id_block' and use the result as an extra identifier for the log
     #   entry.  a placeholder will be used otherwise. 'request.uuid' might be useful in a Rails app.
     def self.generate_index_logger(&entry_id_block)
+      Deprecation.warn(self, 'generate_index_logger is deprecated and will be removed in dor-services version 7')
       index_logger = Logger.new(Config.indexing_svc.log, Config.indexing_svc.log_rotation_interval)
       index_logger.formatter = proc do |_severity, datetime, _progname, msg|
         date_format_str = Config.indexing_svc.log_date_format_str
@@ -28,11 +31,13 @@ module Dor
     @@loggers = { default: nil }
 
     def self.default_index_logger
+      Deprecation.warn(self, 'default_index_logger is deprecated and will be removed in dor-services version 7')
       @@loggers[:default] ||= generate_index_logger
     end
 
     # takes a Dor object and indexes it to solr.  doesn't commit automatically.
     def self.reindex_object(obj, options = {})
+      Deprecation.warn(self, 'reindex_pid is deprecated and will be removed in dor-services 7.')
       solr_doc = obj.to_solr
       Dor::SearchService.solr.add(solr_doc, options)
       solr_doc
@@ -42,6 +47,8 @@ module Dor
     # @param [String] pid the druid
     # @raise [ReindexError] on failure
     def self.reindex_pid_remotely(pid)
+      Deprecation.warn(self, 'reindex_pid_remotely is deprecated and will be removed in dor-services 7.')
+
       pid = "druid:#{pid}" unless pid =~ /^druid:/
       realtime = Benchmark.realtime do
         with_retries(max_tries: 3, rescue: [RestClient::Exception, Errno::ECONNREFUSED]) do
@@ -72,6 +79,7 @@ module Dor
     # @overload reindex_pid(pid, index_logger, should_raise_errors, options = {})
     # @overload reindex_pid(pid, options = {})
     def self.reindex_pid(pid, *args)
+      Deprecation.warn(self, 'reindex_pid is deprecated and will be removed in dor-services 7.')
       options = {}
       options = args.pop if args.last.is_a? Hash
 
@@ -89,8 +97,8 @@ module Dor
       solr_doc = nil
 
       # benchmark how long it takes to load the object
-      load_stats = Benchmark.measure('load_instance') do
-        obj = Dor.load_instance pid
+      load_stats = Benchmark.measure('find') do
+        obj = Dor.find pid
       end.format('%n realtime %rs total CPU %ts').gsub(/[\(\)]/, '')
 
       # benchmark how long it takes to convert the object to a Solr document
@@ -115,6 +123,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)
+      Deprecation.warn(self, 'reindex_pid_list is deprecated and will be removed in dor-services 7')
       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

data/lib/dor/services/metadata_handlers/catalog_handler.rb

@@ -2,24 +2,26 @@
 
 require 'rest-client'
 
-class CatalogHandler
-  def fetch(prefix, identifier)
-    client = RestClient::Resource.new(Dor::Config.metadata.catalog.url,
-                                      Dor::Config.metadata.catalog.user,
-                                      Dor::Config.metadata.catalog.pass)
-    params = "?#{prefix.chomp}=#{identifier.chomp}"
-    client[params].get
-  rescue RestClient::Exception => e
-    raise BadResponseFromCatalog, "#{e.class} - when contacting (with BasicAuth hidden): #{Dor::Config.metadata.catalog.url}#{params}"
-  end
+module Dor
+  class CatalogHandler
+    def fetch(prefix, identifier)
+      client = RestClient::Resource.new(Dor::Config.metadata.catalog.url,
+                                        Dor::Config.metadata.catalog.user,
+                                        Dor::Config.metadata.catalog.pass)
+      params = "?#{prefix.chomp}=#{identifier.chomp}"
+      client[params].get
+    rescue RestClient::Exception => e
+      raise BadResponseFromCatalog, "#{e.class} - when contacting (with BasicAuth hidden): #{Dor::Config.metadata.catalog.url}#{params}"
+    end
 
-  def label(metadata)
-    mods = Nokogiri::XML(metadata)
-    mods.root.add_namespace_definition('mods', 'http://www.loc.gov/mods/v3')
-    mods.xpath('/mods:mods/mods:titleInfo[1]').xpath('mods:title|mods:nonSort').collect(&:text).join(' ').strip
-  end
+    def label(metadata)
+      mods = Nokogiri::XML(metadata)
+      mods.root.add_namespace_definition('mods', 'http://www.loc.gov/mods/v3')
+      mods.xpath('/mods:mods/mods:titleInfo[1]').xpath('mods:title|mods:nonSort').collect(&:text).join(' ').strip
+    end
 
-  def prefixes
-    %w(catkey barcode)
+    def prefixes
+      %w(catkey barcode)
+    end
   end
 end

data/lib/dor/services/search_service.rb

@@ -5,6 +5,7 @@ require 'active_support/core_ext'
 
 module Dor
   class SearchService
+    extend Deprecation
     RISEARCH_TEMPLATE = "select $object from <#ri> where $object <dc:identifier> '%s'"
     @@index_version = nil
 
@@ -13,7 +14,9 @@ module Dor
         Dor::VERSION
       end
 
+      # @deprecated because this depends on Fedora 3 having sparql turned on
       def risearch(query, opts = {})
+        Deprecation.warn(self, 'risearch is deprecated and will be removed in dor-services 7')
         client = Config.fedora.client['risearch']
         client.options[:timeout] = opts.delete(:timeout)
         query_params = {
@@ -28,7 +31,9 @@ module Dor
         result.split(/\n/)[1..-1].collect { |pid| pid.chomp.sub(/^info:fedora\//, '') }
       end
 
+      # @deprecated because this depends on Fedora 3 having sparql turned on
       def iterate_over_pids(opts = {})
+        Deprecation.warn(self, 'iterate_over_pids is deprecated and will be removed in dor-services 7')
         opts[:query] ||= 'select $object from <#ri> where $object <info:fedora/fedora-system:def/model#label> $label'
         opts[:in_groups_of] ||= 100
         opts[:mode] ||= :single

data/lib/dor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dor
-  VERSION = '6.7.0'
+  VERSION = '6.8.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 6.7.0
+  version: 6.8.0
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-03 00:00:00.000000000 Z
+date: 2019-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora