dor-services 5.10.3 → 5.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: accbb045e3ba904bf3dc81b237590f1bedc31f77
-  data.tar.gz: b93eb97ff026fbab8d8b94349b52f39a1aebbfa6
+  metadata.gz: 5c643c1a3d63b56fd2e74475941e379a93a7220a
+  data.tar.gz: 7b7f607b5a01f5acf6b3e876e59f9954e4ae0782
 SHA512:
-  metadata.gz: 723c27330bcc8e4dc035dd917f034d117071f81336603ea1ae1f73112890a5dea6c5673b1c96b7d06544ab9b275fd2f2ed4cba1347237ca8bd8dc7c017117907
-  data.tar.gz: 579c25c61ff9c3363875dcf043c382de17b68ff451bd4416779084005e3f75bd740e672e5188eb0739564c9a38e4282337364eff16a899700d39b60fefc57e06
+  metadata.gz: fb4b9b98f90f2b21061f5b563d1574434baa47894f3d8cc0abc2d7fef9e667633272c431198ed75c6d388be8262c6ca1d3274b06f96e31ea3c88fef30bbbed8c
+  data.tar.gz: 66b565537443097f8b2bc32538cad5bffbdc3bb97595dd28cca1cdd2801981c07e936ca73bde863fd8d9ef57a9f673dd877742e289d8bcd93fe40562470b398e

data/config/dev_console_env.rb

@@ -1,86 +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_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 'https://lyberservices-test.stanford.edu'
+    url 'http://sul-lyberservices-test.stanford.edu'
     user 'labware'
     pass 'lyberteam'
   end
-  
-  metadata do
-    exist.url 'http://viewer:l3l%40nd@lyberapps-dev.stanford.edu/exist/rest/'
-    catalog.url 'http://lyberservices-prod.stanford.edu/catalog/mods'
-  end
-  
-  stacks do
-    local_workspace_root '/dor/workspace'
-    document_cache_host 'sul-purl-test.stanford.edu'
-    local_stacks_root '/stacks' 
-    local_document_cache_root '/purl/document_cache'
-  end
-  
-  gsearch.url 'http://127.0.0.1:8080/solr/argo_test'
-  solrizer.url 'http://127.0.0.1:8080/solr/argo_test'
-  workflow.url 'https://lyberservices-test.stanford.edu/workflow/'
-  dor_services.url 'https://dorAdmin:dorAdmin@sul-lyberservices-test.stanford.edu/dor'
 
-  content do
-    sdr_server 'https://sdr-services-test.stanford.edu'
-    sdr_user 'sdrAdmin'
-    sdr_pass 'sdrAdmin'
-  end
+  solr.url 'https://sul-solr-tester.stanford.edu/argo_stage'
+  workflow.url 'https://sul-lyberservices-test.stanford.edu/workflow/'
 
-  cleanup do
-    local_workspace_root '/dor/workspace'
-    local_assembly_root '/dor/assembly'
-    local_export_home '/dor/export'
-  end
+  purl do
+     base_url 'https://purl-test.stanford.edu/'
+   end
 
-  sdr do
-    url 'https://sdrAdmin:sdrAdmin@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'
-    end
-  end
-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
 
-WORKFLOW_URI = 'http://lyberservices-test.stanford.edu/workflow'
+  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
 
-# Constants for Dor::WorkflowService
-# module Dor
-#   CREATE_WORKFLOW = DOR_CREATE_WORKFLOW = true
-#     WF_URI = 'http://lyberservices-test.stanford.edu/workflow'
-#     end
-#
-#     # External application locations
-#     JHOVE_HOME = File.join(ENV['HOME'], 'jhoveToolkit')
-#
+end

data/lib/dor/datastreams/identity_metadata_ds.rb

@@ -40,7 +40,7 @@ class IdentityMetadataDS < ActiveFedora::OmDatastream
     node ? [node['source'], node.text].join(':') : nil
   end
 
-  # @param  [String, Nil] New value, or nil/empty string to delete sourceId node
+  # @param  [String, Nil] value, or nil/empty string to delete sourceId node
   # @return [String, Nil] The same value, as per Ruby convention for assignment operators
   # @note The actual values assigned will have leading/trailing whitespace stripped.
   def sourceId=(value)

data/lib/dor/models/identifiable.rb

@@ -189,17 +189,6 @@ module Dor
         .any?
     end
 
-    # Removes all displayTypes from an item in preparation of adding a new display type
-    # @return Boolean True if displayTypes were removed, False if no displayTypes were removed
-    def remove_displayTypes
-      nodes = identityMetadata.ng_xml.search('//displayType')
-      # NOTE: .each after search is different than normal ruby enumerator:
-      # ~ ng_xml.search('//nonexistant_tag').each(&:foo) == 0
-      # ~ [].each(&:foo) == []
-      nodes.each(&:remove)
-      nodes.any?
-    end
-
     def update_tag(old_tag, new_tag)
       normtag = normalize_tag(old_tag)
       identityMetadata.ng_xml.search('//tag')

data/lib/dor/models/publishable.rb

@@ -33,7 +33,6 @@ module Dor
 
       im = datastreams['identityMetadata'].ng_xml.clone
       im.search('//release').each(&:remove) # remove any <release> tags from public xml which have full history
-      im.root.add_child(release_xml)
 
       pub.add_child(im.root) # add in modified identityMetadata datastream
       pub.add_child(datastreams['contentMetadata'].public_xml.root.clone)
@@ -81,7 +80,7 @@ module Dor
     # When publishing a PURL, we drop a `aa11bb2222` file into the `local_recent_changes` folder
     # to notify other applications watching the filesystem (i.e., purl-fetcher).
     # We also remove any .deletes entry that may have left over from a previous removal
-    # @param [String] `local_recent_changes` usually `/purl/recent_changes`
+    # @param [String] local_recent_changes usually `/purl/recent_changes`
     def publish_notify_on_success(local_recent_changes = Config.stacks.local_recent_changes)
       raise ArgumentError, "Missing local_recent_changes directory: #{local_recent_changes}" unless File.directory?(local_recent_changes)
       id = pid.gsub(/^druid:/, '')

data/lib/dor/models/releaseable.rb

@@ -209,13 +209,12 @@ module Dor
       end
       raise ArgumentError, ':what must be self or collection' unless what_correct
       raise ArgumentError, 'the value set for this tag is not a boolean' if !!tag != tag # rubocop:disable Style/DoubleNegation
-      validate_tag_format(attrs[:tag]) unless attrs[:tag].nil? # Will Raise exception if invalid tag
       true
     end
 
     # Add a release node for the item
     # Will use the current time if timestamp not supplied. You can supply a timestap for correcting history, etc if desired
-    # Timestamp will be calculated by the function, if no displayType is passed in, it will default to file
+    # Timestamp will be calculated by the function
     #
     # @param release [Boolean] True or false for the release node
     # @param attrs [hash]  A hash of any attributes to be placed onto the tag
@@ -223,16 +222,13 @@ module Dor
     # @raise [ArgumentError] Raised if attributes are improperly supplied
     #
     # @example
-    #  item.add_tag(true,:release,{:tag=>'Fitch : Batch2',:what=>'self',:to=>'Searchworks',:who=>'petucket', :displayType='filmstrip'})
+    #  item.add_release_node(true,{:what=>'self',:to=>'Searchworks',:who=>'petucket'})
     def add_release_node(release, attrs = {})
+      allowed_release_attributes=[:what,:to,:who,:when] # any other release attributes sent in will be rejected and not stored
       identity_metadata_ds = identityMetadata
+      attrs.delete_if { |key, value| !allowed_release_attributes.include?(key) }
       attrs[:when] = Time.now.utc.iso8601 if attrs[:when].nil? # add the timestamp
-      attrs[:displayType] = 'file' if attrs[:displayType].nil? # default to file is no display type is passed
       valid_release_attributes(release, attrs)
-
-      # Remove the old displayType and then add the one for this tag
-      remove_displayTypes
-      identity_metadata_ds.add_value(:displayType, attrs[:displayType], {})
       identity_metadata_ds.add_value(:release, release.to_s, attrs)
     end
 
@@ -247,16 +243,8 @@ module Dor
       [:who, :to, :what].each do |check_attr|
         raise ArgumentError, "#{check_attr} not supplied as a String" if attrs[check_attr].class != String
       end
-
-      what_correct = false
-      %w(self collection).each do |allowed_what_value|
-        what_correct = true if attrs[:what] == allowed_what_value
-      end
-      raise ArgumentError, ':what must be self or collection' unless what_correct
-      raise ArgumentError, 'the value set for this tag is not a boolean' if !!tag != tag # rubocop:disable Style/DoubleNegation
-      raise ArgumentError, ':displayType must be passed in as a String' unless attrs[:displayType].class == String
-
-      validate_tag_format(attrs[:tag]) unless attrs[:tag].nil? # Will Raise exception if invalid tag
+      raise ArgumentError, ':what must be self or collection' unless %w(self collection).include? attrs[:what]
+      raise ArgumentError, 'the value set for this tag is not a boolean' unless [true,false].include? tag
       true
     end
 

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '5.10.3'.freeze
+  VERSION = '5.10.4'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 5.10.3
+  version: 5.10.4
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2016-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora