dor-services 4.7.0 → 4.8.0

data/lib/dor/datastreams/administrative_metadata_ds.rb

@@ -1,5 +1,5 @@
 module Dor
-class AdministrativeMetadataDS < ActiveFedora::OmDatastream 
+class AdministrativeMetadataDS < ActiveFedora::OmDatastream
 
   set_terminology do |t|
     t.root :path => 'administrativeMetadata', :index_as => [:not_searchable]
@@ -21,7 +21,7 @@ class AdministrativeMetadataDS < ActiveFedora::OmDatastream
     end
     t.workflow :path => 'registration/workflow'
     t.deposit :index_as => [:not_searchable]
-    
+
     t.accessioning :index_as => [:not_searchable] do
       t.workflow_id :path => 'workflow/@id', :index_as => [:facetable]
     end
@@ -31,14 +31,24 @@ class AdministrativeMetadataDS < ActiveFedora::OmDatastream
       t.harvester
       t.releaseDelayLimit
     end
+    t.defaults do
+      t.initiate_workflow :path => 'initiateWorkflow' do
+        t.lane :path => { :attribute => 'lane' }
+      end
+      t.shelving :path => 'shelving' do
+        t.path :path => { :attribute => 'path'}
+      end
+    end
   end
+
   define_template :default_collection do |xml|
-  xml.administrativeMetadata{
-    xml.registration{
-      xml.collection(:id => '')
+    xml.administrativeMetadata{
+      xml.registration{
+        xml.collection(:id => '')
+      }
     }
-  }
   end
+
   define_template :agreementId do |xml|
     xml.administrativeMetadata {
       xml.registration{
@@ -46,39 +56,64 @@ class AdministrativeMetadataDS < ActiveFedora::OmDatastream
       }
     }
   end
+
   define_template :metadata_format do |xml|
      xml.descMetadata{
        xml.format
      }
-  
-   end
-   define_template :metadata_source do |xml|
-      xml.administrativeMetadata{
+  end
+
+  define_template :metadata_source do |xml|
+    xml.administrativeMetadata{
       xml.descMetadata{
        xml.source
-       }
-     }
+      }
+    }
   end
-   define_template :registration do |xml|
-      xml.administrativeMetadata {
-        xml.registration{
-          xml.workflow(:id=> '')
-        }
+
+  define_template :registration do |xml|
+    xml.administrativeMetadata {
+      xml.registration{
+        xml.workflow(:id=> '')
       }
-    end
-    define_template :default_collection do |xml|
-        xml.administrativeMetadata {
-          xml.registration{
-            xml.collection
-        }
-        }
-      end
-      def self.xml_template
-        Nokogiri::XML::Builder.new do |xml|
-          xml.administrativeMetadata{
-          }
-        end.doc
-      end
+    }
+  end
+
+  define_template :default_collection do |xml|
+    xml.administrativeMetadata {
+      xml.registration{
+        xml.collection
+      }
+    }
+  end
+
+  def self.xml_template
+    Nokogiri::XML::Builder.new do |xml|
+      xml.administrativeMetadata{ }
+    end.doc
+  end
+
+  #################################################################################
+  # Convenience methods to get and set properties
+  # Hides complexity/verbosity of OM TermOperators for simple, non-repeating values
+  #################################################################################
+
+  def default_workflow_lane= lane
+    self.defaults.initiate_workflow.lane = lane
+  end
+
+  def default_workflow_lane
+    self.defaults.initiate_workflow.lane.first
+  end
+
+  def default_shelving_path= path
+    self.defaults.shelving.path = path
+  end
+
+  def default_shelving_path
+    self.defaults.shelving.path.first
+  end
+
 end
 
 end

data/lib/dor/models/governable.rb

@@ -1,4 +1,4 @@
-module Dor  
+module Dor
   module Governable
     extend ActiveSupport::Concern
     include ActiveFedora::Relationships
@@ -13,6 +13,18 @@ module Dor
       self.initialize_workflow(name, 'dor', !self.new_object?)
     end
 
+    # Returns the default lane_id from the item's APO.  Will return 'default' if the item does not have
+    #   and APO, or if the APO does not have a default_lane
+    # @return [String] the lane id
+    def default_workflow_lane
+      return 'default' if self.admin_policy_object.nil?  # TODO log warning?
+
+      admin_md = admin_policy_object.datastreams['administrativeMetadata']
+      lane = admin_md.default_workflow_lane
+      return 'default' if lane.nil? or lane.strip == ''
+      lane
+    end
+
     def reset_to_apo_default()
       rights_metadata_ds = self.rightsMetadata
       #get the apo for this object
@@ -59,7 +71,7 @@ module Dor
           node.add_child(machine_node)
           machine_node.add_child(none_node)
         end
-      end 
+      end
     end
 
     def add_collection(collection_or_druid)
@@ -71,8 +83,8 @@ module Dor
       end
       self.collections << collection
       self.sets << collection
-    end 
-    
+    end
+
     def remove_collection(collection_or_druid)
 
       collection = case collection_or_druid
@@ -117,19 +129,19 @@ module Dor
       ['dor-administrator','dor-apo-manager', 'dor-apo-depositor']
     end
     def groups_which_manage_content
-      ['dor-administrator','dor-apo-manager', 'dor-apo-depositor']    
+      ['dor-administrator','dor-apo-manager', 'dor-apo-depositor']
     end
     def groups_which_manage_rights
       ['dor-administrator','dor-apo-manager', 'dor-apo-depositor']
     end
     def groups_which_manage_embargo
-      ['dor-administrator','dor-apo-manager', 'dor-apo-depositor']    
+      ['dor-administrator','dor-apo-manager', 'dor-apo-depositor']
     end
     def groups_which_view_content
-      ['dor-administrator','dor-apo-manager', 'dor-apo-depositor', 'dor-viewer']    
+      ['dor-administrator','dor-apo-manager', 'dor-apo-depositor', 'dor-viewer']
     end
     def groups_which_view_metadata
-      ['dor-administrator','dor-apo-manager', 'dor-apo-depositor', 'dor-viewer']    
+      ['dor-administrator','dor-apo-manager', 'dor-apo-depositor', 'dor-viewer']
     end
     def intersect arr1, arr2
       return (arr1 & arr2).length > 0

data/lib/dor/models/processable.rb

@@ -114,14 +114,14 @@ module Dor
       end
 
       current_milestones = []
-      #only get steps that are part of accessioning and part of the current version. That can mean they were archived with the current version 
+      #only get steps that are part of accessioning and part of the current version. That can mean they were archived with the current version
       #number, or they might be active (no version number).
       milestones.each do |m|
         if STEPS.keys.include?(m[:milestone]) and (m[:version].nil? or m[:version] == current_version)
           current_milestones << m unless m[:milestone] == 'registered' and current_version.to_i > 1
         end
       end
-      
+
       status_code = 0
       status_time = ''
       #for each milestone in the current version, see if it comes after the current 'last' step, if so, make it the last and record the date/time
@@ -208,6 +208,7 @@ module Dor
 
     # Initilizes workflow for the object in the workflow service
     #  It will set the priorty of the new workflow to the current_priority if it is > 0
+    #  It will set lane_id from the item's APO default workflow lane
     # @param [String] name of the workflow to be initialized
     # @param [String] repo name of the repository to create workflow for
     # @param [Boolean] create_ds create a 'workflows' datastream in Fedora for the object
@@ -215,6 +216,7 @@ module Dor
       priority = workflows.current_priority if priority == 0
       opts = { :create_ds => create_ds }
       opts[:priority] = priority if(priority > 0)
+      opts[:lane_id] = default_workflow_lane
       Dor::WorkflowService.create_workflow(repo, self.pid, name, Dor::WorkflowObject.initial_workflow(name), opts)
     end
 

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '4.7.0'
+  VERSION = '4.8.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 4.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -36,17 +36,23 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.16
+        version: 3.2.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.16
+        version: 3.2.18
 - !ruby/object:Gem::Dependency
   name: confstruct
   requirement: !ruby/object:Gem::Requirement