hyrax 5.0.0.rc1 → 5.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 136cdda4fa63bf4027c7df373f2bf769221e5d0f9a16811ff75e3a2e7e791f9c
-  data.tar.gz: dc26381d252dc0d89c3ffce60341c906249b57107a812a219b4c6b81801a2035
+  metadata.gz: 020c1b9b867c89474795692fb51cc03751ecfd10feb8dd300750b12891b3687c
+  data.tar.gz: 41385b0600e001653ed3eb30b239b1520125fb52192af6543d6be53ffb76d0e4
 SHA512:
-  metadata.gz: 64629a2c0467415e4d8a5339f15932bcec06bc191cf269733be1f223a2a62129f3e997813cc7ed1572cb7824d31254a538e76510230554dc55d07c3fd701b0f0
-  data.tar.gz: 50df342a224686ca14a60886b14b3154bc0de8e78c73d99099377c81d63be0a33ee4a00f635a65917e462df2a5192e516740231b446671f3b72bdb379975d8e8
+  metadata.gz: 1c56457afe4451c9bd228ef1b45e2d431c60855ba1b744c14f4320ceefa92020d9c4bff083d0d39271c8e8cf2d3db3a79ff0630ece9f676180c21a6b928fee13
+  data.tar.gz: 144eda52bc5bee7caba33a113324e27fa5c00102c9422264758f68ab28f59844d6a1bb8ff6301d251cd17fc34e6e8cc4aa089c1b22c11249d3988070e935dcb8

data/.circleci/config.yml

@@ -91,7 +91,7 @@ jobs:
                 --build-arg "EXTRA_APK_PACKAGES=git bash" \
                 --build-arg "APP_PATH=.<< parameters.hyrax_app >>" \
                 --build-arg "RUBY_VERSION=<< parameters.ruby_version >>" \
-                --context "git://github.com/samvera/hyrax#refs/heads/${CIRCLE_BRANCH}#${CIRCLE_SHA1}" \
+                --context "git://github.com/$(echo $CIRCLE_REPOSITORY_URL | sed -E 's/.+:(.+)\.git/\1/')#refs/heads/${CIRCLE_BRANCH}#${CIRCLE_SHA1}" \
                 --target "hyrax-engine-dev" \
                 --destination "ghcr.io/samvera/hyrax/<< parameters.hyrax_app >>-dev:${CIRCLE_SHA1}"
 
@@ -119,12 +119,10 @@ jobs:
       HYRAX_VALKYRIE: << parameters.hyrax_valkyrie >>
       IN_DOCKER: true
       KARMA_BROWSER: remote-chromium
+      SOLR_URL: http://127.0.0.1:8985/solr/hydra-test
       VALKYRIE_SOLR_CORE: valkyrie-test
       VALKYRIE_SOLR_PORT: 8985
     steps:
-      - run:
-          name: yarn
-          command: cd /app/samvera/hyrax-engine && yarn
       - run:
           name: Create solr core
           command: |
@@ -137,10 +135,20 @@ jobs:
       - ruby/rspec-test:
           app-dir: /app/samvera/hyrax-engine
 
+  rubocop:
+    working_directory: ~/hyrax
+    docker:
+      - image: cimg/ruby:3.2.2
+    steps:
+      - checkout
+      - run: bundle install
+      - ruby/rubocop-check
+
 workflows:
   version: 2
   dassie:
     jobs:
+      - rubocop
       - kaniko-build:
           name: "dassie-build"
           ruby_version: "3.2.2"
@@ -158,3 +166,16 @@ workflows:
           hyrax_valkyrie: "1"
           requires:
             - dassie-build
+
+  koppie:
+    jobs:
+      - kaniko-build:
+          name: "koppie-build"
+          ruby_version: "3.2.2"
+          hyrax_app: "koppie"
+      - hyrax-test:
+          name: "koppie-test"
+          ruby_version: "3.2.2"
+          hyrax_app: "koppie"
+          requires:
+            - koppie-build

data/.dassie/.env

@@ -1,4 +1,7 @@
 ANALYTICS_START_DATE=2021-08-21
+BUNDLE_GEMFILE=Gemfile.dassie
+BUNDLE_PATH=/app/bundle
+CH12N_TOOL=fits_servlet
 CHROME_HEADLESS_MODE=false
 DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL=true
 DATABASE_TEST_URL=postgresql://hyrax_user:hyrax_password@postgres/hyrax_test?pool=5
@@ -24,9 +27,10 @@ RACK_ENV=development
 RAILS_ENV=development
 RAILS_ROOT=.dassie
 REDIS_HOST=redis
+REDIS_PASSWORD=sidekickin
 REDIS_PROVIDER=SIDEKIQ_REDIS_URL
 SEED_DASSIE=true
-SIDEKIQ_REDIS_URL=redis://redis:6379/0
+SIDEKIQ_REDIS_URL=redis://:sidekickin@redis:6379/0
 SOLR_HOST=solr
 SOLR_PORT=8983
 SOLR_TEST_URL=http://solr:8983/solr/hyrax_test

data/.dassie/Gemfile

@@ -8,35 +8,31 @@ else
 end
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 6.0'
-# Use postgresql as the database for Active Record
-gem 'pg', '>= 0.18', '< 2.0'
-# Use Puma as the app server
-gem 'puma', '~> 4.3.8'
-# Use SCSS for stylesheets
-gem 'sass-rails', '~> 6.0'
-# Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.3.0'
-
-gem 'dalli' # mem_cache_store support
-
-# Use CoffeeScript for .coffee assets and views
+gem 'bootsnap', '>= 1.1.0', require: false
+gem 'bootstrap', '~> 4.0'
 gem 'coffee-rails', '~> 4.2'
-# 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
+gem 'dalli'
+gem 'devise'
+gem 'devise-guests', '~> 0.8'
+gemspec name: 'hyrax', path: ENV.fetch('HYRAX_ENGINE_PATH', '..')
 gem 'jbuilder', '~> 2.5'
-
-# Reduces boot times through caching; required in config/boot.rb
-gem 'bootsnap', '>= 1.1.0', require: false
-
-group :development, :test do
-  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
-end
+gem 'jquery-rails'
+gem 'pg', '~> 1.3'
+gem 'puma'
+gem 'rails', '~> 6.1'
+gem 'riiif', '~> 2.1'
+gem 'rsolr', '>= 1.0', '< 3'
+gem 'sass-rails', '~> 6.0'
+gem 'sidekiq', '~> 6.4'
+gem 'turbolinks', '~> 5'
+gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+gem 'uglifier', '>= 1.3.0'
 
 group :development do
+  gem 'better_errors' # add command line in browser when errors
+  gem 'binding_of_caller' # deeper stack trace used by better errors
+
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
   gem 'web-console', '>= 3.3.0'
   gem 'listen', '>= 3.0.5', '< 3.2'
@@ -45,20 +41,9 @@ group :development do
   gem 'spring-watcher-listen', '~> 2.0.0'
 end
 
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
-
-gemspec name: 'hyrax', path: ENV.fetch('HYRAX_ENGINE_PATH', '..')
-
-gem 'bootstrap', '~> 4.0'
-gem 'devise'
-gem 'devise-guests', '~> 0.6'
-gem 'jquery-rails'
-gem 'pry-byebug'
-gem 'pry-doc'
-gem 'pry-rails'
-gem 'pry-rescue'
-gem 'riiif', '~> 2.1'
-gem 'rsolr', '>= 1.0', '< 3'
-gem 'sidekiq', '~> 6.0'
-gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
+group :development, :test do
+  gem 'debug', '>= 1.0.0'
+  gem 'pry-doc'
+  gem 'pry-rails'
+  gem 'pry-rescue'
+end

data/.dassie/Gemfile.dassie

@@ -0,0 +1,2 @@
+# Use dedicated lock files for dassie/koppie to avoid gem mismatches
+eval_gemfile 'Gemfile'

data/.dassie/app/assets/config/manifest.js

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

data/.dassie/app/assets/stylesheets/hyrax.scss

@@ -6,6 +6,7 @@
 
 @import "bootstrap-default-overrides";
 @import 'bootstrap';
+@import 'blacklight/blacklight';
 @import "font-awesome";
 @import "blacklight_gallery/gallery";
 @import "blacklight_gallery/masonry";

data/.dassie/app/listeners/hyrax_listener.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+##
+# Generated by hyrax:listeners
+#
+# The Hyrax engine uses a publish/subscribe programming model to allow
+# pluggable behavior in response to certain repository events. A range of events
+# are published on a topic based event bus.
+#
+# This listener provides a template.
+#
+# For simple use cases, it's fine to add behavior to the `#on_*` methods in this
+# Listener. If you have more than trivial behavior here, you probably want to add
+# new classes that are named narrowly scoped and named for what the listener is
+# for.
+#
+# When writing listener methods, it's important to carefully consider error,
+# handling. Unhandled exceptions short-circuit behavior for other listeners,
+# so it's a good idea to be paying attention to failure cases.
+#
+# @see https://github.com/samvera/hyrax/wiki/Hyrax's-Event-Bus-(Hyrax::Publisher)
+# @see https://www.rubydoc.info/gems/hyrax/Hyrax/Publisher
+# @see https://dry-rb.org/gems/dry-events
+class HyraxListener
+  # def on_batch_created
+  # end
+
+  # def on_collection_deleted
+  # end
+
+  # def on_collection_metadata_updated
+  # end
+
+  # def on_collection_membership_update
+  # end
+
+  # def on_file_characterized
+  # end
+
+  # def on_file_downloaded
+  # end
+
+  # def on_file_metadata_updated
+  # end
+
+  # def on_file_metadata_deleted
+  # end
+
+  # def on_file_uploaded
+  # end
+
+  # def on_file_set_audited
+  # end
+
+  # def on_file_set_attached
+  # end
+
+  # def on_file_set_url_imported
+  # end
+
+  # def on_file_set_restored
+  # end
+
+  # def on_object_deleted
+  # end
+
+  # def on_object_failed_deposit
+  # end
+
+  # def on_object_deposited
+  # end
+
+  # def on_object_acl_updated
+  # end
+
+  # def on_object_membership_updated
+  # end
+
+  # def on_object_metadata_updated
+  # end
+end

data/.dassie/config/environments/test.rb

@@ -1,5 +1,3 @@
-require 'hyrax/specs/disable_animations_in_test_environment'
-
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
   config.assets.debug = true
@@ -46,7 +44,4 @@ Rails.application.configure do
 
   # Raises error for missing translations
   config.action_view.raise_on_missing_translations = true
-
-  # disable animations with shared hyrax code
-  config.middleware.use DisableAnimationsInTestEnvironment
 end

data/.dassie/config/initializers/hyrax.rb

@@ -63,6 +63,11 @@ Hyrax.config do |config|
   # config.collection_model = 'Hyrax::PcdmCollection' # collection without basic metadata
   # config.collection_model = 'CollectionResource'    # collection with basic metadata
   # config.admin_set_model = 'Hyrax::AdministrativeSet'
+
+  # dassie needs legacy AF models
+  config.collection_model = '::Collection'
+  config.admin_set_model = 'AdminSet'
+  config.file_set_model = '::FileSet'
 end
 
 Date::DATE_FORMATS[:standard] = "%m/%d/%Y"

data/.dassie/config/initializers/publisher.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+# Hyrax.publisher.subscribe(HyraxListener.new)

data/.dassie/config/initializers/riiif.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
-ActiveSupport::Reloader.to_prepare do
-  Riiif::Image.file_resolver = Riiif::HttpFileResolver.new
+Rails.application.reloader.to_prepare do
   Riiif::Image.info_service = lambda do |id, _file|
     # id will look like a path to a pcdm:file
     # (e.g. rv042t299%2Ffiles%2F6d71677a-4f80-42f1-ae58-ed1063fd79c7)
     # but we just want the id for the FileSet it's attached to.
 
-    # Capture everything before the first slash
     fs_id = id.sub(/\A([^\/]*)\/.*/, '\1')
     resp = Hyrax::SolrService.get("id:#{fs_id}")
     doc = resp['response']['docs'].first
@@ -15,14 +13,10 @@ ActiveSupport::Reloader.to_prepare do
   end
 
   if Hyrax.config.use_valkyrie?
-    # Use Valkyrie adapter to make sure file is available locally. Riiif will just open it then
-    # id comes in with the format "FILE_SET_ID/files/FILE_ID"
-    Riiif::Image.file_resolver.id_to_uri = lambda do |id|
-      file_metadata = Hyrax.query_service.find_by(id: id.split('/').last)
-      file = Hyrax.storage_adapter.find_by(id: file_metadata.file_identifier)
-      file.disk_path.to_s
-    end
+    Riiif::Image.file_resolver = Hyrax::RiiifFileResolver.new
   else
+    Riiif::Image.file_resolver = Riiif::HttpFileResolver.new
+
     Riiif::Image.file_resolver.id_to_uri = lambda do |id|
       Hyrax::Base.id_to_uri(CGI.unescape(id)).tap do |url|
         Rails.logger.info "Riiif resolved #{id} to #{url}"
@@ -35,5 +29,82 @@ ActiveSupport::Reloader.to_prepare do
   Riiif.not_found_image = Rails.root.join('app', 'assets', 'images', 'us_404.svg')
   Riiif.unauthorized_image = Rails.root.join('app', 'assets', 'images', 'us_404.svg')
 
-  Riiif::Engine.config.cache_duration = 365.days
+  Riiif::Engine.config.cache_duration = 1.day
+end
+
+module Hyrax
+  # Adds file locking to Riiif::File
+  # @see RiiifFileResolver
+  class RiiifFile < Riiif::File
+    include ActiveSupport::Benchmarkable
+
+    attr_reader :id
+    def initialize(input_path, tempfile = nil, id:)
+      super(input_path, tempfile)
+      raise(ArgumentError, "must specify id") if id.blank?
+      @id = id
+    end
+
+    # Wrap extract in a read lock and benchmark it
+    def extract(transformation, image_info = nil)
+      Riiif::Image.file_resolver.file_locks[id].with_read_lock do
+        benchmark "RiiifFile extracted #{path} with #{transformation.to_params}", level: :debug do
+          super
+        end
+      end
+    end
+
+    private
+
+    def logger
+      Hyrax.logger
+    end
+  end
+
+  class RiiifFileResolver
+    include ActiveSupport::Benchmarkable
+
+    # @param [String] id from iiif manifest
+    # @return [Riiif::File]
+    def find(id)
+      path = nil
+      file_locks[id].with_write_lock do
+        path = build_path(id)
+        path = build_path(id, force: true) unless File.exist?(path) # Ensures the file is locally available
+      end
+      RiiifFile.new(path, id: id)
+    end
+
+    # tracks individual file locks
+    # @see RiiifFile
+    # @return [Concurrent::Map<Concurrent::ReadWriteLock>]
+    def file_locks
+      @file_locks ||= Concurrent::Map.new do |k, v|
+        k.compute_if_absent(v) { Concurrent::ReadWriteLock.new }
+      end
+    end
+
+    private
+
+    def build_path(id, force: false)
+      Riiif::Image.cache.fetch("riiif:" + Digest::MD5.hexdigest("path:#{id}"),
+                               expires_in: Riiif::Image.expires_in,
+                               force: force) do
+        load_file(id)
+      end
+    end
+
+    def load_file(id)
+      benchmark "RiiifFileResolver loaded #{id}", level: :debug do
+        fs_id = id.sub(/\A([^\/]*)\/.*/, '\1')
+        file_set = Hyrax.query_service.find_by(id: fs_id)
+        file_metadata = Hyrax.custom_queries.find_original_file(file_set: file_set)
+        file_metadata.file.disk_path.to_s # Stores a local copy in tmpdir
+      end
+    end
+
+    def logger
+      Hyrax.logger
+    end
+  end
 end

data/.dassie/config/metadata/collection_resource.yaml

@@ -13,11 +13,14 @@ attributes:
     form:
       primary: true
       multiple: true
+    predicate: http://hyrax-example.com/target_audience
   department:
     type: string
     form:
       primary: true
+    predicate: http://hyrax-example.com/department
   course:
     type: string
     form:
       primary: false
+    predicate: http://hyrax-example.com/course

data/.dassie/config/metadata/monograph.yaml

@@ -23,6 +23,7 @@
 attributes:
   monograph_title:
     type: string
+    predicate: http://hyrax-example.com/monograph_title
   record_info:
     type: string
     form:
@@ -30,26 +31,33 @@ attributes:
       primary: true
     index_keys:
       - "record_info_tesim"
+    predicate: http://hyrax-example.com/record_info
   place_of_publication:
     type: string
     form:
       required: false
       primary: true
+    predicate: http://hyrax-example.com/place_of_publication
   genre:
     type: string
     form:
       primary: true
+    predicate: http://hyrax-example.com/genre
   series_title:
     type: string
     form:
       primary: false
+    predicate: http://hyrax-example.com/series_title
   target_audience:
     type: string
     form:
       multiple: true
+    predicate: http://hyrax-example.com/target_audience
   table_of_contents:
     type: string
     form:
       multiple: false
+    predicate: http://hyrax-example.com/table_of_contents
   date_of_issuance:
     type: string
+    predicate: http://hyrax-example.com/date_of_issuance

data/.dassie/config/metadata/sample_metadata.yaml

@@ -1,3 +1,4 @@
 attributes:
   sample_attribute:
     type: string
+    predicate: http://hyrax-example.com/sample_attribute

data/.dassie/config/redis.yml

@@ -1,9 +1,11 @@
 development:
   host: <%= ENV.fetch('REDIS_HOST', 'localhost') %>
   port: <%= ENV.fetch('REDIS_PORT', 6379) %>
+  password: <%= ENV['REDIS_PASSWORD'] %>
 test:
   host: <%= ENV.fetch('REDIS_HOST', 'localhost') %>
   port: <%= ENV.fetch('REDIS_PORT', 6379) %>
+  password: <%= ENV['REDIS_PASSWORD'] %>
 production:
   host: <%= ENV.fetch('REDIS_HOST', 'localhost') %>
   port: <%= ENV.fetch('REDIS_PORT', 6379) %>

data/.dassie/db/migrate/20230725222727_create_hyrax_counter_metrics.hyrax.rb

@@ -0,0 +1,14 @@
+class CreateHyraxCounterMetrics < ActiveRecord::Migration[5.2]
+  def change
+    create_table :hyrax_counter_metrics do |t|
+      t.string :worktype
+      t.string :resource_type
+      t.integer :work_id
+      t.date :date
+      t.integer :total_item_investigations
+      t.integer :total_item_requests
+
+      t.timestamps
+    end
+  end
+end

data/.dassie/db/migrate/20230803165135_change_work_id_to_string.rb

@@ -0,0 +1,5 @@
+class ChangeWorkIdToString < ActiveRecord::Migration[5.2]
+  def change
+    change_column :hyrax_counter_metrics, :work_id, :string
+  end
+end

data/.dassie/db/migrate/20230808102105_add_indices_to_hyrax_counter_metrics.hyrax.rb

@@ -0,0 +1,8 @@
+class AddIndicesToHyraxCounterMetrics < ActiveRecord::Migration[5.2]
+  def change
+    add_index :hyrax_counter_metrics, :worktype
+    add_index :hyrax_counter_metrics, :resource_type
+    add_index :hyrax_counter_metrics, :work_id
+    add_index :hyrax_counter_metrics, :date
+  end
+end

data/.dassie/db/migrate/20230821153635_add_fields_to_counter_metric.rb

@@ -0,0 +1,8 @@
+class AddFieldsToCounterMetric < ActiveRecord::Migration[5.2]
+  def change
+    add_column :hyrax_counter_metrics, :title, :string
+    add_column :hyrax_counter_metrics, :year_of_publication, :integer, index: true
+    add_column :hyrax_counter_metrics, :publisher, :string, index: true
+    add_column :hyrax_counter_metrics, :author, :string, index: true
+  end
+end

data/.dassie/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_11_30_181150) do
+ActiveRecord::Schema.define(version: 2023_08_21_153635) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -140,6 +140,25 @@ ActiveRecord::Schema.define(version: 2021_11_30_181150) do
     t.index ["machine_id"], name: "index_hyrax_collection_types_on_machine_id", unique: true
   end
 
+  create_table "hyrax_counter_metrics", force: :cascade do |t|
+    t.string "worktype"
+    t.string "resource_type"
+    t.string "work_id"
+    t.date "date"
+    t.integer "total_item_investigations"
+    t.integer "total_item_requests"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "title"
+    t.integer "year_of_publication"
+    t.string "publisher"
+    t.string "author"
+    t.index ["date"], name: "index_hyrax_counter_metrics_on_date"
+    t.index ["resource_type"], name: "index_hyrax_counter_metrics_on_resource_type"
+    t.index ["work_id"], name: "index_hyrax_counter_metrics_on_work_id"
+    t.index ["worktype"], name: "index_hyrax_counter_metrics_on_worktype"
+  end
+
   create_table "hyrax_default_administrative_set", force: :cascade do |t|
     t.string "default_admin_set_id", null: false
     t.datetime "created_at", null: false

data/.dockerignore

@@ -16,6 +16,7 @@ chart/*
 
 Gemfile.lock
 .dassie/Gemfile.lock
+.koppie/Gemfile.lock
 
 node_modules/*
-yarn.lock
+yarn.lock

data/.gitignore

@@ -4,12 +4,16 @@
 ruby-version
 ruby-gemset
 .rvmrc
-Gemfile.lock
+Gemfile*.lock
 
 # don't push around data files (for dev envs only)
 fcrepo4-data
 fcrepo4-test-data
 
+## JS lock files
+yarn.lock
+package-lock.json
+
 ## MAC OS
 .DS_Store
 

data/.koppie/.env

@@ -1,3 +1,7 @@
+APP_NAME=koppie
+BUNDLE_GEMFILE=Gemfile.koppie
+BUNDLE_PATH=/app/bundle
+CH12N_TOOL=fits_servlet
 CHROME_HEADLESS_MODE=false
 DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL=true
 DATABASE_TEST_URL=postgresql://hyrax_user:hyrax_password@postgres/hyrax_test?pool=5
@@ -7,6 +11,7 @@ DB_NAME=koppie
 DB_PASSWORD=hyrax_password
 DB_PORT=5432
 DB_USERNAME=hyrax_user
+FCREPO_URL=http://fedoraAdmin:fedoraAdmin@fcrepo:8080/fcrepo/rest
 FITS_SERVLET_URL=http://fits:8080/fits
 HUB_URL=http://chrome:4444/wd/hub
 HYRAX_DERIVATIVES_PATH=/app/samvera/hyrax-webapp/derivatives/
@@ -16,6 +21,7 @@ HYRAX_VALKYRIE=true
 IN_DOCKER=true
 KARMA_BROWSER=remote-chromium
 KARMA_HOSTNAME=app
+MEMCACHED_HOST=memcached
 METADATA_DATABASE_NAME=koppie_metadata_development
 POSTGRES_DB=koppie
 POSTGRES_HOST_AUTH_METHOD=trust
@@ -28,7 +34,7 @@ RAILS_LOG_TO_STDOUT=true
 RAILS_QUEUE=sidekiq
 REDIS_HOST=redis
 REDIS_PASSWORD=sidekickin
-REDIS_URL=redis://noop:sidekickin@redis:6379
+REDIS_URL=redis://:sidekickin@redis:6379
 SEED_KOPPIE=true
 SKIP_SELENIUM=
 SOLR_COLLECTION_NAME=koppie
@@ -37,6 +43,6 @@ SOLR_CORES=koppie
 SOLR_HOST=solr
 SOLR_PORT=8983
 SOLR_URL=http://solr:8983/solr/koppie
-VALKYRIE_SOLR_CORE=koppie
-VALKYRIE_SOLR_HOST=solr
-VALKYRIE_SOLR_PORT=8983
+SOLR_TEST_URL=http://solr:8983/solr/hydra-test
+VALKYRIE_METADATA_ADAPTER=pg_metadata
+VALKYRIE_STORAGE_ADAPTER=versioned_disk_storage