Merge pull request #100 from TAMULib/3.0.4-upload-resource-openseadragon

Dependency updates, link openseadragon assets, and update production asset build config

Gemfile

@@ -4,15 +4,15 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby '3.1.6'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 6.1'
+gem 'rails', '~> 6.1.7', '>= 6.1.7.8'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3', '~> 1.4'
 # Use Puma as the app server
-gem 'puma', '~> 4.1'
+gem 'puma', '~> 5.0'
 # Use SCSS for stylesheets
 gem 'sass-rails', '>= 6'
 # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
-gem 'webpacker', '~> 4.0'
+gem 'webpacker', '~> 5.0'
 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
 gem 'turbolinks', '~> 5'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
@@ -35,28 +35,26 @@ end
 
 group :development do
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
-  gem 'web-console', '>= 3.3.0'
+  gem 'web-console', '>= 4.1.0'
+  # Display performance information such as SQL time and flame graphs for each request in your browser.
+  # Can be configured to work on production as well see: https://github.com/MiniProfiler/rack-mini-profiler/blob/master/README.md
+  gem 'rack-mini-profiler', '~> 2.0'
 end
 
 group :test do
   # Adds support for Capybara system testing and selenium driver
-  gem 'capybara', '>= 2.15'
-  gem 'selenium-webdriver', '~> 3.142', '>= 3.142.7'
+  gem 'capybara', '>= 3.26'
+  gem 'selenium-webdriver', '>= 4.0.0.rc1'
   # Easy installation and use of web drivers to run system tests with browsers
   gem 'webdrivers'
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data'
-
-gem 'pg'
-
-gem 'devise_saml_authenticatable'
-
-gem 'tinymce-rails'
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 gem 'blacklight', ' ~> 7.0'
 gem 'blacklight-spotlight', ' ~> 3.0.3'
+
 group :development, :test do
   gem 'solr_wrapper', '>= 0.3'
 end
@@ -66,13 +64,19 @@ gem 'bootstrap', '~> 4.0'
 gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
 gem 'jquery-rails'
 gem 'devise'
-gem 'devise-guests', '~> 0.6'
+gem 'devise-guests', '~> 0.8'
 gem 'coffee-rails', '~> 4.2'
 gem 'uglifier', '>= 1.3.0'
 gem 'friendly_id'
+gem 'riiif'
 gem 'sitemap_generator'
 gem 'blacklight-gallery', '~> 1.1'
+gem 'openseadragon', '>= 0.2.0'
 gem 'blacklight-oembed', '~> 1.0'
 gem 'devise_invitable'
 
-gem 'psych', '~> 3.1'
+gem 'devise_saml_authenticatable'
+
+gem 'tinymce-rails'
+
+gem 'pg'

app/assets/config/manifest.js

@@ -1,3 +1,5 @@
 //= link_tree ../images
 //= link_directory ../stylesheets .css
-//= link_directory ../javascripts .js
+//= link_directory ../javascripts .js
+
+//= link openseadragon-assets

app/views/catalog/_index_header.html.erb

@@ -16,7 +16,9 @@
       </span>
     <% end %>
     <%= link_to_document document, counter: counter %>
-    <%= iiif_drag_n_drop get_presentation_manifest document, document_counter %>
+    <% if !document.uploaded_resource? %>
+      <%= iiif_drag_n_drop get_presentation_manifest document, document_counter %>
+    <% end %>
   </h3>
 
   <%= document_actions %>

config/environments/production.rb

@@ -23,8 +23,10 @@
   config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress CSS using a preprocessor.
-  # config.assets.css_compressor = :sass
-  config.assets.js_compressor = :uglifier
+  config.assets.css_compressor = :sass
+  config.assets.js_compressor = Uglifier.new(harmony: true)
+
+  config.assets.debug = false
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false

package.json

@@ -11,7 +11,7 @@
     "react-dom": "^16.13.1",
     "turbolinks": "^5.2.0"
   },
-  "version": "3.0.4-RC1",
+  "version": "3.0.5-RC1",
   "devDependencies": {
     "webpack-dev-server": "^3.11.0"
   }