Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

2023-03-06 updates #22

Merged
merged 2 commits into from
Mar 7, 2023
Merged

2023-03-06 updates #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a94fcf
Removes DHCL; refactors loading location labels
niquerio Mar 6, 2023
7cdbdfc
ruby updates
niquerio Mar 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Create .env file
run: cat .env-example .env-dev-values > .env
- name: Load .env file
uses: xom9ikk/dotenv@v1.0.2
- name: Set up Ruby 3.1
uses: xom9ikk/dotenv@v2
- name: Set up Ruby 3.2
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.1'
ruby-version: '3.2'
bundler-cache: true
env:
BUNDLE_RUBYGEMS__PKG__GITHUB__COM: ${{secrets.GH_PACKAGE_READ_TOKEN}}
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG RUBY_VERSION=3.1
ARG RUBY_VERSION=3.2
FROM ruby:${RUBY_VERSION}

ARG BUNDLER_VERSION=2.3.26
ARG BUNDLER_VERSION=2.4.7
ARG NPM_VERSION="latest"
ARG UNAME=app
ARG UID=1000
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.prod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG RUBY_VERSION=3.1
ARG RUBY_VERSION=3.2
FROM ruby:${RUBY_VERSION}

ARG BUNDLER_VERSION=2.3.26
ARG BUNDLER_VERSION=2.4.7
ARG NPM_VERSION="latest"
ARG UNAME=app
ARG UID=1000
Expand Down
32 changes: 16 additions & 16 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ GEM
byebug (11.1.3)
climate_control (1.2.0)
coderay (1.1.3)
concurrent-ruby (1.2.0)
concurrent-ruby (1.2.2)
crack (0.4.5)
rexml
date (3.3.3)
Expand All @@ -32,14 +32,14 @@ GEM
faraday-follow_redirects (0.3.0)
faraday (>= 1, < 3)
faraday-net_http (3.0.2)
faraday-retry (2.0.0)
faraday-retry (2.1.0)
faraday (~> 2.0)
ffi (1.15.5)
hashdiff (1.0.1)
hashie (5.0.0)
http-2-next (0.5.1)
httpclient (2.8.3)
httpx (0.22.3)
httpx (0.22.4)
http-2-next (>= 0.4.1)
i18n (1.12.0)
concurrent-ruby (~> 1.0)
Expand All @@ -61,7 +61,7 @@ GEM
net-smtp
method_source (1.0.0)
mini_mime (1.1.2)
minitest (5.17.0)
minitest (5.18.0)
multi_json (1.15.0)
mustermann (3.0.0)
ruby2_keywords (~> 0.0.1)
Expand All @@ -79,7 +79,7 @@ GEM
hashie (>= 3.4.6)
rack (>= 2.2.3)
rack-protection
omniauth_openid_connect (0.6.0)
omniauth_openid_connect (0.6.1)
omniauth (>= 1.9, < 3)
openid_connect (~> 1.1)
openid_connect (1.4.2)
Expand All @@ -94,7 +94,7 @@ GEM
validate_url
webfinger (~> 1.2)
parallel (1.22.1)
parser (3.2.0.0)
parser (3.2.1.0)
ast (~> 2.4.1)
prometheus-client (2.1.0)
pry (0.14.2)
Expand All @@ -104,9 +104,9 @@ GEM
byebug (~> 11.0)
pry (>= 0.13, < 0.15)
public_suffix (5.0.1)
puma (6.0.2)
puma (6.1.1)
nio4r (~> 2.0)
rack (2.2.6.2)
rack (2.2.6.3)
rack-oauth2 (1.21.3)
activesupport
attr_required
Expand All @@ -121,7 +121,7 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
regexp_parser (2.6.2)
regexp_parser (2.7.0)
rexml (3.2.5)
rspec (3.12.0)
rspec-core (~> 3.12.0)
Expand All @@ -146,13 +146,13 @@ GEM
rubocop-ast (>= 1.24.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.24.1)
parser (>= 3.1.1.0)
rubocop-ast (1.27.0)
parser (>= 3.2.1.0)
rubocop-performance (1.15.2)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
ruby-next-core (0.15.3)
ruby-progressbar (1.11.0)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
simplecov (0.22.0)
docile (~> 1.1)
Expand All @@ -173,16 +173,16 @@ GEM
tilt (~> 2.0)
sinatra-flash (0.3.0)
sinatra (>= 1.0.0)
standard (1.23.0)
standard (1.24.3)
language_server-protocol (~> 3.17.0.2)
rubocop (= 1.44.1)
rubocop-performance (= 1.15.2)
swd (1.3.0)
activesupport (>= 3)
attr_required (>= 0.0.5)
httpclient (>= 2.4)
tilt (2.0.11)
timeout (0.3.1)
tilt (2.1.0)
timeout (0.3.2)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.4.2)
Expand Down Expand Up @@ -249,4 +249,4 @@ DEPENDENCIES
yabeda-puma-plugin

BUNDLED WITH
2.3.26
2.4.7
1 change: 0 additions & 1 deletion config/pickup_location_labels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Labels for dropdown list of pickup locations
AAEL: Art, Architecture, & Engineering Library
DHCL: Donald Hall Collection
FINE: Fine Arts
MUSM: Museums
MUSIC: Music Library
Expand Down
3 changes: 2 additions & 1 deletion models/options/media_booking.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
class Option
class MediaBooking < Option
PICKUP_LOCATIONS = YAML.load_file("./config/pickup_location_labels.yml")
def self.match?(patron:, item:)
patron.can_book? && item.bookable?
end
Expand Down Expand Up @@ -77,7 +78,7 @@ def booked_dates
end

def pickup_locations
YAML.load_file("./config/pickup_location_labels.yml").to_a.map do |code, display|
PICKUP_LOCATIONS.map do |code, display|
OpenStruct.new(code: code, display: display)
end
end
Expand Down