ddr-core 1.14.0 → 1.16.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/app/models/concerns/ddr/solr_document_behavior.rb +0 -27
  3. data/app/models/ddr/component.rb +1 -1
  4. data/config/aux/contact.yml +41 -33
  5. metadata +3 -4
  6. data/app/models/concerns/ddr/has_intermediate_file.rb +0 -25
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 53d2fd63ff8f0136a18a83652020f4526920e89c43ec0fde26147387296c4e58
4
- data.tar.gz: 91f74125381a24004a6869db16c30276ac527a891db9e70bfb1bd445a3b2fc46
3
+ metadata.gz: 2696f109287b267f5ef5792291f3096aa9f61cdd9e08164ab64286c276c783b1
4
+ data.tar.gz: 17c0fcc4f2b555fc22279390afac20f48bfb6c12e48bca8ab61b58e2b1cf3f02
5
5
  SHA512:
6
- metadata.gz: 3b812fed3b28c4e937c9829d0e3f88eb456328a113d26772432f4a694a74016c21a323b4ca49fad0c348e985c56c2030ff7c2dd4e209fb79dd11144c3f881b11
7
- data.tar.gz: 19d773e6676b07d42c12c3cb51e19341aa0edfdeeebee92ef7ffad6aa1d5da87574b05de0680a17247bf5c9405610e3c3dac688beef38c64122d1c2a29325ce9
6
+ metadata.gz: e54d34b7d5175bbb53b2e9408650f7ddcdaa79967a2426d1db9b12647e228c8c63543039e2eb476e1cbd397b5cf9a4acdfc79606658e856032d13c879cfd6deb
7
+ data.tar.gz: e17c400895abb5cfc29a9160a9df89520714ff9a35652bcc2d54a7b6d43a986447f55ce64dc19efc94354c56c0be137a3416d0d8cad41fdae2628253e61d77ee
data/app/models/concerns/ddr/solr_document_behavior.rb CHANGED
@@ -202,29 +202,6 @@ module Ddr
202
202
  resource.finding_aid
203
203
  end
204
204
 
205
- def intermediate_type
206
- if has_intermediate_file?
207
- resource.intermediate_type
208
- end
209
- end
210
-
211
- def intermediate_path
212
- if has_intermediate_file?
213
- resource.intermediate_path
214
- end
215
- end
216
-
217
- def intermediate_extension
218
- if has_intermediate_file?
219
- extensions = Ddr.preferred_file_extensions
220
- if extensions.include? intermediate_type
221
- extensions[intermediate_type]
222
- else
223
- intermediate_extension_default
224
- end
225
- end
226
- end
227
-
228
205
  def captionable?
229
206
  resource.captionable?
230
207
  end
@@ -345,10 +322,6 @@ module Ddr
345
322
  structure['default'] || structure.values.first
346
323
  end
347
324
 
348
- def intermediate_extension_default
349
- resource.intermediate_file.default_file_extension
350
- end
351
-
352
325
  def caption_extension_default
353
326
  resource.caption.default_file_extension
354
327
  end
data/app/models/ddr/component.rb CHANGED
@@ -6,7 +6,6 @@ module Ddr
6
6
  include HasContent
7
7
  include HasDerivedImage
8
8
  include HasExtractedText
9
- include HasIntermediateFile
10
9
  include HasMultiresImage
11
10
  include HasParent
12
11
  include Streamable
@@ -14,6 +13,7 @@ module Ddr
14
13
  alias_method :item_id, :parent_id
15
14
  alias_method :item, :parent
16
15
 
16
+ attribute :intermediate_file, Ddr::File.optional
17
17
  attribute :target_id, Valkyrie::Types::ID.optional
18
18
 
19
19
  self.parent_class = Ddr::Item
data/config/aux/contact.yml CHANGED
@@ -1,87 +1,95 @@
1
1
  - slug: dvs
2
2
  name: Data and Visualization Services
3
3
  short_name: null
4
- url: http://library.duke.edu/data/
5
- phone: 919-660-5880
4
+ url: https://library.duke.edu/data/
5
+ phone: 919-660-5870
6
6
  email: askdata@duke.edu
7
7
  ask: null
8
8
 
9
9
  - slug: libraries
10
10
  name: Duke University Libraries
11
11
  short_name: null
12
- url: http://library.duke.edu
13
- phone: 919-660-5880
12
+ url: https://library.duke.edu
13
+ phone: 919-660-5870
14
14
  email: askref@duke.edu
15
- ask: http://library.duke.edu/research/ask
15
+ ask: https://library.duke.edu/research/ask
16
16
 
17
17
  - slug: divinity
18
18
  name: Divinity School Library
19
19
  short_name: null
20
- url: http://library.divinity.duke.edu/
21
- phone: 919-660-3453
20
+ url: https://library.divinity.duke.edu/
21
+ phone: 919-660-3450
22
22
  email: divlib@duke.edu
23
- ask: http://library.divinity.duke.edu/ask-us
23
+ ask: https://library.divinity.duke.edu/ask-us
24
24
 
25
25
  - slug: uarchives
26
26
  name: Duke University Archives
27
27
  short_name: University Archives
28
- url: http://library.duke.edu/rubenstein/uarchives/
28
+ url: https://library.duke.edu/rubenstein/uarchives/
29
29
  phone: 919-660-5822
30
- email: uarchives@duke.edu
31
- ask: http://library.duke.edu/rubenstein/uarchives/ask
30
+ email: askrl@duke.edu
31
+ ask: https://library.duke.edu/rubenstein/ask
32
32
 
33
33
  - slug: humanrights
34
34
  name: Human Rights Archive
35
- short_name: null
36
- url: http://library.duke.edu/rubenstein/human-rights/
35
+ short_name: Human Rights Archive
36
+ url: https://library.duke.edu/rubenstein/human-rights/
37
37
  phone: 919-660-5822
38
- email: special-collections@duke.edu
39
- ask: http://library.duke.edu/rubenstein/ask
38
+ email: askrl@duke.edu
39
+ ask: https://library.duke.edu/rubenstein/ask
40
40
 
41
41
  - slug: hom
42
42
  name: History of Medicine Collections
43
43
  short_name: null
44
- url: http://library.duke.edu/rubenstein/history-of-medicine/
44
+ url: https://library.duke.edu/rubenstein/history-of-medicine/
45
45
  phone: 919-684-8549
46
- email: special-collections@duke.edu
47
- ask: http://library.duke.edu/rubenstein/ask
46
+ email: askrl@duke.edu
47
+ ask: https://library.duke.edu/rubenstein/ask
48
48
 
49
49
  - slug: franklin
50
50
  name: John Hope Franklin Research Center
51
51
  short_name: Franklin Research Center
52
- url: http://library.duke.edu/rubenstein/franklin/
52
+ url: https://library.duke.edu/rubenstein/franklin/
53
53
  phone: 919-660-5922
54
- email: franklin-collection@duke.edu
55
- ask: http://library.duke.edu/rubenstein/ask
54
+ email: askrl@duke.edu
55
+ ask: https://library.duke.edu/rubenstein/ask
56
56
 
57
57
  - slug: docarts
58
58
  name: Archive of Documentary Arts
59
59
  short_name: null
60
- url: http://library.duke.edu/rubenstein/documentaryarts/
60
+ url: https://library.duke.edu/rubenstein/documentaryarts/
61
61
  phone: 919-660-5822
62
- email: special-collections@duke.edu
63
- ask: http://library.duke.edu/rubenstein/ask
62
+ email: askrl@duke.edu
63
+ ask: https://library.duke.edu/rubenstein/ask
64
64
 
65
65
  - slug: bingham
66
66
  name: Sallie Bingham Center for Women's History & Culture
67
67
  short_name: Bingham Center
68
- url: http://library.duke.edu/rubenstein/bingham/
68
+ url: https://library.duke.edu/rubenstein/bingham/
69
69
  phone: 919-660-5967
70
- email: cwhc@duke.edu
71
- ask: http://library.duke.edu/rubenstein/ask
70
+ email: askrl@duke.edu
71
+ ask: https://library.duke.edu/rubenstein/ask
72
72
 
73
73
  - slug: hartman
74
74
  name: John W. Hartman Center for Sales, Advertising & Marketing History
75
75
  short_name: Hartman Center
76
- url: http://library.duke.edu/rubenstein/hartman/
76
+ url: https://library.duke.edu/rubenstein/hartman/
77
77
  phone: 919-660-5827
78
- email: hartman-center@duke.edu
79
- ask: http://library.duke.edu/rubenstein/hartman/ask
78
+ email: askrl@duke.edu
79
+ ask: https://library.duke.edu/rubenstein/ask
80
80
 
81
81
  - slug: rubenstein
82
82
  name: David M. Rubenstein Rare Book & Manuscript Library
83
83
  short_name: Rubenstein Library
84
- url: http://library.duke.edu/rubenstein/
84
+ url: https://library.duke.edu/rubenstein/
85
+ phone: 919-660-5822
86
+ email: askrl@duke.edu
87
+ ask: https://library.duke.edu/rubenstein/ask
88
+
89
+ - slug: economists
90
+ name: Economists' Papers Archive
91
+ short_name: null
92
+ url: https://library.duke.edu/rubenstein/economists
85
93
  phone: 919-660-5822
86
- email: special-collections@duke.edu
87
- ask: http://library.duke.edu/rubenstein/ask
94
+ email: askrl@duke.edu
95
+ ask: https://library.duke.edu/rubenstein/ask
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ddr-core
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.14.0
4
+ version: 1.16.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jim Coble
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2022-05-31 00:00:00.000000000 Z
14
+ date: 2022-10-03 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: activeresource
@@ -315,7 +315,6 @@ files:
315
315
  - app/models/concerns/ddr/has_content.rb
316
316
  - app/models/concerns/ddr/has_derived_image.rb
317
317
  - app/models/concerns/ddr/has_extracted_text.rb
318
- - app/models/concerns/ddr/has_intermediate_file.rb
319
318
  - app/models/concerns/ddr/has_multires_image.rb
320
319
  - app/models/concerns/ddr/has_parent.rb
321
320
  - app/models/concerns/ddr/has_struct_metadata.rb
@@ -451,7 +450,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
451
450
  - !ruby/object:Gem::Version
452
451
  version: '0'
453
452
  requirements: []
454
- rubygems_version: 3.3.14
453
+ rubygems_version: 3.3.22
455
454
  signing_key:
456
455
  specification_version: 4
457
456
  summary: Models used in the Duke Digital Repository
data/app/models/concerns/ddr/has_intermediate_file.rb DELETED
@@ -1,25 +0,0 @@
1
- module Ddr
2
- module HasIntermediateFile
3
- extend ActiveSupport::Concern
4
-
5
- included do
6
- attribute :intermediate_file, Ddr::File.optional
7
- end
8
-
9
- def intermediate_type
10
- intermediate_file&.media_type
11
- end
12
-
13
- # This method is used in dul-hydra 'ComponentsController'
14
- def intermediate_extension
15
- if filename = intermediate_file&.original_filename
16
- ::File.extname(filename)
17
- end
18
- end
19
-
20
- def intermediate_path
21
- intermediate_file&.file&.disk_path
22
- end
23
-
24
- end
25
- end