Merge remote-tracking branch 'origin/master' into develop

sul-dlss-deprecated · Feb 18, 2016 · 6acbb88 · 6acbb88
2 parents 97a93ee + 79df76c
commit 6acbb88
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -117,11 +117,6 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 24
 
-# Offense count: 60
-# Configuration parameters: AllowURI, URISchemes.
-Metrics/LineLength:
-  Max: 6121
-
 # Offense count: 89
 # Configuration parameters: CountComments.
 Metrics/MethodLength:

diff --git a/lib/dor/datastreams/workflow_ds.rb b/lib/dor/datastreams/workflow_ds.rb
@@ -1,15 +1,14 @@
 module Dor
   # TODO: class docs
   class WorkflowDs < ActiveFedora::OmDatastream
-
     set_terminology do |t|
       t.root(:path => 'workflows')
       t.workflow {
         t.workflowId( :path => {:attribute => 'id'} )
         t.process {
           t.name_(    :path => {:attribute => 'name'     }, :index_as => [:displayable, :not_searchable] )
           t.status(   :path => {:attribute => 'status'   }, :index_as => [:displayable, :not_searchable] )
-          t.timestamp(:path => {:attribute => 'datetime' }, :index_as => [:displayable, :not_searchable] ) # , :data_type => :date)
+          t.timestamp(:path => {:attribute => 'datetime' }, :index_as => [:displayable, :not_searchable] ) #, :data_type => :date)
           t.elapsed(  :path => {:attribute => 'elapsed'  }, :index_as => [:displayable, :not_searchable] )
           t.lifecycle(:path => {:attribute => 'lifecycle'}, :index_as => [:displayable, :not_searchable] )
           t.attempts( :path => {:attribute => 'attempts' }, :index_as => [:displayable, :not_searchable] )
@@ -24,7 +23,7 @@ def get_workflow(wf, repo = 'dor')
       Workflow::Document.new(xml.to_s)
     end
 
-    alias_method :[], :get_workflow
+    alias :[] :get_workflow
 
     def ng_xml
       @ng_xml ||= Nokogiri::XML::Document.parse(content)