dor-services 6.0.1 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '07199060c4d04ee110cd61aff79d908be4d75a4c9dc2393519b5a591490b15ea'
-  data.tar.gz: 8b7d431a98aafbad4ea03501ef1bbbc89ca0eee839f4b3d653ff4c97f0dd2c64
+  metadata.gz: e548811519b3b37c921c727cffcab68013bc5efdbcd2f28310c81c6f30f776bb
+  data.tar.gz: b975beadda238cef372cc020bcac83b53bb8de94a158c1f4f3301aeab44fbf0c
 SHA512:
-  metadata.gz: 06ed4c473c5616f84d1beb3b877e0d4d5d860c0a4b13ecc9b91fbc519708392d78bca9a5cdcda31b63e1a9f17f994cd5c1e58f84d15eb72c4e6f05aebbbe46c8
-  data.tar.gz: 7ae86baac69973b6b1fd00ac04b7a9a6e4c4bb8dabc29979656897ff19c7dfc5f51ce8bc77f6683707afb391a27609c770f792b48d0cbe5b2795077db2425441
+  metadata.gz: 120606bd2ab5c52ac8908a15e8402e06675af037cc9a4f2721e15804933cb1faf9ade415b833230b872a42d15e7b22ae8dadd614c1820d62c2e2c2012dc4eede
+  data.tar.gz: 3ac8789d051b8ecdfbc2e558448bb733766dece388580cc952107894114b7f6442883f3bbf714130268ca6adde14df07728c14faa469c9d2295a57864b8d82a8

data/lib/dor/datastreams/workflow_ds.rb

@@ -3,6 +3,7 @@
 module Dor
   # TODO: class docs
   class WorkflowDs < ActiveFedora::OmDatastream
+    before_save :build_location
     set_terminology do |t|
       t.root(:path => 'workflows')
       t.workflow {
@@ -18,6 +19,18 @@ module Dor
       }
     end
 
+    # Called before saving, but after a pid has been assigned
+    def build_location
+      return unless new?
+
+      self.dsLocation = File.join(Dor::Config.workflow.url, "dor/objects/#{pid}/workflows")
+    end
+
+    # Called by rubydora. This lets us customize the mime-type
+    def self.default_attributes
+      super.merge(mimeType: 'application/xml')
+    end
+
     def get_workflow(wf, repo = 'dor')
       xml = Dor::Config.workflow.client.get_workflow_xml(repo, pid, wf)
       xml = Nokogiri::XML(xml)

data/lib/dor/models/concerns/processable.rb

@@ -7,8 +7,11 @@ module Dor
     extend ActiveSupport::Concern
 
     included do
-      has_metadata :name => 'workflows', :type => Dor::WorkflowDs, :label => 'Workflows', :control_group => 'E'
-      after_initialize :set_workflows_datastream_location
+      has_metadata name: 'workflows',
+                   type: Dor::WorkflowDs,
+                   label: 'Workflows',
+                   control_group: 'E',
+                   autocreate: true
     end
 
     # verbiage we want to use to describe an item when it has completed a particular step
@@ -38,17 +41,6 @@ module Dor
       'opened' => 9
     }.freeze
 
-    # 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
-    # .load_instance_from_solr.
-    def set_workflows_datastream_location
-      return if self.respond_to?(:inner_object) && inner_object.is_a?(ActiveFedora::SolrDigitalObject)
-      return unless workflows.new?
-
-      workflows.mimeType   = 'application/xml'
-      workflows.dsLocation = File.join(Dor::Config.workflow.url, "dor/objects/#{pid}/workflows")
-    end
-
     def empty_datastream?(datastream)
       return true if datastream.new?
 

data/lib/dor/services/digital_stacks_service.rb

@@ -108,6 +108,8 @@ module Dor
       unless stacks_pathname.exist?
         stacks_pathname.parent.mkpath
         FileUtils.cp workspace_pathname.to_s, stacks_pathname.to_s
+        # Change permissions
+        FileUtils.chmod 'u=rw,go=r', stacks_pathname.to_s
         return true
       end
       false

data/lib/dor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dor
-  VERSION = '6.0.1'
+  VERSION = '6.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.2
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2018-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora