etda_utilities 0.18.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b10b643a58edd0dc56a49380d919d0461dcee1fd9c0d3c3d3bdefe4fc2a2e9ed
-  data.tar.gz: cabba43f45679fa74735e9cf7c64c3a0c9554c40c8b08614d6c931f436606c63
+  metadata.gz: e1e6f1fc1ee53eb759df0bac3b41fd77994eea99ead5d98afb6130bbf5466892
+  data.tar.gz: 1541e43f5d8b3a66b0517029e4c879018f33800e654ea37244afc0d22a1b4e3d
 SHA512:
-  metadata.gz: 31ebedf24fc8a06e54ef52130e0e0c7f513871aa057c8b3972566e349edb5e405f0ee41118130146722c353e3a57adfa176244e3426dfe1f8a89b3198a4e3ba5
-  data.tar.gz: 926a4349ae7bb6856d425370115f7823baa47342796c663868d76cef8bf3a0c9e13d89b2adc01da5969ae01fe9186484e3ea600210e44e2920198e4083ce1f0c
+  metadata.gz: 24ae704029023cd7c1a60c63be857897164e457347bdf49f52a9b6128ed689d0904c7465a1e63e27d80d51fcd7edf2dd4aa7b310f1e59febef8b04e2d622898c
+  data.tar.gz: 3184bec04b2da4f405c7807de78d4342299a563983163f7091ed61f26848099d4a55da7cf05460ac0d6f248de5e7f7208e91c7c9a1abf723c36f4a10595b73b8

data/.github/workflows/ruby-ci.yml

@@ -20,7 +20,7 @@ jobs:
         uses: actions/checkout@v2
       # Add or replace dependency steps here
       - name: Install Ruby and gems
-        uses: ruby/setup-ruby@8f312efe1262fb463d906e9bf040319394c18d3e # v1.92
+        uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
       # Add or replace test runners here
@@ -33,11 +33,9 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Install Ruby and gems
-        uses: ruby/setup-ruby@8f312efe1262fb463d906e9bf040319394c18d3e # v1.92
+        uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
       # Add or replace any other lints here
-      - name: Security audit dependencies
-        run: bundle exec bundle-audit
       - name: Lint Ruby files
         run: bundle exec rubocop

data/.rubocop.yml

@@ -160,3 +160,7 @@ Style/BlockDelimiters:
 
 Naming/FileName:
   Exclude:
+
+Style/OptionalBooleanParameter:
+  Exclude:
+  - 'lib/etda_utilities/hosts.rb'

data/.ruby-version

@@ -1 +1 @@
-2.7.4
+3.1.3

data/Gemfile

@@ -11,5 +11,3 @@ gem 'rubocop', require: false
 gem 'rubocop-rspec', require: false
 
 gem 'byebug', require: false
-
-gem 'bundle-audit', require: false

data/Gemfile.lock

@@ -1,25 +1,21 @@
 PATH
   remote: .
   specs:
-    etda_utilities (0.18.0)
+    etda_utilities (0.20.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
-    bundle-audit (0.1.0)
-      bundler-audit
-    bundler-audit (0.6.1)
-      bundler (>= 1.2.0, < 3)
-      thor (~> 0.18)
+    ast (2.4.2)
     byebug (11.1.1)
     diff-lcs (1.3)
-    jaro_winkler (1.5.4)
-    parallel (1.19.1)
-    parser (2.7.0.5)
-      ast (~> 2.4.0)
-    rainbow (3.0.0)
+    json (2.6.3)
+    parallel (1.22.1)
+    parser (3.2.1.1)
+      ast (~> 2.4.1)
+    rainbow (3.1.1)
     rake (13.0.1)
+    regexp_parser (2.7.0)
     rexml (3.2.5)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -34,25 +30,30 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    rubocop (0.80.1)
-      jaro_winkler (~> 1.5.1)
+    rubocop (1.48.1)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      rexml
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.26.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-rspec (1.30.1)
-      rubocop (>= 0.60.0)
-    ruby-progressbar (1.10.1)
-    thor (0.20.3)
-    unicode-display_width (1.6.1)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.27.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.17.1)
+      rubocop (~> 1.41)
+    rubocop-rspec (2.19.0)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
+    ruby-progressbar (1.13.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundle-audit
   bundler (~> 2.3.a)
   byebug
   etda_utilities!

data/README.md

@@ -1,6 +1,6 @@
 # EtdaUtilities
 
-[![Build Status](https://travis-ci.com/psu-stewardship/etda_utilities.svg?token=aQpbqAxsm8KshbvyB24o&branch=master)](https://travis-ci.com/psu-stewardship/etda_utilities)
+![CI](https://github.com/psu-libraries/etda_utilities/actions/workflows/ruby-ci.yml/badge.svg)
 
 Common methods used by etda_workflow and etda_explore
 

data/etda_utilities.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib", "lib/etda_utilities"]
 
+  spec.required_ruby_version = '~> 3.1'
+
   spec.add_development_dependency "bundler", "~> 2.3.a"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/etda_utilities/access_level.rb

@@ -6,6 +6,7 @@ module EtdaUtilities
 
   class AccessLevel
     attr_accessor :attributes
+
     # attr_accessor :current_access_level
     # *** IMPORTANT NOTE ***
     # The order of the keys in this array matter and they should go from least restrictive to most restrictive

data/lib/etda_utilities/access_levels_for_partners.yml

@@ -2,15 +2,15 @@ graduate:
   access_level:
     open_access: Open Access
     open_access_attr:
-      description_html: Allows free worldwide access to the entire work beginning immediately after degree conferral. Appropriate for the majority of dissertation submissions in immediately fulfilling the requirement for making the work available to the public.
+      description_html: 'Allows free worldwide access to the entire work beginning immediately after degree conferral. Appropriate for the majority of dissertation submissions in immediately fulfilling the requirement for making the work available to the public. 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: released_for_publication
     restricted_to_institution: 'Restricted (Penn State Only)'
     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>'
+      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: '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.'
+      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.'
       scope: final_withheld
     no_access: ''
     no_access_attr:

data/lib/etda_utilities/etda_file_paths.rb

@@ -15,29 +15,29 @@ module EtdaUtilities
     end
 
     def workflow_upload_final_files_path
-      workflow_base_path + 'final_submission_files/'
+      "#{workflow_base_path}final_submission_files/"
     end
 
     def workflow_upload_format_review_path
-      workflow_base_path + 'format_review_files/'
+      "#{workflow_base_path}format_review_files/"
     end
 
     def workflow_restricted
-      workflow_base_path + RESTRICTED_DIR + '/'
+      "#{workflow_base_path}#{RESTRICTED_DIR}/"
     end
 
     def explore_open
-      explore_base_path + OPEN_DIR + '/'
+      "#{explore_base_path}#{OPEN_DIR}/"
     end
 
     def explore_psu_only
-      explore_base_path + RESTRICTED_INSTITUTION_DIR + '/'
+      "#{explore_base_path}#{RESTRICTED_INSTITUTION_DIR}/"
     end
 
     def detailed_file_path(file_id)
       str1 = format("%02d", ((file_id.to_i || 0) % 100))
       str2 = file_id.to_s
-      str1 + '/' + str2 + '/'
+      "#{str1}/#{str2}/"
     end
 
     def explore_download_file_path(file_id, access_level, filename)

data/lib/etda_utilities/hosts.rb

@@ -9,7 +9,7 @@ module EtdaUtilities
         else
           raise ArgumentError, "_partner and _host are required arguments" if partner.nil? || host.nil?
 
-          "https://" + new.workflow_submit_host(partner, host)
+          "https://#{new.workflow_submit_host(partner, host)}"
         end
       end
 
@@ -19,7 +19,7 @@ module EtdaUtilities
         else
           raise ArgumentError, "_partner and _host are required arguments" if partner.nil? || host.nil?
 
-          "https://" + new.explore_host(partner, host)
+          "https://#{new.explore_host(partner, host)}"
         end
       end
     end
@@ -56,16 +56,8 @@ module EtdaUtilities
       end
 
       def partner_host(partner)
-        case partner
-        when 'graduate'
-          "etda"
-        when 'honors'
-          "honors"
-        when 'milsch'
-          "millennium-scholars"
-        when 'sset'
-          "sset"
-        end
+        host_hash = { 'graduate' => "etda", 'honors' => "honors", 'milsch' => "millennium-scholars", 'sset' => "sset" }
+        host_hash[partner]
       end
   end
 end

data/lib/etda_utilities/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EtdaUtilities
-  VERSION = "0.18.0"
+  VERSION = "0.20.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etda_utilities
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.20.0
 platform: ruby
 authors:
 - ajk5603@psu.edu
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-15 00:00:00.000000000 Z
+date: 2024-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,7 +65,6 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".ruby-version"
-- ".travis.yml"
 - CODEOWNERS
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -88,24 +87,24 @@ homepage: https://github.com/psu-stewardship/etda_utilities
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 - lib/etda_utilities
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: A gem containing common fuctions for the ETDA applications.
 test_files: []

data/.travis.yml

@@ -1,33 +0,0 @@
-language: ruby
-cache: bundler
-sudo: required
-#rvm:
-#- 2.6.0
-jdk:
-- oraclejdk12
-env:
-  global:
-  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-  - JS=true
-before_install:
-  - "gem --version"
-  - "gem update --system"
-  - "gem --version"
-  - 'gem install bundler -v "$(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -n 1)"'
-script:
-- gem install bundler
-- gem install rspec
-- bundle exec rubocop
-- bundle exec rspec 
-notifications:
-  email:
-    recipients:
-      secure: "l84DQVl48Z4/O/H/zAHFL6GmnBe5BHGQZj2rBv2/X7j1QfOOQEb3h0ZVk5+RdlGLvNjgc8va0sI6JJWa8QuQa68/T6RfcBoZHb90pKOIRoZOVjiwwUYC+mdRMv5s0vemJ2VxreAoJl5JmJ6TLvy5w52G7mmMOm+1VuYPv3MuvZ3nbFwm15qz6LxiRhyUJhaXcZhi1emZYsRd+qazQ9HlkKWMoCz68gi8zWVULnRbZSIHIEj4GV5bn9L67u+699LgIjKrT1Xeh0wnb/wtPIrgwheSksgqYcaRRkBmkaajjss2Zeg5m5hUteTTsx6mSAk3QSTjqVQ0t/Kh5En68W4B/VnA8qiuLolzHqaTqid8sa4rvh/JVAU3zsOvMun5f3OZzdgf7VTXM/E3A+L25KrVTk9UcQnPHcvJvdAIlr0ZZTX2G+3Vs/XSEPQk4KRfLFSqLUm4uYvh9INki7SlB7lllYudSMQzV/5Ghg2K6UaxP9PDRRxOCVPWeYuR3H3tesdBciv+6+d3LxDdAWVbxZwphlGtS5N7NlIl2du888wQ5COaOwSAlXIQWdRvvVfvvQaTTY245jdsiToNX+KSf27bT+szpHyzOaIsT1kO4DAIdSlSxdSK600GsM5RY80iIF92mFc9EjK24WqFZ0PpaSRZ3L4aUvl+HbdS/K4+q1uTCTM="
-    on_success: change
-    on_failure: always
-  irc:
-    channels: 
-    template: 
-
-
-