Revert "Merge pull request #608 from archivesspace/bold-rails-upgrade…

…-experiment"

This reverts commit 891a5af, reversing
changes made to fab7efb.

We'll move this work to a feature branch for the time being.

.travis.yml

@@ -25,7 +25,6 @@ before_install:
   --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 2560x1700x24
 - export DISPLAY=:99.0
 before_script:
-- free -m
 - (cd /tmp; wget 'https://ftp.mozilla.org/pub/firefox/releases/47.0.1/linux-x86_64/en-US/firefox-47.0.1.tar.bz2'; tar xvjf firefox-47.0.1.tar.bz2)
 - sleep 3
 - if [[ "$DB" == "mysql" ]]; then (mkdir lib; cd lib; curl -Oq http://central.maven.org/maven2/mysql/mysql-connector-java/5.1.39/mysql-connector-java-5.1.39.jar );
@@ -34,7 +33,7 @@ before_script:
   fi
 - if [[ "$DB" == "mysql" ]]; then mysql -e "create database archivesspace default
   character set utf8;"; fi
-- 'export JAVA_OPTS="-Xmx600m -verbose:gc $JAVA_OPTS"'
+- 'export JAVA_OPTS="-Xmx1G $JAVA_OPTS"'
 - 'export PATH="/tmp/firefox:$PATH"'
 - firefox --version
 branches:
@@ -55,7 +54,4 @@ addons:
     - $( ls /var/tmp/*.html | tr "\n" ":" )
     - $( ls /var/log/mysql/* | tr "\n" ":" )
     - $( ls  /var/tmp/aspace-integration.log | tr "\n" ":" )
-sudo: true
-after_failure:
-- if [[ -e "/tmp/firefox_console" ]]; then cat /tmp/firefox_console; fi
-- dmesg | tail -500
+sudo: false

_yard/Gemfile.lock

@@ -1,8 +1,8 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    kramdown (1.13.2)
-    yard (0.9.8)
+    kramdown (1.11.1)
+    yard (0.9.0)
 
 PLATFORMS
   java

backend/Gemfile

@@ -1,36 +1,36 @@
 source "https://rubygems.org"
 
 gem "atomic", '= 1.0.1'
-gem "sinatra", "1.4.7", :require => false
-gem "sinatra-contrib", "1.4.7", :require => false
+gem "sinatra", "1.3.6", :require => false
+gem 'rack', '= 1.4.7'
+gem "sinatra-reloader", :require => false
 gem "sequel", "~> 4.20.0"
 gem "rack-session-sequel", "0.0.1"
 gem "jdbc-mysql", "5.1.13", :group => :development
-gem "jdbc-derby", "10.12.1.1"
+gem "jdbc-derby", "10.6.2.1"
 gem "bcrypt", "3.1.7"
-gem 'json', "1.8.6"
+gem 'json', "1.8.0"
 gem "json-schema", "1.0.10"
-gem "jruby-jars", "= 9.1.7.0"
-gem "nokogiri", "1.7.0.1"
+gem "jruby-jars", "= 1.7.21"
+gem "nokogiri",  '~> 1.6.1'
 gem "saxerator", "~> 0.9.2"
 gem 'saxon-xslt'
-gem 'tzinfo'
+gem 'tzinfo', '~> 0.3.48'
 gem "rufus-scheduler", "~> 2.0.24"
 gem "rufus-lru", "1.0.5"
 gem "net-ldap", "0.6.1"
-gem "puma", "3.6.2"
+gem "puma", "2.8.2"
 gem "i18n", ">= 0.6.4"
 
 gem "axlsx", "2.0.1"
 
-gem "warbler", "2.0.4", :group => :build
+gem "warbler", "1.4.9", :group => :build
 
 
 group :test do
-  gem "factory_girl"
-  gem "activesupport", "5.0.1"  # Loaded by factory_girl
-  gem "rspec"
-  gem "rspec-core"
+  gem "factory_girl", "~> 4.1.0"
+  gem "rspec", "~> 3.3.0"
+  gem "rspec-core", "~> 3.3.0"
   gem "ladle", "0.2.0"
   gem "simplecov", "0.7.1"
 end

backend/Gemfile.lock

@@ -1,61 +1,63 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.0.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
+    activesupport (4.0.13)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
     atomic (1.0.1-java)
     axlsx (2.0.1)
       htmlentities (~> 4.3.1)
       nokogiri (>= 1.4.1)
       rubyzip (~> 1.0.0)
     backports (3.6.8)
     bcrypt (3.1.7-java)
-    concurrent-ruby (1.0.4-java)
-    diff-lcs (1.3)
-    factory_girl (4.8.0)
+    diff-lcs (1.2.5)
+    eventmachine (1.2.0.1-java)
+    factory_girl (4.1.0)
       activesupport (>= 3.0.0)
     htmlentities (4.3.4)
     i18n (0.7.0)
-    jdbc-derby (10.12.1.1)
+    jdbc-derby (10.6.2.1-java)
     jdbc-mysql (5.1.13)
-    jruby-jars (9.1.7.0)
+    jruby-jars (1.7.21)
     jruby-rack (1.1.20)
-    json (1.8.6-java)
+    json (1.8.0-java)
     json-schema (1.0.10)
     ladle (0.2.0-java)
-    minitest (5.10.1)
+    minitest (4.7.5)
     multi_json (1.12.1)
     multipart-post (1.2.0)
     net-http-persistent (2.8)
     net-ldap (0.6.1)
-    nokogiri (1.7.0.1-java)
-    puma (3.6.2-java)
-    rack (1.6.5)
+    nokogiri (1.6.8-java)
+    puma (2.8.2-java)
+      rack (>= 1.1, < 2.0)
+    rack (1.4.7)
     rack-protection (1.5.3)
       rack
     rack-session-sequel (0.0.1)
       rack
       sequel
     rack-test (0.6.3)
       rack (>= 1.0)
-    rake (12.0.0)
+    rake (11.2.2)
     rjack-jackson (1.8.11.0-java)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
     rubyzip (1.0.0)
     rufus-lru (1.0.5)
     rufus-scheduler (2.0.24)
@@ -68,65 +70,66 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sinatra (1.4.7)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    sinatra-contrib (1.4.7)
+    sinatra (1.3.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.3)
+      tilt (~> 1.3, >= 1.3.3)
+    sinatra-contrib (1.3.2)
       backports (>= 2.0)
-      multi_json
+      eventmachine
       rack-protection
       rack-test
-      sinatra (~> 1.4.0)
-      tilt (>= 1.3, < 3)
+      sinatra (~> 1.3.0)
+      tilt (~> 1.3)
+    sinatra-reloader (1.0)
+      sinatra-contrib
     thread_safe (0.3.5-java)
-    tilt (2.0.6)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    warbler (2.0.4)
-      jruby-jars (>= 9.0.0.0)
+    tilt (1.4.1)
+    tzinfo (0.3.51)
+    warbler (1.4.9)
+      jruby-jars (>= 1.5.6, < 2.0)
       jruby-rack (>= 1.1.1, < 1.3)
-      rake (>= 10.1.0)
-      rubyzip (~> 1.0, < 1.4)
+      rake (>= 0.9.6)
+      rubyzip (>= 0.9, < 1.2)
     zip-zip (0.3)
       rubyzip (>= 1.0.0)
 
 PLATFORMS
   java
 
 DEPENDENCIES
-  activesupport (= 5.0.1)
   atomic (= 1.0.1)
   axlsx (= 2.0.1)
   bcrypt (= 3.1.7)
-  factory_girl
+  factory_girl (~> 4.1.0)
   i18n (>= 0.6.4)
-  jdbc-derby (= 10.12.1.1)
+  jdbc-derby (= 10.6.2.1)
   jdbc-mysql (= 5.1.13)
-  jruby-jars (= 9.1.7.0)
-  json (= 1.8.6)
+  jruby-jars (= 1.7.21)
+  json (= 1.8.0)
   json-schema (= 1.0.10)
   ladle (= 0.2.0)
   multipart-post (= 1.2.0)
   net-http-persistent (= 2.8)
   net-ldap (= 0.6.1)
-  nokogiri (= 1.7.0.1)
-  puma (= 3.6.2)
+  nokogiri (~> 1.6.1)
+  puma (= 2.8.2)
+  rack (= 1.4.7)
   rack-session-sequel (= 0.0.1)
   rjack-jackson (= 1.8.11.0)
-  rspec
-  rspec-core
+  rspec (~> 3.3.0)
+  rspec-core (~> 3.3.0)
   rubyzip (= 1.0.0)
   rufus-lru (= 1.0.5)
   rufus-scheduler (~> 2.0.24)
   saxerator (~> 0.9.2)
   saxon-xslt
   sequel (~> 4.20.0)
   simplecov (= 0.7.1)
-  sinatra (= 1.4.7)
-  sinatra-contrib (= 1.4.7)
-  tzinfo
-  warbler (= 2.0.4)
+  sinatra (= 1.3.6)
+  sinatra-reloader
+  tzinfo (~> 0.3.48)
+  warbler (= 1.4.9)
   zip-zip (= 0.3)
 
 BUNDLED WITH

backend/app/controllers/system.rb

@@ -49,7 +49,7 @@ class ArchivesSpaceService < Sinatra::Base
   .returns([200, "OK"]) \
   do
     flag = AppConfig[:demodb_snapshot_flag]
-    if File.exist?(flag)
+    if File.exists?(flag)
       Log.info("Starting backup of embedded demo database")
       DB.demo_db_backup
       Log.info("Backup of embedded demo database completed!")

backend/app/converters/accession_converter.rb

@@ -171,10 +171,16 @@ def self.configure
       #        param 1 is the set of objects generated by the row
       #        param 2 is an object in the row (of the type described in the handler)
 
+      :acknowledgement_sent_event_date => event_template('acknowledgement_sent'),
+
       :agreement_received_event_date => event_template('agreement_received'),
 
+      :agreement_sent_event_date => event_template('agreement_sent'),
+
       :cataloged_event_date => event_template('cataloged'),
 
+      :processed_event_date => event_template('processed'),
+
       :agent => {
         :record_type => Proc.new {|data|
           @agent_type = data['agent_type']