dor-services 8.6.0 → 9.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (41) hide show
  1. checksums.yaml +4 -4
  2. data/config/config_defaults.yml +0 -1
  3. data/config/dev_console_env.rb.example +0 -1
  4. data/lib/dor-services.rb +0 -34
  5. data/lib/dor/models/abstract.rb +1 -47
  6. data/lib/dor/models/admin_policy_object.rb +0 -9
  7. data/lib/dor/models/collection.rb +0 -9
  8. data/lib/dor/models/etd.rb +0 -6
  9. data/lib/dor/models/item.rb +0 -9
  10. data/lib/dor/models/part.rb +0 -2
  11. data/lib/dor/models/set.rb +0 -8
  12. data/lib/dor/services/search_service.rb +1 -0
  13. data/lib/dor/static_config.rb +0 -8
  14. data/lib/dor/static_config/stacks_config.rb +0 -15
  15. data/lib/dor/version.rb +1 -1
  16. metadata +2 -55
  17. data/lib/dor/datastreams/simple_dublin_core_ds.rb +0 -59
  18. data/lib/dor/datastreams/workflow_definition_ds.rb +0 -71
  19. data/lib/dor/datastreams/workflow_ds.rb +0 -20
  20. data/lib/dor/indexers/composite_indexer.rb +0 -27
  21. data/lib/dor/indexers/data_indexer.rb +0 -24
  22. data/lib/dor/indexers/describable_indexer.rb +0 -60
  23. data/lib/dor/indexers/editable_indexer.rb +0 -25
  24. data/lib/dor/indexers/identifiable_indexer.rb +0 -102
  25. data/lib/dor/indexers/process_indexer.rb +0 -58
  26. data/lib/dor/indexers/processable_indexer.rb +0 -99
  27. data/lib/dor/indexers/releasable_indexer.rb +0 -33
  28. data/lib/dor/indexers/workflow_indexer.rb +0 -47
  29. data/lib/dor/indexers/workflows_indexer.rb +0 -34
  30. data/lib/dor/models/workflow_object.rb +0 -28
  31. data/lib/dor/models/workflow_solr_document.rb +0 -93
  32. data/lib/dor/release_tags.rb +0 -13
  33. data/lib/dor/release_tags/identity_metadata.rb +0 -145
  34. data/lib/dor/release_tags/purl.rb +0 -51
  35. data/lib/dor/release_tags/purl_client.rb +0 -44
  36. data/lib/dor/services/release_tag_service.rb +0 -40
  37. data/lib/dor/services/state_service.rb +0 -34
  38. data/lib/dor/services/status_service.rb +0 -125
  39. data/lib/dor/static_config/workflow_config.rb +0 -51
  40. data/lib/dor/workflow/document.rb +0 -72
  41. data/lib/dor/workflow/process.rb +0 -157
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a4ca8c1eccdd421044aafd1d3eee2de4e7492ca0c66f30e25bfd5befac06e832
4
- data.tar.gz: b231f5ec8b86bfcc3160359911005b10f65bb5696f8b0428bdd554c7fcf113f6
3
+ metadata.gz: 6975540b2c6651e92c02c37d9a1e95c8915a6ed4e2f8a386f3834850fb3c1df7
4
+ data.tar.gz: c8da1818b3e04ae27f09a16264e5f13c17e250382a4b5d313b1853b24516108e
5
5
  SHA512:
6
- metadata.gz: def0a4ffb45a50adcd1c805a55b9902ea86770838567eebf2b010bc01d4bf67e959c250589d0b74893c644c0c15737f6ba3d65e64012bc0fa4e7c2ed6f21cfa4
7
- data.tar.gz: 929a1adcd6f2743f0666198429bd66b576a9e8ce52a95b2793f54fd7305cb725f537c42f0f415072a90299eded2bf4148c9a83b997f3be0462eddb5f59e58863
6
+ metadata.gz: 9a286057bcf87acf81a680afac4973e06073ad620822e54d2b1f5575017380f6f8412b55fc0db54ee7e689194fc13115563976206b6fad48174aeb8a2618c978
7
+ data.tar.gz: b104f5093f0b5222decc2217e16909bf001615639f165e52dadadd4b6ff654c5de680703529bfdfdad29f079b852a6649e00f09bb53dc442c7139b084ef8cfdc
@@ -9,7 +9,6 @@ solr:
9
9
  url:
10
10
  stacks:
11
11
  local_workspace_root: /dor
12
- document_cache_host:
13
12
  local_stacks_root: /stacks
14
13
  local_document_cache_root: /purl/document_cache
15
14
  suri:
@@ -22,7 +22,6 @@ Dor::Config.configure do
22
22
  end
23
23
 
24
24
  stacks do
25
- document_cache_host 'purl-dev.stanford.edu'
26
25
  local_workspace_root '/dor/workspace'
27
26
  local_stacks_root '/stacks'
28
27
  local_document_cache_root '/purl'
@@ -5,7 +5,6 @@ require 'active_fedora/version'
5
5
  require 'active_support/core_ext/module/attribute_accessors'
6
6
  require 'active_support/core_ext/object/blank'
7
7
  require 'deprecation'
8
- require 'retries' # Used by Dor::ReleaseTagService
9
8
 
10
9
  module Dor
11
10
  extend ActiveSupport::Autoload
@@ -50,19 +49,6 @@ module Dor
50
49
 
51
50
  require 'druid-tools'
52
51
 
53
- autoload_under 'indexers' do
54
- autoload :CompositeIndexer
55
- autoload :DataIndexer
56
- autoload :DescribableIndexer
57
- autoload :EditableIndexer
58
- autoload :IdentifiableIndexer
59
- autoload :ProcessableIndexer
60
- autoload :ProcessIndexer
61
- autoload :ReleasableIndexer
62
- autoload :WorkflowIndexer
63
- autoload :WorkflowsIndexer
64
- end
65
-
66
52
  # datastreams
67
53
  autoload_under 'datastreams' do
68
54
  autoload :AdministrativeMetadataDS
@@ -76,11 +62,8 @@ module Dor
76
62
  autoload :ProvenanceMetadataDS
77
63
  autoload :RightsMetadataDS
78
64
  autoload :RoleMetadataDS
79
- autoload :SimpleDublinCoreDs
80
65
  autoload :TechnicalMetadataDS
81
66
  autoload :VersionMetadataDS
82
- autoload :WorkflowDefinitionDs
83
- autoload :WorkflowDs
84
67
  end
85
68
 
86
69
  # DOR Concerns
@@ -89,8 +72,6 @@ module Dor
89
72
  end
90
73
 
91
74
  eager_autoload do
92
- autoload :ReleaseTags
93
-
94
75
  # ActiveFedora Classes
95
76
  autoload_under 'models' do
96
77
  autoload :Abstract
@@ -101,8 +82,6 @@ module Dor
101
82
  autoload :Item
102
83
  autoload :Part
103
84
  autoload :Set
104
- autoload :WorkflowObject
105
- autoload :WorkflowSolrDocument
106
85
  end
107
86
  end
108
87
 
@@ -111,27 +90,14 @@ module Dor
111
90
  autoload :CollectionService
112
91
  autoload :CreativeCommonsLicenseService
113
92
  autoload :EmbargoService
114
- autoload :IdentityMetadataTagService
115
93
  autoload :Ontology
116
94
  autoload :OpenDataLicenseService
117
- autoload :PurlTagService
118
- autoload :ReleaseTagService
119
95
  autoload :SearchService
120
- autoload :StatusService
121
- autoload :StateService
122
96
  autoload :SuriService
123
97
  autoload :TagService
124
98
  end
125
99
 
126
- # Workflow Classes
127
- module Workflow
128
- extend ActiveSupport::Autoload
129
- autoload :Process
130
- autoload :Document
131
- end
132
-
133
100
  eager_load!
134
101
 
135
102
  require 'dor/utils/hydrus_shims'
136
- require 'dor/workflow/client'
137
103
  end
@@ -2,17 +2,9 @@
2
2
 
3
3
  module Dor
4
4
  class Abstract < ::ActiveFedora::Base
5
- extend Deprecation
6
- self.deprecation_horizon = '8.0'
7
-
8
5
  has_metadata name: 'provenanceMetadata',
9
6
  type: ProvenanceMetadataDS,
10
7
  label: 'Provenance Metadata'
11
- has_metadata name: 'workflows',
12
- type: WorkflowDs,
13
- label: 'Workflows',
14
- control_group: 'E',
15
- autocreate: true
16
8
  has_metadata name: 'rightsMetadata',
17
9
  type: RightsMetadataDS,
18
10
  label: 'Rights metadata'
@@ -23,9 +15,6 @@ module Dor
23
15
  type: VersionMetadataDS,
24
16
  label: 'Version Metadata',
25
17
  autocreate: true
26
- has_metadata name: 'DC',
27
- type: SimpleDublinCoreDs,
28
- label: 'Dublin Core Record for self object'
29
18
  has_metadata name: 'identityMetadata',
30
19
  type: Dor::IdentityMetadataDS,
31
20
  label: 'Identity Metadata'
@@ -44,7 +33,6 @@ module Dor
44
33
  property: :is_member_of,
45
34
  class_name: 'Dor::Collection'
46
35
 
47
- class_attribute :resource_indexer
48
36
  class_attribute :object_type
49
37
 
50
38
  def self.has_object_type(str)
@@ -62,7 +50,7 @@ module Dor
62
50
 
63
51
  # Overrides the method in ActiveFedora
64
52
  def to_solr
65
- resource_indexer.new(resource: self).to_solr
53
+ raise 'this should never be called'
66
54
  end
67
55
 
68
56
  # Override ActiveFedora::Core#adapt_to_cmodel (used with associations, among other places) to
@@ -82,36 +70,6 @@ module Dor
82
70
  end
83
71
  end
84
72
 
85
- # a regex that can be used to identify the last part of a druid (e.g. oo000oo0001)
86
- # @return [Regex] a regular expression to identify the ID part of the druid
87
- def pid_regex
88
- /[a-zA-Z]{2}[0-9]{3}[a-zA-Z]{2}[0-9]{4}/
89
- end
90
- deprecation_deprecate pid_regex: 'use PidUtils::PID_REGEX instead'
91
-
92
- # a regex that can be used to identify a full druid with prefix (e.g. druid:oo000oo0001)
93
- # @return [Regex] a regular expression to identify a full druid
94
- def druid_regex
95
- /druid:#{pid_regex}/
96
- end
97
- deprecation_deprecate druid_regex: 'will be removed without replacement'
98
-
99
- # Since purl does not use the druid: prefix but much of dor does, use this function to strip the druid: if needed
100
- # @return [String] the druid sans the druid: or if there was no druid: prefix, the entire string you passed
101
- def remove_druid_prefix(druid = id)
102
- PidUtils.remove_druid_prefix(druid)
103
- end
104
- deprecation_deprecate remove_druid_prefix: 'use PidUtils.remove_druid_prefix instead'
105
-
106
- # This is used by Argo and the MergeService
107
- # @return [Boolean] true if the object is in a state that allows it to be modified.
108
- # States that will allow modification are: has not been submitted for accessioning, has an open version or has sdr-ingest set to hold
109
- # @todo this could be a workflow service endpoint
110
- def allows_modification?
111
- Dor::StateService.new(pid).allows_modification?
112
- end
113
- deprecation_deprecate allows_modification?: 'use Dor::StateService#allows_modification? instead'
114
-
115
73
  def current_version
116
74
  versionMetadata.current_version_id
117
75
  end
@@ -128,8 +86,6 @@ module Dor
128
86
  rightsMetadata.set_read_rights(rights)
129
87
  unshelve_and_unpublish if rights == 'dark'
130
88
  end
131
- alias set_read_rights read_rights=
132
- deprecation_deprecate set_read_rights: 'Use read_rights= instead'
133
89
 
134
90
  def add_collection(collection_or_druid)
135
91
  collection_manager.add(collection_or_druid)
@@ -143,8 +99,6 @@ module Dor
143
99
  def reapply_admin_policy_object_defaults
144
100
  rightsMetadata.content = admin_policy_object.defaultObjectRights.content
145
101
  end
146
- alias reapplyAdminPolicyObjectDefaults reapply_admin_policy_object_defaults
147
- deprecation_deprecate reapplyAdminPolicyObjectDefaults: 'Use reapply_admin_policy_object_defaults instead'
148
102
 
149
103
  private
150
104
 
@@ -9,15 +9,6 @@ module Dor
9
9
  has_metadata name: 'defaultObjectRights', type: Dor::DefaultObjectRightsDS, label: 'Default Object Rights'
10
10
  belongs_to :agreement_object, property: :referencesAgreement, class_name: 'Dor::Item'
11
11
 
12
- self.resource_indexer = CompositeIndexer.new(
13
- DataIndexer,
14
- DescribableIndexer,
15
- EditableIndexer,
16
- IdentifiableIndexer,
17
- ProcessableIndexer,
18
- WorkflowsIndexer
19
- )
20
-
21
12
  delegate :add_roleplayer, :purge_roles, :roles, to: :roleMetadata
22
13
  delegate :mods_title, :mods_title=, to: :descMetadata
23
14
  delegate :default_collections, :add_default_collection, :remove_default_collection,
@@ -3,14 +3,5 @@
3
3
  module Dor
4
4
  class Collection < Dor::Set
5
5
  has_object_type 'collection'
6
-
7
- self.resource_indexer = CompositeIndexer.new(
8
- DataIndexer,
9
- DescribableIndexer,
10
- IdentifiableIndexer,
11
- ProcessableIndexer,
12
- ReleasableIndexer,
13
- WorkflowsIndexer
14
- )
15
6
  end
16
7
  end
@@ -4,10 +4,6 @@ module Dor
4
4
  class Etd < Abstract
5
5
  include Dor::Embargoable
6
6
 
7
- self.resource_indexer = CompositeIndexer.new(
8
- DataIndexer
9
- )
10
-
11
7
  # This relationship was modeled incorrectly when first implemented.
12
8
  # It should have been has_and_belongs_to_many so that the ETD is aware of
13
9
  # its component parts. Presently there is no way to discover which parts
@@ -74,8 +70,6 @@ module Dor
74
70
  m.field 'submitted_to_registrar', :string
75
71
  end
76
72
 
77
- has_metadata name: 'DC', type: Dor::SimpleDublinCoreDs, versionable: false, label: 'DC', control_group: 'X'
78
-
79
73
  def etd_embargo_date
80
74
  regaction = properties.regactiondttm.first
81
75
  embargo = properties.embargo.first
@@ -6,15 +6,6 @@ module Dor
6
6
 
7
7
  has_object_type 'item'
8
8
 
9
- self.resource_indexer = CompositeIndexer.new(
10
- DataIndexer,
11
- DescribableIndexer,
12
- IdentifiableIndexer,
13
- ProcessableIndexer,
14
- ReleasableIndexer,
15
- WorkflowsIndexer
16
- )
17
-
18
9
  has_metadata name: 'technicalMetadata',
19
10
  type: TechnicalMetadataDS,
20
11
  label: 'Technical Metadata',
@@ -12,7 +12,5 @@ module Dor
12
12
  m.field 'size', :string
13
13
  m.field 'label', :string
14
14
  end
15
-
16
- has_metadata name: 'DC', type: Dor::SimpleDublinCoreDs, versionable: false, label: 'DC', control_group: 'X'
17
15
  end
18
16
  end
@@ -4,13 +4,5 @@ module Dor
4
4
  class Set < Dor::Abstract
5
5
  has_many :members, property: :is_member_of_collection, class_name: 'ActiveFedora::Base'
6
6
  has_object_type 'set'
7
-
8
- self.resource_indexer = CompositeIndexer.new(
9
- DataIndexer,
10
- DescribableIndexer,
11
- IdentifiableIndexer,
12
- ProcessableIndexer,
13
- WorkflowsIndexer
14
- )
15
7
  end
16
8
  end
@@ -4,6 +4,7 @@ require 'json'
4
4
  require 'active_support/core_ext'
5
5
 
6
6
  module Dor
7
+ # Used by Argo and dor-services-app
7
8
  class SearchService
8
9
  class << self
9
10
  def index_version
@@ -12,7 +12,6 @@ module Dor
12
12
  autoload :SolrConfig
13
13
  autoload :StacksConfig
14
14
  autoload :SuriConfig
15
- autoload :WorkflowConfig
16
15
  end
17
16
 
18
17
  def initialize(hash)
@@ -21,7 +20,6 @@ module Dor
21
20
  @solr = SolrConfig.new(hash.fetch(:solr))
22
21
  @stacks = StacksConfig.new(hash.fetch(:stacks))
23
22
  @suri = SuriConfig.new(hash.fetch(:suri))
24
- @workflow = WorkflowConfig.new(hash.fetch(:workflow))
25
23
  end
26
24
 
27
25
  def configure(&block)
@@ -93,11 +91,5 @@ module Dor
93
91
 
94
92
  @suri
95
93
  end
96
-
97
- def workflow(&block)
98
- @workflow.configure(&block) if block_given?
99
-
100
- @workflow
101
- end
102
94
  end
103
95
  end
@@ -4,11 +4,7 @@ module Dor
4
4
  class StaticConfig
5
5
  # Represents the configuration for the shared filesystem direcotories
6
6
  class StacksConfig
7
- extend Deprecation
8
- self.deprecation_horizon = 'dor-services 9.0'
9
-
10
7
  def initialize(hash)
11
- @document_cache_host = hash.fetch(:document_cache_host)
12
8
  @local_stacks_root = hash.fetch(:local_stacks_root)
13
9
  @local_workspace_root = hash.fetch(:local_workspace_root)
14
10
  @local_document_cache_root = hash.fetch(:local_document_cache_root)
@@ -18,11 +14,6 @@ module Dor
18
14
  instance_eval(&block)
19
15
  end
20
16
 
21
- def document_cache_host(new_value = nil)
22
- @document_cache_host = new_value if new_value
23
- @document_cache_host
24
- end
25
-
26
17
  def local_stacks_root(new_value = nil)
27
18
  @local_stacks_root = new_value if new_value
28
19
  @local_stacks_root
@@ -32,12 +23,6 @@ module Dor
32
23
  @local_workspace_root = new_value if new_value
33
24
  @local_workspace_root
34
25
  end
35
-
36
- def local_document_cache_root(new_value = nil)
37
- @local_document_cache_root = new_value if new_value
38
- @local_document_cache_root
39
- end
40
- deprecation_deprecate :local_document_cache_root
41
26
  end
42
27
  end
43
28
  end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Dor
4
- VERSION = '8.6.0'
4
+ VERSION = '9.0.0'
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dor-services
3
3
  version: !ruby/object:Gem::Version
4
- version: 8.6.0
4
+ version: 9.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michael Klein
@@ -20,7 +20,7 @@ authors:
20
20
  autorequire:
21
21
  bindir: bin
22
22
  cert_chain: []
23
- date: 2020-02-13 00:00:00.000000000 Z
23
+ date: 2020-02-14 00:00:00.000000000 Z
24
24
  dependencies:
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: active-fedora
@@ -152,20 +152,6 @@ dependencies:
152
152
  - - "<"
153
153
  - !ruby/object:Gem::Version
154
154
  version: '3'
155
- - !ruby/object:Gem::Dependency
156
- name: retries
157
- requirement: !ruby/object:Gem::Requirement
158
- requirements:
159
- - - "~>"
160
- - !ruby/object:Gem::Version
161
- version: 0.0.5
162
- type: :runtime
163
- prerelease: false
164
- version_requirements: !ruby/object:Gem::Requirement
165
- requirements:
166
- - - "~>"
167
- - !ruby/object:Gem::Version
168
- version: 0.0.5
169
155
  - !ruby/object:Gem::Dependency
170
156
  name: rsolr
171
157
  requirement: !ruby/object:Gem::Requirement
@@ -234,20 +220,6 @@ dependencies:
234
220
  - - ">="
235
221
  - !ruby/object:Gem::Version
236
222
  version: 1.2.0
237
- - !ruby/object:Gem::Dependency
238
- name: dor-workflow-client
239
- requirement: !ruby/object:Gem::Requirement
240
- requirements:
241
- - - "~>"
242
- - !ruby/object:Gem::Version
243
- version: '3.1'
244
- type: :runtime
245
- prerelease: false
246
- version_requirements: !ruby/object:Gem::Requirement
247
- requirements:
248
- - - "~>"
249
- - !ruby/object:Gem::Version
250
- version: '3.1'
251
223
  - !ruby/object:Gem::Dependency
252
224
  name: druid-tools
253
225
  requirement: !ruby/object:Gem::Requirement
@@ -472,22 +444,9 @@ files:
472
444
  - lib/dor/datastreams/provenance_metadata_ds.rb
473
445
  - lib/dor/datastreams/rights_metadata_ds.rb
474
446
  - lib/dor/datastreams/role_metadata_ds.rb
475
- - lib/dor/datastreams/simple_dublin_core_ds.rb
476
447
  - lib/dor/datastreams/technical_metadata_ds.rb
477
448
  - lib/dor/datastreams/version_metadata_ds.rb
478
- - lib/dor/datastreams/workflow_definition_ds.rb
479
- - lib/dor/datastreams/workflow_ds.rb
480
449
  - lib/dor/exceptions.rb
481
- - lib/dor/indexers/composite_indexer.rb
482
- - lib/dor/indexers/data_indexer.rb
483
- - lib/dor/indexers/describable_indexer.rb
484
- - lib/dor/indexers/editable_indexer.rb
485
- - lib/dor/indexers/identifiable_indexer.rb
486
- - lib/dor/indexers/process_indexer.rb
487
- - lib/dor/indexers/processable_indexer.rb
488
- - lib/dor/indexers/releasable_indexer.rb
489
- - lib/dor/indexers/workflow_indexer.rb
490
- - lib/dor/indexers/workflows_indexer.rb
491
450
  - lib/dor/models/abstract.rb
492
451
  - lib/dor/models/admin_policy_object.rb
493
452
  - lib/dor/models/agreement.rb
@@ -497,22 +456,13 @@ files:
497
456
  - lib/dor/models/item.rb
498
457
  - lib/dor/models/part.rb
499
458
  - lib/dor/models/set.rb
500
- - lib/dor/models/workflow_object.rb
501
- - lib/dor/models/workflow_solr_document.rb
502
- - lib/dor/release_tags.rb
503
- - lib/dor/release_tags/identity_metadata.rb
504
- - lib/dor/release_tags/purl.rb
505
- - lib/dor/release_tags/purl_client.rb
506
459
  - lib/dor/rest_resource_factory.rb
507
460
  - lib/dor/services/collection_service.rb
508
461
  - lib/dor/services/creative_commons_license_service.rb
509
462
  - lib/dor/services/embargo_service.rb
510
463
  - lib/dor/services/ontology.rb
511
464
  - lib/dor/services/open_data_license_service.rb
512
- - lib/dor/services/release_tag_service.rb
513
465
  - lib/dor/services/search_service.rb
514
- - lib/dor/services/state_service.rb
515
- - lib/dor/services/status_service.rb
516
466
  - lib/dor/services/suri_service.rb
517
467
  - lib/dor/services/tag_service.rb
518
468
  - lib/dor/static_config.rb
@@ -521,15 +471,12 @@ files:
521
471
  - lib/dor/static_config/ssl_config.rb
522
472
  - lib/dor/static_config/stacks_config.rb
523
473
  - lib/dor/static_config/suri_config.rb
524
- - lib/dor/static_config/workflow_config.rb
525
474
  - lib/dor/utils/hydrus_shims.rb
526
475
  - lib/dor/utils/ng_tidy.rb
527
476
  - lib/dor/utils/pid_utils.rb
528
477
  - lib/dor/utils/predicate_patch.rb
529
478
  - lib/dor/utils/solr_doc_helper.rb
530
479
  - lib/dor/version.rb
531
- - lib/dor/workflow/document.rb
532
- - lib/dor/workflow/process.rb
533
480
  - lib/tasks/rdoc.rake
534
481
  homepage: http://github.com/sul-dlss/dor-services
535
482
  licenses: