dor-services 4.6.2 → 4.6.3

data/config/certs/dlss-dev-test.crt

@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC3zCCAccCCQC3NmcDpol4lzANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJV
+UzETMBEGA1UECBMKQ2FsaWZvcm5pYTERMA8GA1UEBxMIU3RhbmZvcmQxETAPBgNV
+BAoTCFN0YW5mb3JkMQ0wCwYDVQQLEwRETFNTMRQwEgYDVQQDEwtMeWJlclRlc3RD
+QTAeFw0xMTAyMjMxNjUzNTlaFw0yMTAyMjAxNjUzNTlaMHoxCzAJBgNVBAYTAlVT
+MRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQHEwhTdGFuZm9yZDEcMBoGA1UE
+ChMTU3RhbmZvcmQgVW5pdmVyc2l0eTENMAsGA1UECxMERExTUzEWMBQGA1UEAxMN
+ZGxzcy1kZXYtdGVzdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAl70WWl1c
+eC50SwKDCr+vhNFH9N+YdTzh3rIRVKzJFPKvNqkye0jwq9MApyEtQzdyk3eDInlK
+dOwKX0XpoLnzm9SgBIY714ojYKZMRPPaIc2k5D7mYgyAUYyWLTJnO93KH3PhMbZY
+79BrNIMaYu7FGu/SVqQB44j9VnlG36mpmUUCAwEAATANBgkqhkiG9w0BAQUFAAOC
+AQEAlAn5InW1y7GCH/I4t9FgL3nkaOkaO9EzdU8EGtQpQ3YuNqy7IWfqFUm0r06w
+C9CkvEeaZe2GhzQ0ppKXFGI/oWOxETQhgr50HUlXp6hb+zvgrgD1daKbeBCseYF3
+yni37BoPrmQbfA+kmrskRTPpxNnTyQqXCLF2IY+1oAsLC9LyZ3wit/x6oTHwFB6a
+ME/9gJ49UkXaHqvfXy76/qWCBjDZOgMlR0O2y4gi1NPR4+EvEuxcyaXqu9wvAnm2
+z+UPjqi8dBji8T5eWxtiqnawBN5457L80z9EGHCEADHzlyVFUVmHFbFCs/lTzQj7
+fDH+2wlD4o4TMaztLAE3IR6Gtg==
+-----END CERTIFICATE-----

data/config/certs/dlss-dev-test.key

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQCXvRZaXVx4LnRLAoMKv6+E0Uf035h1POHeshFUrMkU8q82qTJ7
+SPCr0wCnIS1DN3KTd4MieUp07ApfRemgufOb1KAEhjvXiiNgpkxE89ohzaTkPuZi
+DIBRjJYtMmc73cofc+Extljv0Gs0gxpi7sUa79JWpAHjiP1WeUbfqamZRQIDAQAB
+AoGAT5Rgm8XpEDK01P4dQc7kO5ES3u9BYwMqJoRXKIRx9SWOFOnJyvSnHEZOSljR
+BzaWRZbhVHwuO4HrsqnU7HF5vAqWQvWfMFVnImIFnIY2hIai4MlB3HMljuosJ5jE
+RRWng6FcalWq5AeWM5hjNG0yhULhKN5y+AI9mHkzIlpWSsECQQDILiA2uSh7zLBa
+hcq2ODPfB42G9xJVXn4oxLdn2zlyKXWvVXoYWGMQWZnnxvrt75n4Iif1y6G/Imhq
+C6DenWXRAkEAwgz1QYd7Ei+Sl3adTtKRVe6jtXrD3JEA7/JtY+mcgCpD8fbUynsS
+7rFA4c8dIa5BkOSvp8kQWJ/Dl3uwnpt1NQJAKSZSOO2XBNvu5KzcHtku0Ioc7cGc
+YzApfvfxO8g05uLe7kwD7T0+H/5LRPoCWycF35wl2sEhXskT7bi2OQziAQJAWtak
+DMv2MdoxPlQZaaeqv1ZaLn9Mprj+flS3HpliWKDwc5l/nVWl1DUH0W0aDwU6zjAv
+hlTaIRKRBh2x3V2arQJBAIwzwimH6SDiXqZUZ5pBxX1GETNvegHeeIj0Bmu+jFhN
+0KDbvoWrJe0Hw1UpBlWiZdrD9Ht3mQdNiPyorL+DDJs=
+-----END RSA PRIVATE KEY-----

data/config/certs/robots-dor-dev.crt

@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIE9zCCAt8CCQCcUJVDTu7rTjANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCkNhbGlmb3JuaWExETAPBgNVBAcTCFN0YW5mb3JkMRwwGgYD
+VQQKExNTdGFuZm9yZCBVbml2ZXJzaXR5MRIwEAYDVQQLEwlMaWJyYXJpZXMxJTAj
+BgNVBAMTHFNVTCBET1IgKGRldi90ZXN0KSBhY2Nlc3MgQ0ExLzAtBgkqhkiG9w0B
+CQEWIHN1bC13ZWJtYXN0ZXJAbGlzdHMuc3RhbmZvcmQuZWR1MB4XDTEyMDkyNjE1
+NTQzNVoXDTIyMDkyNDE1NTQzNVowgboxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpD
+YWxpZm9ybmlhMREwDwYDVQQHEwhTdGFuZm9yZDEcMBoGA1UEChMTU3RhbmZvcmQg
+VW5pdmVyc2l0eTEyMDAGA1UEAxQpcm9ib3RzQHN1bC1seWJlcnNlcnZpY2VzLWRl
+di5zdGFuZm9yZC5lZHUxMTAvBgkqhkiG9w0BCQEWImRsc3MtZGV2ZWxvcGVyc0Bs
+aXN0cy5zdGFuZm9yZC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQC1t+PPhLTDFQBuAf4f1GOj7jHdXMN0tvSHL1OCaibe0d8iKbXCMMIE0z8lbBpZ
+1pA+8terIvxoTlly92EEvGkywZb+DIxnjyG0b9ftDJ64pARJMcnvwJMW/w3WdHCd
+5uJ5HVM8ZCbEItUfskFukS6tfNBpG8ri6cIQ2ulJzOWYxPV5R2eRneM6vtFD0xtu
+RJb/uMwiOwB79qk4QazbEQtkeZsrvomDFkIuHO/nf9wmgYG99H7q1kXplIrzDDX+
+fvD+JHvuMr5YXfmBQ9wmaZf6YIL7CXj79HUF4uG/a0SjrLZyLh262zWJQFVpjSW8
+Brl/fAyjeZvWJMyCDXRqsedjAgMBAAEwDQYJKoZIhvcNAQEFBQADggIBAG0jIfTj
+1FJsxTzcD938vtKuNo5XEIX8phqW1MA2eJ5Ojgu1hpW5Jf7fmUHKVnamm7eya5QR
+356KCJzZzwdCS4xVFq/l43gCA2j8TYrwO6/0EfM/5psUZS3ecwahzcJXfHPHvd9u
+qaXRqbjJYi+Ls70uStTC/JBIIu48atDF0DeXJ21hAbstZ1OKKNzAcYgZk14GKxCi
+ArgAzdg8UDtC4KsdqgxP6vF8Vc/gcHSu9AkVHgPVXbITjV0/kaKNgFi0bVqP7bJD
+hrUFYrS+S+hflQJCmVrDwW0JU2HnJ3EJOFX5F4FYHL4vt6ZjVsMzucraMqiLyUaO
+s6DVaWO8WMlphmFUfb3ChQjrKxFZZ6vKJPD/ExnQHa0kWwOELyMJuXw2PLk7k+qD
+rmjX+K3Ed+JiJuiDG5k8f1BDZE24lvxDwye5fQyDWPfib1yTClYYy4PRh4AI688f
+qgMyv51Qx82o0IJ1On1rNg5/iB7OEVcYSol3U5xiY9gRUd3vq637agZzMuRQnKXs
+Uj0+Vl4OrZ54F8MVsUKfi7Je1oVUEhuHqFt/tSOGlHg1XyR/ExwulCNBKIVdhhrF
+rxZCYrGDSUCF6tteJXpOBTtFT9b7hbMmBohKyS4XjfPSPRh9QHx7wepqSp3aHpmR
+4gY8Go40mS83xHCKBooqsy2/Z9vQlSb9Cr8u
+-----END CERTIFICATE-----

data/config/certs/robots-dor-dev.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAtbfjz4S0wxUAbgH+H9Rjo+4x3VzDdLb0hy9Tgmom3tHfIim1
+wjDCBNM/JWwaWdaQPvLXqyL8aE5ZcvdhBLxpMsGW/gyMZ48htG/X7QyeuKQESTHJ
+78CTFv8N1nRwnebieR1TPGQmxCLVH7JBbpEurXzQaRvK4unCENrpSczlmMT1eUdn
+kZ3jOr7RQ9MbbkSW/7jMIjsAe/apOEGs2xELZHmbK76JgxZCLhzv53/cJoGBvfR+
+6tZF6ZSK8ww1/n7w/iR77jK+WF35gUPcJmmX+mCC+wl4+/R1BeLhv2tEo6y2ci4d
+uts1iUBVaY0lvAa5f3wMo3mb1iTMgg10arHnYwIDAQABAoIBAQCmlDzsZZ2C24S6
+U29OZFc21kq1vqyaGIEOT48BFSguyDsAyTWKH0IsRC41suRxCGTQn7KeegLh5zjO
+UAGK4uCYm6g7mOs4n5fpHUHWVuRFJG2dX1vbQTBVO1fHCJSX2ygumHhN+w0ibT/r
+v2+F2ObuOGWghM62tkylQNfsRD0QjalE8ST2xp9p4xwPrAwEuURlA04qnLYNi4+6
+qexDtrLG8E6JV/dd3dY95WjKPscadR1fAKm9sebD0XO31Lu6BGCvpmBU0OmYVfrY
+BN/ofhEmJh+Xgwfxx6PicRDvu9bPnffqbGhDO4ckGDlqXp1fDBgf1I7CclXdrVMH
+Qsxunh5pAoGBAN7929V1aw0S7Rqvuf4N+o1XwBExa2DL7EYI1Oea/nuBMPqvfeNh
+SrbM0gYejEzLmeRUUKRhMMoAgXQnxcg3Kz/5pUXT3b4YtzeskX8nkJ6/2gEU3M7E
+lJj7c5wW1otqMH19+iDNR4N8vjPh98kDJW1HZUHSAcdyE+dZiFP2ofMfAoGBANCe
+AJgA9EkdwZsom+I7Ty9LSrTWx6cKmNEbLVn1iSlyJx1kHoWyTMtuZszCWBjiXx70
+84WpX2B4MuJBq6sSoEiUahNsphks82glOd6i+eoE/I+NtZehOFnkAMyGux+FbMyG
+q/9ZlQgsbWpFHxS59vX/kvlNun2RpJkaF6QPBuc9AoGBAIGdscCb5cPNsoCGkGf6
+HB84WG4l+bJkFkyHKaoOT8neSGgOxe/7R4CGAbaI3yhsWGF+GPnTfJaOQLERxUch
+ukQPil/STNwIZcc4ycHNb6S3A7MJO2f8oBtkXcjnBYI4EUOAjHmwmNb3FV/3Ax6W
+c5TXoSXnOh2CU8twIWwcufolAoGATqnFf4uckZVu05rUbNIAYcz6NoZmck5EoVSm
+HS3Asqggp6yA9djtrCfNC5icr4VsaLfku5nKJQ4t4bLxkGhNmBCejwSA/S09+x9O
+Wu0JX3zR3y+IMczQ+tRGmNiU5qXhCJ4fbQHSeGqIN3Io7h/RR6E/QlJU59RrRG/a
+SjqAV+ECgYEA2mA5VFK3jECnLde+biEaXidIOuBMcqaP0VG6sBwz2wTGSTBE1WkG
+6prCD0McWVAgDTm3MMKxeuMaoW5eEi83+G+CywLaTBpc8Hz7qgRhBpKhRirCfHMW
+EfQV5k32vEGoSI+eG8zcGb9mwDeb/EWXAMGXrx2YuYFu7txtwC2mZXc=
+-----END RSA PRIVATE KEY-----

data/lib/dor/models/describable.rb

@@ -90,20 +90,20 @@ module Dor
 	  end
 
     # returns the desc metadata a relatedItem with information about the collection this object belongs to for use in published mods and mods to DC conversion
-    # @param [Nokogiri::XML::Document] doc Document representing the descriptiveMetadata of the object
+    # @param [Nokogiri::XML::Document] doc A copy of the descriptiveMetadata of the object
     # @note this method modifies the passed in doc
     def add_collection_reference(doc)
-	    if not self.methods.include? :public_relationships
-        return
+	    return unless self.methods.include? :public_relationships
+	    collections=self.public_relationships.search('//rdf:RDF/rdf:Description/fedora:isMemberOfCollection',
+	                                     'fedora' => 'info:fedora/fedora-system:def/relations-external#',
+	                                     'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#' )
+	    return if collections.empty?
+
+	    # Remove any existing collections in the descMetadata
+      doc.search('/mods:mods/mods:relatedItem[@type="host"]/mods:typeOfResource[@collection=\'yes\']', 'mods' => 'http://www.loc.gov/mods/v3').each do |node|
+        node.parent.remove
       end
-	    relationships=self.public_relationships
 
-	    collections=relationships.search('//rdf:RDF/rdf:Description/fedora:isMemberOfCollection','fedora' => 'info:fedora/fedora-system:def/relations-external#', 'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#' 	)
-	    #if there is an existing relatedItem node with type=host and a child typeOfResource @collection=yes dont add anything
-	    existing_node=doc.search('//mods:relatedItem/mods:typeOfResource[@collection=\'yes\']', 'mods' => 'http://www.loc.gov/mods/v3')
-      if(existing_node.length > 0)
-        return
-      end
       collections.each do |collection_node|
         druid=collection_node['rdf:resource']
         druid=druid.gsub('info:fedora/','')

data/lib/dor/models/processable.rb

@@ -224,6 +224,6 @@ module Dor
     end
   end
 
-  
+
 end
 

data/lib/dor/models/publishable.rb

@@ -13,7 +13,7 @@ module Dor
     end
 
     def build_rightsMetadata_datastream(ds)
-      content_ds = self.admin_policy_object.first.datastreams['defaultObjectRights']
+      content_ds = self.admin_policy_object.datastreams['defaultObjectRights']
       ds.dsLabel = 'Rights Metadata'
       ds.ng_xml = content_ds.ng_xml.clone
       ds.content = ds.ng_xml.to_xml

data/lib/dor/services/digital_stacks_service.rb

@@ -22,6 +22,7 @@ module Dor
     # @param [Array<Array<String>>] file_map an array of two string arrays.  Each inner array represents old-file/new-file mappings.  First string is the old file name, second string is the new file name. e.g:
     #   [ ['src1.file', 'dest1.file'], ['src2.file', 'dest2.file'] ]
     def self.rename_in_stacks(id, file_map)
+      return if file_map.nil? or file_map.empty?
       dr = DruidTools::StacksDruid.new id, Config.stacks.local_stacks_root
       content_dir = dr.find_filelist_parent('content', file_map.first.first)
       file_map.each do |src, dest|

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '4.6.2'
+  VERSION = '4.6.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 4.6.2
+  version: 4.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-01 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -610,7 +610,11 @@ files:
 - lib/gsearch/schema.xml
 - lib/tasks/dor.rake
 - lib/tasks/rdoc.rake
+- config/certs/dlss-dev-test.crt
+- config/certs/dlss-dev-test.key
 - config/certs/README
+- config/certs/robots-dor-dev.crt
+- config/certs/robots-dor-dev.key
 - config/config_defaults.yml
 - config/dev_console_env.rb
 - config/dev_console_env.rb.example