Commit 2 changes from Amelia Johnson

site/Gemfile

@@ -1,20 +1,9 @@
-# If you do not have OpenSSL installed, update
-# the following line to use "http://" instead
 source 'https://rubygems.org'
 
-gem "middleman", "~>3.3.12"
+gem 'middleman', '~> 4.2'
+gem 'middleman-autoprefixer', '~> 2.7'
+gem 'tzinfo-data', platforms: [:mswin, :mingw, :jruby]
+gem 'wdm', '~> 0.1', platforms: [:mswin, :mingw]
+gem 'middleman-deploy', '~> 2.0.0.pre.alpha'
+gem 'middleman-syntax'
 
-# Live-reloading plugin
-gem "middleman-livereload", "~> 3.1.0"
-
-# For faster file watcher updates on Windows:
-gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
-
-# Windows does not come with time zone data
-gem "tzinfo-data", platforms: [:mswin, :mingw, :jruby]
-
-# Provides some nice extensions such as code highlighting
-gem "middleman-syntax"
-
-# Extension for deploying site over ssh
-gem 'middleman-deploy', '~> 1.0'

site/Gemfile.lock

@@ -1,146 +1,124 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.10)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
+    activesupport (5.0.7)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
-    chunky_png (1.3.4)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    autoprefixer-rails (8.6.5)
+      execjs
+    backports (3.11.4)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1.1)
-    compass (1.0.3)
-      chunky_png (~> 1.2)
-      compass-core (~> 1.0.2)
-      compass-import-once (~> 1.0.5)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      sass (>= 3.3.13, < 3.5)
-    compass-core (1.0.3)
-      multi_json (~> 1.0)
-      sass (>= 3.3.0, < 3.5)
+    coffee-script-source (1.12.2)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    em-websocket (0.5.1)
-      eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
+    concurrent-ruby (1.0.5)
+    contracts (0.13.0)
+    dotenv (2.5.0)
     erubis (2.7.0)
-    eventmachine (1.0.7)
-    execjs (2.5.2)
-    ffi (1.9.8)
-    haml (4.0.6)
+    execjs (2.7.0)
+    fast_blank (1.0.0)
+    fastimage (2.1.3)
+    ffi (1.9.25)
+    haml (5.0.4)
+      temple (>= 0.8.0)
       tilt
-    hike (1.2.3)
-    hitimes (1.2.2)
-    hooks (0.4.0)
-      uber (~> 0.0.4)
-    http_parser.rb (0.6.0)
+    hamster (3.0.0)
+      concurrent-ruby (~> 1.0)
+    hashie (3.6.0)
     i18n (0.7.0)
-    json (1.8.3)
-    kramdown (1.7.0)
-    listen (2.10.0)
-      celluloid (~> 0.16.0)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    middleman (3.3.12)
+    kramdown (1.17.0)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    memoist (0.16.0)
+    middleman (4.2.1)
       coffee-script (~> 2.2)
-      compass (>= 1.0.0, < 2.0.0)
       compass-import-once (= 1.0.5)
-      execjs (~> 2.0)
       haml (>= 4.0.5)
       kramdown (~> 1.2)
-      middleman-core (= 3.3.12)
-      middleman-sprockets (>= 3.1.2)
+      middleman-cli (= 4.2.1)
+      middleman-core (= 4.2.1)
       sass (>= 3.4.0, < 4.0)
-      uglifier (~> 2.5)
-    middleman-core (3.3.12)
-      activesupport (~> 4.1.0)
+    middleman-autoprefixer (2.9.0)
+      autoprefixer-rails (~> 8.0)
+      middleman-core (>= 3.3.3)
+    middleman-cli (4.2.1)
+      thor (>= 0.17.0, < 2.0)
+    middleman-core (4.2.1)
+      activesupport (>= 4.2, < 5.1)
+      addressable (~> 2.3)
+      backports (~> 3.6)
       bundler (~> 1.1)
+      contracts (~> 0.13.0)
+      dotenv
       erubis
-      hooks (~> 0.3)
+      execjs (~> 2.0)
+      fast_blank
+      fastimage (~> 2.0)
+      hamster (~> 3.0)
+      hashie (~> 3.4)
       i18n (~> 0.7.0)
-      listen (>= 2.7.9, < 3.0)
-      padrino-helpers (~> 0.12.3)
-      rack (>= 1.4.5, < 2.0)
-      rack-test (~> 0.6.2)
-      thor (>= 0.15.2, < 2.0)
-      tilt (~> 1.4.1, < 2.0)
-    middleman-deploy (1.0.0)
+      listen (~> 3.0.0)
+      memoist (~> 0.14)
+      padrino-helpers (~> 0.13.0)
+      parallel
+      rack (>= 1.4.5, < 3)
+      sass (>= 3.4)
+      servolux
+      tilt (~> 2.0)
+      uglifier (~> 3.0)
+    middleman-deploy (2.0.0.pre.alpha)
       middleman-core (>= 3.2)
       net-sftp
       ptools
-    middleman-livereload (3.1.1)
-      em-websocket (>= 0.2.0)
-      middleman-core (>= 3.0.2)
-      multi_json (~> 1.0)
-      rack-livereload
-    middleman-sprockets (3.4.2)
-      middleman-core (>= 3.3)
-      sprockets (~> 2.12.1)
-      sprockets-helpers (~> 1.1.0)
-      sprockets-sass (~> 1.3.0)
-    middleman-syntax (2.0.0)
-      middleman-core (~> 3.2)
-      rouge (~> 1.0)
-    minitest (5.7.0)
-    multi_json (1.11.0)
+    middleman-syntax (3.0.0)
+      middleman-core (>= 3.2)
+      rouge (~> 2.0)
+    minitest (5.11.3)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.2)
-    padrino-helpers (0.12.5)
+    net-ssh (5.0.2)
+    padrino-helpers (0.13.3.4)
       i18n (~> 0.6, >= 0.6.7)
-      padrino-support (= 0.12.5)
-      tilt (~> 1.4.1)
-    padrino-support (0.12.5)
+      padrino-support (= 0.13.3.4)
+      tilt (>= 1.4.1, < 3)
+    padrino-support (0.13.3.4)
       activesupport (>= 3.1)
-    ptools (1.3.2)
-    rack (1.6.1)
-    rack-livereload (0.3.15)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rb-fsevent (0.9.5)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    rouge (1.9.0)
-    sass (3.4.14)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-helpers (1.1.0)
-      sprockets (~> 2.0)
-    sprockets-sass (1.3.1)
-      sprockets (~> 2.0)
-      tilt (~> 1.1)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tilt (1.4.1)
-    timers (4.0.1)
-      hitimes
-    tzinfo (1.2.2)
+    parallel (1.12.1)
+    ptools (1.3.5)
+    public_suffix (3.0.3)
+    rack (2.0.5)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rouge (2.2.1)
+    sass (3.4.25)
+    servolux (0.13.0)
+    temple (0.8.0)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tilt (2.0.8)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uber (0.0.13)
-    uglifier (2.7.1)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
+    uglifier (3.2.0)
+      execjs (>= 0.3.0, < 3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  middleman (~> 3.3.12)
-  middleman-deploy (~> 1.0)
-  middleman-livereload (~> 3.1.0)
+  middleman (~> 4.2)
+  middleman-autoprefixer (~> 2.7)
+  middleman-deploy (~> 2.0.0.pre.alpha)
   middleman-syntax
   tzinfo-data
-  wdm (~> 0.1.0)
+  wdm (~> 0.1)
 
 BUNDLED WITH
-   1.10.3
+   1.16.4

site/config.rb

@@ -36,9 +36,9 @@
 # activate :automatic_image_sizes
 
 # Reload the browser automatically whenever files change
-configure :development do
-  activate :livereload
-end
+# configure :development do
+#   activate :livereload
+# end
 
 helpers do
   # hack to set the active menu item for each page.  inspired by https://forum.middlemanapp.com/t/active-navigation/584/9
@@ -48,11 +48,11 @@ def nav_link(link_text, url, options = {})
       options[:class] << active
       "<li class='#{active}'>#{link_to(link_text, url, options)}</li>"
     end
-#   def some_helper
-#     "Helping"
-#   end
 end
 
+# Suppress warnings: https://github.com/middleman/middleman/issues/2087
+Haml::TempleEngine.disable_option_validator!
+
 set :markdown_engine, :kramdown
 
 set :css_dir, 'stylesheets'
@@ -63,32 +63,36 @@ def nav_link(link_text, url, options = {})
 
 activate :syntax
 
-# Build-specific configuration
-configure :build do
-  # For example, change the Compass output style for deployment
-  # activate :minify_css
+# # Build-specific configuration
+# configure :build do
+#   # For example, change the Compass output style for deployment
+#   # activate :minify_css
 
-  # Minify Javascript on build
-  # activate :minify_javascript
+#   # Minify Javascript on build
+#   # activate :minify_javascript
 
-  # Enable cache buster
-  # activate :asset_hash
+#   # Enable cache buster
+#   # activate :asset_hash
 
-  # Use relative URLs
-  activate :relative_assets
+#   # Use relative URLs
+#   activate :relative_assets
 
-  # Or use a different image path
-  #set :http_prefix, "/~dkulp"
-end
+#   # Or use a different image path
+#   #set :http_prefix, "/~dkulp"
+# end
 
-activate :deploy do |deploy|
-  deploy.method = :rsync
-  deploy.host   = 'stat-gen.org'
-  deploy.path   = '/home/statgen/public_html'
-  # Optional Settings
-  deploy.user  = 'statgen' # no default
-  # deploy.port  = 5309 # ssh port, default: 22
-  # deploy.clean = true # remove orphaned files on remote host, default: false
-  # deploy.flags = '-rltgoDvzO --no-p --del' # add custom flags, default: -avz
+# 8/31/18: :deploy no longer works with middleman
+#
+# Manually deploy with 'middleman build' and 'rsync build/* [email protected]:/home/statgen/public_html/'
+#
+# activate :deploy do |deploy|
+#   deploy.method = :rsync
+#   deploy.host   = 'stat-gen.org'
+#   deploy.path   = '/home/statgen/public_html'
+#   # Optional Settings
+#   deploy.user  = 'statgen' # no default
+#   # deploy.port  = 5309 # ssh port, default: 22
+#   # deploy.clean = true # remove orphaned files on remote host, default: false
+#   # deploy.flags = '-rltgoDvzO --no-p --del' # add custom flags, default: -avz
 
-end
+# end