merged dev into master

benwbrum · Sep 11, 2019 · 12fe380 · 12fe380
2 parents 583519a + 5c4238f
commit 12fe380
Show file tree

Hide file tree

Showing 56 changed files with 1,878 additions and 349 deletions.
diff --git a/.coveralls.yml b/.coveralls.yml
@@ -0,0 +1 @@
+service_name: travis-ci
diff --git a/Gemfile b/Gemfile
@@ -6,7 +6,7 @@ gem 'rails', '4.1.2'
 gem 'will_paginate'
 #gem 'rmagick', '2.13.2', require: "RMagick"
 gem 'rmagick'
-gem 'nokogiri', '~> 1.8.1'
+gem 'nokogiri'
 gem 'oai', git: 'https://github.com/mispy/ruby-oai.git'
 gem 'capistrano', '~> 3.4.0'
 gem 'capistrano-rails', '= 1.1.3'
@@ -41,6 +41,8 @@ gem 'iiif-presentation', git: 'https://github.com/benwbrum/osullivan', branch: '
 gem 'omniauth-saml'
 gem 'omniauth-google-oauth2'
 
+gem 'rack-reverse-proxy', :require => 'rack/reverse_proxy'
+
 group :assets do
   gem 'therubyracer'
   gem 'uglifier'
@@ -52,6 +54,7 @@ group :test do
   gem 'shoulda'
   gem 'webmock', require: false
   gem 'vcr'
+  gem 'coveralls', require: false
 end
 
 group :development, :test do
@@ -65,7 +68,7 @@ group :development, :test do
   gem 'binding_of_caller' # goes with better_errors
   # Supporting gem for RailsPanel
   # https://github.com/dejan/rails_panel
-  gem 'meta_request'
+  gem 'bullet'
 end
 
 # Use SASS for stylesheets
@@ -89,3 +92,13 @@ gem 'friendly_id'
 #support right to left languages
 gem 'rtl'
 gem 'iso-639'
+
+# Quiet asset lines in log files
+gem 'quiet_assets', '~> 1.1.0', group: :development
+
+# Profiling for use in prod
+gem 'flamegraph'
+gem 'memory_profiler'
+gem 'meta_request'
+gem 'rack-mini-profiler'
+gem 'stackprof'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -88,6 +88,9 @@ GEM
       debug_inspector (>= 0.0.1)
     browser (2.5.3)
     builder (3.2.3)
+    bullet (6.0.2)
+      activesupport (>= 3.0.0)
+      uniform_notifier (~> 1.11)
     byebug (11.0.1)
     callsite (0.0.11)
     capistrano (3.4.1)
@@ -116,6 +119,12 @@ GEM
       mime-types (>= 1.16)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
+    coveralls (0.8.23)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.16.1)
+      term-ansicolor (~> 1.3)
+      thor (>= 0.19.4, < 2.0)
+      tins (~> 1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     database_cleaner (1.7.0)
@@ -133,6 +142,7 @@ GEM
       devise (>= 2.1.0)
       railties (>= 3.0)
     diff-lcs (1.3)
+    docile (1.3.2)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     errbase (0.1.1)
@@ -149,6 +159,7 @@ GEM
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
     ffi (1.11.1)
+    flamegraph (0.9.5)
     friendly_id (5.2.5)
       activerecord (>= 4.0.0)
     geocoder (1.5.1)
@@ -176,6 +187,7 @@ GEM
     mail (2.5.5)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    memory_profiler (0.9.14)
     meta_request (0.7.0)
       callsite (~> 0.0, >= 0.0.11)
       rack-contrib (>= 1.1, < 3)
@@ -230,11 +242,20 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.10)
     public_suffix (3.1.0)
+    quiet_assets (1.1.0)
+      railties (>= 3.1, < 5.0)
     rack (1.5.5)
     rack-attack (5.4.2)
       rack (>= 1.0, < 3)
     rack-contrib (1.8.0)
       rack (~> 1.4)
+    rack-mini-profiler (1.0.2)
+      rack (>= 1.2.0)
+    rack-proxy (0.6.5)
+      rack
+    rack-reverse-proxy (0.12.0)
+      rack (>= 1.0.0)
+      rack-proxy (~> 0.6, >= 0.6.1)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.1.2)
@@ -329,6 +350,11 @@ GEM
     shoulda-context (1.2.2)
     shoulda-matchers (3.1.3)
       activesupport (>= 4.0.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     slim (3.0.9)
       temple (>= 0.7.6, < 0.9)
       tilt (>= 1.3.3, < 2.1)
@@ -343,13 +369,17 @@ GEM
     sshkit (1.18.2)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
+    stackprof (0.2.12)
     temple (0.8.1)
+    term-ansicolor (1.7.1)
+      tins (~> 1.0)
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
     thor (0.20.3)
     thread_safe (0.3.6)
     tilt (2.0.9)
+    tins (1.21.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
@@ -360,6 +390,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.6)
+    uniform_notifier (1.12.1)
     user_agent_parser (2.5.1)
     uuidtools (2.1.5)
     vcr (5.0.0)
@@ -386,26 +417,30 @@ DEPENDENCIES
   autoprefixer-rails (~> 8)
   better_errors
   binding_of_caller
+  bullet
   capistrano (~> 3.4.0)
   capistrano-bundler (~> 1.1.2)
   capistrano-rails (= 1.1.3)
   capybara
   capybara-webkit
   carrierwave
+  coveralls
   database_cleaner
   devise (= 3.4.1)
   devise-encryptable
   devise_masquerade
   factory_bot_rails
+  flamegraph
   friendly_id
   gravatar_image_tag
   iiif-presentation!
   iso-639
   jquery-rails
   launchy
+  memory_profiler
   meta_request
   mysql2 (= 0.3.21)
-  nokogiri (~> 1.8.1)
+  nokogiri
   oai!
   omeka_client!
   omniauth-google-oauth2
@@ -414,6 +449,9 @@ DEPENDENCIES
   pry
   pry-awesome_print
   pry-byebug
+  quiet_assets (~> 1.1.0)
+  rack-mini-profiler
+  rack-reverse-proxy
   rails (= 4.1.2)
   recaptcha
   render_anywhere
@@ -427,6 +465,7 @@ DEPENDENCIES
   savon (~> 2.12.0)
   shoulda
   slim (~> 3.0.0)
+  stackprof
   therubyracer
   uglifier
   vcr

diff --git a/app/assets/stylesheets/components/layout.scss b/app/assets/stylesheets/components/layout.scss
@@ -49,35 +49,35 @@
 }
 
 .footer {
-  left: 0;
+  display: flex;
+  box-sizing: border-box;
+  position: absolute;
   bottom: 0;
   width: 100%;
   color: $footerFg;
-  text-align: left;
   padding: $gapSize;
-  position: absolute;
-  vertical-align: top;
-  display: inline-block;
   background: $footerBg;
-  height: $footerHeight;
-  box-sizing: border-box;
-  &_copyright {
-    float: left;
-  }
-  &_nav {
-    float: right;
-    a {
-      text-decoration: none !important;
-      display: block;
-      font-size: $fontSizeBig;
-      line-height: 30px;
-    }
-  }
-  a {
-    color: inherit;
-    text-decoration: underline;
-    &:hover { color: lighten($footerFg, 20); }
-  }
+}
+
+.footer ul {
+  margin: 0;
+  padding: 0;
+}
+
+.footer_nav li {
+  margin-right: 0.4em;
+  display: inline;
+}
+
+.footer_copyright {
+  flex: auto;
+  text-align: right;
+}
+
+.footer_nav li a, .footer_copyright a {
+  color: inherit;
+  text-decoration: underline;
+  &:hover { color: lighten($footerFg, 20); }
 }
 
 .wrapper {

diff --git a/app/assets/stylesheets/sections/page.scss b/app/assets/stylesheets/sections/page.scss
@@ -210,8 +210,7 @@
     box-shadow: none;
   }
   textarea, div.editarea {
-    height: calc(100% - 50px);
-    margin-top: 45px;
+    height: 100%;
     resize: none;
     padding: $gapSize / 2;
   }

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,4 +1,11 @@
 class ApplicationController < ActionController::Base
+
+  before_action do
+    if current_user && current_user.admin
+      Rack::MiniProfiler.authorize_request
+    end
+  end
+
   before_filter :load_objects_from_params
   before_filter :update_ia_work_server
   before_filter :update_omeka_urls