dor-services 6.3.0 → 6.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8610285f6083a621745b30d7bd063bf732e33052ff2f8be6ea6fd5f976bbcfe1
-  data.tar.gz: 0f235f97bdc5e5102cc675a2789eafce2cf12a10fa1ba06772b69f864707e476
+  metadata.gz: b8f84301c1b84bb4155b4dec895cb2b3d63daea54637b35f51728a8268c792ee
+  data.tar.gz: 8accea8e3978a89bf772dd0ecb14b17229b6755b8a8a1c3e12b790b59eaae3ee
 SHA512:
-  metadata.gz: 1bbe06840429b3612a827375b54022fc43ea9318153acc4e4b68c747c025f0e12b460630a211ddbdd0a9030be42a8160ce8eeea30b1ce0872e653364aca02709
-  data.tar.gz: 3222dd6c0435580bbf452c9cc89b6ebcedd47d8b279f127dfc256621b9d4ce9ee50b08a2ea4adaf5d3d29bbc2d45f6bd4155a835b5bba5fba24e241c7ffc490d
+  metadata.gz: 923ed4f14197cdb8fdc821276b7d500ffaa0fde36187cf537ee894ac025213dde7fe7905bd71e25f9d1b25d057b10649c48016e6bbf41a5dd1cef4efc3df001c
+  data.tar.gz: 26e4f1ab094617dc635340f0a31858ba0e1d9ad31565c7bedd83fb58b013432ecfc303a875702a4db846eaa820e5cf0776ab3bb1daac2e726fe70fcf6e775ee0

data/lib/dor-services.rb

@@ -128,7 +128,6 @@ module Dor
     autoload :Eventable
     autoload :Versionable
     autoload :Contentable
-    autoload :Editable
     autoload :Discoverable
     autoload :Geoable
     autoload :Releaseable

data/lib/dor/datastreams/rights_metadata_ds.rb

@@ -76,7 +76,7 @@ module Dor
       @dra_object ||= Dor::RightsAuth.parse(ng_xml, true)
     end
 
-    # key is the rights type code, used by e.g. RightsMetadataDS#set_read_rights and Editable#default_rights=
+    # key is the rights type code, used by e.g. RightsMetadataDS#set_read_rights and AdminPolicyObject#default_rights=
     # value is the human-readable string, used for indexing, and for things like building select lists in the argo UI.
     def self.valid_rights_types
       RIGHTS_TYPE_CODES.keys

data/lib/dor/models/admin_policy_object.rb

@@ -2,13 +2,12 @@
 
 module Dor
   class AdminPolicyObject < Dor::Abstract
-    include Editable
-
     has_many :things, property: :is_governed_by, class_name: 'ActiveFedora::Base'
     has_object_type 'adminPolicy'
     has_metadata name: 'administrativeMetadata', type: Dor::AdministrativeMetadataDS, label: 'Administrative Metadata'
     has_metadata name: 'roleMetadata',           type: Dor::RoleMetadataDS,           label: 'Role Metadata'
     has_metadata name: 'defaultObjectRights',    type: Dor::DefaultObjectRightsDS,    label: 'Default Object Rights'
+    belongs_to :agreement_object, property: :referencesAgreement, class_name: 'Dor::Item'
 
     self.resource_indexer = CompositeIndexer.new(
       DataIndexer,
@@ -18,5 +17,35 @@ module Dor
       ProcessableIndexer,
       WorkflowIndexer
     )
+
+    CREATIVE_COMMONS_USE_LICENSES = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('CREATIVE_COMMONS_USE_LICENSES', 'Dor::CreativeCommonsLicenseService')
+    OPEN_DATA_COMMONS_USE_LICENSES = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('OPEN_DATA_COMMONS_USE_LICENSES', 'Dor::OpenDataLicenseService')
+
+    delegate :add_roleplayer, :purge_roles, :roles, to: :roleMetadata
+    delegate :mods_title, :mods_title=, to: :descMetadata
+    delegate :default_collections, :add_default_collection, :remove_default_collection,
+             :metadata_source, :metadata_source=,
+             :default_workflows, :default_workflow=,
+             :desc_metadata_source, :desc_metadata_source=,
+             :desc_metadata_format, :desc_metadata_format=, to: :administrativeMetadata
+
+    delegate :use_statement, :use_statement=,
+             :copyright_statement, :copyright_statement=,
+             :creative_commons_license, :creative_commons_license_human,
+             :open_data_commons_license, :open_data_commons_license_human,
+             :use_license, :use_license_uri, :use_license_human,
+             :creative_commons_license=, :creative_commons_license_human=,
+             :open_data_commons_license=, :open_data_commons_license_human=,
+             :use_license=, :default_rights, :default_rights=, to: :defaultObjectRights
+
+    def agreement
+      agreement_object ? agreement_object.pid : ''
+    end
+
+    def agreement=(val)
+      raise ArgumentError, 'agreement must have a valid druid' if val.blank?
+
+      self.agreement_object = Dor.find val.to_s, cast: true
+    end
   end
 end

data/lib/dor/services/sdr_ingest_service.rb

@@ -47,7 +47,7 @@ module Dor
     # @param [String] druid The object identifier
     # @return [Moab::SignatureCatalog] the catalog of all files previously ingested
     def self.get_signature_catalog(druid)
-      Sdr::Client.get_signature_catalog(druid)
+      Dor::Services::Client.object(druid).sdr.signature_catalog
     end
 
     # @param [Dor::Item] dor_item The representation of the digital object

data/lib/dor/version.rb

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

data/lib/dor/workflow/document.rb

@@ -3,6 +3,7 @@
 module Dor
   module Workflow
     class Document
+      extend Deprecation
       include SolrDocHelper
       include ::OM::XML::Document
 
@@ -41,6 +42,7 @@ module Dor
       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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 6.4.0
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2019-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -90,14 +90,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -631,7 +631,6 @@ files:
 - lib/dor/models/concerns/assembleable.rb
 - lib/dor/models/concerns/contentable.rb
 - lib/dor/models/concerns/describable.rb
-- lib/dor/models/concerns/editable.rb
 - lib/dor/models/concerns/embargoable.rb
 - lib/dor/models/concerns/eventable.rb
 - lib/dor/models/concerns/geoable.rb

data/lib/dor/models/concerns/editable.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-module Dor
-  ## This is basically used just by APOs.  Arguably "editable" is the wrong name.
-  module Editable
-    extend ActiveSupport::Concern
-
-    included do
-      belongs_to :agreement_object, property: :referencesAgreement, class_name: 'Dor::Item'
-    end
-
-    CREATIVE_COMMONS_USE_LICENSES = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('CREATIVE_COMMONS_USE_LICENSES', 'Dor::CreativeCommonsLicenseService')
-    OPEN_DATA_COMMONS_USE_LICENSES = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('OPEN_DATA_COMMONS_USE_LICENSES', 'Dor::OpenDataLicenseService')
-
-    delegate :add_roleplayer, :purge_roles, :roles, to: :roleMetadata
-    delegate :mods_title, :mods_title=, to: :descMetadata
-    delegate :default_collections, :add_default_collection, :remove_default_collection,
-             :metadata_source, :metadata_source=,
-             :default_workflows, :default_workflow=,
-             :desc_metadata_source, :desc_metadata_source=,
-             :desc_metadata_format, :desc_metadata_format=, to: :administrativeMetadata
-
-    delegate :use_statement, :use_statement=,
-             :copyright_statement, :copyright_statement=,
-             :creative_commons_license, :creative_commons_license_human,
-             :open_data_commons_license, :open_data_commons_license_human,
-             :use_license, :use_license_uri, :use_license_human,
-             :creative_commons_license=, :creative_commons_license_human=,
-             :open_data_commons_license=, :open_data_commons_license_human=,
-             :use_license=, :default_rights, :default_rights=, to: :defaultObjectRights
-
-    def agreement
-      agreement_object ? agreement_object.pid : ''
-    end
-
-    def agreement=(val)
-      raise ArgumentError, 'agreement must have a valid druid' if val.blank?
-
-      self.agreement_object = Dor.find val.to_s, cast: true
-    end
-  end
-end