dor-services 6.8.0 → 7.0.0

data/lib/dor/models/item.rb

@@ -2,14 +2,7 @@
 
 module Dor
   class Item < Dor::Abstract
-    include Shelvable
     include Embargoable
-    include Publishable
-    include Itemizable
-    include Assembleable
-    include Contentable
-    include Geoable
-    include Releaseable
 
     has_object_type 'item'
 
@@ -22,26 +15,17 @@ module Dor
       WorkflowsIndexer
     )
 
-    has_metadata name: 'technicalMetadata', type: TechnicalMetadataDS, label: 'Technical Metadata', control_group: 'M'
-
-    def build_technicalMetadata_datastream(_ds = nil)
-      TechnicalMetadataService.add_update_technical_metadata(self)
-    end
+    has_metadata name: 'technicalMetadata',
+                 type: TechnicalMetadataDS,
+                 label: 'Technical Metadata',
+                 control_group: 'M'
+    has_metadata name: 'contentMetadata',
+                 type: Dor::ContentMetadataDS,
+                 label: 'Content Metadata',
+                 control_group: 'M'
+    has_metadata name: 'geoMetadata',
+                 type: Dor::GeoMetadataDS,
+                 label: 'Geographic Information Metadata in ISO 19139',
+                 control_group: 'M'
   end
 end
-
-# Describable  = Descriptive metadata.
-# Embargoable  = Time limits and processes for embargoed materials.
-# Governable   = Relationships to collections and codified administrative policies.
-# Identifiable = Object identity and source metadata.
-# Itemizable   = Hierarchical content metadata.
-# Preservable  = Provenance and technical metadata; preservation repository transfer.
-# Processable  = Workflow.
-# Publishable  = Transfer of metadata to discovery and access systems.
-# Shelvable    = Transfer of content to digital stacks.
-# Geoable      = Descriptive metadata for GIS in ISO 19139/19110.
-
-# Required for all DOR objects:
-#   - Identifiable
-#   - Governable
-#   - Describable

data/lib/dor/models/part.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Dor
+  # Represents a piece of an ETD submission
+  class Part < ActiveFedora::Base
+    belongs_to :parents, property: :is_part_of, class_name: 'Etd' # relationship between main pdf and parent etd
+    belongs_to :supplemental_file_for, property: :is_constituent_of, class_name: 'Etd' # relationship between supplemental file and parent etd
+    belongs_to :permission_file_for, property: :is_dependent_of, class_name: 'Etd' # relationsihip between permission file and parent etd
+
+    has_metadata name: 'properties', type: ActiveFedora::SimpleDatastream, versionable: false do |m|
+      m.field 'file_name', :string
+      m.field 'size', :string
+      m.field 'label', :string
+    end
+
+    has_metadata name: 'DC', type: Dor::SimpleDublinCoreDs, versionable: false, label: 'DC', control_group: 'X'
+  end
+end

data/lib/dor/models/set.rb

@@ -2,8 +2,6 @@
 
 module Dor
   class Set < Dor::Abstract
-    include Publishable
-
     has_many :members, property: :is_member_of_collection, class_name: 'ActiveFedora::Base'
     has_object_type 'set'
 

data/lib/dor/services/collection_service.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Dor
+  # Adds and removes collections to and from objects
+  # Collections are added as Compollections and Sets.
+  class CollectionService
+    def initialize(obj)
+      @obj = obj
+    end
+
+    def add(collection_or_druid)
+      collection = dereference(collection_or_druid)
+      obj.collections << collection
+      obj.sets << collection
+    end
+
+    def remove(collection_or_druid)
+      collection = dereference(collection_or_druid)
+      obj.collections.delete(collection)
+      obj.sets.delete(collection)
+    end
+
+    private
+
+    attr_reader :obj
+
+    def dereference(collection_or_druid)
+      case collection_or_druid
+      when String
+        Dor::Collection.find(collection_or_druid)
+      when Dor::Collection
+        collection_or_druid
+      end
+    end
+  end
+end

data/lib/dor/services/embargo_service.rb

@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+module Dor
+  # Sets up and removes embargos on an object
+  # This assumes the object has embargoMetadata, rightsMetadata, and events datastreams
+  class EmbargoService
+    def initialize(obj)
+      @obj = obj
+    end
+
+    # Lift the embargo from the object
+    # Sets embargo status to released in embargoMetadata
+    # Modifies rightsMetadata to remove embargoReleaseDate and updates/adds access from embargoMetadata/releaseAccess
+    # @param [String] release_agent name of the person, application or thing that released embargo
+    # @note The caller should save the object to fedora to commit the changes
+    def release(release_agent)
+      # Set status to released
+      embargoMetadata.status = 'released'
+
+      # Remove all read acces nodes
+      rights_xml = rightsMetadata.ng_xml
+      rightsMetadata.ng_xml_will_change!
+      rights_xml.xpath("//rightsMetadata/access[@type='read']").each(&:remove)
+
+      # Replace rights <access> nodes with those from embargoMetadta
+      release_access = embargoMetadata.release_access_node
+      release_access.xpath('//releaseAccess/access').each do |new_access|
+        access_sibling = rights_xml.at_xpath('//rightsMetadata/access[last()]')
+        if access_sibling
+          access_sibling.add_next_sibling(new_access.clone)
+        else
+          rights_xml.root.add_child(new_access.clone)
+        end
+      end
+
+      events.add_event('embargo', release_agent, 'Embargo released')
+    end
+
+    def release_20_pct_vis(release_agent)
+      # Set status to released
+      embargoMetadata.twenty_pct_status = 'released'
+
+      # Remove all read acces nodes
+      rights_xml = rightsMetadata.ng_xml
+      rightsMetadata.ng_xml_will_change!
+      rights_xml.xpath("//rightsMetadata/access[@type='read']").each(&:remove)
+
+      # Replace rights <access> nodes with 1 machine/world node
+      access_sibling = rights_xml.at_xpath('//rightsMetadata/access[last()]')
+      if access_sibling
+        access_sibling.add_next_sibling(world_doc.root.clone)
+      else
+        rights_xml.root.add_child(world_doc.root.clone)
+      end
+
+      events.add_event('embargo', release_agent, '20% Visibility Embargo released')
+    end
+
+    def update(new_date)
+      raise ArgumentError, 'You cannot change the embargo date of an item that is not embargoed.' if embargoMetadata.status != 'embargoed'
+      raise ArgumentError, 'You cannot set the embargo date to a past date.' if new_date.past?
+
+      updated = false
+      rightsMetadata.ng_xml.search('//embargoReleaseDate').each do |node|
+        node.content = new_date.beginning_of_day.utc.xmlschema
+        updated = true
+      end
+      rightsMetadata.ng_xml_will_change!
+      rightsMetadata.save
+      raise 'No release date in rights metadata, cannot proceed!' unless updated
+
+      embargoMetadata.ng_xml.xpath('//releaseDate').each do |node|
+        node.content = new_date.beginning_of_day.utc.xmlschema
+      end
+      embargoMetadata.ng_xml_will_change!
+      embargoMetadata.save
+    end
+
+    private
+
+    attr_reader :obj
+
+    delegate :rightsMetadata, :embargoMetadata, :events, to: :obj
+
+    def world_doc
+      Nokogiri::XML::Builder.new do |xml|
+        xml.access(type: 'read') do
+          xml.machine { xml.world }
+        end
+      end.doc
+    end
+  end
+end

data/lib/dor/services/ontology.rb

@@ -2,29 +2,11 @@
 
 module Dor
   class Ontology
-    extend Deprecation
-    self.deprecation_horizon = 'dor-services version 7.0.0'
-
     class << self
-      def [](key)
-        Deprecation.warn(self, "#{self}.[] is deprecated and will be removed in #{Dor::Ontology.deprecation_horizon}. Use `property' instead.")
-        @data[key]
-      end
-
       def key?(key)
         @data.key?(key)
       end
 
-      def include?(key)
-        Deprecation.warn(self, "#{self}.include? is deprecated and will be removed in #{Dor::Ontology.deprecation_horizon}. Use `key?' instead.")
-        @data.include?(key)
-      end
-
-      def map(&block)
-        Deprecation.warn(self, "#{self}.map is deprecated and will be removed in #{Dor::Ontology.deprecation_horizon}. Use `options' instead.")
-        @data.map(&block)
-      end
-
       # Yields each term to the block provided
       def options
         @data.map do |k, _v|

data/lib/dor/services/public_desc_metadata_service.rb

@@ -81,11 +81,9 @@ module Dor
     # expand constituent relations into relatedItem references -- see JUMBO-18
     # @return [Void]
     def add_constituent_relations!
-      object.public_relationships.search('//rdf:RDF/rdf:Description/fedora:isConstituentOf',
-                                         'fedora' => 'info:fedora/fedora-system:def/relations-external#',
-                                         'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#').each do |parent|
+      object.relationships(:is_constituent_of).each do |parent|
         # fetch the parent object to get title
-        druid = parent['rdf:resource'].gsub(/^info:fedora\//, '')
+        druid = parent.gsub(/^info:fedora\//, '')
         parent_item = Dor.find(druid)
 
         # create the MODS relation
@@ -96,7 +94,7 @@ module Dor
         # load the title from the parent's DC.title
         titleInfo = doc.create_element 'titleInfo'
         title = doc.create_element 'title'
-        title.content = Dor::Describable.get_collection_title(parent_item)
+        title.content = parent_item.full_title
         titleInfo << title
         relatedItem << titleInfo
 
@@ -116,15 +114,13 @@ module Dor
     # For use in published mods and mods-to-DC conversion.
     # @return [Void]
     def add_collection_reference!
-      collections = object.public_relationships.search('//rdf:RDF/rdf:Description/fedora:isMemberOfCollection',
-                                                       'fedora' => 'info:fedora/fedora-system:def/relations-external#',
-                                                       'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#')
+      collections = object.relationships(:is_member_of_collection)
       return if collections.empty?
 
       remove_related_item_nodes_for_collections!
 
-      collections.each do |collection_node|
-        collection_druid = collection_node['rdf:resource'].gsub('info:fedora/', '')
+      collections.each do |collection_uri|
+        collection_druid = collection_uri.gsub('info:fedora/', '')
         add_related_item_node_for_collection! collection_druid
       end
     end
@@ -144,7 +140,7 @@ module Dor
       end
 
       title_node         = Nokogiri::XML::Node.new('title', doc)
-      title_node.content = Dor::Describable.get_collection_title(collection_obj)
+      title_node.content = collection_obj.full_title
 
       title_info_node = Nokogiri::XML::Node.new('titleInfo', doc)
       title_info_node.add_child(title_node)

data/lib/dor/services/search_service.rb

@@ -5,51 +5,11 @@ 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
-
     class << self
       def index_version
         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 = {
-          type: 'tuples',
-          lang: 'itql',
-          format: 'CSV',
-          limit: '1000',
-          stream: 'on',
-          query: query
-        }.merge(opts)
-        result = client.post(query_params)
-        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
-        start = 0
-        pids = Dor::SearchService.risearch("#{opts[:query]} limit #{opts[:in_groups_of]} offset #{start}")
-        while pids.present?
-          if opts[:mode] == :single
-            pids.each { |pid| yield pid }
-          else
-            yield pids
-          end
-          start += pids.length
-          pids = Dor::SearchService.risearch("#{opts[:query]} limit #{opts[:in_groups_of]} offset #{start}")
-        end
-      end
-
       def query(query, args = {})
         params = args.merge(q: query)
         params[:start] ||= 0

data/lib/dor/version.rb

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

data/lib/dor/workflow/document.rb

@@ -3,7 +3,6 @@
 module Dor
   module Workflow
     class Document
-      extend Deprecation
       include ::OM::XML::Document
 
       set_terminology do |t|
@@ -37,12 +36,6 @@ module Dor
         processes.map { |proc| proc.priority.to_i }.detect(0) { |p| p > 0 }
       end
 
-      # @return [Boolean] if any process node does not have version, returns true, false otherwise (all processes have version)
-      def active?
-        ng_xml.at_xpath('/workflow/process[not(@version)]') ? true : false
-      end
-      deprecation_deprecate active?: 'Workflow::Document#active? has moved to Argo. This implementation does not work with the new workflow server, which returns all versions'
-
       # @return [Dor::WorkflowDefinitionDs]
       def definition
         @definition ||= begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 6.8.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-11 00:00:00.000000000 Z
+date: 2019-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -40,22 +40,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.10
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.10
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: confstruct
   requirement: !ruby/object:Gem::Requirement
@@ -132,20 +126,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.1
-- !ruby/object:Gem::Dependency
-  name: net-sftp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -325,19 +305,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: dor-workflow-service
+  name: dor-workflow-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: 3.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: 3.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: druid-tools
   requirement: !ruby/object:Gem::Requirement
@@ -520,20 +500,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -609,63 +575,34 @@ files:
 - lib/dor/models/admin_policy_object.rb
 - lib/dor/models/agreement.rb
 - lib/dor/models/collection.rb
-- lib/dor/models/concerns/assembleable.rb
-- lib/dor/models/concerns/contentable.rb
-- lib/dor/models/concerns/describable.rb
 - lib/dor/models/concerns/embargoable.rb
-- lib/dor/models/concerns/eventable.rb
-- lib/dor/models/concerns/geoable.rb
-- lib/dor/models/concerns/governable.rb
-- lib/dor/models/concerns/identifiable.rb
-- lib/dor/models/concerns/itemizable.rb
-- lib/dor/models/concerns/preservable.rb
-- lib/dor/models/concerns/processable.rb
-- lib/dor/models/concerns/publishable.rb
-- lib/dor/models/concerns/releaseable.rb
-- lib/dor/models/concerns/rightsable.rb
-- lib/dor/models/concerns/shelvable.rb
-- lib/dor/models/concerns/versionable.rb
+- lib/dor/models/etd.rb
 - lib/dor/models/item.rb
+- lib/dor/models/part.rb
 - lib/dor/models/set.rb
 - lib/dor/models/workflow_object.rb
 - lib/dor/models/workflow_solr_document.rb
 - lib/dor/rest_resource_factory.rb
-- lib/dor/services/ability.rb
-- lib/dor/services/cleanup_reset_service.rb
 - lib/dor/services/cleanup_service.rb
+- lib/dor/services/collection_service.rb
 - lib/dor/services/create_workflow_service.rb
 - lib/dor/services/creative_commons_license_service.rb
-- lib/dor/services/datastream_builder.rb
-- lib/dor/services/decommission_service.rb
-- lib/dor/services/digital_stacks_service.rb
-- lib/dor/services/dublin_core_service.rb
-- lib/dor/services/file_metadata_merge_service.rb
-- lib/dor/services/indexing_service.rb
-- lib/dor/services/merge_service.rb
+- lib/dor/services/embargo_service.rb
 - lib/dor/services/metadata_handlers/catalog_handler.rb
 - lib/dor/services/metadata_service.rb
 - lib/dor/services/mods2dc.xslt
 - lib/dor/services/ontology.rb
 - lib/dor/services/open_data_license_service.rb
 - lib/dor/services/public_desc_metadata_service.rb
-- lib/dor/services/public_xml_service.rb
-- lib/dor/services/publish_metadata_service.rb
 - lib/dor/services/release_tag_service.rb
-- lib/dor/services/reset_workspace_service.rb
-- lib/dor/services/sdr_ingest_service.rb
 - lib/dor/services/search_service.rb
-- lib/dor/services/secondary_file_name_service.rb
-- lib/dor/services/shelving_service.rb
 - lib/dor/services/status_service.rb
 - lib/dor/services/suri_service.rb
 - lib/dor/services/tag_service.rb
-- lib/dor/services/technical_metadata_service.rb
 - lib/dor/services/thumbnail_service.rb
-- lib/dor/services/version_service.rb
 - lib/dor/utils/hydrus_shims.rb
 - lib/dor/utils/ng_tidy.rb
 - lib/dor/utils/predicate_patch.rb
-- lib/dor/utils/sdr_client.rb
 - lib/dor/utils/solr_doc_helper.rb
 - lib/dor/version.rb
 - lib/dor/workflow/document.rb