dor-services 9.2.1 → 9.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39bd6a1c73843860a182c886b4075b6a6c7216c69cec108467d76e72bbba658d
-  data.tar.gz: c49fbea2b7311b3bd80640b90c764ad54bbf959b27f4f8994c4d3a9c38ccb403
+  metadata.gz: '00984fb52f721f76280cdedaa3c4a4d7bf99416530eccccef6d8682f6bb35b18'
+  data.tar.gz: 42b67e4ad809eefd062cc6ac8eaf4103f95fb5f89d4057efbc3107c51260c9ab
 SHA512:
-  metadata.gz: a9e04dcdc34a7d0df4265b77e08f5b20756325418ccfee501216c813bdbb5393f5295633e5f2b41e7898e1a87ca5a5cc3d42e63a6ca6d421de00b3fb281dd2fb
-  data.tar.gz: 826b55305ff535e531a0531dd0673e82a5df710343121329fe2443bd642dd45771cea326ecf956da1973447a32f10946e9341806ea596a9e2d014ffa9129e6ba
+  metadata.gz: 1d8fdc37e4576ac1ddf40aaa13cb718b5198e3f0803246ba42811a886bfafed1a6df14587adf1cacf145c72a677232cdc1fc431b15b026ca0f31b90afb446f19
+  data.tar.gz: ee3dc7f2d342b557b543261ccdf3086403b32724f18246a653538d8d37fffae6e5dc203ba46d8e21e49096323377009dc79c6012c3aa905930cea7ace85412a7

data/config/certs/dlss-dev-petucket-dor-dev.crt

@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIE3zCCAscCCQCcUJVDTu7rPzANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCkNhbGlmb3JuaWExETAPBgNVBAcTCFN0YW5mb3JkMRwwGgYD
+VQQKExNTdGFuZm9yZCBVbml2ZXJzaXR5MRIwEAYDVQQLEwlMaWJyYXJpZXMxJTAj
+BgNVBAMTHFNVTCBET1IgKGRldi90ZXN0KSBhY2Nlc3MgQ0ExLzAtBgkqhkiG9w0B
+CQEWIHN1bC13ZWJtYXN0ZXJAbGlzdHMuc3RhbmZvcmQuZWR1MB4XDTEyMDkyNjAw
+Mzg1OFoXDTIyMDkyNDAwMzg1OFowgaIxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpD
+YWxpZm9ybmlhMREwDwYDVQQHEwhTdGFuZm9yZDEcMBoGA1UEChMTU3RhbmZvcmQg
+VW5pdmVyc2l0eTEnMCUGA1UEAxMeZGxzcy1kZXYtcGV0dWNrZXQuc3RhbmZvcmQu
+ZWR1MSQwIgYJKoZIhvcNAQkBFhVwZXR1Y2tldEBzdGFuZm9yZC5lZHUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3cqsXN6QQIMD/yqKNI+BFtPBrhV1F
+hRqenXUrqDRhIE6o0WVolJC4pBVXMXZksk/cnsDkb/PrD2JZH4YTS6+B51qRvScg
+cyqioPOJnPNRowogNUwkDiR4OGdKIbdRyYG+SgDuMWN/it7TqtG92KJm78imQS6S
+wOtP8AnqOveMHEdmAzcANGTHCLF8SNxNqGgedXLWfpi4MSYI1io0PCA/gtrotrsL
+xcwOfdkUrImaa0Og/Jyp/GAq6uveYangt3Ox3GLyyToSK4/FJXwxba9+OqR0U2MZ
+qiFbXkTzGzLbx+xhfkG5Qe1eR3u1JigSjS4z3rUmvPz+MIQVQX9ZdAThAgMBAAEw
+DQYJKoZIhvcNAQEFBQADggIBAH0u9ZVNGCXO6a77hTIO6vjJ0MoWzJNY4j+47Dl9
+2hhDoVtw7VtV5/mKVKAiQB+Gbz/NIfkqfPgJEwyC5vr4330wIC2dMuGNFnSxGTKz
+PlkZAWGUqpkfucPISwPXRgbQIMghRy+EZ05ayv1w+HlV9QGj+hbOt92jL/e1yCpH
+Fd3I/7Ui26vrHqx+5Hg2d4gT2YGHTKBy8LakuoN59fw8sb+Gk0Xp/0pZMD+Sgl6T
+db0HOH4lcC3qG0ZfrNJ2BwDUnzbt8cruc98iu5obnmSK39ezKsSWx6leHzWIQLLT
+guNGOpbWJrNfF/VXpH9t0Q/xd0vZsOWSUkfHpd02PCBFRIWUv6UCldsDByP4IKHE
+bwNa3STPwIWKq2SGE+qGkY5P6t7zqPZ+SFl4kOXUWNuspSY8v5dKFyfFexaX6p6S
+bRRK5CoZq3jvxvHk88VQPTli0EP12r4SSG19UU43Twqqqd2CEW7woL3Z/OPws047
+jV/e8cHA7goo5d9RKwyz/7zivUWqidnp7SeL5/YQRY2bwWOcS/y49Dmi0+FQOJCw
+wjDDUv6Z+SR3NmbGtc0dIroTIWxvS7otIa+dXnH+ubrGAlbUvT1NAeO9mdX9m/qh
+YHm8oRVyJD12Hylc5pmFEBbV02Lzc/D4mB3oNtSVvhNfoTZfyKqwA+kAPol6HDIb
+vJi3
+-----END CERTIFICATE-----

data/config/certs/dlss-dev-petucket-dor-dev.csr

@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIC6DCCAdACAQAwgaIxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlh
+MREwDwYDVQQHEwhTdGFuZm9yZDEcMBoGA1UEChMTU3RhbmZvcmQgVW5pdmVyc2l0
+eTEnMCUGA1UEAxMeZGxzcy1kZXYtcGV0dWNrZXQuc3RhbmZvcmQuZWR1MSQwIgYJ
+KoZIhvcNAQkBFhVwZXR1Y2tldEBzdGFuZm9yZC5lZHUwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQC3cqsXN6QQIMD/yqKNI+BFtPBrhV1FhRqenXUrqDRh
+IE6o0WVolJC4pBVXMXZksk/cnsDkb/PrD2JZH4YTS6+B51qRvScgcyqioPOJnPNR
+owogNUwkDiR4OGdKIbdRyYG+SgDuMWN/it7TqtG92KJm78imQS6SwOtP8AnqOveM
+HEdmAzcANGTHCLF8SNxNqGgedXLWfpi4MSYI1io0PCA/gtrotrsLxcwOfdkUrIma
+a0Og/Jyp/GAq6uveYangt3Ox3GLyyToSK4/FJXwxba9+OqR0U2MZqiFbXkTzGzLb
+x+xhfkG5Qe1eR3u1JigSjS4z3rUmvPz+MIQVQX9ZdAThAgMBAAGgADANBgkqhkiG
+9w0BAQUFAAOCAQEAdAVri6K2jyMcAJDWohxGVld7HU2ejhN1tx9+HSroK1+7f2LX
+R4i06NLZI0qJA92cd5sC7T5KFG3v1Ad5gPcZfkhmH8uL0v/qNkx/vvZgF9vlUf+L
+5JEyqzsMIxcRCC9gujsk9ha7oigFWbf1AxNt1KSDcIIID7nm+Tl7b/kSoOTK5z8j
+/Pg8CL54paNtRQ8TDtlvdbziPn4J/Zopx0s5lpgV/pLaSkq+GPih+eV2ST1fpFzu
+RQNQVZ3fa2W3Jz9m6vAtWZP1Ht7ZnLYTdSIJOo0Z2mBjcDE86JqF8bbWYt4THAgv
+DIEKxWpGWz7rmTJJ5DStxFmUK6135FKatnAT4w==
+-----END CERTIFICATE REQUEST-----

data/config/certs/dlss-dev-petucket-dor-dev.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEAt3KrFzekECDA/8qijSPgRbTwa4VdRYUanp11K6g0YSBOqNFl
+aJSQuKQVVzF2ZLJP3J7A5G/z6w9iWR+GE0uvgedakb0nIHMqoqDziZzzUaMKIDVM
+JA4keDhnSiG3UcmBvkoA7jFjf4re06rRvdiiZu/IpkEuksDrT/AJ6jr3jBxHZgM3
+ADRkxwixfEjcTahoHnVy1n6YuDEmCNYqNDwgP4La6La7C8XMDn3ZFKyJmmtDoPyc
+qfxgKurr3mGp4Ldzsdxi8sk6EiuPxSV8MW2vfjqkdFNjGaohW15E8xsy28fsYX5B
+uUHtXkd7tSYoEo0uM961Jrz8/jCEFUF/WXQE4QIDAQABAoIBAGZR9Q/sHvxH6J5D
+ncrvecYnl/nA1zdReHmEBbimByEtbfJHaTKduuLh0m1hz1F3C4hYm+pOb1RqrkZb
+iOL2Uhw4uJGVWV+GHP+8mlnlSun78Efqsl9h7AGKJEJ6788Uf+NtT3uL3J1lDcgt
+/PLRBDQ6BkaFEL8WD6n0jvMwlKZ2pLOsYaMx29vPVpcf/zL2B4CWr+jsm38OMRNk
+WsQ0aA1XPZuJC/iS8Ky/ccvOLt3BlVVh62/L776XrKpXzAi9O/u3clak3Sel1rxt
+NnTrN+hacsQp4gS1qPiKF656b6WG1tQ29r5rUMPqNltPjmVTe4m5S16NoRv/IEFQ
+9thtEAECgYEA7WSSNiwbDgXRygEIRAP4M26Bvv8EQ29i7mnv5RnHObiD1y5eu/qQ
+E5/VULqYcHR9C3qpDqdfFf9IVg0CjeuFatG85Jd15vDWtk5RErxLq005qzUsC0o8
+AsCurdb0r6zOo5iWyjk8JwT/LAJ8Tg4JDGARcZnHk9LBbDI8i/FAvqECgYEAxdOo
+9viFFblcwu9Oua/i67VNGocBgjTHNof15nhnu4Am3vR3g8wRBzjUcJLjxT+kxlMf
+/YwfUSDIs9yviGv2kj8M3UPtCQ8vkzRwPnhbT9gvWxtnc0XxYNq7IVZ8x1cZeBsf
+8vH6/tCnjgfsN6HP3DSqiJ5cqAjECsJq0fo03kECgYBAIs3FyQC+NyBIvSKojZH/
+AzoWifty5KML2p8vfFlw5MLp3eNGUhme063kE6WfrDkkYs1N4jY0UTYP2Y/5G8p9
+45BvCeSWsjawJlSNBUZET6bm9ISjwDiaXchTuyF8XOmvFUiX9gKkYBs4nqtKw0v6
+hfHwiSV8cJJFUwU8ob9mQQKBgAh8MqQdNsAeyj7GOu81/xqzFRKNNeBa2Syamk5/
+XZuqPICVpcauaxCPPHVzp3dfanbjO90JNJKrQFCOp6zHTLUrJScccb9Qum6q8iGL
+0gbTs/xJaZ+FIXxRBXPBnOqD7uC68Rzfii+BzZ4G8vfT5fGBBMuFV14Rui7n9eL5
+w2jBAoGAbh77B0kzLngbs+NmTfwjnYw5qYqwFPAYPYcu0w1wF8oTD38U8FqJ/6LG
+oKaszyYODurPox81kJplNukEmSCDto1i6DJ71i8HcCfitEFXua28WD1+5Wn4o9CS
+AOxLn8jHa7K6lmXZm2hgjWcSI9VGp5En79pGzrtO/d+OswVIJEc=
+-----END RSA PRIVATE KEY-----

data/config/certs/dlss-dev-petucket-dor-prod.crt

@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIE+jCCAuICCQDiT+2CJW52sTANBgkqhkiG9w0BAQUFADCBuTELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCkNhbGlmb3JuaWExETAPBgNVBAcTCFN0YW5mb3JkMRwwGgYD
+VQQKExNTdGFuZm9yZCBVbml2ZXJzaXR5MRIwEAYDVQQLEwlMaWJyYXJpZXMxHzAd
+BgNVBAMTFlNVTCBET1IgcHJvZCBhY2Nlc3MgQ0ExLzAtBgkqhkiG9w0BCQEWIHN1
+bC13ZWJtYXN0ZXJAbGlzdHMuc3RhbmZvcmQuZWR1MB4XDTEyMTAwODE3MDk1NVoX
+DTIyMTAwNjE3MDk1NVowgcMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9y
+bmlhMREwDwYDVQQHEwhTdGFuZm9yZDEcMBoGA1UEChMTU3RhbmZvcmQgVW5pdmVy
+c2l0eTESMBAGA1UECxMJTGlicmFyaWVzMScwJQYDVQQDEx5kbHNzLWRldi1wZXR1
+Y2tldC5zdGFuZm9yZC5lZHUxMTAvBgkqhkiG9w0BCQEWImRsc3MtZGV2ZWxvcGVy
+c0BsaXN0cy5zdGFuZm9yZC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDO3bOG2i4DZNnPTt2C6fFM3znmqHIW/n771ntWTzS8k01REksYPlxBNZ3t
+M+aZFy/2lEv7PMMNg2VDDn1TRJd0hy87VW7QOTYTo1SCo2AYgn+qOnujSGqU+RRn
+pM4xTGBnF5BGSXfAi++iMJyyQngF3nev5jAcy9SrwtpXrV4JyNl6LtmodtjBi/3k
+LO6KY9Uc9T8zRcuiC/5zidM1+aymfoymG295aVDc+JsghjWm/UoE+Nvs20zfi+5a
+JB3iL+3RyUr2Hh3N4zdxR6dar/Ivy5WfPTEmtkqiSnnhdDX6fE4f+4P3ewn7bbZN
+LrH2T5Bm4W64bPsnUPP1evgidZ0LAgMBAAEwDQYJKoZIhvcNAQEFBQADggIBAJIZ
+bdwEJQEOKAruCvCwxFNXQUUPzJiuYqlJ61+4Vhs7JugORo+DgNTYL/JkZ6dCR/uj
+4W0TQyBtA1GtfUYvcXCrvQl51YTMAODkoWNlkP/xaHx02twIoZDsGSVAVZryP0ae
+OzToLSvj+a1OvRS3YX/CO+Gq5t2//kCYrI1h6d/41PjWBRD2A2NWJrBiIj62W1qJ
+muY1YvSiNZ27Pwjp0fA6QwpFY+AxUAei6jKQcUCp6q3wlFaVgMS4SKtIC/rNAAc3
+2aN2dlk6u81wjKQqMKXzWhwxTqEPQAmxoP8oJVxRwh1gxoBEAbLxse76Cc9+eISn
+CG0RF+bku3ceGrNYWQHGu8xOXAexM77WFSIVrtYJ2Tf/P+un8J+fvb3U8I5hOkGK
+/yMIxRfpYyOx8Qg3IJ6ci6Frg2Jn1Csv7RR8vXgRqWDRrYpeRdm8VjO/MkozGp3X
+r7y8hmoacnaOAcPV+KCMQ4zCobFEfxpIlajNgb4ZJhA4/ZcHlnXCr51n/A3FTLdG
+MR4D2JWw9oKDrf9317IomWQd6B8/+MzBX+vFteq0xQPHVJcCh48NuRkJomfy+m2q
+nMgxRTeRIN0VNFrhOxarv+Xiw9BoBAdKd1JbZX4uPVFs+DdkAcZC8aJRnmsowwfG
+C5+Fxxdx+ucfga5QSZui4uyIXlx1nAy+eeTPwmDc
+-----END CERTIFICATE-----

data/config/certs/dlss-dev-petucket-dor-prod.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAzt2zhtouA2TZz07dgunxTN855qhyFv5++9Z7Vk80vJNNURJL
+GD5cQTWd7TPmmRcv9pRL+zzDDYNlQw59U0SXdIcvO1Vu0Dk2E6NUgqNgGIJ/qjp7
+o0hqlPkUZ6TOMUxgZxeQRkl3wIvvojCcskJ4Bd53r+YwHMvUq8LaV61eCcjZei7Z
+qHbYwYv95CzuimPVHPU/M0XLogv+c4nTNfmspn6MphtveWlQ3PibIIY1pv1KBPjb
+7NtM34vuWiQd4i/t0clK9h4dzeM3cUenWq/yL8uVnz0xJrZKokp54XQ1+nxOH/uD
+93sJ+222TS6x9k+QZuFuuGz7J1Dz9Xr4InWdCwIDAQABAoIBAQCSt1jJrtptm8yD
+JKskW2nBnJzDQ/rO5icH1EHboAeGK27trezGwAvMUAu3HVVShMiGuPz+rkSkw+lA
+2vj14rMMeYh9K4WRdtIssW2Rze+s0nlbMWlZEFZPXC0lqRR4kHPbCjJQN3EQhe8q
+eBHauBvKBdObVMYQ1lv6ihMzlgkZJCtRdwn6DqiN2kkFkHx4mhWoMadYA6xBwN4S
++YM5O1KwC9nUgRpLFSM8D8fBANzI6takkVDQ6QaJJ11dsur5RE9BsFzl+Op7Evzu
++zCisC17ZUn07YVvGeTUkIwTk0aeu3HCX83WM8jmg02ijtwqf6pdlLMJ8G8MQURe
+siKh1ZP5AoGBAP5ZJrZ/UcGFR1XLeL6WmgljlF26LQzy/DHMBbWMYpTrwfaxk/sK
+o8wTuVebJGhuffTgYU2VWJ5at7AMasOP6IAT2nP2KvcoCmvG8u3BCTkck57Vde5H
+86bJ88z6TEzhrElDMjmKx7gEb2P6RIKnDcNdduaR6DE6qJOBJ5F5W3KlAoGBANA1
+nKBEFEXJ4Cuw6OrJeyrgu/aCLFKus/orlfLPHFQAvFJzpqmCONz5H/Wcf+m6uMeR
+MQ6V705h2y+FUmwufpFyqCVunC1zJu6mZG9TNEjXzyFBnb4jcEjsMm6DCrVA6zOx
+3iWd+rLNxIpN3fhskzclNnhn+WhGo7xktuIrVDHvAoGBAPLWVVLKTllQkWIFaRu2
+GA08yMuP1DFX0JcOrqi+BuUeDkslEh8N8oMGld9hnSojzBg/Hkd/fmN6Q4RO5qQe
+QqH90oUCk9Tzordx9EAxHEgt03dDYFwG0Eb+68lZc/23PNGZ2Vr8+F/lxCAVMtH3
+Avnyw3Gx/pj54zcpiYin8DqNAoGBAKSqcdfSX9Id6ZvES0E83Zs4p486vkEaCB8H
+j4y7veS1vDrdWmbfJYelw1/lSMiaMv8qVgj6DYwJGmdH4rrKPrFbY55PD1dmpdjC
+YdYlkMk3XIopsc6pimkx3GTIYJSe5iU5O762ZYo58IGNOcr6W6eWV7D8UiTlESOy
+52yR5gGjAoGALfzgCSIAVlOli3a7m3aMWUtGhp+sVi7jGLE9NHTwFXnkYEoXmR+v
+5CIvK8IzwtATEomoAa2GKGek8MSE+H1/o+SrGL9PIATnzuEZeJOIMnGa5mO26a9/
+eV2Qud4v/7qD2P2VnCVYaAMYqS6l0SxB11/UhuQiWdpITxy44CK1Jk8=
+-----END RSA PRIVATE KEY-----

data/config/dev_console_env.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+cert_dir = File.join(File.dirname(__FILE__), 'certs')
+
+# rubocop:disable Metrics/BlockLength
+Dor::Config.configure do
+  fedora do
+    url 'https://sul-dor-prod.stanford.edu/fedora'
+  end
+
+  ssl do
+    cert_file File.join(cert_dir, 'dlss-dev-petucket-dor-prod.crt')
+    key_file  File.join(cert_dir, 'dlss-dev-petucket-dor-prod.key')
+    key_pass ''
+  end
+
+  sdr do
+    # url 'https://sdrAdmin:sdrPass@sdr-services-test.stanford.edu/sdr/'
+    local_workspace_root '/dor/workspace'
+    local_export_home '/dor/export'
+    datastreams do
+      administrativeMetadata 'optional'
+      contentMetadata 'optional'
+      descMetadata 'required'
+      defaultObjectRights 'optional'
+      events 'optional'
+      embargoMetadata 'optional'
+      identityMetadata 'required'
+      provenanceMetadata 'required'
+      relationshipMetadata 'required'
+      rightsMetadata 'optional'
+      roleMetadata 'optional'
+      sourceMetadata 'optional'
+      technicalMetadata 'optional'
+      versionMetadata 'required'
+      workflows 'optional'
+      geoMetadata 'optional'
+    end
+  end
+
+  suri do
+    mint_ids true
+    id_namespace 'druid'
+    url 'http://sul-lyberservices-test.stanford.edu'
+    user 'labware'
+    pass 'lyberteam'
+  end
+
+  solr.url 'https://sul-solr-tester.stanford.edu/argo_prod'
+  workflow.url 'https://sul-lyberservices-prod.stanford.edu/workflow/'
+  dor_services.url 'https://dorAdmin:dorAdmin@sul-lyberservices-test.stanford.edu/dor'
+
+  purl do
+    base_url 'https://purl-test.stanford.edu/'
+  end
+
+  remediation do
+    check_for_versioning_required false # this MUST be true in production; can be false in development and test if you want to ignore workflow checks
+    check_for_in_accessioning false # this MUST be true in production; can be false in development and test if you want to ignore workflow checks
+  end
+
+  dor do
+    service_root 'https://dorAdmin:dorAdmin@sul-lyberservices-test.stanford.edu/dor/v1'
+    num_attempts 3 # the number of attempts to contact the dor web service before throwing an exception
+    sleep_time 2 # sleep time in seconds between attempts to contact the dor service
+    default_label 'Untitled' # the default label for an object that is registered when no label is provided in the manifest
+  end
+
+  content do
+    content_user 'lyberadmin'
+    content_base_dir '/dor/workspace/'
+    content_server 'lyberservices-test'
+  end
+
+  status do
+    indexer_url 'http://sulstats-raw.stanford.edu//render/?format=json&from=-1minute&until=now&target=stats.gauges.dor-prod.argo.reindexqueue.queue-size.count'
+  end
+
+  stacks do
+    document_cache_storage_root '/home/lyberadmin/document_cache'
+    document_cache_host 'purl-test.stanford.edu'
+    document_cache_user 'lyberadmin'
+    local_workspace_root '/dor/workspace'
+    storage_root '/stacks'
+    host 'stacks-test.stanford.edu'
+    user 'lyberadmin'
+  end
+end
+# rubocop:enable Metrics/BlockLength

data/lib/dor-services.rb

@@ -29,7 +29,7 @@ module Dor
       @logger ||= if defined?(::Rails) && ::Rails.respond_to?(:logger)
                     Rails.logger
                   else
-                    Logger.new(STDOUT)
+                    Logger.new($stdout)
                   end
     end
   end
@@ -92,7 +92,6 @@ module Dor
     autoload :OpenDataLicenseService
     autoload :SearchService
     autoload :SuriService
-    autoload :TagService
   end
 
   eager_load!

data/lib/dor/datastreams/content_metadata_ds.rb

@@ -6,7 +6,7 @@ module Dor
   class ContentMetadataDS < ActiveFedora::OmDatastream
     set_terminology do |t|
       t.root        path: 'contentMetadata',          index_as: [:not_searchable]
-      t.contentType path: '/contentMetadata/@type',   index_as: [:not_searchable]
+      t.contentType path: { attribute: 'type' },      index_as: [:not_searchable]
       t.stacks      path: '/contentMetadata/@stacks', index_as: [:not_searchable]
       t.resource(index_as: [:not_searchable]) do
         t.id_       path: { attribute: 'id' }
@@ -35,6 +35,10 @@ module Dor
       t.shelved_file_id proxy: %i[resource shelved_file id], index_as: %i[displayable stored_searchable]
     end
 
+    def self.xml_template
+      Nokogiri::XML.parse('<contentMetadata/>')
+    end
+
     ### READ ONLY METHODS
 
     # Only use this when you want the behavior of raising an exception if anything besides exactly one matching node

data/lib/dor/datastreams/identity_metadata_ds.rb

@@ -8,6 +8,7 @@ module Dor
     # ids for previous and current catkeys
     CATKEY_TYPE_ID = 'catkey'
     PREVIOUS_CATKEY_TYPE_ID = 'previous_catkey'
+    BARCODE_TYPE_ID = 'barcode'
 
     set_terminology do |t|
       t.root(path: 'identityMetadata')
@@ -69,16 +70,6 @@ module Dor
     end
     alias source_id= sourceId=
 
-    def tags
-      tag
-    end
-
-    # helper method to get just the content type tag
-    def content_type_tag
-      content_tag = tags.select { |tag| tag.include?('Process : Content Type') }
-      content_tag.size == 1 ? content_tag[0].split(':').last.strip : ''
-    end
-
     def otherId(type = nil)
       result = find_by_terms(:otherId).to_a
       if type.nil?
@@ -154,6 +145,25 @@ module Dor
       otherId(PREVIOUS_CATKEY_TYPE_ID)
     end
 
+    def barcode
+      otherId(BARCODE_TYPE_ID).first
+    end
+
+    # Convenience method to set the barcode
+    # @param  [String] val the new barcode
+    # @return [String] same value, as per Ruby assignment convention
+    def barcode=(val)
+      if val.blank? # if we are setting the barcode to blank, remove the node from XML
+        remove_other_Id(BARCODE_TYPE_ID)
+      elsif barcode.blank? # if there is no current barcode, then add it
+        add_other_Id(BARCODE_TYPE_ID, val)
+      else # if there is a current barcode, update the current barcode to the new value
+        update_other_Id(BARCODE_TYPE_ID, val)
+      end
+
+      val
+    end
+
     # Helper method to get the release tags as a nodeset
     # @return [Nokogiri::XML::NodeSet] all release tags and their attributes
     def release_tags
@@ -170,61 +180,6 @@ module Dor
       return_hash
     end
 
-    def to_solr(solr_doc = {}, *args)
-      solr_doc = super(solr_doc, *args)
-
-      if digital_object.respond_to?(:profile)
-        digital_object.profile.each_pair do |property, value|
-          add_solr_value(solr_doc, property.underscore, value, (property =~ /Date/ ? :date : :symbol), [:stored_searchable])
-        end
-      end
-
-      if sourceId.present?
-        (name, id) = sourceId.split(/:/, 2)
-        add_solr_value(solr_doc, 'dor_id', id, :symbol, [:stored_searchable])
-        add_solr_value(solr_doc, 'identifier', sourceId, :symbol, [:stored_searchable])
-        add_solr_value(solr_doc, 'source_id', sourceId, :symbol, [])
-      end
-      otherId.compact.each do |qid|
-        # this section will solrize barcode and catkey, which live in otherId
-        (name, id) = qid.split(/:/, 2)
-        add_solr_value(solr_doc, 'dor_id', id, :symbol, [:stored_searchable])
-        add_solr_value(solr_doc, 'identifier', qid, :symbol, [:stored_searchable])
-        add_solr_value(solr_doc, "#{name}_id", id, :symbol, [])
-      end
-
-      # do some stuff to make tags in general and project tags specifically more easily searchable and facetable
-      find_by_terms(:tag).each do |tag|
-        (prefix, rest) = tag.text.split(/:/, 2)
-        prefix = prefix.downcase.strip.gsub(/\s/, '_')
-        unless rest.nil?
-          # this part will index a value in a field specific to the tag, e.g. registered_by_tag_*,
-          # book_tag_*, project_tag_*, remediated_by_tag_*, etc.  project_tag_* and registered_by_tag_*
-          # definitley get used, but most don't.  we can limit the prefixes that get solrized if things
-          # get out of hand.
-          add_solr_value(solr_doc, "#{prefix}_tag", rest.strip, :symbol, [])
-        end
-
-        # solrize each possible prefix for the tag, inclusive of the full tag.
-        # e.g., for a tag such as "A : B : C", this will solrize to an _ssim field
-        # that contains ["A",  "A : B",  "A : B : C"].
-        tag_parts = tag.text.split(/:/)
-        progressive_tag_prefix = ''
-        tag_parts.each_with_index do |part, index|
-          progressive_tag_prefix += ' : ' if index > 0
-          progressive_tag_prefix += part.strip
-          add_solr_value(solr_doc, 'exploded_tag', progressive_tag_prefix, :symbol, [])
-        end
-      end
-
-      solr_doc
-    end
-
-    # maintain AF < 8 indexing behavior
-    def prefix
-      ''
-    end
-
     private
 
     # Convert one release element into a Hash

data/lib/dor/datastreams/rights_metadata_ds.rb

@@ -64,6 +64,7 @@ module Dor
       'world-nd' => 'World (no-download)',
       'stanford' => 'Stanford',
       'stanford-nd' => 'Stanford (no-download)',
+      'cdl-stanford-nd' => 'Controlled Digital Lending (no-download)',
       'loc:spec' => 'Location: Special Collections',
       'loc:music' => 'Location: Music Library',
       'loc:ars' => 'Location: Archive of Recorded Sound',
@@ -98,12 +99,14 @@ module Dor
     # @param rights_xml [ng_xml] a nokogiri xml (ruby) object that represents the rights xml for a DOR object
     # @param rights_type [string] a recognized rights type code ('world', 'dark', 'loc:spec', etc)
     def self.upd_rights_xml_for_rights_type(rights_xml, rights_type)
+      # Note: The discover node is either 'none' for a dark object or 'world' for any other rights option
       label = rights_type == 'dark' ? 'none' : 'world'
       rights_xml.search('//rightsMetadata/access[@type=\'discover\']/machine').each do |node|
         node.children.remove
         node.add_child Nokogiri::XML::Node.new(label, rights_xml)
       end
 
+      # The read node varies by rights option
       rights_xml.search('//rightsMetadata/access[@type=\'read\']').each do |node|
         node.children.remove
         machine_node = Nokogiri::XML::Node.new('machine', rights_xml)
@@ -121,6 +124,13 @@ module Dor
           loc_node = Nokogiri::XML::Node.new('location', rights_xml)
           loc_node.content = rights_type.split(':').last
           machine_node.add_child(loc_node)
+        elsif rights_type.start_with?('cdl')
+          cdl_node = Nokogiri::XML::Node.new('cdl', rights_xml)
+          group_node = Nokogiri::XML::Node.new('group', cdl_node)
+          group_node.content = 'stanford'
+          group_node.set_attribute('rule', 'no-download')
+          cdl_node.add_child(group_node)
+          machine_node.add_child(cdl_node)
         else # we know it is none or dark by the argument filter (first line)
           machine_node.add_child Nokogiri::XML::Node.new('none', rights_xml)
         end
@@ -144,73 +154,6 @@ module Dor
       @dra_object = nil # until TODO complete, we'll expect to have to reparse after modification
     end
 
-    def to_solr(solr_doc = {}, *args)
-      solr_doc = super(solr_doc, *args)
-      dra = dra_object
-      solr_doc['rights_primary_ssi'] = dra.index_elements[:primary]
-      solr_doc['rights_errors_ssim'] = dra.index_elements[:errors] if dra.index_elements[:errors].size > 0
-      solr_doc['rights_characteristics_ssim'] = dra.index_elements[:terms] if dra.index_elements[:terms].size > 0
-
-      solr_doc['rights_descriptions_ssim'] = [
-        dra.index_elements[:primary],
-
-        (dra.index_elements[:obj_locations_qualified] || []).map do |rights_info|
-          rule_suffix = rights_info[:rule] ? " (#{rights_info[:rule]})" : ''
-          "location: #{rights_info[:location]}#{rule_suffix}"
-        end,
-        (dra.index_elements[:file_locations_qualified] || []).map do |rights_info|
-          rule_suffix = rights_info[:rule] ? " (#{rights_info[:rule]})" : ''
-          "location: #{rights_info[:location]} (file)#{rule_suffix}"
-        end,
-
-        (dra.index_elements[:obj_agents_qualified] || []).map do |rights_info|
-          rule_suffix = rights_info[:rule] ? " (#{rights_info[:rule]})" : ''
-          "agent: #{rights_info[:agent]}#{rule_suffix}"
-        end,
-        (dra.index_elements[:file_agents_qualified] || []).map do |rights_info|
-          rule_suffix = rights_info[:rule] ? " (#{rights_info[:rule]})" : ''
-          "agent: #{rights_info[:agent]} (file)#{rule_suffix}"
-        end,
-
-        (dra.index_elements[:obj_groups_qualified] || []).map do |rights_info|
-          rule_suffix = rights_info[:rule] ? " (#{rights_info[:rule]})" : ''
-          "#{rights_info[:group]}#{rule_suffix}"
-        end,
-        (dra.index_elements[:file_groups_qualified] || []).map do |rights_info|
-          rule_suffix = rights_info[:rule] ? " (#{rights_info[:rule]})" : ''
-          "#{rights_info[:group]} (file)#{rule_suffix}"
-        end,
-
-        (dra.index_elements[:obj_world_qualified] || []).map do |rights_info|
-          rule_suffix = rights_info[:rule] ? " (#{rights_info[:rule]})" : ''
-          "world#{rule_suffix}"
-        end,
-        (dra.index_elements[:file_world_qualified] || []).map do |rights_info|
-          rule_suffix = rights_info[:rule] ? " (#{rights_info[:rule]})" : ''
-          "world (file)#{rule_suffix}"
-        end
-      ].flatten.uniq
-
-      # these two values are returned by index_elements[:primary], but are just a less granular version of
-      # what the other more specific fields return, so discard them
-      solr_doc['rights_descriptions_ssim'] -= %w[access_restricted access_restricted_qualified world_qualified]
-      solr_doc['rights_descriptions_ssim'] += ['dark (file)'] if dra.index_elements[:terms].include? 'none_read_file'
-
-      solr_doc['obj_rights_locations_ssim'] = dra.index_elements[:obj_locations] unless dra.index_elements[:obj_locations].blank?
-      solr_doc['file_rights_locations_ssim'] = dra.index_elements[:file_locations] unless dra.index_elements[:file_locations].blank?
-      solr_doc['obj_rights_agents_ssim'] = dra.index_elements[:obj_agents] unless dra.index_elements[:obj_agents].blank?
-      solr_doc['file_rights_agents_ssim'] = dra.index_elements[:file_agents] unless dra.index_elements[:file_agents].blank?
-
-      # suppress empties
-      %w(use_statement_ssim copyright_ssim).each do |key|
-        solr_doc[key] = solr_doc[key].reject(&:blank?).flatten unless solr_doc[key].nil?
-      end
-      add_solr_value(solr_doc, 'use_license_machine', use_license.first, :string, [:stored_sortable])
-      add_solr_value(solr_doc, 'use_licenses_machine', use_license, :symbol, [:stored_searchable])
-
-      solr_doc
-    end
-
     def use_license
       use_license = []
       use_license += Array(creative_commons)
@@ -219,11 +162,6 @@ module Dor
       use_license.reject(&:blank?)
     end
 
-    # maintain AF < 8 indexing behavior
-    def prefix
-      ''
-    end
-
     def rights
       xml = ng_xml
       if xml.search('//rightsMetadata/access[@type=\'read\']/machine/group').length == 1

data/lib/dor/datastreams/version_metadata_ds.rb

@@ -112,7 +112,7 @@ module Dor
     def current_version_id
       current_version = current_version_node
       if current_version.nil?
-        return '1'
+        '1'
       else
         current_version[:versionId].to_s
       end
@@ -157,9 +157,9 @@ module Dor
     def current_version_closeable?
       current = current_version_node
       if current[:tag] && current.at_xpath('description')
-        return true
+        true
       else
-        return false
+        false
       end
     end
 

data/lib/dor/models/abstract.rb

@@ -76,11 +76,11 @@ module Dor
 
     delegate :full_title, :stanford_mods, to: :descMetadata
     delegate :rights, to: :rightsMetadata
-    delegate :catkey, :catkey=, :source_id, :source_id=,
+    delegate :catkey, :catkey=, :source_id, :source_id=, :barcode, :barcode=,
              :objectId, :objectId=, :objectCreator, :objectCreator=,
              :objectLabel, :objectLabel=, :objectType, :objectType=,
-             :other_ids=, :otherId, :tag=, :tags, :release_tags,
-             :previous_catkeys, :content_type_tag, to: :identityMetadata
+             :other_ids=, :otherId, :release_tags, :previous_catkeys,
+             to: :identityMetadata
 
     def read_rights=(rights)
       rightsMetadata.set_read_rights(rights)

data/lib/dor/models/admin_policy_object.rb

@@ -1,13 +1,16 @@
 # frozen_string_literal: true
 
+require 'deprecation'
+
 module Dor
   class AdminPolicyObject < Dor::Abstract
+    extend Deprecation
     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'
+    belongs_to :agreement_object, property: :referencesAgreement, class_name: 'Dor::Agreement'
 
     delegate :add_roleplayer, :purge_roles, :roles, to: :roleMetadata
     delegate :mods_title, :mods_title=, to: :descMetadata
@@ -29,11 +32,13 @@ module Dor
     def agreement
       agreement_object ? agreement_object.pid : ''
     end
+    deprecation_deprecate agreement: 'use #agreement_object_id instead'
 
     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
+    deprecation_deprecate :agreement= => 'use #agreement_object_id= instead'
   end
 end

data/lib/dor/models/etd.rb

@@ -22,10 +22,11 @@ module Dor
                    :regactiondttm, :documentaccess, :submit_date, :symphonyStatus,
                    datastream: 'properties', multiple: false
 
-    has_attributes :citation_verified, :abstract_provided, :dissertation_uploaded,
-                   :supplemental_files_uploaded, :permissions_provided,
-                   :permission_files_uploaded, :rights_selected,
-                   :cc_license_selected, :submitted_to_registrar,
+    has_attributes :citation_verified, :abstract_provided, :format_reviewed,
+                   :dissertation_uploaded, :supplemental_files_uploaded,
+                   :permissions_provided, :permission_files_uploaded,
+                   :rights_selected, :cc_license_selected,
+                   :submitted_to_registrar,
                    datastream: 'workflow', multiple: false
 
     has_metadata name: 'properties', type: ActiveFedora::SimpleDatastream, versionable: false do |m|
@@ -77,6 +78,7 @@ module Dor
     has_metadata name: 'workflow', type: ActiveFedora::SimpleDatastream, versionable: false do |m|
       m.field 'citation_verified', :string
       m.field 'abstract_provided', :string
+      m.field 'format_reviewed', :string
       m.field 'dissertation_uploaded', :string
       m.field 'supplemental_files_uploaded', :string
       m.field 'permissions_provided', :string

data/lib/dor/services/search_service.rb

@@ -27,9 +27,10 @@ module Dor
       end
 
       def query_by_id(id)
-        if id.is_a?(Hash) # Single valued: { :google => 'STANFORD_0123456789' }
+        case id
+        when Hash # Single valued: { :google => 'STANFORD_0123456789' }
           id = id.collect { |*v| v.join(':') }.first
-        elsif id.is_a?(Array) # Two values: [ 'google', 'STANFORD_0123456789' ]
+        when Array # Two values: [ 'google', 'STANFORD_0123456789' ]
           id = id.join(':')
         end
         q = "{!term f=#{Solrizer.solr_name 'identifier', :symbol}}#{id}"

data/lib/dor/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 9.2.1
+  version: 9.6.1
 platform: ruby
 authors:
 - Michael Klein
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-16 00:00:00.000000000 Z
+date: 2020-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -338,14 +338,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: '0.74'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: '0.74'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -410,7 +410,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - config/certs/README
+- config/certs/dlss-dev-petucket-dor-dev.crt
+- config/certs/dlss-dev-petucket-dor-dev.csr
+- config/certs/dlss-dev-petucket-dor-dev.key
+- config/certs/dlss-dev-petucket-dor-prod.crt
+- config/certs/dlss-dev-petucket-dor-prod.key
 - config/config_defaults.yml
+- config/dev_console_env.rb
 - config/dev_console_env.rb.example
 - config/predicate_mappings.yml
 - lib/dor-services.rb
@@ -450,7 +456,6 @@ files:
 - lib/dor/services/open_data_license_service.rb
 - lib/dor/services/search_service.rb
 - lib/dor/services/suri_service.rb
-- lib/dor/services/tag_service.rb
 - lib/dor/static_config.rb
 - lib/dor/static_config/fedora_config.rb
 - lib/dor/static_config/solr_config.rb

data/lib/dor/services/tag_service.rb

@@ -1,100 +0,0 @@
-# frozen_string_literal: true
-
-module Dor
-  # Manage tags on an object
-  class TagService
-    def self.add(item, tag)
-      new(item).add(tag)
-    end
-
-    def self.remove(item, tag)
-      new(item).remove(tag)
-    end
-
-    def self.update(item, old_tag, new_tag)
-      new(item).update(old_tag, new_tag)
-    end
-
-    def initialize(item)
-      @item = item
-    end
-
-    # Add an administrative tag to an item, you will need to seperately save the item to write it to fedora
-    # @param tag [string] The tag you wish to add
-    def add(tag)
-      normalized_tag = validate_and_normalize_tag(tag, identity_metadata.tags)
-      identity_metadata.add_value(:tag, normalized_tag)
-    end
-
-    def remove(tag)
-      normtag = normalize_tag(tag)
-      tag_nodes
-        .select { |node| normalize_tag(node.content) == normtag }
-        .each { identity_metadata.ng_xml_will_change! }
-        .each(&:remove)
-        .any?
-    end
-
-    def update(old_tag, new_tag)
-      normtag = normalize_tag(old_tag)
-      tag_nodes
-        .select { |node| normalize_tag(node.content) == normtag }
-        .each { identity_metadata.ng_xml_will_change! }
-        .each { |node| node.content = normalize_tag(new_tag) }
-        .any?
-    end
-
-    private
-
-    attr_reader :item
-    def identity_metadata
-      item.identityMetadata
-    end
-
-    def tag_nodes
-      identity_metadata.ng_xml.search('//tag')
-    end
-
-    # turns a tag string into an array with one element per tag part.
-    # split on ":", disregard leading and trailing whitespace on tokens.
-    def split_tag_to_arr(tag_str)
-      tag_str.split(':').map(&:strip)
-    end
-
-    # turn a tag array back into a tag string with a standard format
-    def normalize_tag_arr(tag_arr)
-      tag_arr.join(' : ')
-    end
-
-    # take a tag string and return a normalized tag string
-    def normalize_tag(tag_str)
-      normalize_tag_arr(split_tag_to_arr(tag_str))
-    end
-
-    # take a proposed tag string and a list of the existing tags for the object being edited.  if
-    # the proposed tag is valid, return it in normalized form.  if not, raise an exception with an
-    # explanatory message.
-    def validate_and_normalize_tag(tag_str, existing_tag_list)
-      tag_arr = validate_tag_format(tag_str)
-
-      # note that the comparison for duplicate tags is case-insensitive, but we don't change case as part of the normalized version
-      # we return, because we want to preserve the user's intended case.
-      normalized_tag = normalize_tag_arr(tag_arr)
-      dupe_existing_tag = existing_tag_list.detect { |existing_tag| normalize_tag(existing_tag).casecmp(normalized_tag) == 0 }
-      raise "An existing tag (#{dupe_existing_tag}) is the same, consider using update_tag?" if dupe_existing_tag
-
-      normalized_tag
-    end
-
-    # Ensure that an administrative tag meets the proper mininum format
-    # @param tag_str [String] the tag
-    # @return [Array] the tag split into an array via ':'
-    def validate_tag_format(tag_str)
-      tag_arr = split_tag_to_arr(tag_str)
-      raise ArgumentError, "Invalid tag structure: tag '#{tag_str}' must have at least 2 elements" if tag_arr.length < 2
-      raise ArgumentError, "Invalid tag structure: tag '#{tag_str}' contains empty elements" if tag_arr.detect(&:empty?)
-
-      tag_arr
-    end
-  end
-end