From a8dcfcdf317835eca08cbbdb22b8aab8fff4c27d Mon Sep 17 00:00:00 2001 From: wkdewey Date: Sun, 2 Jun 2024 18:00:45 -0500 Subject: [PATCH 1/5] bump ruby version to one supported by my Mac --- .ruby-version | 2 +- Gemfile | 4 +- Gemfile.lock | 229 +++++++++++++++++++++++++------------------------- 3 files changed, 119 insertions(+), 116 deletions(-) diff --git a/.ruby-version b/.ruby-version index 711ee4f..97ceee1 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.1.3 \ No newline at end of file +3.1.5 \ No newline at end of file diff --git a/Gemfile b/Gemfile index 7501ad8..75f1041 100644 --- a/Gemfile +++ b/Gemfile @@ -1,12 +1,12 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '3.1.3' +ruby '3.1.5' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 6.1.7' # Use sqlite3 as the database for Active Record -gem 'sqlite3' +gem 'sqlite3', '~> 1.4' # Use Puma as the app server gem 'puma', '~> 3.11' # Use SCSS for stylesheets diff --git a/Gemfile.lock b/Gemfile.lock index efd9bf9..06298e2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/CDRH/orchid - revision: 843cc49859ce753ae8c20bbe6531de6208febcf7 + revision: a051ae6a43808a8515011685f2d8ed3d3d5566e8 branch: local_testing specs: orchid (3.1.1) @@ -9,84 +9,85 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (6.1.7.2) - actionpack (= 6.1.7.2) - activesupport (= 6.1.7.2) + actioncable (6.1.7.7) + actionpack (= 6.1.7.7) + activesupport (= 6.1.7.7) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.2) - actionpack (= 6.1.7.2) - activejob (= 6.1.7.2) - activerecord (= 6.1.7.2) - activestorage (= 6.1.7.2) - activesupport (= 6.1.7.2) + actionmailbox (6.1.7.7) + actionpack (= 6.1.7.7) + activejob (= 6.1.7.7) + activerecord (= 6.1.7.7) + activestorage (= 6.1.7.7) + activesupport (= 6.1.7.7) mail (>= 2.7.1) - actionmailer (6.1.7.2) - actionpack (= 6.1.7.2) - actionview (= 6.1.7.2) - activejob (= 6.1.7.2) - activesupport (= 6.1.7.2) + actionmailer (6.1.7.7) + actionpack (= 6.1.7.7) + actionview (= 6.1.7.7) + activejob (= 6.1.7.7) + activesupport (= 6.1.7.7) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.7.2) - actionview (= 6.1.7.2) - activesupport (= 6.1.7.2) + actionpack (6.1.7.7) + actionview (= 6.1.7.7) + activesupport (= 6.1.7.7) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7.2) - actionpack (= 6.1.7.2) - activerecord (= 6.1.7.2) - activestorage (= 6.1.7.2) - activesupport (= 6.1.7.2) + actiontext (6.1.7.7) + actionpack (= 6.1.7.7) + activerecord (= 6.1.7.7) + activestorage (= 6.1.7.7) + activesupport (= 6.1.7.7) nokogiri (>= 1.8.5) - actionview (6.1.7.2) - activesupport (= 6.1.7.2) + actionview (6.1.7.7) + activesupport (= 6.1.7.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.7.2) - activesupport (= 6.1.7.2) + activejob (6.1.7.7) + activesupport (= 6.1.7.7) globalid (>= 0.3.6) - activemodel (6.1.7.2) - activesupport (= 6.1.7.2) - activerecord (6.1.7.2) - activemodel (= 6.1.7.2) - activesupport (= 6.1.7.2) - activestorage (6.1.7.2) - actionpack (= 6.1.7.2) - activejob (= 6.1.7.2) - activerecord (= 6.1.7.2) - activesupport (= 6.1.7.2) + activemodel (6.1.7.7) + activesupport (= 6.1.7.7) + activerecord (6.1.7.7) + activemodel (= 6.1.7.7) + activesupport (= 6.1.7.7) + activestorage (6.1.7.7) + actionpack (= 6.1.7.7) + activejob (= 6.1.7.7) + activerecord (= 6.1.7.7) + activesupport (= 6.1.7.7) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7.2) + activesupport (6.1.7.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.8.1) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) archive-zip (0.12.0) io-like (~> 0.3.0) - autoprefixer-rails (10.4.13.0) + autoprefixer-rails (10.4.16.0) execjs (~> 2) + base64 (0.2.0) bindex (0.8.1) - bootsnap (1.16.0) + bootsnap (1.18.3) msgpack (~> 1.2) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) builder (3.2.4) byebug (11.1.3) - capybara (3.38.0) + capybara (3.40.0) addressable matrix mini_mime (>= 0.1.3) - nokogiri (~> 1.8) + nokogiri (~> 1.11) rack (>= 1.6.0) rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) @@ -101,105 +102,107 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.2.2) + concurrent-ruby (1.3.1) crass (1.0.6) - date (3.3.3) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) + date (3.3.4) + domain_name (0.6.20240107) erubi (1.12.0) - execjs (2.8.1) - ffi (1.15.5) - globalid (1.1.0) - activesupport (>= 5.0) + execjs (2.9.1) + ffi (1.17.0-x86_64-darwin) + globalid (1.2.1) + activesupport (>= 6.1) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) - i18n (1.12.0) + i18n (1.14.5) concurrent-ruby (~> 1.0) io-like (0.3.1) - jbuilder (2.11.5) + jbuilder (2.12.0) actionview (>= 5.0.0) activesupport (>= 5.0.0) - jquery-rails (4.5.1) + jquery-rails (4.6.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - listen (3.8.0) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.19.1) + loofah (2.22.0) crass (~> 1.0.2) - nokogiri (>= 1.5.9) + nokogiri (>= 1.12.0) mail (2.8.1) mini_mime (>= 0.1.1) net-imap net-pop net-smtp - marcel (1.0.2) + marcel (1.0.4) matrix (0.4.2) - method_source (1.0.0) - mime-types (3.4.1) + method_source (1.1.0) + mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2023.0218.1) - mini_mime (1.1.2) - minitest (5.18.0) - msgpack (1.6.1) - net-imap (0.3.4) + mime-types-data (3.2024.0507) + mini_mime (1.1.5) + minitest (5.23.1) + msgpack (1.7.2) + net-imap (0.4.12) date net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.2.1) + net-protocol (0.2.2) timeout - net-smtp (0.3.3) + net-smtp (0.5.0) net-protocol netrc (0.11.0) - nio4r (2.5.8) - nokogiri (1.14.2-x86_64-darwin) + nio4r (2.7.3) + nokogiri (1.16.5-x86_64-darwin) racc (~> 1.4) - public_suffix (5.0.1) + public_suffix (5.0.5) puma (3.12.6) - racc (1.6.2) - rack (2.2.6.3) - rack-test (2.0.2) + racc (1.8.0) + rack (2.2.9) + rack-test (2.1.0) rack (>= 1.3) - rails (6.1.7.2) - actioncable (= 6.1.7.2) - actionmailbox (= 6.1.7.2) - actionmailer (= 6.1.7.2) - actionpack (= 6.1.7.2) - actiontext (= 6.1.7.2) - actionview (= 6.1.7.2) - activejob (= 6.1.7.2) - activemodel (= 6.1.7.2) - activerecord (= 6.1.7.2) - activestorage (= 6.1.7.2) - activesupport (= 6.1.7.2) + rails (6.1.7.7) + actioncable (= 6.1.7.7) + actionmailbox (= 6.1.7.7) + actionmailer (= 6.1.7.7) + actionpack (= 6.1.7.7) + actiontext (= 6.1.7.7) + actionview (= 6.1.7.7) + activejob (= 6.1.7.7) + activemodel (= 6.1.7.7) + activerecord (= 6.1.7.7) + activestorage (= 6.1.7.7) + activesupport (= 6.1.7.7) bundler (>= 1.15.0) - railties (= 6.1.7.2) + railties (= 6.1.7.7) sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.5.0) - loofah (~> 2.19, >= 2.19.1) - railties (6.1.7.2) - actionpack (= 6.1.7.2) - activesupport (= 6.1.7.2) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (6.1.7.7) + actionpack (= 6.1.7.7) + activesupport (= 6.1.7.7) method_source rake (>= 12.2) thor (~> 1.0) - rake (13.0.6) + rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) - regexp_parser (2.7.0) + regexp_parser (2.9.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.5) + rexml (3.2.8) + strscan (>= 3.0.9) rubyzip (2.3.2) sassc (2.4.0) ffi (~> 1.9) @@ -209,7 +212,8 @@ GEM sprockets (> 3.0) sprockets-rails tilt - selenium-webdriver (4.8.1) + selenium-webdriver (4.21.1) + base64 (~> 0.2) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -217,40 +221,39 @@ GEM spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) spring (>= 1.2, < 3.0) - sprockets (4.2.0) + sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.6.1-x86_64-darwin) - thor (1.2.1) - tilt (2.1.0) - timeout (0.3.2) + sqlite3 (1.7.3-x86_64-darwin) + strscan (3.1.0) + thor (1.3.1) + tilt (2.3.0) + timeout (0.4.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.2) - web-console (4.2.0) + web-console (4.2.1) actionview (>= 6.0.0) activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - websocket (1.2.9) - websocket-driver (0.7.5) + websocket (1.2.10) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.7) + zeitwerk (2.6.15) PLATFORMS x86_64-darwin-19 x86_64-darwin-22 + x86_64-darwin-23 DEPENDENCIES bootsnap (>= 1.1.0) @@ -270,13 +273,13 @@ DEPENDENCIES selenium-webdriver spring spring-watcher-listen (~> 2.0.0) - sqlite3 + sqlite3 (~> 1.4) tzinfo-data uglifier (>= 1.3.0) web-console (>= 3.3.0) RUBY VERSION - ruby 3.1.3p185 + ruby 3.1.5p252 BUNDLED WITH 2.2.28 From 1779319c3673464f42da893956d0d0c3bdd37fc3 Mon Sep 17 00:00:00 2001 From: William Dewey Date: Fri, 4 Oct 2024 16:03:40 -0500 Subject: [PATCH 2/5] add citations to figures and monasteries --- app/views/items/_citation.html.erb | 9 +++++++++ app/views/monasteries/items/_show_metadata.html.erb | 11 +++++++++++ .../religious_figures/items/_show_metadata.html.erb | 11 +++++++++++ 3 files changed, 31 insertions(+) create mode 100644 app/views/items/_citation.html.erb diff --git a/app/views/items/_citation.html.erb b/app/views/items/_citation.html.erb new file mode 100644 index 0000000..1ca1ddd --- /dev/null +++ b/app/views/items/_citation.html.erb @@ -0,0 +1,9 @@ + +

+ <% if author && publisher != "BDRC" %> + <% lastname = author.split(" ").last %> + <% firstname = author.split(" ")[0..-1].join(" ") %> + <%= lastname %>, <%= firstname %>. + <% end %> + "<%= title %>." <%= publisher %>, <%= Date.parse(date).year %>, <%= link_to nil, page_url %>. Accessed <%= accessed %> +

\ No newline at end of file diff --git a/app/views/monasteries/items/_show_metadata.html.erb b/app/views/monasteries/items/_show_metadata.html.erb index 837cb08..12537c5 100644 --- a/app/views/monasteries/items/_show_metadata.html.erb +++ b/app/views/monasteries/items/_show_metadata.html.erb @@ -40,4 +40,15 @@ <% end %> <% end %> +

Citation

+ <% Array.wrap(@res["citation"]).each_with_index do |citation, idx| %> + <%= render partial: "citation", locals: { + author: @res["creator"]["name"], + title: citation["name"], + date: citation["date"], + publisher: citation["publisher"], + page_url: @res["rights_uri"][idx], + accessed: @res["date_accessed_k"] + } %> + <% end %> diff --git a/app/views/religious_figures/items/_show_metadata.html.erb b/app/views/religious_figures/items/_show_metadata.html.erb index e500078..6ad5dde 100644 --- a/app/views/religious_figures/items/_show_metadata.html.erb +++ b/app/views/religious_figures/items/_show_metadata.html.erb @@ -51,4 +51,15 @@ <% end %> <% end %> +

Citation

+ <% Array.wrap(@res["citation"]).each_with_index do |citation, idx| %> + <%= render partial: "citation", locals: { + author: @res["creator"]["name"], + title: citation["name"], + date: citation["date"], + publisher: citation["publisher"], + page_url: @res["rights_uri"][idx], + accessed: @res["date_accessed_k"] + } %> + <% end %> From e150e8e73b382a93e32ee88dc450c8f1ef478ccf Mon Sep 17 00:00:00 2001 From: William Dewey Date: Fri, 4 Oct 2024 16:11:16 -0500 Subject: [PATCH 3/5] update Orchid branch --- Gemfile.lock | 141 ++++++++++++++++++++++++++------------------------- 1 file changed, 73 insertions(+), 68 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 06298e2..7e302c1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,68 +1,68 @@ GIT remote: https://github.com/CDRH/orchid - revision: a051ae6a43808a8515011685f2d8ed3d3d5566e8 + revision: 2b4a9e3afc0b2c6ca571f984e3010869e716b2a8 branch: local_testing specs: orchid (3.1.1) - rails (~> 6.1.7) + rails (> 6.1.7) GEM remote: https://rubygems.org/ specs: - actioncable (6.1.7.7) - actionpack (= 6.1.7.7) - activesupport (= 6.1.7.7) + actioncable (6.1.7.8) + actionpack (= 6.1.7.8) + activesupport (= 6.1.7.8) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.7) - actionpack (= 6.1.7.7) - activejob (= 6.1.7.7) - activerecord (= 6.1.7.7) - activestorage (= 6.1.7.7) - activesupport (= 6.1.7.7) + actionmailbox (6.1.7.8) + actionpack (= 6.1.7.8) + activejob (= 6.1.7.8) + activerecord (= 6.1.7.8) + activestorage (= 6.1.7.8) + activesupport (= 6.1.7.8) mail (>= 2.7.1) - actionmailer (6.1.7.7) - actionpack (= 6.1.7.7) - actionview (= 6.1.7.7) - activejob (= 6.1.7.7) - activesupport (= 6.1.7.7) + actionmailer (6.1.7.8) + actionpack (= 6.1.7.8) + actionview (= 6.1.7.8) + activejob (= 6.1.7.8) + activesupport (= 6.1.7.8) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.7.7) - actionview (= 6.1.7.7) - activesupport (= 6.1.7.7) + actionpack (6.1.7.8) + actionview (= 6.1.7.8) + activesupport (= 6.1.7.8) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7.7) - actionpack (= 6.1.7.7) - activerecord (= 6.1.7.7) - activestorage (= 6.1.7.7) - activesupport (= 6.1.7.7) + actiontext (6.1.7.8) + actionpack (= 6.1.7.8) + activerecord (= 6.1.7.8) + activestorage (= 6.1.7.8) + activesupport (= 6.1.7.8) nokogiri (>= 1.8.5) - actionview (6.1.7.7) - activesupport (= 6.1.7.7) + actionview (6.1.7.8) + activesupport (= 6.1.7.8) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.7.7) - activesupport (= 6.1.7.7) + activejob (6.1.7.8) + activesupport (= 6.1.7.8) globalid (>= 0.3.6) - activemodel (6.1.7.7) - activesupport (= 6.1.7.7) - activerecord (6.1.7.7) - activemodel (= 6.1.7.7) - activesupport (= 6.1.7.7) - activestorage (6.1.7.7) - actionpack (= 6.1.7.7) - activejob (= 6.1.7.7) - activerecord (= 6.1.7.7) - activesupport (= 6.1.7.7) + activemodel (6.1.7.8) + activesupport (= 6.1.7.8) + activerecord (6.1.7.8) + activemodel (= 6.1.7.8) + activesupport (= 6.1.7.8) + activestorage (6.1.7.8) + actionpack (= 6.1.7.8) + activejob (= 6.1.7.8) + activerecord (= 6.1.7.8) + activesupport (= 6.1.7.8) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7.7) + activesupport (6.1.7.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -81,7 +81,7 @@ GEM bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) - builder (3.2.4) + builder (3.3.0) byebug (11.1.3) capybara (3.40.0) addressable @@ -102,19 +102,20 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.3.1) + concurrent-ruby (1.3.4) crass (1.0.6) date (3.3.4) domain_name (0.6.20240107) - erubi (1.12.0) + erubi (1.13.0) execjs (2.9.1) + ffi (1.17.0-arm64-darwin) ffi (1.17.0-x86_64-darwin) globalid (1.2.1) activesupport (>= 6.1) http-accept (1.7.0) http-cookie (1.0.6) domain_name (~> 0.5) - i18n (1.14.5) + i18n (1.14.6) concurrent-ruby (~> 1.0) io-like (0.3.1) jbuilder (2.12.0) @@ -142,9 +143,9 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2024.0507) mini_mime (1.1.5) - minitest (5.23.1) + minitest (5.25.1) msgpack (1.7.2) - net-imap (0.4.12) + net-imap (0.4.16) date net-protocol net-pop (0.1.2) @@ -155,28 +156,30 @@ GEM net-protocol netrc (0.11.0) nio4r (2.7.3) - nokogiri (1.16.5-x86_64-darwin) + nokogiri (1.16.7-arm64-darwin) + racc (~> 1.4) + nokogiri (1.16.7-x86_64-darwin) racc (~> 1.4) public_suffix (5.0.5) puma (3.12.6) - racc (1.8.0) + racc (1.8.1) rack (2.2.9) rack-test (2.1.0) rack (>= 1.3) - rails (6.1.7.7) - actioncable (= 6.1.7.7) - actionmailbox (= 6.1.7.7) - actionmailer (= 6.1.7.7) - actionpack (= 6.1.7.7) - actiontext (= 6.1.7.7) - actionview (= 6.1.7.7) - activejob (= 6.1.7.7) - activemodel (= 6.1.7.7) - activerecord (= 6.1.7.7) - activestorage (= 6.1.7.7) - activesupport (= 6.1.7.7) + rails (6.1.7.8) + actioncable (= 6.1.7.8) + actionmailbox (= 6.1.7.8) + actionmailer (= 6.1.7.8) + actionpack (= 6.1.7.8) + actiontext (= 6.1.7.8) + actionview (= 6.1.7.8) + activejob (= 6.1.7.8) + activemodel (= 6.1.7.8) + activerecord (= 6.1.7.8) + activestorage (= 6.1.7.8) + activesupport (= 6.1.7.8) bundler (>= 1.15.0) - railties (= 6.1.7.7) + railties (= 6.1.7.8) sprockets-rails (>= 2.0.0) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) @@ -185,9 +188,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (6.1.7.7) - actionpack (= 6.1.7.7) - activesupport (= 6.1.7.7) + railties (6.1.7.8) + actionpack (= 6.1.7.8) + activesupport (= 6.1.7.8) method_source rake (>= 12.2) thor (~> 1.0) @@ -224,13 +227,14 @@ GEM sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) + sprockets-rails (3.5.2) + actionpack (>= 6.1) + activesupport (>= 6.1) sprockets (>= 3.0.0) + sqlite3 (1.7.3-arm64-darwin) sqlite3 (1.7.3-x86_64-darwin) strscan (3.1.0) - thor (1.3.1) + thor (1.3.2) tilt (2.3.0) timeout (0.4.1) tzinfo (2.0.6) @@ -248,9 +252,10 @@ GEM websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.15) + zeitwerk (2.6.18) PLATFORMS + arm64-darwin-23 x86_64-darwin-19 x86_64-darwin-22 x86_64-darwin-23 From c3bf5190df630acf8bc9a1099cc3741d905a395c Mon Sep 17 00:00:00 2001 From: William Dewey Date: Fri, 11 Oct 2024 15:22:58 -0500 Subject: [PATCH 4/5] hide data accessed if not provided fixes #39 --- app/views/items/_citation.html.erb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/items/_citation.html.erb b/app/views/items/_citation.html.erb index 1ca1ddd..4742a44 100644 --- a/app/views/items/_citation.html.erb +++ b/app/views/items/_citation.html.erb @@ -5,5 +5,8 @@ <% firstname = author.split(" ")[0..-1].join(" ") %> <%= lastname %>, <%= firstname %>. <% end %> - "<%= title %>." <%= publisher %>, <%= Date.parse(date).year %>, <%= link_to nil, page_url %>. Accessed <%= accessed %> + "<%= title %>." <%= publisher %>, <%= Date.parse(date).year %>, <%= link_to nil, page_url %>. + <% if accessed %> + Accessed <%= accessed %> + <% end %>

\ No newline at end of file From afda8383323fc61eb2cbd677f2764f058d6aea4f Mon Sep 17 00:00:00 2001 From: wkdewey Date: Tue, 15 Oct 2024 21:21:38 -0500 Subject: [PATCH 5/5] add notes about licensing of source material --- config/locales/en.yml | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index d503aaa..6a78af5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -33,34 +33,7 @@ en: # it's recommended that you override it in your config/locales files. If your about # page is more involved, please override the about.html.erb template entirely contents_html: |- -

To edit the contents of this page, please open config/locales/en.yml - and alter "contents_html", - or override about.html.erb in your local application.

-

And now, a few words from Star Trek:

-

Damage report! Now we know what they mean by 'advanced' tactical - training. Is it my imagination, or have tempers become a little frayed on - the ship lately? - You did exactly what you had to do. You considered all your options, you - tried every alternative and then you made the hard choice. - In all trust, there is the possibility for betrayal. Earl Grey tea, - watercress sandwiches... and Bularian canapés? Are you up for promotion? - Wait a minute - you've been declared dead. You can't give orders around - here. Some days you get the bear, and some days the bear gets you. - Maybe if we felt any human loss as keenly as we feel one of those close - to us, human history would be far less bloody.

-

The Enterprise computer system is controlled by three primary main - processor cores, cross-linked with a redundant melacortz ramistat, - fourteen kiloquad interface modules. - Well, that's certainly good to know. Well, I'll say this for him - he's - sure of himself. Maybe we better talk out here; the observation lounge - has turned into a swamp. - A lot of things can change in twelve years, Admiral. Computer, belay that - order. Congratulations - you just destroyed the Enterprise. - Ensign Babyface! Did you come here for something in particular or just - general Riker-bashing? Fear is the true enemy, the only enemy. - I will obey your orders. I will serve this ship as First Officer. And in - an attack against the Enterprise, I will die with this crew. But I will - not break my oath of loyalty to Starfleet.

+

Copyright

This site makes extensive use of metadata from BDRC and Treasury of Lives. Both of these organizations have released into the public domain under the CC0 license. See Treasury of Live's terms of use and BDRC entries which note that their metadata has been released as CC0. (However, Treasury of Lives biographies are copyright of the owners and cannot be reproduced without permission.)

########## # BROWSE #