dor-services 7.1.0 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cf9f20e7028e7252d30de465bbbee5afc837f32793be1612591443dab72170d
-  data.tar.gz: 0436dcc7ecf8964b20193603f4219ebfc46a0bedf42566ddcf4a79bd831ed8ff
+  metadata.gz: a2f12b5263f8e70fb23775a198bd2a376da3ac042689620be3d71a6832c44ccc
+  data.tar.gz: e493994b692813a7812e550ee939f17f68a34d856acb6ee4a714df3e3a72083b
 SHA512:
-  metadata.gz: e48a8d2b2f1f3ccfff30db3def931c14862eb9e108865db26b4d830c170e990db20ca453b5b66b8fdf61fa8b9c5a677f522c124bd294918e682e0ea88693da4e
-  data.tar.gz: 1cb0bfa19232319da9d3e47efd241974a91f0e94f21cdc46195804270d02a29be8e2979cbba15c01b5e0c35b53a643f627f5153fb966369b7f74b0100e0132e6
+  metadata.gz: de6e765d5e943c10c0109a23b69f339f31b7d29a79a468c19597d669004ef632de7fa02bf004a849880cedcc493a2289ca62807114aa7afa767d25836b51ebcd
+  data.tar.gz: 8a3d6e02177c15e7eec9677da779be3d490a79a1c2361f031a7e0f30ead149fc75008cc4c26dedcc2df3dbff3439f168078a2b0e52e29c435473ed3400ce3413

data/lib/dor-services.rb

@@ -108,6 +108,7 @@ module Dor
     autoload :CollectionService
     autoload :CreateWorkflowService
     autoload :CreativeCommonsLicenseService
+    autoload :DeleteService
     autoload :EmbargoService
     autoload :IndexingService
     autoload :MetadataService

data/lib/dor/indexers/workflow_indexer.rb

@@ -45,7 +45,7 @@ module Dor
       index_error_message(solr_doc, wf_name, process)
 
       # workflow name, process status then process name
-      solr_doc.add_wps("#{wf_name}:#{process.status}", "#{wf_name}:#{process.status}:#{process.name}")
+      solr_doc.add_wsp("#{wf_name}:#{process.status}", "#{wf_name}:#{process.status}:#{process.name}")
 
       # workflow name, process name then process status
       solr_doc.add_wps("#{wf_name}:#{process.name}", "#{wf_name}:#{process.name}:#{process.status}")

data/lib/dor/models/workflow_object.rb

@@ -28,6 +28,7 @@ module Dor
     # @param [String] name the name of the workflow
     # @return [String] the initial workflow xml
     def self.initial_workflow(name)
+      Deprecation.warn(self, 'WorkflowObject#initial_workflow is deprecated and will be removed in dor-services 8.0')
       return @@xml_cache[name] if @@xml_cache.include?(name)
 
       find_and_cache_workflow_xml_and_repo name
@@ -39,6 +40,7 @@ module Dor
     # @param [String] name the name of the workflow
     # @return [String] the initial workflow xml
     def self.initial_repo(name)
+      Deprecation.warn(self, 'WorkflowObject#initial_repo is deprecated and will be removed in dor-services 8.0')
       return @@repo_cache[name] if @@repo_cache.include?(name)
 
       find_and_cache_workflow_xml_and_repo name

data/lib/dor/services/cleanup_service.rb

@@ -24,6 +24,7 @@ module Dor
     def self.cleanup_workspace_content(druid, base)
       DruidTools::Druid.new(druid, base).prune!
     end
+    private_class_method :cleanup_workspace_content
 
     # @param [String] druid The identifier for the object whose data is to be removed
     # @return [void] remove copy of the data that was exported to preservation core
@@ -34,6 +35,7 @@ module Dor
       tarfile = "#{bag_dir}.tar"
       remove_branch(tarfile)
     end
+    private_class_method :cleanup_export
 
     # @param [Pathname,String] pathname The full path of the branch to be removed
     # @return [void] Remove the specified directory and all its children
@@ -41,6 +43,7 @@ module Dor
       pathname = Pathname(pathname) if pathname.instance_of? String
       pathname.rmtree if pathname.exist?
     end
+    private_class_method :remove_branch
 
     # Tries to remove any exsitence of the object in our systems
     #   Does the following:
@@ -53,35 +56,8 @@ module Dor
     #   - Removes active workflows
     # @param [String] druid id of the object you wish to remove
     def self.nuke!(druid)
-      cleanup_by_druid druid
-      cleanup_stacks druid
-      cleanup_purl_doc_cache druid
-      remove_active_workflows druid
-      delete_from_dor druid
-    end
-
-    def self.cleanup_stacks(druid)
-      DruidTools::StacksDruid.new(druid, Config.stacks.local_stacks_root).prune!
-    end
-
-    def self.cleanup_purl_doc_cache(druid)
-      DruidTools::PurlDruid.new(druid, Config.stacks.local_document_cache_root).prune!
-    end
-
-    def self.remove_active_workflows(druid)
-      %w(dor sdr).each do |repo|
-        dor_wfs = Dor::Config.workflow.client.workflows(druid, repo)
-        dor_wfs.each { |wf| Dor::Config.workflow.client.delete_workflow(repo, druid, wf) }
-      end
-    end
-
-    # Delete an object from DOR.
-    #
-    # @param [string] pid the druid
-    def self.delete_from_dor(pid)
-      Dor::Config.fedora.client["objects/#{pid}"].delete
-      Dor::SearchService.solr.delete_by_id(pid)
-      Dor::SearchService.solr.commit
+      Deprecation.warn(self, 'CleanupService.nuke! is deprecated and will be removed in dor-services 8.  Use Dor::DeleteService.destroy() instead.')
+      DeleteService.destroy(druid)
     end
   end
 end

data/lib/dor/services/create_workflow_service.rb

@@ -2,13 +2,15 @@
 
 module Dor
   class CreateWorkflowService
-    # Initilizes workflow for the object in the workflow service
+    extend Deprecation
+    # Initializes workflow for the object in the workflow service
     #  It will set the priorty of the new workflow to the current_priority if it is > 0
     #  It will set lane_id from the item's APO default workflow lane
     # @param [String] name of the workflow to be initialized
     # @param [Boolean] create_ds create a 'workflows' datastream in Fedora for the object
     # @param [Integer] priority the workflow's priority level
     def self.create_workflow(item, name:, create_ds: true, priority: 0)
+      Deprecation.warn(self, 'CreateWorkflowService is deprecated.  Use dor-workflow-service instead')
       new(item).create_workflow(name: name, create_ds: create_ds, priority: priority)
     end
 

data/lib/dor/services/delete_service.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Dor
+  # Remove all traces of the object's data files from the workspace and export areas
+  class DeleteService
+    # Tries to remove any exsitence of the object in our systems
+    #   Does the following:
+    #   - Removes item from Fedora/Solr
+    #   - Removes content from dor workspace
+    #   - Removes content from assembly workspace
+    #   - Removes content from sdr export area
+    #   - Removes content from stacks
+    #   - Removes content from purl
+    #   - Removes active workflows
+    # @param [String] druid id of the object you wish to remove
+    def self.destroy(druid)
+      new(druid).destroy
+    end
+
+    def initialize(druid)
+      @druid = druid
+    end
+
+    def destroy
+      CleanupService.cleanup_by_druid druid
+      cleanup_stacks
+      cleanup_purl_doc_cache
+      remove_active_workflows
+      delete_from_dor
+    end
+
+    private
+
+    attr_reader :druid
+
+    def cleanup_stacks
+      DruidTools::StacksDruid.new(druid, Config.stacks.local_stacks_root).prune!
+    end
+
+    def cleanup_purl_doc_cache
+      DruidTools::PurlDruid.new(druid, Config.stacks.local_document_cache_root).prune!
+    end
+
+    def remove_active_workflows
+      %w[dor sdr].each do |repo|
+        dor_wfs = Dor::Config.workflow.client.workflows(druid, repo)
+        dor_wfs.each { |wf| Dor::Config.workflow.client.delete_workflow(repo, druid, wf) }
+      end
+    end
+
+    # Delete an object from DOR.
+    #
+    # @param [string] pid the druid
+    def delete_from_dor
+      Dor::Config.fedora.client["objects/#{druid}"].delete
+      Dor::SearchService.solr.delete_by_id(druid)
+      Dor::SearchService.solr.commit
+    end
+  end
+end

data/lib/dor/services/public_desc_metadata_service.rb

@@ -2,11 +2,14 @@
 
 module Dor
   class PublicDescMetadataService
+    extend Deprecation
+
     attr_reader :object
 
     NOKOGIRI_DEEP_COPY = 1
 
     def initialize(object)
+      Deprecation.warn(self, 'Dor::PublicDescMetadataService has moved to dor-services-app')
       @object = object
     end
 

data/lib/dor/services/search_service.rb

@@ -13,7 +13,7 @@ module Dor
       def query(query, args = {})
         params = args.merge(q: query)
         params[:start] ||= 0
-        resp = solr.get 'select', params: params
+        resp = _solr.get 'select', params: params
         return resp unless block_given?
 
         cont = true
@@ -21,7 +21,7 @@ module Dor
           cont = yield(resp)
           params[:rows] ||= resp['response']['docs'].length
           params[:start] += params[:rows]
-          resp = solr.get 'select', params: params
+          resp = _solr.get 'select', params: params
         end
       end
 
@@ -41,7 +41,8 @@ module Dor
       end
 
       def solr
-        @@solr ||= ActiveFedora.solr.conn.is_a?(RSolr::Client) ? ActiveFedora.solr.conn : Dor::Config.make_solr_connection
+        Deprecation.warn(self, 'Dor::SearchService.solr is deprecated. Call ActiveFedora.solr.conn directly')
+        _solr
       end
 
       # @return String druid of the SDR Graveyard APO
@@ -58,6 +59,12 @@ module Dor
           r['response']['docs'].first[:id]
         end
       end
+
+      private
+
+      def _solr
+        ActiveFedora.solr.conn
+      end
     end
   end
 end

data/lib/dor/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 7.2.0
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-25 00:00:00.000000000 Z
+date: 2019-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -250,20 +250,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: systemu
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: dor-rights-auth
   requirement: !ruby/object:Gem::Requirement
@@ -312,20 +298,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.1
-- !ruby/object:Gem::Dependency
-  name: moab-versioning
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: stanford-mods
   requirement: !ruby/object:Gem::Requirement
@@ -382,20 +354,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: jhove-service
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -581,6 +539,7 @@ files:
 - lib/dor/services/collection_service.rb
 - lib/dor/services/create_workflow_service.rb
 - lib/dor/services/creative_commons_license_service.rb
+- lib/dor/services/delete_service.rb
 - lib/dor/services/embargo_service.rb
 - lib/dor/services/metadata_handlers/catalog_handler.rb
 - lib/dor/services/metadata_service.rb