dor-services 4.6.6.1 → 4.6.6.2

data/lib/dor/datastreams/content_metadata_ds.rb

@@ -6,6 +6,7 @@ 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/models/shelvable.rb

@@ -9,8 +9,9 @@ module Dor
     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, Config.stacks.local_stacks_root
+      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)
@@ -41,6 +42,23 @@ module Dor
       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
+       
+    end
   end
 end

data/lib/dor/services/digital_stacks_service.rb

@@ -106,6 +106,7 @@ module Dor
         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
       end

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '4.6.6.1'
+  VERSION = '4.6.6.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 4.6.6.1
+  version: 4.6.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -342,7 +342,10 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.5.0
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -350,7 +353,10 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.5.0
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: druid-tools
   requirement: !ruby/object:Gem::Requirement