dor-services 5.12.0 → 5.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0aff39b53fc6fedf10ff743cb3d278e873283d98
-  data.tar.gz: d1c37b58887fbdc7a2d1c86fe9c689dec9d69023
+  metadata.gz: 83ea7517f092cf1a5d89325c43366ccb4e3bee86
+  data.tar.gz: 94eadb824517f646112e73134687684be1e2f47c
 SHA512:
-  metadata.gz: edfde3b9ce9e74b4ac8956cc147a194287f5c10fba0458851fdef493e73c5ac67cdd0e69e8654e18e602ed832dd5706d20c345eb6ffde7aa31d69148bbdc8c5a
-  data.tar.gz: 805ade0109e6085e67aedb75e47eadfe9c0c9a22a67ce444f0d1502d7cd2a013e733b069ce74c67ef1c8d68d3d43cd57a699baacedd492f6372a921d91252f30
+  metadata.gz: b5a1a67f735a73ec58a0958f0daeb650d83e42ed09dea6c2fc3592c3d2caa58b4e5fb0187bbe2d4dd5d79741820a3178b6e935933a83569a27e527f50c7b8d37
+  data.tar.gz: 4cd1cdd316963885fe7f3e82ad67fcd1e42aa32170ab6f2e08b4980bc7ebaf10b0d7d9736837bef6defe3a07a1eaba2dc1cb166a5c03087cae55bc3e8a237c0d

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,66 @@
+cert_dir = File.join(File.dirname(__FILE__), "certs")
+
+Dor::Config.configure do
+
+  fedora do
+    url 'https://sul-dor-test.stanford.edu/fedora'
+  end
+
+  ssl do
+    cert_file File.join(cert_dir,"dlss-dev-petucket-dor-dev.crt")
+    key_file  File.join(cert_dir,"dlss-dev-petucket-dor-dev.key")
+    key_pass ''
+  end
+
+  sdr do
+    url 'http://localhost'
+    local_workspace_root '/dor/workspace'
+    local_export_home '/dor/export'
+  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_stage'
+  workflow.url 'https://sul-lyberservices-test.stanford.edu/workflow/'
+
+  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

data/lib/dor-services.rb

@@ -20,8 +20,8 @@ module Dor
     # @param [String] pid The object's PID
     def load_instance(pid)
       ensure_models_loaded!
-      obj = Dor::Abstract.find pid
-      return nil if obj.new_object?
+      obj = Dor::Abstract.find pid, cast: false
+      return nil if obj.new_record?
       object_type = obj.identityMetadata.objectType.first
       object_class = registered_classes[object_type] || Dor::Item
       obj.adapt_to(object_class)
@@ -51,7 +51,7 @@ module Dor
           begin
             object_class.load_instance_from_solr solr_doc['id'], solr_doc
           rescue Exception => e
-            ActiveFedora.logger.warn("Exception: '#{e.message}' trying to load #{solr_doc['id']} from solr. Loading from Fedora")
+            Dor.logger.warn("Exception: '#{e.message}' trying to load #{solr_doc['id']} from solr. Loading from Fedora")
             load_instance(solr_doc['id'])
           end
         else
@@ -67,6 +67,19 @@ module Dor
     def root
       File.dirname(__FILE__)
     end
+
+    def logger
+      require 'logger'
+      @logger ||= if defined?(::Rails) && ::Rails.respond_to?(:logger)
+          Rails.logger
+        else
+          Logger.new(STDOUT)
+        end
+    end
+  end
+
+  def logger
+    Dor.logger
   end
 
   require 'dor/version'

data/lib/dor/datastreams/administrative_metadata_ds.rb

@@ -115,5 +115,10 @@ class AdministrativeMetadataDS < ActiveFedora::OmDatastream
     defaults.shelving.path.first
   end
 
+  # maintain AF < 8 indexing behavior
+  def prefix
+    ''
+  end
+
 end
 end

data/lib/dor/datastreams/content_metadata_ds.rb

@@ -53,7 +53,7 @@ module Dor
         fail ArgumentError, "Malformed externalFile data: #{externalFile.inspect}" if [src_resource_id, src_file_id, src_druid].map(&:blank?).any?
 
         # grab source item
-        src_item = Dor::Item.find(src_druid)
+        src_item = Dor.find(src_druid)
 
         # locate and extract the resourceId/fileId elements
         doc = src_item.datastreams['contentMetadata'].ng_xml
@@ -367,5 +367,10 @@ module Dor
       end
       self.content = ng_xml.to_s
     end
+
+    # maintain AF < 8 indexing behavior
+    def prefix
+      ''
+    end
   end
 end

data/lib/dor/datastreams/default_object_rights_ds.rb

@@ -138,5 +138,10 @@ module Dor
       template = Nokogiri::XSLT(File.read(File.expand_path('../human.xslt', __FILE__)))
       template.apply_to(xml_doc)
     end
+
+    # maintain AF < 8 indexing behavior
+    def prefix
+      ''
+    end
   end
 end

data/lib/dor/datastreams/desc_metadata_ds.rb

@@ -43,5 +43,10 @@ module Dor
       end.doc
     end
 
+    # maintain AF < 8 indexing behavior
+    def prefix
+      ''
+    end
+
   end
 end

data/lib/dor/datastreams/embargo_metadata_ds.rb

@@ -28,7 +28,7 @@ class EmbargoMetadataDS < ActiveFedora::OmDatastream
   end
 
   def to_solr(solr_doc = {}, *args)
-    super
+    solr_doc = super
     #::Solrizer.insert_field(solr_doc, field_name, value, *index_types)
     rd1  = release_date
     rd20 = twenty_pct_release_date
@@ -107,5 +107,10 @@ class EmbargoMetadataDS < ActiveFedora::OmDatastream
     ng_xml.root.add_child(new_doc.root.clone)
   end
 
+  # maintain AF < 8 indexing behavior
+  def prefix
+    ''
+  end
+
 end
 end

data/lib/dor/datastreams/events_ds.rb

@@ -59,5 +59,10 @@ class EventsDS < ActiveFedora::OmDatastream
     end
   end
 
+  # maintain AF < 8 indexing behavior
+  def prefix
+    ''
+  end
+
 end
 end

data/lib/dor/datastreams/geo_metadata_ds.rb

@@ -74,5 +74,10 @@ module Dor
         bb.xpath('gmd:southBoundLatitude/gco:Decimal', params).text.to_f
       )
     end
+
+    # maintain AF < 8 indexing behavior
+    def prefix
+      ''
+    end
   end
 end

data/lib/dor/datastreams/identity_metadata_ds.rb

@@ -80,7 +80,7 @@ class IdentityMetadataDS < ActiveFedora::OmDatastream
   end
 
   def to_solr(solr_doc = {}, *args)
-    super(solr_doc, *args)
+    solr_doc = super(solr_doc, *args)
 
     if digital_object.respond_to?(:profile)
       digital_object.profile.each_pair do |property, value|
@@ -128,5 +128,10 @@ class IdentityMetadataDS < ActiveFedora::OmDatastream
 
     solr_doc
   end
+
+  # maintain AF < 8 indexing behavior
+  def prefix
+    ''
+  end
 end # class
 end

data/lib/dor/datastreams/rights_metadata_ds.rb

@@ -96,7 +96,7 @@ module Dor
     end
 
     def to_solr(solr_doc = {}, *args)
-      super(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
@@ -167,5 +167,10 @@ module Dor
       ''
     end
 
+    # maintain AF < 8 indexing behavior
+    def prefix
+      ''
+    end
+
   end # class
 end

data/lib/dor/datastreams/role_metadata_ds.rb

@@ -46,5 +46,10 @@ class RoleMetadataDS < ActiveFedora::OmDatastream
     solr_doc
   end
 
+  # maintain AF < 8 indexing behavior
+  def prefix
+    ''
+  end
+
 end
 end

data/lib/dor/datastreams/simple_dublin_core_ds.rb

@@ -47,5 +47,10 @@ class SimpleDublinCoreDs < ActiveFedora::OmDatastream
     warn "ERROR in SimpleDublinCoreDs to_solr()! #{e}"
     solr_doc
   end
+
+  # maintain AF < 8 indexing behavior
+  def prefix
+    ''
+  end
 end
 end

data/lib/dor/datastreams/version_metadata_ds.rb

@@ -211,6 +211,11 @@ module Dor
       increment_version(opts[:description], opts[:significance])
     end
 
+    # maintain AF < 8 indexing behavior
+    def prefix
+      ''
+    end
+
     private
 
     # @return [Nokogiri::XML::Node] Node representing the current version
@@ -223,6 +228,5 @@ module Dor
       tags = find_by_terms(:version, :tag)
       tags.map {|t| VersionTag.parse(t.value)}.max
     end
-
   end
 end

data/lib/dor/datastreams/workflow_definition_ds.rb

@@ -93,7 +93,7 @@ class WorkflowDefinitionDs < ActiveFedora::OmDatastream
   end
 
   def to_solr(solr_doc = {}, *args)
-    super(solr_doc, *args)
+    solr_doc = super(solr_doc, *args)
     add_solr_value(solr_doc, 'workflow_name', name, :symbol, [:symbol])
     processes.each do |p|
       add_solr_value(solr_doc, 'process', "#{p.name}|#{p.label}", :symbol, [:displayable])
@@ -105,5 +105,10 @@ class WorkflowDefinitionDs < ActiveFedora::OmDatastream
     YAML.dump(configuration)
   end
 
+  # maintain AF < 8 indexing behavior
+  def prefix
+    ''
+  end
+
 end
 end

data/lib/dor/datastreams/workflow_ds.rb

@@ -71,8 +71,13 @@ module Dor
 
     def to_solr(solr_doc = {}, *args)
       # super solr_doc, *args
-      workflows.each { |wf| wf.to_solr(solr_doc, *args) }
+      workflows.each { |wf| solr_doc = wf.to_solr(solr_doc, *args) }
       solr_doc
     end
+
+    # maintain AF < 8 indexing behavior
+    def prefix
+      ''
+    end
   end
 end

data/lib/dor/models/admin_policy_object.rb

@@ -7,7 +7,7 @@ module Dor
     include Processable
     include Versionable
 
-    has_many :things, :property => :is_governed_by, :inbound => :true, :class_name => 'ActiveFedora::Base'
+    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'

data/lib/dor/models/collection.rb

@@ -8,7 +8,7 @@ module Dor
     include Versionable
     include Releaseable
 
-    has_many :members, :property => :is_member_of_collection, :inbound => true, :class_name => 'ActiveFedora::Base'
+    has_many :members, :property => :is_member_of_collection, :class_name => 'ActiveFedora::Base'
     has_object_type 'collection'
   end
 end

data/lib/dor/models/contentable.rb

@@ -41,7 +41,7 @@ module Dor
 
     def replace_file(file, file_name)
       sftp = Net::SFTP.start(Config.content.content_server, Config.content.content_user, :auth_methods => ['publickey'])
-      item = Dor::Item.find(pid)
+      item = Dor.find(pid)
       druid_tools = DruidTools::Druid.new(pid, Config.content.content_base_dir)
       location = druid_tools.path(file_name)
       oldlocation = location.gsub('/' + pid.gsub('druid:', ''), '')
@@ -161,7 +161,7 @@ module Dor
       max_sequence = primary_cm.at_xpath('/contentMetadata/resource[last()]/@sequence').value.to_i
 
       source_obj_pids.each do |src_pid|
-        source_obj = Dor::Item.find src_pid
+        source_obj = Dor.find src_pid
         source_cm = source_obj.contentMetadata.ng_xml
 
         # Copy the resources from each source object

data/lib/dor/models/describable.rb

@@ -110,7 +110,7 @@ module Dor
 
     def add_related_item_node_for_collection(doc, collection_druid)
       begin
-        collection_obj = Dor::Item.find(collection_druid)
+        collection_obj = Dor.find(collection_druid)
       rescue ActiveFedora::ObjectNotFoundError
         return nil
       end
@@ -172,7 +172,7 @@ module Dor
                                        'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#' ).each do |parent|
         # fetch the parent object to get title
         druid = parent['rdf:resource'].gsub(/^info:fedora\//, '')
-        parent_item = Dor::Item.find(druid)
+        parent_item = Dor.find(druid)
 
         # create the MODS relation
         relatedItem = doc.create_element 'relatedItem'
@@ -209,7 +209,7 @@ module Dor
     end
 
     def to_solr(solr_doc = {}, *args)
-      super solr_doc, *args
+      solr_doc = super solr_doc, *args
       mods_sources = {
         'sw_language_ssim'            => :sw_language_facet,
         'sw_language_tesim'           => :sw_language_facet,
@@ -246,7 +246,7 @@ module Dor
         creator_title = creator + title
         add_solr_value(solr_doc, 'creator_title', creator_title, :string, [:stored_sortable])
       rescue CrosswalkError => e
-        ActiveFedora.logger.warn "Cannot index #{pid}.descMetadata: #{e.message}"
+        Dor.logger.warn "Cannot index #{pid}.descMetadata: #{e.message}"
       end
 
       begin

data/lib/dor/models/editable.rb

@@ -46,7 +46,7 @@ module Dor
     }.freeze
 
     def to_solr(solr_doc = {}, *args)
-      super(solr_doc, *args)
+      solr_doc = super(solr_doc, *args)
       add_solr_value(solr_doc, 'default_rights', default_rights, :string, [:symbol])
       add_solr_value(solr_doc, 'agreement', agreement, :string, [:symbol]) if agreement_object
       add_solr_value(solr_doc, 'default_use_license_machine', use_license, :string, [:stored_sortable])
@@ -328,7 +328,7 @@ module Dor
     end
     def agreement=(val)
       fail ArgumentError, 'agreement must have a valid druid' if val.blank?
-      self.agreement_object = Dor::Item.find val.to_s, :cast => true
+      self.agreement_object = Dor.find val.to_s, :cast => true
     end
   end
 end

data/lib/dor/models/governable.rb

@@ -10,7 +10,7 @@ module Dor
     end
 
     def initiate_apo_workflow(name)
-      create_workflow(name, !self.new_object?)
+      create_workflow(name, !self.new_record?)
     end
 
     # Returns the default lane_id from the item's APO.  Will return 'default' if the item does not have

data/lib/dor/models/identifiable.rb

@@ -58,7 +58,7 @@ module Dor
 
     def to_solr(solr_doc = {}, *args)
       assert_content_model
-      super(solr_doc, *args)
+      solr_doc = super(solr_doc, *args)
 
       solr_doc[Dor::INDEX_VERSION_FIELD] = Dor::VERSION
       solr_doc['indexed_at_dtsi'] = Time.now.utc.xmlschema

data/lib/dor/models/processable.rb

@@ -155,7 +155,7 @@ module Dor
     end
 
     def to_solr(solr_doc = {}, *args)
-      super(solr_doc, *args)
+      solr_doc = super(solr_doc, *args)
       sortable_milestones = {}
       current_version = '1'
       begin

data/lib/dor/models/releaseable.rb

@@ -79,7 +79,8 @@ module Dor
     def get_release_tags_for_item_and_all_governing_sets
       return_tags = release_nodes || {}
       collections.each do |collection|
-        return_tags = combine_two_release_tag_hashes(return_tags, Dor::Item.find(collection.id).get_release_tags_for_item_and_all_governing_sets) # recurvise so parents of parents are found
+        next if collection.id == id  # recursive, so parents of parents are found, but we need to avoid an infinite loop if the collection references itself (i.e. bad data)
+        return_tags = combine_two_release_tag_hashes(return_tags, Dor.find(collection.id).get_release_tags_for_item_and_all_governing_sets)
       end
       return_tags
     end
@@ -319,7 +320,7 @@ module Dor
     end
 
     def to_solr(solr_doc = {}, *args)
-      super(solr_doc, *args)
+      solr_doc = super(solr_doc, *args)
 
       # TODO: sort of worried about the performance impact in bulk reindex
       # situations, since released_for recurses all parent collections.  jmartin 2015-07-14

data/lib/dor/models/set.rb

@@ -7,7 +7,7 @@ module Dor
     include Publishable
     include Versionable
 
-    has_many :members, :property => :is_member_of_collection, :inbound => true, :class_name => 'ActiveFedora::Base'
+    has_many :members, :property => :is_member_of_collection, :class_name => 'ActiveFedora::Base'
     has_object_type 'set'
   end
 end

data/lib/dor/services/cleanup_reset_service.rb

@@ -14,7 +14,7 @@ module Dor
     end
 
     def self.get_druid_last_version(druid)
-      druid_obj = Dor::Item.find(druid)
+      druid_obj = Dor.find(druid)
       last_version = druid_obj.current_version.to_i
 
       # if the current version is still open, avoid this versioned directory

data/lib/dor/services/merge_service.rb

@@ -11,9 +11,9 @@ module Dor
     end
 
     def initialize(primary_druid, secondary_pids, tag, logger = nil)
-      @primary = Dor::Item.find primary_druid
+      @primary = Dor.find primary_druid
       @secondary_pids = secondary_pids
-      @secondary_objs = secondary_pids.map {|pid|  Dor::Item.find pid }
+      @secondary_objs = secondary_pids.map {|pid|  Dor.find pid }
       if logger.nil?
         @logger = Logger.new(STDERR)
       else

data/lib/dor/services/registration_service.rb

@@ -129,7 +129,7 @@ module Dor
         workflow_priority = params[:workflow_priority] ? params[:workflow_priority].to_i : 0
 
         Array(params[:seed_datastream]).each { |datastream_name| new_item.build_datastream(datastream_name) }
-        Array(params[:initiate_workflow]).each { |workflow_id| new_item.create_workflow(workflow_id, !new_item.new_object?, workflow_priority)}
+        Array(params[:initiate_workflow]).each { |workflow_id| new_item.create_workflow(workflow_id, !new_item.new_record?, workflow_priority)}
 
         new_item.assert_content_model
 

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '5.12.0'.freeze
+  VERSION = '5.13.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 5.12.0
+  version: 5.13.0
 platform: ruby
 authors:
 - Michael Klein
@@ -14,22 +14,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-13 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 9.a
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 9.a
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -576,7 +582,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
@@ -676,8 +688,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Ruby implmentation of DOR services used by the SULAIR Digital Library
 test_files: []
+has_rdoc: