Merge pull request #38 from psu-libraries/add-embargo-option

add fourth embargo option for college of liberal arts

Author: Smullz622

lib/etda_utilities/access_level.rb

@@ -11,7 +11,7 @@ class AccessLevel
     # *** IMPORTANT NOTE ***
     # The order of the keys in this array matter and they should go from least restrictive to most restrictive
     # This is used in the comparison operation (<=>) below
-    ACCESS_LEVEL_KEYS = ['open_access', 'restricted_to_institution', 'restricted', ''].freeze
+    ACCESS_LEVEL_KEYS = ['open_access', 'restricted_to_institution', 'restricted_liberal_arts', 'restricted', ''].freeze
 
     # create instances of each type that can be used
     # OPEN_ACCESS, RESTRICTED, and RESTRICTED_TO_INSTITUTION (graduate only)

lib/etda_utilities/access_levels_for_partners.yml

@@ -8,6 +8,10 @@ graduate:
     restricted_to_institution_attr:
       description_html: Access restricted to individuals having a valid Penn State Access Account, for a period of two years. Allows restricted access of the entire work beginning immediately after degree conferral. At the end of the two-year period, the status will automatically change to Open Access. <i>Intended for use by authors in cases where prior public release of the work may compromise its acceptance for publication.</i> After the conferral of the degree, abstracts for all doctoral dissertations and master's theses, whether Open Access, Restricted (Penn State) or Restricted, become accessible worldwide.
       scope: final_restricted_institution
+    restricted_liberal_arts: 'Restricted (Liberal Arts Only)'
+    restricted_liberal_arts_attr:
+      description_html: 'Immediately after the conferral of the degree, the abstract becomes accessible worldwide. All other parts of the document are restricted to Penn State only for an embargo period of five (5) years for dissertations from the College of the Liberal Arts. No extensions will be granted beyond five (5) years.'
+      scope: final_restricted_liberal_arts
     restricted: 'Restricted'
     restricted_attr:
       description_html: Restricts the entire work for the purpose of filing a patent.  At the end of the two-year period, the status will automatically change to Open Access. Selection of this option requires that an invention disclosure (ID) be filed with the Office of Technology Management (OTM) prior to submission of the final thesis/dissertation, and confirmed by OTM. After the conferral of the degree, abstracts for all doctoral dissertations and master's theses, whether Open Access, Restricted (Penn State) or Restricted, become accessible worldwide.

lib/etda_utilities/etda_file_paths.rb

@@ -4,6 +4,7 @@ module EtdaUtilities
   class EtdaFilePaths
     RESTRICTED_DIR = 'restricted'
     RESTRICTED_INSTITUTION_DIR = 'restricted_institution'
+    RESTRICTED_LIBERAL_ARTS_DIR = 'restricted_liberal_arts'
     OPEN_DIR = 'open_access'
 
     def workflow_base_path
@@ -34,6 +35,10 @@ def explore_psu_only
       "#{explore_base_path}#{RESTRICTED_INSTITUTION_DIR}/"
     end
 
+    def explore_liberal_arts_only
+      "#{explore_base_path}#{RESTRICTED_LIBERAL_ARTS_DIR}/"
+    end
+
     def detailed_file_path(file_id)
       str1 = format("%02d", ((file_id.to_i || 0) % 100))
       str2 = file_id.to_s
@@ -49,6 +54,8 @@ def explore_download_file_path(file_id, access_level, filename)
 
       return explore_psu_only + detailed_file_path(file_id) + filename if access_level == 'restricted_to_institution'
 
+      return explore_liberal_arts_only + detailed_file_path(file_id) + filename if access_level == 'restricted_liberal_arts'
+
       nil
     end
   end

spec/lib/etda_utilities_access_level_spec.rb

@@ -4,7 +4,7 @@
   describe 'AccessLevel' do
     describe '#ACCESS_LEVEL_KEYS' do
       it 'constant containing all access levels' do
-        expect(described_class::ACCESS_LEVEL_KEYS).to contain_exactly('open_access', 'restricted_to_institution', 'restricted', '')
+        expect(described_class::ACCESS_LEVEL_KEYS).to contain_exactly('open_access', 'restricted_to_institution', 'restricted_liberal_arts', 'restricted', '')
       end
     end
 
@@ -19,6 +19,7 @@
         yml_level = described_class.partner_access_levels['access_level']
         expect(yml_level['open_access']).to include('Open Access')
         expect(yml_level['restricted_to_institution']).to include('Restricted (Penn State Only)')
+        expect(yml_level['restricted_liberal_arts']).to include('Restricted (Liberal Arts Only)')
         expect(yml_level['restricted']).to include('Restricted')
       end
     end
@@ -45,6 +46,9 @@
         restricted_to_institution = described_class.new('restricted_to_institution')
         expect(restricted_to_institution.attributes).to eq('Restricted (Penn State Only)')
         expect(restricted_to_institution.current_access_level).to eq('restricted_to_institution')
+        restricted_liberal_arts = described_class.new('restricted_liberal_arts')
+        expect(restricted_liberal_arts.attributes).to eq('Restricted (Liberal Arts Only)')
+        expect(restricted_liberal_arts.current_access_level).to eq('restricted_liberal_arts')
         restricted = described_class.new('restricted')
         expect(restricted.attributes).to eq('Restricted')
         expect(restricted.current_access_level).to eq('restricted')

spec/lib/etda_utilities_etda_file_paths_spec.rb

@@ -72,6 +72,11 @@
         expect(subject.explore_download_file_path(file_id, access_level, filename)).to eq('tmp/restricted_institution/45/345/myfile.pdf')
       end
 
+      it 'returns a path for restricted_liberal_arts records' do
+        access_level = 'restricted_liberal_arts'
+        expect(subject.explore_download_file_path(file_id, access_level, filename)).to eq('tmp/restricted_liberal_arts/45/345/myfile.pdf')
+      end
+
       it 'returns a path for open_access records' do
         access_level = 'open_access'
         expect(subject.explore_download_file_path(file_id, access_level, filename)).to eq('tmp/open_access/45/345/myfile.pdf')