dor-services 5.1.1 → 5.2.0

data/lib/dor/workflow/process.rb

@@ -23,8 +23,8 @@ module Workflow
         'batch_limit' => node['batch-limit'] ? node['batch-limit'].to_i : nil,
         'error_limit' => node['error-limit'] ? node['error-limit'].to_i : nil,
         'prerequisite' => node.xpath('prereq').collect { |p|
-          repo = (p['repository'].nil? or p['repository'] == @repo) ? nil : p['repository']
-          wf = (p['workflow'].nil? or p['workflow'] == @workflow) ? nil : p['workflow']
+          repo = (p['repository'].nil? || p['repository'] == @repo) ? nil : p['repository']
+          wf = (p['workflow'].nil? || p['workflow'] == @workflow) ? nil : p['workflow']
           [repo,wf,p.text.to_s].compact.join(':')
         },
         'priority' => node['priority'] ? node['priority'].to_i : 0
@@ -46,19 +46,19 @@ module Workflow
     def completed?    ; self.status == 'completed' ; end
     def error?        ; self.status == 'error'     ; end
     def waiting?      ; self.status == 'waiting'   ; end
-    def date_time     ;@attrs['datetime']       ; end 
+    def date_time     ;@attrs['datetime']       ; end
 
     def archived?
-      return true if(@attrs['archived'] =~ /true$/i)
+      return true if @attrs['archived'] =~ /true$/i
       return false
     end
 
     def ready?
-      self.waiting? and (not self.prerequisite.nil?) and self.prerequisite.all? { |pr| (prq = self.owner[pr]) && prq.completed? }
+      self.waiting? && (!self.prerequisite.nil?) && self.prerequisite.all? { |pr| (prq = self.owner[pr]) && prq.completed? }
     end
 
     def blocked?
-      self.waiting? and (not self.prerequisite.nil?) and self.prerequisite.any? { |pr| (prq = self.owner[pr]) && (prq.error? or prq.blocked?) }
+      self.waiting? && (!self.prerequisite.nil?) && self.prerequisite.any? { |pr| (prq = self.owner[pr]) && (prq.error? || prq.blocked?) }
     end
 
     def state
@@ -92,8 +92,8 @@ module Workflow
     end
 
     def to_hash
-      @attrs.reject { |k,v| v.nil? or v == 0 or (v.respond_to?(:empty?) and v.empty?) }
+      @attrs.reject { |k,v| v.nil? || v == 0 || (v.respond_to?(:empty?) && v.empty?) }
     end
   end
 end
-end
+end

data/lib/tasks/rdoc.rake

@@ -10,11 +10,11 @@ namespace :doc do
     require 'yard/rake/yardoc_task'
 
     YARD::Rake::YardocTask.new(:generate) do |yt|
-      yt.files   =  Dir.glob(File.join(project_root, 'lib', '*.rb')) + 
-                    Dir.glob(File.join(project_root, 'lib', '**', '*.rb')) + ['-']
-                   [ File.join(project_root, 'README.md') ] +
-                   [ File.join(project_root, 'LICENSE') ]
-                   
+      yt.files = Dir.glob(File.join(project_root, 'lib', '*.rb')) +
+                 Dir.glob(File.join(project_root, 'lib', '**', '*.rb')) + ['-'] +
+                [ File.join(project_root, 'README.md') ] +
+                [ File.join(project_root, 'LICENSE') ]
+
       yt.options = ['--output-dir', doc_destination, '--readme', 'README.md']
     end
   rescue LoadError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.2.0
 platform: ruby
 authors:
 - Michael Klein
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -559,19 +559,12 @@ dependencies:
 description: Contains classes to register objects and initialize workflows
 email:
 - mbklein@stanford.edu
-executables:
-- dor-indexer
-- dor-indexerd
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/dor-indexer
-- bin/dor-indexerd
 - 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
 - config/predicate_mappings.yml
 - lib/dor-services.rb
@@ -672,7 +665,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby implmentation of DOR services used by the SULAIR Digital Library

data/bin/dor-indexer

@@ -1,108 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'optparse'
-require 'stomp'
-require 'timeout'
-require 'dor-services'
-
-options = { :log_level => Logger::WARN }
-
-optparse = OptionParser.new do|opts|
-  opts.banner = "Usage: #{File.basename(__FILE__)} [options]"
-
-  options[:dor_config] = nil
-  opts.on( '--dor-config PATH', 'Load the dor-services configuration file at this path' ) do |path|
-    puts "Configuring dor-services..."
-    options[:dor_config] = path
-    require options[:dor_config]
-  end
-
-  options[:destination] = '/topic/fedora.apim.update'
-  opts.on('-d','--destination TOPIC', 'Topic to listen to') do |destination|
-    options[:destination] = destination
-  end
-
-  options[:client_id] = "fedora_stomper"
-  opts.on('-c', '--client-id ID', 'Stomp client ID') do |client_id|
-    Dor::Config.stomp.client_id = client_id
-  end
-  
-  opts.on('-v', 'Verbose') do
-    options[:log_level] -= 1 if options[:log_level] > 0
-  end
-  
-  opts.on('-h', '--help', 'Display this screen') do
-    puts opts
-    exit
-  end
-end
-
-optparse.parse!
-
-begin; require 'rubygems'; rescue; end
-
-unless options[:dor_config]
-  $stderr.puts "The --dor-config PATH option is mandatory. Please provide the path to a valid dor-services configuration file."
-  exit 1
-end
-
-puts "loading listener"
-
-begin
-  @clientid = options[:client_id]
-  @destination = options[:destination]
-
-  
-  @conn = Dor::Config.stomp.connection
-  $stderr.print Time.now.to_s + " Getting output from #{@destination}\n"
-  
-  @conn.subscribe(@destination, {"activemq.subscriptionName" => @clientid, :ack =>"client" })
-  while true
-    
-      begin
-      	Timeout::timeout(300) do
-        	@msg = @conn.receive
-        end
-        if @msg.nil?
-        $stderr.print 'nil message\n'
-        else
-        pid = @msg.headers["pid"]
-        method = @msg.headers["methodName"]
-
-        if ["addDatastream", "addRelationship","ingest","modifyDatastreamByValue","modifyDatastreamByReference","modifyObject","purgeDatastream","purgeRelationship","reindex"].include? method
-          begin
-            obj = Dor.load_instance pid
-            Dor::SearchService.solr.add(obj.to_solr, :add_attributes => {:commitWithin => 10}) unless obj.nil?
-          rescue
-          end
-        elsif method == "purgeObject"
-          Dor::SearchService.solr.delete_by_id(pid)
-        else
-          $stderr.print Time.now.to_s + " Unknown Method: #{method} for PID #{pid}"
-        end
-        $stderr.print Time.now.to_s + " updated solr index for #{pid}\n"
-        @conn.ack @msg.headers["message-id"]
-        end
-      rescue Timeout::Error
-				begin
-					$stderr.print Time.now.to_s +" Sending heartbeat\n"
-					@conn.begin('heartbeat')
-					@conn.commit('heartbeat')
-				rescue Exception => e
-					body = "Unable to send heartbeat to broker\n"
-					body << "\n\nExeption:\n" << he.inspect << "\n" << he.backtrace.join("\n")
-					$stderr.print(Time.now.to_s + " Unable to send heartbeat")
-					$stderr.print(body)
-				end
-			
-	      
-      rescue Exception => e
-        $stderr.print Time.now.to_s + " failed to update solr index for #{pid}: #<#{e.class.name}: #{e.message}>"
-      end
-  end
-  @conn.join
-rescue Exception => e
-p e
-end
-

data/bin/dor-indexerd

@@ -1,73 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'daemons'
-require 'stomp'
-
-banner=<<-EOC
-Usage: #{File.basename(__FILE__)} command --dor-config PATH [options]
-        PATH must point to a valid dor-services configuration file
-Commands:
-        start         start an instance of the application
-        stop          stop all instances of the application
-        restart       stop all instances and restart them afterwards
-        status        show status (PID) of application instances
-Options:
-        --dor-config PATH          Load the dor-services configuration file at this path
-        -d, --destination TOPIC    Topic to listen to (default: /topic/fedora.apim.update)
-        -c, --client-id            Stomp client ID (default: fedora_stomper)
-        -h, --help                 Display this screen
-EOC
-
-
-# check for a valid command
-unless ['start','stop','restart','status'].include? ARGV[0]
-  puts banner
-  exit 7
-end
-
-if ARGV.include?('-h') || ARGV.include?('--help')
-  puts banner
-  exit 0
-end
-
-# Make sure --dor-config was set for the start and restart commands
-if ARGV[0] == 'start' || ARGV[0] == 'restart'
-  unless ARGV[1] == '--dor-config'
-    puts "ERROR: You must --dor-config to specify the path to a valid dor-services gem configuration file"
-    exit 8
-  end
-end
-#4th arg should be --log_dir and 5th is the path.
-log_dir=nil
-if ARGV[3]=='--log_dir'
-log_dir=ARGV[4]
-else
-	puts "Log dir not specified"
-end
-
-
-if log_dir.empty?
-	File.join(Dir.pwd,'log')
-end
-
-
-options = {
-  :multiple=>ARGV.any? { |arg| arg =~ %r{^/queue/}},
-  :dir_mode=>:normal,
-  :dir=>'/tmp',
-  :log_dir=> log_dir,
-  :log_output=>true,
-  :backtrace=>true
-}
-argv_array = []
-argv_array << ARGV[0]
-argv_array << '--'
-ARGV[1..-1].each {|ele| argv_array << ele }
-options[:ARGV] = argv_array
-
-version = '>=0'
-#app = Gem.bin_path('dor-services','dor-indexer',version)
-app = File.expand_path('../dor-indexer',__FILE__)
-Daemons.run(app,options)
-

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

@@ -1,29 +0,0 @@
------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

@@ -1,27 +0,0 @@
------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/config/dev_console_env.rb

@@ -1,78 +0,0 @@
-cert_dir = File.join(File.dirname(__FILE__), "certs")
-
-Dor::Config.configure do
-
-  ssl do
-    cert_file File.join(cert_dir,"robots-dor-dev.crt")
-    key_file  File.join(cert_dir,"robots-dor-dev.key")
-    key_pass  ''
-  end
-  
-  suri do
-    mint_ids true
-    id_namespace 'druid'
-    url 'https://lyberservices-dev.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
-    document_cache_host 'purl-dev.stanford.edu'
-    local_stacks_root         '/stacks'
-    local_document_cache_root '/purl/document_cache'
-    local_workspace_root      '/dor/workspace'
-  end
- 
-  solrizer.url     'http://sul-solr.stanford.edu/solr/argo_test'
-  fedora.url       'https://sul-dor-test.stanford.edu/fedora'
-  workflow.url     'https://lyberservices-dev.stanford.edu/workflow/'
-  dor_services.url 'https://dorAdmin:dorAdmin@sul-lyberservices-dev.stanford.edu/dor'
-
-  cleanup do
-    local_workspace_root '/dor/workspace'
-    local_export_home    '/dor/export'
-  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
-
-  accessioning_robot_sleep_time 30
-
-end
-
-
-#WORKFLOW_URI = 'http://lyberservices-test.stanford.edu/workflow'
-
-# 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')