dor-services 4.22.3 → 4.22.4

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
@@ -43,22 +43,22 @@ module Workflow
     def note          ; @attrs['note']          ; end
     def version       ; @attrs['version']       ; end
     def priority      ; @attrs['priority']      ; end
-    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 completed?    ; status == 'completed' ; end
+    def error?        ; status == 'error'     ; end
+    def waiting?      ; status == 'waiting'   ; end
+    def date_time     ;@attrs['datetime']       ; end
 
     def archived?
       return true if(@attrs['archived'] =~ /true$/i)
-      return false
+      false
     end
 
     def ready?
-      self.waiting? and (not self.prerequisite.nil?) and self.prerequisite.all? { |pr| (prq = self.owner[pr]) && prq.completed? }
+      self.waiting? && (!prerequisite.nil?) && prerequisite.all? { |pr| (prq = 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? && (!prerequisite.nil?) && prerequisite.any? { |pr| (prq = owner[pr]) && (prq.error? || prq.blocked?) }
     end
 
     def state
@@ -83,7 +83,7 @@ module Workflow
       @attrs['elapsed'].nil? ? nil : @attrs['elapsed'].to_f
     end
 
-    def update!(info, new_owner=nil)
+    def update!(info, new_owner = nil)
       @owner = new_owner unless new_owner.nil?
       if info.is_a? Nokogiri::XML::Node
         info = Hash[info.attributes.collect { |k,v| [k,v.value] }]
@@ -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/dor.rake

@@ -24,7 +24,7 @@ task :bump_version, [:level] do |t, args|
   version = version.join('.')
   file_content.sub!(/^(\s*VERSION = )['"](.+)['"]/,"#{declaration}'#{version}'")
   File.open(version_file,'w') { |f| f.write(file_content) }
-  
+
   readme_file = File.expand_path('../../../README.rdoc',__FILE__)
   file_content = File.read(readme_file)
   lines = file_content.lines.to_a

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')) + 
+      yt.files   =  Dir.glob(File.join(project_root, 'lib', '*.rb')) +
                     Dir.glob(File.join(project_root, 'lib', '**', '*.rb')) +
                    [ File.join(project_root, 'README.rdoc') ] +
                    [ File.join(project_root, 'LICENSE') ]
-                   
+
       yt.options = ['--output-dir', doc_destination, '--readme', 'README.rdoc']
     end
   rescue LoadError
@@ -29,4 +29,4 @@ namespace :doc do
     rm_r doc_destination if File.exists?(doc_destination)
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 4.22.3
+  version: 4.22.4
 platform: ruby
 authors:
 - Michael Klein
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -540,7 +540,10 @@ 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
@@ -643,7 +646,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby implmentation of DOR services used by the SULAIR Digital Library