dor-services 8.0.0 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b23b30fbc918705e040049d04869e4ce0ca5d2c9060aa52cbc3cb17bcbf1efa
-  data.tar.gz: 75f7b272d2bd43b5cc6546f9881f15cd3f85f484bc5a219c710ac428efb8a558
+  metadata.gz: 9db4d292ea111c582968fb625988bf1479ee1f72d660b3f0c7c6b85084590888
+  data.tar.gz: d447c63fc694a3b5d490a092a90d08175b4e67b42979b275bf336e77b8b8e027
 SHA512:
-  metadata.gz: f0fb8fe1755b93d8257f74b17ebc822e287dbb9d69c2a2376b05b6a45bc0f7241f68d8ffb0b36b0294e42b5030af223e9660e48c116e6c86882cc88f25e1589c
-  data.tar.gz: 4de638d794ec9b372f3093c5ee432067c9ebca4fc213b7d4793a77f29b9d6bbde92cdf180e0f00844ac6cea89ed048639a2817e67f38743f21d03d199c74c327
+  metadata.gz: c5aa415cd76013eb41033aa02796351cff7c3343d018f35ca1a5fafa5e845d553d7cb38b05de8c005bf90afdec06ee36effe9563e5a210ac43aa2653da2f790d
+  data.tar.gz: b6c612125ee87bf1d583db3173cf7947b123273d93a24c46a68a5412697b263dbf090eac41603bbde940aaaf260aae23b89148364488fdaf012b7c101e05d79b

data/lib/dor/datastreams/content_metadata_ds.rb

@@ -35,9 +35,6 @@ module Dor
       t.shelved_file_id proxy: %i[resource shelved_file id], index_as: %i[displayable stored_searchable]
     end
 
-    extend Deprecation
-    self.deprecation_horizon = '8.0'
-
     ### READ ONLY METHODS
 
     # Only use this when you want the behavior of raising an exception if anything besides exactly one matching node
@@ -138,38 +135,6 @@ module Dor
       end
     end
 
-    # @param [Object] file
-    # @param [String] resource_name
-    # @return [Nokogiri::XML::Node] the added XML node
-    def add_file(file, resource_name)
-      resource_nodes = ng_xml.search('//resource[@id=\'' + resource_name + '\']')
-      raise 'resource doesnt exist.' if resource_nodes.length == 0
-
-      ng_xml_will_change!
-
-      node = resource_nodes.first
-      file_node = Nokogiri::XML::Node.new('file', ng_xml)
-      file_node['id'] = file[:name]
-      file_node['shelve'] = file[:shelve] || ''
-      file_node['publish'] = file[:publish] || ''
-      file_node['preserve'] = file[:preserve] || ''
-      node.add_child(file_node)
-
-      %i[md5 sha1].each do |algo|
-        next unless file[algo]
-
-        checksum_node = Nokogiri::XML::Node.new('checksum', ng_xml)
-        checksum_node['type'] = algo.to_s
-        checksum_node.content = file[algo]
-        file_node.add_child(checksum_node)
-      end
-      file_node['size'] = file[:size] if file[:size]
-      file_node['mimetype'] = file[:mime_type] if file[:mime_type]
-      file_node['role'] = file[:role] if file[:role]
-      file_node
-    end
-    deprecation_deprecate :add_file
-
     # Copies the child's resource into the parent (self) as a virtual resource.
     # Assumes the resource isn't a duplicate of an existing virtual or real resource.
     # @param [String] child_druid druid
@@ -195,71 +160,6 @@ module Dor
       resource
     end
 
-    # @param [Array] files
-    # @param [String] resource_name ID of the resource
-    # @param [Integer] position
-    # @param [String] type Resource type
-    # @return [Nokogiri::XML::Node] the new resource that was added to the contentMetadata
-    def add_resource(files, resource_name, position, type = 'file')
-      raise "resource #{resource_name} already exists" if ng_xml.search('//resource[@id=\'' + resource_name + '\']').length > 0
-
-      ng_xml_will_change!
-      max = ng_xml.search('//resource').map { |node| node['sequence'].to_i }.max
-      # renumber all of the resources that will come after the newly added one
-      while max > position
-        node = ng_xml.search('//resource[@sequence=\'' + position + '\']')
-        node.first[sequence] = max + 1 if node.length > 0
-        max -= 1
-      end
-      node = Nokogiri::XML::Node.new('resource', ng_xml)
-      node['sequence'] = position.to_s
-      node['id']       = resource_name
-      node['type']     = type
-      files.each do |file|
-        file_node = Nokogiri::XML::Node.new('file', ng_xml)
-        %w(shelve publish preserve).each { |x| file_node[x] = file[x.to_sym] || '' }
-        file_node['id'] = file[:name]
-        node.add_child(file_node)
-
-        %i[md5 sha1].each do |algo|
-          next if file[algo].nil?
-
-          checksum_node = Nokogiri::XML::Node.new('checksum', ng_xml)
-          checksum_node['type'] = algo.to_s
-          checksum_node.content = file[algo]
-          file_node.add_child(checksum_node)
-        end
-        file_node['size'] = file[:size] if file[:size]
-        file_node['role'] = file[:role] if file[:role]
-      end
-      ng_xml.search('//contentMetadata').first.add_child(node)
-      node
-    end
-    deprecation_deprecate :add_resource
-
-    # @param [String] resource_name ID of the resource
-    def remove_resource(resource_name)
-      ng_xml_will_change!
-      node = singular_node('//resource[@id=\'' + resource_name + '\']')
-      position = node['sequence'].to_i + 1
-      node.remove
-      loop do
-        res = ng_xml.search('//resource[@sequence=\'' + position.to_s + '\']')
-        break if res.length == 0
-
-        res['sequence'] = position.to_s
-        position += 1
-      end
-    end
-    deprecation_deprecate :remove_resource
-
-    # @param [String] file_name ID of the file element
-    def remove_file(file_name)
-      ng_xml_will_change!
-      ng_xml.search('//file[@id=\'' + file_name + '\']').each(&:remove)
-    end
-    deprecation_deprecate :remove_file
-
     # @param [String] file_name ID of the file element
     # @param [String] publish
     # @param [String] shelve

data/lib/dor/indexers/processable_indexer.rb

@@ -27,7 +27,7 @@ module Dor
 
     def current_version
       @current_version ||= begin
-                             resource.versionMetadata.current_version_id
+                             resource.current_version
                            rescue StandardError
                              '1'
                            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
 
@@ -40,11 +40,6 @@ module Dor
         result
       end
 
-      def solr
-        Deprecation.warn(self, 'Dor::SearchService.solr is deprecated. Call ActiveFedora.solr.conn directly')
-        _solr
-      end
-
       # @return String druid of the SDR Graveyard APO
       #   nil if APO does not exist in the currently configured environment
       def sdr_graveyard_apo_druid
@@ -62,7 +57,7 @@ module Dor
 
       private
 
-      def _solr
+      def solr
         ActiveFedora.solr.conn
       end
     end

data/lib/dor/services/state_service.rb

@@ -2,19 +2,29 @@
 
 module Dor
   class StateService
-    def initialize(pid)
+    extend Deprecation
+
+    # having version is prefered as without it, a call to
+    # fedora will be made to retrieve it.
+    def initialize(pid, version: nil)
       @pid = pid
+      @version = version || fetch_version
     end
 
     def allows_modification?
       !client.lifecycle('dor', pid, 'submitted') ||
-        client.active_lifecycle('dor', pid, 'opened') ||
+        client.lifecycle('dor', pid, 'opened', version: version) ||
         client.workflow_status('dor', pid, 'accessionWF', 'sdr-ingest-transfer') == 'hold'
     end
 
     private
 
-    attr_reader :pid
+    attr_reader :pid, :version
+
+    def fetch_version
+      Deprecation.warn(self, 'Calling the state service without passing in a version is deprecated and will be removed in dor-services 9')
+      Dor.find(pid).current_version
+    end
 
     def client
       Dor::Config.workflow.client

data/lib/dor/static_config.rb

@@ -66,11 +66,6 @@ module Dor
       @default_ssl_cert_store ||= RestClient::Request.default_ssl_cert_store
     end
 
-    def cleanup
-      @cleanup.configure(&block) if block_given?
-      @cleanup
-    end
-
     def ssl(&block)
       @ssl.configure(&block) if block_given?
       @ssl

data/lib/dor/static_config/stacks_config.rb

@@ -4,6 +4,9 @@ module Dor
   class StaticConfig
     # Represents the configuration for the shared filesystem direcotories
     class StacksConfig
+      extend Deprecation
+      self.deprecation_horizon = 'dor-services 9.0'
+
       def initialize(hash)
         @document_cache_host = hash.fetch(:document_cache_host)
         @local_stacks_root = hash.fetch(:local_stacks_root)
@@ -34,6 +37,7 @@ module Dor
         @local_document_cache_root = new_value if new_value
         @local_document_cache_root
       end
+      deprecation_deprecate :local_document_cache_root
     end
   end
 end

data/lib/dor/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.1.0
 platform: ruby
 authors:
 - Michael Klein
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-16 00:00:00.000000000 Z
+date: 2019-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -240,14 +240,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: druid-tools
   requirement: !ruby/object:Gem::Requirement