dor-services 9.0.0 → 9.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6975540b2c6651e92c02c37d9a1e95c8915a6ed4e2f8a386f3834850fb3c1df7
-  data.tar.gz: c8da1818b3e04ae27f09a16264e5f13c17e250382a4b5d313b1853b24516108e
+  metadata.gz: 136d61d182d9ce8c75cd211f5b1d76c5a27f7db15811939718ecf4257a025a9b
+  data.tar.gz: ddb8aaab834a7c7c78fe7da5388127bd8978740ac9fa5b59e1b25a34b6c0aca4
 SHA512:
-  metadata.gz: 9a286057bcf87acf81a680afac4973e06073ad620822e54d2b1f5575017380f6f8412b55fc0db54ee7e689194fc13115563976206b6fad48174aeb8a2618c978
-  data.tar.gz: b104f5093f0b5222decc2217e16909bf001615639f165e52dadadd4b6ff654c5de680703529bfdfdad29f079b852a6649e00f09bb53dc442c7139b084ef8cfdc
+  metadata.gz: 904c66a42965b98fa202d6044d2e82557a673f520fb06d011dcc3e40a4d42ed5ccf0eeadf725743066b7087a664da0567a7cf0fb7ea0086e094e40ee4dbada2c
+  data.tar.gz: 73d3fb910e501d6c85e67d32d459f2af338e1373ffaed6dabb3ed00e2245b4e8534753c369cb5882785d065fee6b5e204b5e57a8a7a295b538fd016bcb75e1c8

data/config/config_defaults.yml

@@ -17,8 +17,3 @@ suri:
   url:
   user:
   mint_ids: false
-workflow:
-  url:
-  timeout: 60
-  logfile: workflow_service.log
-  shift_age: weekly

data/lib/dor-services.rb

@@ -47,8 +47,6 @@ module Dor
 
   require 'dor/datastreams/datastream_spec_solrizer'
 
-  require 'druid-tools'
-
   # datastreams
   autoload_under 'datastreams' do
     autoload :AdministrativeMetadataDS

data/lib/dor/datastreams/embargo_metadata_ds.rb

@@ -9,9 +9,14 @@ module Dor
       t.status
       t.embargo_status(path: 'status', index_as: [:symbol])
       t.release_date(path: 'releaseDate', index_as: [:dateable])
-      t.release_access(path: 'releaseAccess')
+      t.release_access(path: 'releaseAccess') do
+        t.use do
+          t.human(attributes: { type: 'useAndReproduction' })
+        end
+      end
       t.twenty_pct_status(path: 'twentyPctVisibilityStatus', index_as: [:symbol])
       t.twenty_pct_release_date(path: 'twentyPctVisibilityReleaseDate')
+      t.use_and_reproduction_statement(proxy: %i[release_access use human])
     end
 
     # Default EmbargoMetadataDS xml

data/lib/dor/models/etd.rb

@@ -12,6 +12,22 @@ module Dor
     has_many :supplemental_files, property: :is_constituent_of, class_name: 'Part'
     has_many :permission_files, property: :is_dependent_of, class_name: 'Part'
 
+    has_attributes :name, :prefix, :suffix, :major, :degree, :advisor, :etd_type,
+                   :title, :abstract, :containscopyright, :copyrightclearance,
+                   :sulicense, :cclicense, :cclicensetype, :embargo,
+                   :external_visibility, :term, :sub, :univid, :sunetid, :ps_career,
+                   :ps_program, :ps_plan, :ps_subplan, :dissertation_id, :provost,
+                   :degreeconfyr, :schoolname, :department, :readerapproval,
+                   :readercomment, :readeractiondttm, :regapproval, :regcomment,
+                   :regactiondttm, :documentaccess, :submit_date, :symphonyStatus,
+                   datastream: 'properties', multiple: false
+
+    has_attributes :citation_verified, :abstract_provided, :dissertation_uploaded,
+                   :supplemental_files_uploaded, :permissions_provided,
+                   :permission_files_uploaded, :rights_selected,
+                   :cc_license_selected, :submitted_to_registrar,
+                   datastream: 'workflow', multiple: false
+
     has_metadata name: 'properties', type: ActiveFedora::SimpleDatastream, versionable: false do |m|
       m.field 'name',  :string                    # PS:name
       m.field 'prefix', :string                   # PS:prefix

data/lib/dor/models/part.rb

@@ -7,6 +7,8 @@ module Dor
     belongs_to :supplemental_file_for, property: :is_constituent_of, class_name: 'Etd' # relationship between supplemental file and parent etd
     belongs_to :permission_file_for, property: :is_dependent_of, class_name: 'Etd' # relationsihip between permission file and parent etd
 
+    has_attributes :file_name, :size, datastream: 'properties', multiple: false
+
     has_metadata name: 'properties', type: ActiveFedora::SimpleDatastream, versionable: false do |m|
       m.field 'file_name', :string
       m.field 'size', :string

data/lib/dor/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 9.0.0
+  version: 9.1.0
 platform: ruby
 authors:
 - Michael Klein
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-14 00:00:00.000000000 Z
+date: 2020-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -220,20 +220,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: druid-tools
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: stanford-mods
   requirement: !ruby/object:Gem::Requirement