etd_model 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfab7e22ca2525e8f43727d95434e828b31f28b1
-  data.tar.gz: 60578973a4aba6e139ac5827a16d45f366df6f9c
+  metadata.gz: a2f63693b51ee84e8c60021efb6f4dfa7c7654c2
+  data.tar.gz: 3935b877d02536cd69a183c82c24d94b5ab38663
 SHA512:
-  metadata.gz: b34cd9a37e593ed44a945fd1a641f7639883a2b92a2ed6b0fc2546f2f6b5a271a64c3edc77bb4a36667ef83f574a05f9f02ff1783f3dce078afa816ccb974ce1
-  data.tar.gz: fd2723c261f5c1fe7989177a1400b7bdeb756c719694aa8a3b87c7d31ee0903e14b596a087eb7e5a1bae3aea777717e2e65387850c678fea563ba323983ba137
+  metadata.gz: 4a2cc261f1b7017becb7b9aeb442f61f3a2613e3b6e79b9a7b04c5f22fb6acac92bffb91a40c9bf6c63d089c09a0eef69f60754985ea80f6f15a07a0f95e08fe
+  data.tar.gz: c216498dd298ca08ff4b8006eac4406416d895e24e32262c5cf360e6742ae3b63e4e9d3b253ac18493f0124ebb0b79110d601ab591af7a39c7c13c1fbc445d68

data/lib/etd_model/etd.rb

@@ -4,11 +4,11 @@ module EtdModel
     include Dor::Embargoable
     include Dor::Eventable
 
-    has_many 'parts', :property => :is_part_of
-    has_many 'supplemental_files', :property => :is_constituent_of, class_name: 'EtdModel::Part'
-    has_many 'permission_files', :property => :is_dependent_of, class_name: 'EtdModel::Part'
+    has_many :parts, :property => :is_part_of, class_name: 'Part'
+    has_many :supplemental_files, :property => :is_constituent_of, class_name: 'Part'
+    has_many :permission_files, :property => :is_dependent_of, class_name: 'Part'
 
-    has_metadata :name => 'properties', :type => ActiveFedora::SimpleDatastream do |m|
+    has_metadata :name => 'properties', :type => ActiveFedora::SimpleDatastream, :versionable => false do |m|
       m.field 'name',  :string                    # PS:name
       m.field 'prefix', :string                   # PS:prefix
       m.field 'suffix', :string                   # PS:suffix
@@ -54,7 +54,7 @@ module EtdModel
       m.field 'symphonyStatus', :string
     end
 
-    has_metadata :name => 'workflow', :type => ActiveFedora::SimpleDatastream do |m|
+    has_metadata :name => 'workflow', :type => ActiveFedora::SimpleDatastream, :versionable => false do |m|
       m.field 'citation_verified', :string
       m.field 'abstract_provided', :string
       m.field 'dissertation_uploaded', :string
@@ -66,7 +66,6 @@ module EtdModel
       m.field 'submitted_to_registrar', :string
     end
 
-    has_metadata :name => 'DC', :type => ActiveFedora::QualifiedDublinCoreDatastream do |m|
-    end
+    has_metadata :name => 'DC', type: Dor::SimpleDublinCoreDs, versionable: false, label: 'DC', control_group: 'X'
   end
 end

data/lib/etd_model/part.rb

@@ -1,16 +1,15 @@
 module EtdModel
   class Part < ActiveFedora::Base
-    belongs_to 'parents', :property => :is_part_of, class_name: 'EtdModel::Etd' # relationship between main pdf and parent etd
-    belongs_to 'supplemental_file_for', :property => :is_constituent_of, class_name: 'EtdModel::Etd' # relationship between supplemental file and parent etd
-    belongs_to 'permission_file_for', :property => :is_dependent_of, class_name: 'EtdModel::Etd'  # relationsihip between permission file and parent etd
+    belongs_to :parents, :property => :is_part_of, class_name: 'Etd' # relationship between main pdf and parent etd
+    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_metadata :name => 'properties', :type => ActiveFedora::SimpleDatastream do |m|
+    has_metadata :name => 'properties', :type => ActiveFedora::SimpleDatastream, :versionable => false do |m|
       m.field 'file_name', :string
       m.field 'size', :string
       m.field 'label', :string
     end
 
-    has_metadata :name => 'DC', :type => ActiveFedora::QualifiedDublinCoreDatastream do |m|
-    end
+    has_metadata :name => 'DC', type: Dor::SimpleDublinCoreDs, versionable: false, label: 'DC', control_group: 'X'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: etd_model
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Douglas Kim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2018-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dor-services
@@ -17,14 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.13'
+        version: '5.26'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.13'
+        version: '5.26'
+- !ruby/object:Gem::Dependency
+  name: active-fedora
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '8.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '8.4'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: ETD content model used by the SULAIR Digital Library