dor-services 4.6.6.3 → 4.6.7

data/config/dev_console_env.rb

@@ -27,6 +27,7 @@ Dor::Config.configure do
   end
 
   stacks do
+    document_cache_storage_root '/home/lyberadmin/document_cache'
     document_cache_host 'purl-dev.stanford.edu'
     document_cache_user 'lyberadmin'
     local_workspace_root '/dor/workspace'

data/lib/dor/config.rb

@@ -88,7 +88,7 @@ module Dor
       config[:stomp][:host] ||= URI.parse(config.fedora.url).host rescue nil
 
       [:cert_file, :key_file, :key_pass].each do |key|
-        stack = caller.dup
+        stack = Kernel.caller.dup
         stack.shift while stack[0] =~ %r{(active_support/callbacks|dor/config|dor-services)\.rb}
         if config.fedora[key].present?
           ActiveSupport::Deprecation.warn "Dor::Config -- fedora.#{key.to_s} is deprecated. Please use ssl.#{key.to_s} instead.", stack

data/lib/dor/datastreams/content_metadata_ds.rb

@@ -6,7 +6,6 @@ module Dor
     set_terminology do |t|
       t.root :path => 'contentMetadata', :index_as => [:not_searchable]
       t.contentType :path => '/contentMetadata/@type', :index_as => [:not_searchable]
-      t.stacks :path=> '/contentMetadata/@stacks', :index_as => [:not_searchable]
       t.resource(:index_as => [:not_searchable]) do
         t.id_ :path => { :attribute => 'id' }
         t.sequence :path => { :attribute => 'sequence' }#, :data_type => :integer

data/lib/dor/datastreams/geo2mods.xsl

@@ -3,7 +3,7 @@
      geo2mods.xsl - Transformation from ISO 19139 XML into MODS v3 
      
      
-     Copyright 2013, The Board of Trustees of the Leland Stanford Junior University
+     Copyright 2013-2014, The Board of Trustees of the Leland Stanford Junior University
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@
      http://www.schemacentral.com/sc/niem21/t-gml32_GeometryPropertyType.html
      * purl - e.g., http://purl.stanford.edu/aa111bb2222
      * zipName - e.g., data.zip
-     * format - e.g., MIME type application/x-esri-shapefile
      
      TODO:
      * Series statements may need work?
@@ -41,7 +40,6 @@
   version="1.0" exclude-result-prefixes="gml gmd gco gmi xsl">
   <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
   <xsl:strip-space elements="*"/>
-  <xsl:param name="format" select="'application/x-esri-shapefile'"/>
   <xsl:param name="geometryType"/>
   <xsl:param name="purl"/>
   <xsl:param name="zipName" select="'data.zip'"/>
@@ -51,15 +49,27 @@
        -->
   <xsl:param name="geoformat" select="'MARC255'"/>
   <xsl:param name="fileIdentifier" select="''"/>
+  <xsl:variable name="format">
+    <xsl:choose>
+    <xsl:when test="contains(gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:name, 'Raster Dataset')">
+      <xsl:text>image/tiff</xsl:text>
+    </xsl:when>
+      <xsl:when test="contains(gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:name, 'GeoTIFF')">
+        <xsl:text>image/tiff</xsl:text>
+      </xsl:when>
+      <xsl:when test="contains(gmd:MD_Metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:distributionFormat/gmd:MD_Format/gmd:name, 'Shapefile')">
+        <xsl:text>application/x-esri-shapefile</xsl:text>
+      </xsl:when>
+    </xsl:choose>
+  </xsl:variable>
   <xsl:template match="/">
     <mods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.loc.gov/mods/v3" xmlns:xlink="http://www.w3.org/1999/xlink" version="3.4" xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-4.xsd">
       <xsl:for-each select="/gmi:MI_Metadata|/gmd:MD_Metadata|//gmd:MD_Metadata">
         <xsl:if test="gmd:fileIdentifier/gco:CharacterString/text()">
           <xsl:variable name="fileIdentifier" select="."/>
         </xsl:if>
-        <xsl:if test="gmd:dataSetURI/gco:CharacterString/text()">
-          <xsl:variable name="purl" select="."/>
-        </xsl:if>
+         <xsl:variable name="purl" select="gmd:dataSetURI"/>
+        
         <titleInfo>
           <title>
             <xsl:apply-templates select="gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:title"/>
@@ -153,21 +163,8 @@
             </xsl:choose>
           </dateIssued>
      
-            
-         <!-- kd: construct dateValid from Temporal_EX field? 
-                <xsl:if test="gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement/gmd:EX_TemporalExtent/gmd:extent/gml:TimePeriod">
-               <dateValid>
-               <xsl:attribute name="point">start</xsl:attribute>
-                   
-                   <xsl:value-of select="substring-before(gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement/gmd:EX_TemporalExtent/gmd:extent/gml:TimePeriod/gml:beginPosition, 'T')"/>
-              </dateValid>  
-               <dateValid>
-                   <xsl:attribute name="point">end</xsl:attribute>
-                   <xsl:value-of select="substring-before(gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement/gmd:EX_TemporalExtent/gmd:extent/gml:TimePeriod/gml:endPosition, 'T')"/>
-               </dateValid>  
-           </xsl:if> -->
-            
-            <xsl:for-each select="gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords/gmd:MD_Keywords">
+  
+             <xsl:for-each select="gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords/gmd:MD_Keywords">
                 <xsl:if test="gmd:type/gmd:MD_KeywordTypeCode[@codeListValue='temporal']">
                     <xsl:for-each select="gmd:keyword">
                         
@@ -226,15 +223,10 @@
           <xsl:for-each select="gmd:distributionInfo/gmd:MD_Distribution/gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:transferSize">
             <extent>
               <xsl:value-of select="gco:Real"/>
-              <xsl:choose>
-                <xsl:when test="ancestor-or-self::*/gmd:MD_DigitalTransferOptions/gmd:unitsOfDistribution">
+                <xsl:if test="ancestor-or-self::*/gmd:MD_DigitalTransferOptions/gmd:unitsOfDistribution">
                   <xsl:text> </xsl:text>
                   <xsl:value-of select="ancestor-or-self::*/gmd:MD_DigitalTransferOptions/gmd:unitsOfDistribution"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:text> MB</xsl:text>
-                </xsl:otherwise>
-              </xsl:choose>
+                </xsl:if>
             </extent>
               
             <!-- The digitalOrigin is coded here: 
@@ -506,6 +498,13 @@
                 </title>
               </titleInfo>
               <typeOfResource collection="yes"/>
+              <xsl:if test="gmd:aggregateDataSetName/gmd:CI_Citation/gmd:identifier/gmd:MD_Identifier/gmd:code">
+                <location>
+                  <url>
+                    <xsl:value-of select="gmd:aggregateDataSetName/gmd:CI_Citation/gmd:identifier/gmd:MD_Identifier/gmd:code"/>
+                  </url>
+                </location>
+              </xsl:if>
               <xsl:for-each select="gmd:aggregateDataSetName/gmd:CI_Citation/gmd:citedResponsibleParty/gmd:CI_ResponsibleParty/gmd:organisationName">
                 <xsl:if test="ancestor-or-self::gmd:CI_ResponsibleParty/gmd:role/gmd:CI_RoleCode[@codeListValue='originator']">
                   <name type="corporate">
@@ -547,7 +546,9 @@
                   </edition>
                 </xsl:for-each>
               </originInfo>
-               <xsl:for-each select="gmd:aggregateDataSetName/gmd:CI_Citation/gmd:series/gmd:CI_Series">
+              
+              <!-- series titles / not in use -->
+             <!--  <xsl:for-each select="gmd:aggregateDataSetName/gmd:CI_Citation/gmd:series/gmd:CI_Series">
                       <relatedItem>
                           <xsl:attribute name="type">host</xsl:attribute>
                         <titleInfo>
@@ -562,7 +563,7 @@
                               <issuance>continuing</issuance>
                          </originInfo>
                       </relatedItem>
-                  </xsl:for-each>
+                  </xsl:for-each>  -->
              </relatedItem>
           </xsl:if>
         </xsl:for-each>
@@ -749,9 +750,9 @@
                   <xsl:attribute name="valueURI"><xsl:value-of select="."/></xsl:attribute>
                   <xsl:text>Planning and Cadastral</xsl:text>
                 </xsl:when>
-                <xsl:when test="contains(.,'structural')">
+                <xsl:when test="contains(.,'structure')">
                   <xsl:attribute name="valueURI"><xsl:value-of select="."/></xsl:attribute>
-                  <xsl:text>Structures</xsl:text>
+                  <xsl:text>Structure</xsl:text>
                 </xsl:when>
                 <xsl:when test="contains(.,'transportation')">
                   <xsl:attribute name="valueURI"><xsl:value-of select="."/></xsl:attribute>
@@ -769,13 +770,37 @@
             </topic>
           </subject>
         </xsl:for-each>
-        <!-- TODO: Need a metadata practice for GIS Dataset's Online Resource. -->
+
+ 
+          <location>
+            <url>
+              <xsl:value-of select="$purl"/>
+            </url>
+          </location>
+
         <!-- access rights to be mapped from restrictionCode/otherRestrictions/APO -->
         <xsl:for-each select="gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceConstraints/gmd:MD_LegalConstraints/gmd:otherConstraints">
           <accessCondition type="useAndReproduction">
             <xsl:value-of select=". "/>
           </accessCondition>
         </xsl:for-each>
+          
+          <!-- recordInfo -->
+          
+          
+              <recordInfo>
+                  <recordContentSource>
+                      <xsl:text>Stanford</xsl:text>
+                  </recordContentSource>
+                  <recordIdentifier>
+                      <xsl:value-of select="gmd:fileIdentifier"/>
+                  </recordIdentifier>
+                  <recordOrigin>This record was translated from ISO 19139 to MODS v.3 using an xsl transformation.</recordOrigin>
+                  <languageOfCataloging>
+                      <languageTerm authority="iso639-2b" type="code">eng</languageTerm>
+                  </languageOfCataloging>
+              </recordInfo>
+          
         
         <!-- Output geo extension to MODS -->
         <xsl:if test="gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:geographicElement/gmd:EX_GeographicBoundingBox">
@@ -823,7 +848,7 @@
                           <xsl:value-of select="../../@xlink:href"/>
                         </xsl:attribute>
                         <xsl:attribute name="dc:language">
-                          <xsl:value-of select="../../../../../gmd:language/gmd:LanguageCode"/>
+                          <xsl:value-of select="../../../../../gmd:language/gmd:LanguageCode"/> 
                         </xsl:attribute>
                         <xsl:attribute name="dc:title">
                           <xsl:value-of select="."/>

data/lib/dor/models/describable.rb

@@ -56,9 +56,7 @@ module Dor
       doc = self.descMetadata.ng_xml.dup(1)
       add_collection_reference(doc)
       add_access_conditions(doc)
-      new_doc = Nokogiri::XML(doc.to_xml) { |x| x.noblanks }
-      new_doc.encoding = 'UTF-8'
-      new_doc.to_xml
+      Nokogiri::XML(doc.to_xml) { |x| x.noblanks }.to_xml { |config| config.no_declaration }
 	  end
 
     # Create MODS accessCondition statements from rightsMetadata

data/lib/dor/models/processable.rb

@@ -11,6 +11,33 @@ module Dor
       after_initialize :set_workflows_datastream_location
     end
 
+    #verbiage we want to use to describe an item when it has completed a particular step
+    STATUS_CODE_DISP_TXT = {
+      0 => 'Unknown Status', #if there are no milestones for the current version, someone likely messed up the versioning process.
+      1 => 'Registered',
+      2 => 'In accessioning',
+      3 => 'In accessioning (described)',
+      4 => 'In accessioning (described, published)',
+      5 => 'In accessioning (described, published, deposited)',
+      6 => 'Accessioned',
+      7 => 'Accessioned (indexed)',
+      8 => 'Accessioned (indexed, ingested)',
+      9 => 'Opened'
+    }
+
+    #milestones from accessioning and the order they happen in
+    STEPS = {
+      'registered' => 1,
+      'submitted' => 2,
+      'described' => 3,
+      'published' => 4,
+      'deposited' => 5,
+      'accessioned' => 6,
+      'indexed' => 7,
+      'shelved' => 8,
+      'opened' => 1
+    }
+
     def set_workflows_datastream_location
       # This is a work-around for some strange logic in ActiveFedora that
       # don't allow self.workflows.new? to work if we load the object using
@@ -78,69 +105,49 @@ module Dor
     def milestones
       Dor::WorkflowService.get_milestones('dor',self.pid)
     end
-    def status(include_time=false)
-      current_version='1'
+
+    def status_info()
+      current_version = '1'
       begin
         current_version = self.versionMetadata.current_version_id
       rescue
       end
-      status = 0
-      version = ''
-      #verbage we want to use to describe an item when it has completed a particular step
-      status_hash={
-        0 => 'Unknown Status', #if there are no milestones for the current version, someone likely messed up the versioning process.
-        1 => 'Registered',
-        2 => 'In accessioning',
-        3 => 'In accessioning (described)',
-        4 => 'In accessioning (described, published)',
-        5 => 'In accessioning (described, published, deposited)',
-        6 => 'Accessioned',
-        7 => 'Accessioned (indexed)',
-        8 => 'Accessioned (indexed, ingested)',
-        9 => 'Opened'
-      }
-      #milestones from accesioning and the order they happen in
-      steps={
-        'registered' => 1,
-        'submitted' => 2,
-        'described' => 3,
-        'published' => 4,
-        'deposited' => 5,
-        'accessioned' => 6,
-        'indexed' => 7,
-        'shelved' => 8,
-        'opened' => 1
-      }
-      status_time=nil
-
-      current=false
-      versions=[]
-      result=""
+
       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 number, or they might be active (no version number)
+      #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)
+        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 = 0
+      
+      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
       current_milestones.each do |m|
-        name=m[:milestone]
-        time=m[:at].utc.xmlschema
-        if steps.keys.include? name
-          if steps[name] > status
-            status = steps[name]
-            status_time=time
+        name = m[:milestone]
+        time = m[:at].utc.xmlschema
+        if STEPS.keys.include? name
+          if STEPS[name] > status_code
+            status_code = STEPS[name]
+            status_time = time
           end
         end
       end
+
+      return {:current_version => current_version, :status_code => status_code, :status_time => status_time}
+    end
+
+    def status(include_time=false)
+      status_info_hash = status_info
+      current_version, status_code, status_time = status_info_hash[:current_version], status_info_hash[:status_code], status_info_hash[:status_time]
+
       #use the translation table to get the appropriate verbage for the latest step
-      result='v'+current_version.to_s+' '+status_hash[status].to_s
-      result +=" #{format_date(status_time)}" if include_time
-      result
-  end
+      result = "v#{current_version} #{STATUS_CODE_DISP_TXT[status_code]}"
+      result += " #{format_date(status_time)}" if include_time
+      return result
+    end
 
     def to_solr(solr_doc=Hash.new, *args)
       super(solr_doc, *args)
@@ -210,6 +217,8 @@ module Dor
       opts[:priority] = priority if(priority > 0)
       Dor::WorkflowService.create_workflow(repo, self.pid, name, Dor::WorkflowObject.initial_workflow(name), opts)
     end
+
+
     private
     #handles formating utc date/time to human readable
     def format_date datetime

data/lib/dor/models/publishable.rb

@@ -41,9 +41,7 @@ module Dor
       rels = public_relationships.root
       pub.add_child(rels.clone) unless rels.nil? # TODO: Should never be nil in practice; working around an ActiveFedora quirk for testing
       pub.add_child(self.generate_dublin_core.root.clone)
-      new_pub = Nokogiri::XML(pub.to_xml) { |x| x.noblanks }
-      new_pub.encoding = 'UTF-8'
-      new_pub.to_xml
+      Nokogiri::XML(pub.to_xml) { |x| x.noblanks }.to_xml { |config| config.no_declaration }
     end
 
     # Copies this object's public_xml to the Purl document cache if it is world discoverable

data/lib/dor/models/shelvable.rb

@@ -7,58 +7,21 @@ module Dor
 
     # Push file changes for shelve-able files into the stacks
     def shelve
-      # retrieve the differences between the current contentMetadata and the previously ingested version
-      shelve_diff = get_shelve_diff
-      stacks_object_pathname = get_stacks_location
-      # determine the location of the object's files in the stacks area
-      stacks_druid = DruidTools::StacksDruid.new id, stacks_object_pathname
-      stacks_object_pathname = Pathname(stacks_druid.path)
-      # determine the location of the object's content files in the workspace area
-      workspace_druid = DruidTools::Druid.new(id,Config.stacks.local_workspace_root)
-      workspace_content_pathname = workspace_content_dir(shelve_diff, workspace_druid)
-      # delete, rename, or copy files to the stacks area
-      DigitalStacksService.remove_from_stacks(stacks_object_pathname, shelve_diff)
-      DigitalStacksService.rename_in_stacks(stacks_object_pathname, shelve_diff)
-      DigitalStacksService.shelve_to_stacks(workspace_content_pathname, stacks_object_pathname, shelve_diff)
-    end
-
-    # retrieve the differences between the current contentMetadata and the previously ingested version
-    # (filtering to select only the files that should be shelved to stacks)
-    def get_shelve_diff
       inventory_diff_xml = self.get_content_diff(:shelve)
       inventory_diff = Moab::FileInventoryDifference.parse(inventory_diff_xml)
-      shelve_diff = inventory_diff.group_difference("content")
-      shelve_diff
-    end
+      content_group_diff = inventory_diff.group_difference("content")
+      deltas = content_group_diff.file_deltas
 
-    # Find the location of the object's content files in the workspace area
-    # @param [Moab::FileGroupDifference] content_diff The differences between the current contentMetadata and the previously ingested version
-    # @param [DruidTools::Druid] workspace_druid the location of the object's files in the workspace area
-    # @return [Pathname] The location of the object's content files in the workspace area
-    def workspace_content_dir (content_diff, workspace_druid)
-      deltas = content_diff.file_deltas
-      filelist = deltas[:modified] + deltas[:added] + deltas[:copyadded].collect{|old,new| new}
-      return nil if filelist.empty?
-      content_pathname = Pathname(workspace_druid.find_filelist_parent('content', filelist))
-      content_pathname
-    end
-    
-    
-    # get the stack location based on the contentMetadata stacks attribute 
-    # or using the default value from the config file if it doesn't exist
-    def get_stacks_location
-      
-      contentMetadataDS = self.datastreams['contentMetadata']
-      unless contentMetadataDS.nil? or contentMetadataDS.stacks.length == 0
-        stacks_location = contentMetadataDS.stacks[0]        
-        if stacks_location.start_with?"/"  #Absolute stacks path
-          return stacks_location
-        else        
-          raise "stacks attribute for item: "+self.id+ " contentMetadata should start with /. The current value is "+stacks_location
-        end
-      end      
-      return Config.stacks.local_stacks_root #Default stacks
-       
+      if content_group_diff.rename_require_temp_files(deltas[:renamed])
+        triplets = content_group_diff.rename_tempfile_triplets(deltas[:renamed])
+        DigitalStacksService.rename_in_stacks self.pid, triplets.collect{|old,new,temp| [old,temp]}
+        DigitalStacksService.rename_in_stacks self.pid, triplets.collect{|old,new,temp| [temp,new]}
+      else
+        DigitalStacksService.rename_in_stacks self.pid, deltas[:renamed]
+      end
+      DigitalStacksService.shelve_to_stacks   self.pid, deltas[:modified] + deltas[:added] + deltas[:copyadded].collect{|old,new| new}
+      DigitalStacksService.remove_from_stacks self.pid, deltas[:deleted] + deltas[:copydeleted]
     end
+
   end
 end

data/lib/dor/services/digital_stacks_service.rb

@@ -2,128 +2,42 @@ require 'net/ssh'
 require 'net/sftp'
 
 module Dor
-
   class DigitalStacksService
 
-    # Delete files from stacks that have change type 'deleted', 'copydeleted', or 'modified'
-    # @param [Pathname] stacks_object_pathname the stacks location of the digital object
-    # @param [Moab::FileGroupDifference] content_diff the content file version differences report
-    def self.remove_from_stacks(stacks_object_pathname, content_diff)
-      [:deleted, :copydeleted, :modified].each do |change_type|
-        subset = content_diff.subset(change_type) # {Moab::FileGroupDifferenceSubset}
-        subset.files.each do |moab_file| # {Moab::FileInstanceDifference}
-          moab_signature = moab_file.signatures.first # {Moab::FileSignature}
-          file_pathname = stacks_object_pathname.join(moab_file.basis_path)
-          self.delete_file(file_pathname, moab_signature)
-        end
-      end
-    end
-
-    # Delete a file, but only if it exists and matches the expected signature
-    # @param [Pathname] file_pathname The location of the file to be deleted
-    # @param [Moab::FileSignature] moab_signature The fixity values of the file
-    # @return [Boolean] true if file deleted, false otherwise
-    def self.delete_file(file_pathname, moab_signature)
-      if file_pathname.exist? and (file_pathname.size == moab_signature.size)
-        file_signature = Moab::FileSignature.new.signature_from_file(file_pathname)
-        if (file_signature == moab_signature)
-          file_pathname.delete
-          return true
-        end
-      end
-      return false
-    end
-
-    # Rename files from stacks that have change type 'renamed' using an intermediate temp filename.
-    # The 2-step renaming allows chained or cyclic renames to occur without file collisions.
-    # @param [Pathname] stacks_object_pathname the stacks location of the digital object
-    # @param [Moab::FileGroupDifference] content_diff the content file version differences report
-    def self.rename_in_stacks(stacks_object_pathname, content_diff)
-      subset = content_diff.subset(:renamed) # {Moab::FileGroupDifferenceSubset
-
-      # 1st Pass - rename files from original name to checksum-based name
-      subset.files.each do |moab_file| # {Moab::FileInstanceDifference}
-        moab_signature = moab_file.signatures.first # {Moab::FileSignature}
-        original_pathname = stacks_object_pathname.join(moab_file.basis_path)
-        temp_pathname = stacks_object_pathname.join(moab_signature.checksums.values.last)
-        self.rename_file(original_pathname, temp_pathname, moab_signature)
-      end
-
-      # 2nd Pass - rename files from checksum-based name to new name
-      subset.files.each do |moab_file| # {Moab::FileInstanceDifference}
-        moab_signature = moab_file.signatures.first # {Moab::FileSignature}
-        temp_pathname = stacks_object_pathname.join(moab_signature.checksums.values.last)
-        new_pathname = stacks_object_pathname.join(moab_file.other_path)
-        self.rename_file(temp_pathname, new_pathname, moab_signature)
-      end
-
+    def self.transfer_to_document_store(id, content, filename)
+      druid = DruidTools::PurlDruid.new id, Config.stacks.local_document_cache_root
+      druid.content_dir # create the druid tree if it doesn't exist yet
+      File.open(File.join(druid.content_dir, filename), 'w') {|f| f.write content }
     end
 
-    # Rename a file, but only if it exists and has the expected signature
-    # @param [Pathname] old_pathname The original location/name of the file being renamed
-    # @param [Pathname] new_pathname The new location/name of the file
-    # @param [Moab::FileSignature] moab_signature The fixity values of the file
-    # @return [Boolean] true if file renamed, false otherwise
-    def self.rename_file(old_pathname, new_pathname, moab_signature)
-      if old_pathname.exist? and (old_pathname.size == moab_signature.size)
-        file_signature = Moab::FileSignature.new.signature_from_file(old_pathname)
-        if (file_signature == moab_signature)
-          new_pathname.parent.mkpath
-          old_pathname.rename(new_pathname)
-          return true
-        end
+    def self.remove_from_stacks(id, files)
+      files.each do |file|
+        dr = DruidTools::StacksDruid.new id, Config.stacks.local_stacks_root
+        content = dr.find_content file
+        FileUtils.rm content if content
       end
-      return false
     end
 
-    # Add files to stacks that have change type 'added', 'copyadded' or 'modified'.
-    # @param [Pathname] workspace_content_pathname The dor workspace location of the digital object's content fies
-    # @param [Pathname] stacks_object_pathname the stacks location of the digital object's shelved files
-    # @param [Moab::FileGroupDifference] content_diff the content file version differences report
-    def self.shelve_to_stacks(workspace_content_pathname, stacks_object_pathname, content_diff)
-      return false if workspace_content_pathname.nil?
-      [:added, :copyadded, :modified,].each do |change_type|
-        subset = content_diff.subset(change_type) # {Moab::FileGroupDifferenceSubset
-        subset.files.each do |moab_file| # {Moab::FileInstanceDifference}
-          moab_signature = moab_file.signatures.last # {Moab::FileSignature}
-          filename = (change_type == :modified) ? moab_file.basis_path : moab_file.other_path
-          workspace_pathname = workspace_content_pathname.join(filename)
-          stacks_pathname = stacks_object_pathname.join(filename)
-          self.copy_file(workspace_pathname, stacks_pathname, moab_signature)
-        end
+    # @param [String] id object pid
+    # @param [Array<Array<String>>] file_map an array of two string arrays.  Each inner array represents old-file/new-file mappings.  First string is the old file name, second string is the new file name. e.g:
+    #   [ ['src1.file', 'dest1.file'], ['src2.file', 'dest2.file'] ]
+    def self.rename_in_stacks(id, file_map)
+      return if file_map.nil? or file_map.empty?
+      dr = DruidTools::StacksDruid.new id, Config.stacks.local_stacks_root
+      content_dir = dr.find_filelist_parent('content', file_map.first.first)
+      file_map.each do |src, dest|
+        File.rename(File.join(content_dir, src), File.join(content_dir, dest))
       end
-      true
     end
 
-    # Copy a file to stacks, but only if it does not yet exist with the expected signature
-    # @param [Pathname] workspace_pathname The location of the file in the DOR workspace
-    # @param [Pathname] stacks_pathname The location of the file in the stacks
-    # @param [Moab::FileSignature] moab_signature The fixity values of the file
-    # @return [Boolean] true if file copied, false otherwise
-    def self.copy_file(workspace_pathname, stacks_pathname, moab_signature)
-      if stacks_pathname.exist?
-        file_signature = Moab::FileSignature.new.signature_from_file(stacks_pathname)
-        stacks_pathname.delete if (file_signature != moab_signature)
-      end
-      unless stacks_pathname.exist?
-        stacks_pathname.parent.mkpath
-        FileUtils.cp workspace_pathname.to_s, stacks_pathname.to_s
-        return true
+    def self.shelve_to_stacks(id, files)
+      workspace_druid = DruidTools::Druid.new(id,Config.stacks.local_workspace_root)
+      stacks_druid = DruidTools::StacksDruid.new(id,Config.stacks.local_stacks_root)
+      files.each do |file|
+        stacks_druid.content_dir
+        workspace_file = workspace_druid.find_content(file)
+        FileUtils.cp workspace_file, stacks_druid.content_dir
       end
-      return false
-    end
-
-    ### depricated ???
-
-    # Create a file inside the content directory under the stacks.local_document_cache_root
-    # @param [String] id The druid identifier for the object
-    # @param [String] content The contents of the file to be created
-    # @param [String] filename The name of the file to be created
-    # @return [void]
-    def self.transfer_to_document_store(id, content, filename)
-      druid = DruidTools::PurlDruid.new id, Config.stacks.local_document_cache_root
-      druid.content_dir # create the druid tree if it doesn't exist yet
-      File.open(File.join(druid.content_dir, filename), 'w') { |f| f.write content }
     end
 
     # Assumes the digital stacks storage root is mounted to the local file system

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '4.6.6.3'
+  VERSION = '4.6.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 4.6.6.3
+  version: 4.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -36,7 +36,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.16
   type: :runtime
@@ -44,7 +44,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.16
 - !ruby/object:Gem::Dependency
@@ -134,7 +134,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -142,7 +142,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: om
   requirement: !ruby/object:Gem::Requirement
@@ -342,10 +342,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -353,10 +350,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: druid-tools
   requirement: !ruby/object:Gem::Requirement