hyrax-iiif_av 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1048d5bad3dcabb9cfbaa7617e7ac7e325e650bf
-  data.tar.gz: b53798072660f48f69438f5569eb8b51451c8b7e
+SHA256:
+  metadata.gz: 60db1204a3be6e2045adea2459d963caa13baadec61fd4cfdc541babf9e05bab
+  data.tar.gz: f751f0a1f73f67b34fd321ac4d1f3b714575b8b2a2ea3fb320993501078d8bb6
 SHA512:
-  metadata.gz: 7f9759d67ab956c8aa7e2b1f09efe2ba53c17e9922c45d2317b4f2248a14d6503a6587231d113b6daf3ce85228be9bf3b4e3df6d3f60f41f33fcedd8d66398c9
-  data.tar.gz: 9cf31dba99e9c3c2b646c08f06889b4d55c625752f7dcce859b4b654a453e57977da2afed310b0875ac5f835d868836559431d0a3d4100380fa90a9e46f37d62
+  metadata.gz: 4aad636182df8ce8acc9c9f6f233f46bd5f70dfcec9a76d7c01583d6ec85602734da94ed4134042885664daad451aabbac511d9d02807cc344645780630a07ea
+  data.tar.gz: b2e5d4821b51707a04c60c8cc94b601f8600cdfd80a477361983cef33f423adacd73be366d01cb97ecd893824b0dcee14551cf1859bae75a33187418e3ee22d0

data/.circleci/config.yml

@@ -0,0 +1,48 @@
+version: 2.1
+orbs:
+  samvera: samvera/circleci-orb@1.0
+jobs:
+  bundle_and_test:
+    parameters:
+      ruby_version:
+        type: string
+        default: 3.4.4
+      bundler_version:
+        type: string
+        default: 2.6.7
+        
+    executor:
+      name: 'samvera/ruby_fcrepo_solr'
+      ruby_version: << parameters.ruby_version >>
+      solr_version: 7-slim
+
+    working_directory: ~/project
+
+    environment:
+      ENGINE_CART_RAILS_OPTIONS: --skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-coffee --skip-puma --skip-test
+      
+    steps:
+      - samvera/cached_checkout
+          
+      - samvera/bundle:
+          ruby_version: << parameters.ruby_version >>
+          bundler_version: << parameters.bundler_version >>
+    
+      - samvera/engine_cart_generate:
+          cache_key: v2-internal-test-app-{{ checksum "hyrax-iiif_av.gemspec" }}-{{ checksum "spec/test_app_templates/lib/generators/test_app_generator.rb" }}-{{ checksum "lib/generators/hyrax/iiif_av/install_generator.rb" }}
+
+      - samvera/install_solr_core:
+          solr_config_path: .internal_test_app/solr/conf
+
+      - samvera/bundle:
+          ruby_version: << parameters.ruby_version >>
+          bundler_version: << parameters.bundler_version >>
+          
+      - samvera/parallel_rspec
+
+workflows:
+  ci:
+    jobs:
+      - bundle_and_test:
+          name: ruby3-4
+          ruby_version: 3.4.4

data/.github/workflows/release.yml

@@ -0,0 +1,33 @@
+name: Release Gem
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - v*
+
+jobs:
+  push:
+    if: github.repository == 'samvera-labs/hyrax-iiif_av'
+    name: Push gem to RubyGems.org
+    runs-on: ubuntu-latest
+
+    permissions:
+      id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
+      contents: write # IMPORTANT: this permission is required for `rake release` to push the release tag
+
+    environment: release
+    
+    steps:
+      # Set up
+      - uses: actions/checkout@v5
+        with:
+          persist-credentials: false
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: ruby
+
+      # Release
+      - uses: rubygems/release-gem@v1
+

data/.gitignore

@@ -4,3 +4,4 @@ pkg/
 Gemfile.lock
 .internal_test_app
 .byebug_history
+vendor/bundle/**

data/.rubocop.yml

@@ -2,7 +2,7 @@ inherit_gem:
   bixby: bixby_default.yml
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
   DisplayCopNames: true
 
 Naming/FileName:
@@ -20,7 +20,11 @@ Metrics/BlockLength:
     - 'lib/hyrax/iiif_av/spec/shared_specs/displays_content.rb'
     - 'lib/hyrax/iiif_av/spec/shared_specs/displays_iiif_av.rb'
     - 'spec/controllers/generic_works_controller_spec.rb'
+    - 'spec/controllers/iiif_av_controller_spec.rb'
+    - 'spec/factories/users.rb'
     - 'spec/helpers/iiif_av_helper_spec.rb'
+    - 'spec/requests/auth_controller_behavior_spec.rb'
+    - 'spec/support/features/session_helpers.rb'
 
 RSpec/VerifiedDoubles:
   Exclude:
@@ -31,3 +35,15 @@ RSpec/VerifiedDoubles:
 RSpec/ExampleLength:
   Exclude:
     - 'lib/hyrax/iiif_av/spec/shared_specs/displays_content.rb'
+
+Metrics/ModuleLength:
+  Exclude:
+    - 'app/presenters/concerns/hyrax/iiif_av/displays_content.rb'
+
+Metrics/MethodLength:
+  Exclude:
+    - 'app/presenters/concerns/hyrax/iiif_av/displays_content.rb'
+
+Rails/OutputSafety:
+  Exclude:
+    - 'app/controllers/hyrax/iiif_av/iiif_av_controller.rb'

data/CONTRIBUTING.md

@@ -0,0 +1,181 @@
+# How to Contribute
+
+We want your help to make the Samvera community great. There are a few guidelines
+that we need contributors to follow so that we can have a chance of
+keeping on top of things.
+
+## Code of Conduct
+
+The Samvera Community is dedicated to providing a welcoming and positive
+experience for all its members, whether they are at a formal gathering, in
+a social setting, or taking part in activities online. Please see our
+[Code of Conduct](CODE_OF_CONDUCT.md) for more information.
+
+## Language
+
+The language we use matters. Today, tomorrow, and for years to come
+people will read the code we write. They will judge us for our
+design, logic, and the words we use to describe the system.
+
+Our words should be accessible. Favor descriptive words that give
+meaning while avoiding reinforcing systemic inequities. For example,
+in the Samvera community, we should favor using allowed_list instead
+of whitelist, denied_list instead of blacklist, or source/copy
+instead of master/slave.
+
+We're going to get it wrong, but this is a call to keep working to
+make it right. View our code and the words we choose as a chance to
+have a conversation. A chance to grow an understanding of the systems
+we develop as well as the systems in which we live.
+
+See [“Blacklists” and “whitelists”: a salutary warning concerning the
+prevalence of racist language in discussions of predatory
+publishing](https://www.ncbi.nlm.nih.gov/pmc/articles/PMC6148600/) for
+further details.
+
+## Contribution Tasks
+
+- Reporting Issues
+- Making Changes
+- Documenting Code
+- Committing Changes
+- Submitting Changes
+- Reviewing and Merging Changes
+
+### Reporting Issues
+
+- Make sure you have a [GitHub account](https://github.com/signup/free)
+- Submit a [Github issue](https://github.com/samvera-labs/hyrax-iiif_av/issues/) by:
+  - Clearly describing the issue
+    - Provide a descriptive summary
+    - Explain the expected behavior
+    - Explain the actual behavior
+    - Provide steps to reproduce the actual behavior
+
+### Making Changes
+
+- Fork the repository on GitHub
+- Create a topic branch from where you want to base your work.
+  - This is usually the `main` branch.
+  - To quickly create a topic branch based on `main`; `git branch fix/main/my_contribution main`
+  - Then checkout the new branch with `git checkout fix/main/my_contribution`.
+  - Please avoid working directly on the `main` branch.
+  - Please do not create a branch called `master`. (See note below.)
+  - You may find the [hub suite of commands](https://github.com/defunkt/hub) helpful
+- Make sure you have added sufficient tests and documentation for your changes.
+  - Test functionality with RSpec; Test features / UI with Capybara.
+- Run _all_ the tests to assure nothing else was accidentally broken.
+
+NOTE: This repository follows the [Samvera Community Code of Conduct](https://samvera.atlassian.net/wiki/spaces/samvera/pages/405212316/Code+of+Conduct)
+and [language recommendations](#language).
+Please **_do not_** create a branch called `master` for this repository or as part of
+your pull request; the branch will either need to be removed or renamed before it can
+be considered for inclusion in the code base and history of this repository.
+
+### Documenting Code
+
+- All new public methods, modules, and classes should include inline documentation in [YARD](http://yardoc.org/).
+  - Documentation should seek to answer the question "why does this code exist?"
+- Document private / protected methods as desired.
+- If you are working in a file with no prior documentation, do try to document as you gain understanding of the code.
+  - If you don't know exactly what a bit of code does, it is extra likely that it needs to be documented. Take a stab at it and ask for feedback in your pull request. You can use the 'blame' button on GitHub to identify the original developer of the code and @mention them in your comment.
+  - This work greatly increases the usability of the code base and supports the on-ramping of new committers.
+  - We will all be understanding of one another's time constraints in this area.
+- [Getting started with YARD](http://www.rubydoc.info/gems/yard/file/docs/GettingStarted.md)
+
+### Committing changes
+
+- Make commits of logical units.
+- Check for unnecessary whitespace with `git diff --check` before committing.
+- Make sure your commit messages are [well formed](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+- If you created an issue, you can close it by including "Closes #issue" in your commit message. See [Github's blog post for more details](https://github.com/blog/1386-closing-issues-via-commit-messages)
+
+```
+    Present tense short summary (50 characters or less)
+
+    More detailed description, if necessary. It should be wrapped to 72
+    characters. Try to be as descriptive as you can, even if you think that
+    the commit content is obvious, it may not be obvious to others. You
+    should add such description also if it's already present in bug tracker,
+    it should not be necessary to visit a webpage to check the history.
+
+    Include Closes #<issue-number> when relavent.
+
+    Description can have multiple paragraphs and you can use code examples
+    inside, just indent it with 4 spaces:
+
+        class PostsController
+          def index
+            respond_to do |wants|
+              wants.html { render 'index' }
+            end
+          end
+        end
+
+    You can also add bullet points:
+
+    - you can use dashes or asterisks
+
+    - also, try to indent next line of a point for readability, if it's too
+      long to fit in 72 characters
+```
+
+- Make sure you have added the necessary tests for your changes.
+- Run _all_ the tests to assure nothing else was accidentally broken.
+- When you are ready to submit a pull request
+
+### Submitting Changes
+
+- Read the article ["Using Pull Requests"](https://help.github.com/articles/using-pull-requests) on GitHub.
+- Make sure your branch is up to date with its parent branch (i.e. main)
+  - `git checkout main`
+  - `git pull --rebase`
+  - `git checkout <your-branch>`
+  - `git rebase main`
+  - It is a good idea to run your tests again.
+- If you've made more than one commit take a moment to consider whether squashing commits together would help improve their logical grouping.
+  - [Detailed Walkthrough of One Pull Request per Commit](http://ndlib.github.io/practices/one-commit-per-pull-request/)
+  - `git rebase --interactive main` ([See Github help](https://help.github.com/articles/interactive-rebase))
+  - Squashing your branch's changes into one commit is "good form" and helps the person merging your request to see everything that is going on.
+- Push your changes to a topic branch in your fork of the repository.
+- Submit a pull request from your fork to the project.
+
+### Reviewing and Merging Changes
+
+We adopted [Github's Pull Request Review](https://help.github.com/articles/about-pull-request-reviews/) for our repositories.
+Common checks that may occur in our repositories:
+
+1. [CircleCI](https://circleci.com/gh/samvera) - where our automated tests are running
+2. RuboCop/Bixby - where we check for style violations
+3. Approval Required - Github enforces at least one person approve a pull request. Also, all reviewers that have chimed in must approve.
+4. CodeClimate - is our code remaining healthy (at least according to static code analysis)
+
+If one or more of the required checks failed (or are incomplete), the code should not be merged (and the UI will not allow it). If all of the checks have passed, then anyone on the project (including the pull request submitter) may merge the code.
+
+_Example: Carolyn submits a pull request, Justin reviews the pull request and approves. However, Justin is still waiting on other checks (CI tests are usually the culprit), so he does not merge the pull request. Eventually, all of the checks pass. At this point, Carolyn or anyone else may merge the pull request._
+
+#### Things to Consider When Reviewing
+
+First, the person contributing the code is putting themselves out there. Be mindful of what you say in a review.
+
+- Ask clarifying questions
+- State your understanding and expectations
+- Provide example code or alternate solutions, and explain why
+
+This is your chance for a mentoring moment of another developer. Take time to give an honest and thorough review of what has changed. Things to consider:
+
+- Does the commit message explain what is going on?
+- Does the code changes have tests? _Not all changes need new tests, some changes are refactorings_
+- Do new or changed methods, modules, and classes have documentation?
+- Does the commit contain more than it should? Are two separate concerns being addressed in one commit?
+- Does the description of the new/changed specs match your understanding of what the spec is doing?
+- Did the Continuous Integration tests complete successfully?
+
+If you are uncertain, bring other contributors into the conversation by assigning them as a reviewer.
+
+# Additional Resources
+
+- [General GitHub documentation](http://help.github.com/)
+- [GitHub pull request documentation](https://help.github.com/articles/about-pull-requests/)
+- [Pro Git](http://git-scm.com/book) is both a free and excellent book about Git.
+- [A Git Config for Contributing](http://ndlib.github.io/practices/my-typical-per-project-git-config/)

data/README.md

@@ -1,43 +1,40 @@
 # hyrax-iiif_av
 Hyrax plugin for IIIF Presentation 3.0 Audiovisual support
 
-# Steps to use this plugin
-1. Include controller mixin in your model controller:
-```ruby
-# Generated via
-#  `rails generate hyrax:work GenericWork`
-module Hyrax
-  # Generated controller for GenericWork
-  class GenericWorksController < ApplicationController
-    # Adds Hyrax behaviors to the controller.
-    include Hyrax::WorksControllerBehavior
-    include Hyrax::BreadcrumbsForWorks
-    include Hyrax::IiifAv::ControllerBehavior
-    self.curation_concern_type = ::GenericWork
-
-    # Use this line if you want to use a custom presenter
-    self.show_presenter = Hyrax::GenericWorkPresenter
-  end
-end
+# How to use this plugin
+1. Add `hyrax-iiif_av` to your `Gemfile` and `bundle install`
+
+2. Run generator passing your work type:
+```
+rails g hyrax:iiif_av:add_to_work_type MyWorkType
 ```
+Notice that this generator includes mixins in the work controller and work show presenter.
 
-2. Setup work presenter:
-```ruby
-# Generated via
-#  `rails generate hyrax:work GenericWork`
-module Hyrax
-  class GenericWorkPresenter < Hyrax::WorkShowPresenter
-    include Hyrax::IiifAv::DisplaysIiifAv
-
-    Hyrax::MemberPresenterFactory.file_presenter_class = Hyrax::IiifAv::IiifFileSetPresenter
-
-    # Optional override to select iiif viewer to render
-    # default :avalon for AV, :universal_viewer for images
-    def iiif_viewer
-      :universal_viewer
-    end
-  end
-end
+3. (Optional) Run avalon player generator:
 ```
+rails g hyrax:iiif_av:install_avalon_player
+```
+This will install `webpacker`, `react-rails`, and the avalon player (view partial, react JS, and yarn dependency).  This might take a while.
+
+4. Ingest audiovisual content and see a IIIF viewer render on the work show page.
+
+For a walkthrough of this in a demo application try running through this repository's README: https://github.com/avalonmediasystem/connect2018-workshop
+
+
+# Set up dev / test environment
+This project uses engine cart for testing and development purposes. To generate the .internal_test_app directory do the following
+
+```bash
+export ENGINE_CART_RAILS_OPTIONS="--skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-coffee --skip-puma --skip-test"
+bundle exec rake engine_cart:generate
+```
+
+Spec and rubocop can then be run using the `rake` command.
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at <https://github.com/samvera-labs/hyrax-iiif_av>. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+
+If you're working on PR for this project, create a feature branch off of `main`.
 
-3. Ingest audiovisual content and see the Avalon IIIF viewer render on the work show page.
+This repository follows the [Samvera Community Code of Conduct](https://samvera.atlassian.net/wiki/spaces/samvera/pages/405212316/Code+of+Conduct) and [language recommendations](https://github.com/samvera-labs/hyrax-iiif_av/blob/main/CONTRIBUTING.md#language).  Please ***do not*** create a branch called `master` for this repository or as part of your pull request; the branch will either need to be removed or renamed before it can be considered for inclusion in the code base and history of this repository.

data/app/controllers/concerns/hyrax/iiif_av/auth_controller_behavior.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+# Copyright 2011-2018, The Trustees of Indiana University and Northwestern
+# University. Additional copyright may be held by others, as reflected in
+# the commit history.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---  END LICENSE_HEADER BLOCK  ---
+
+module Hyrax
+  module IiifAv
+    module AuthControllerBehavior
+      extend ActiveSupport::Concern
+
+      def after_sign_in_path_for(resource_or_scope)
+        return Hyrax::IiifAv::Engine.routes.url_helpers.iiif_av_sign_in_path if referer_iiif_login? || request_iiif_login?
+        super
+      end
+
+      private
+
+        def referer_iiif_login?
+          # When going through the login form
+          referer_uri_string = request.env.fetch("HTTP_REFERER", nil)
+          return false unless referer_uri_string.present?
+          referer_uri = URI(referer_uri_string)
+          # Don't worry about referers that come from a different site (includings where the IIIF viewer is embedded)
+          return false if referer_uri.host.present? && referer_uri.host != request.host
+          query_params = Rack::Utils.parse_query(referer_uri.query)
+          query_params && ActiveModel::Type::Boolean.new.cast(query_params["iiif_auth_login"])
+        end
+
+        def request_iiif_login?
+          # When already logged in
+          request_uri_string = request.env.fetch("REQUEST_URI", nil)
+          return false unless request_uri_string.present?
+          request_uri = URI(request_uri_string)
+          query_params = Rack::Utils.parse_query(request_uri.query)
+          ActiveModel::Type::Boolean.new.cast(query_params["iiif_auth_login"])
+        end
+    end
+  end
+end

data/app/controllers/concerns/hyrax/iiif_av/controller_behavior.rb

@@ -26,19 +26,24 @@ module Hyrax
         prepend_view_path(Hyrax::IiifAv::Engine.view_path)
       end
 
-      IIIF_PRESENTATION_2_MIME = 'application/json;profile=http://iiif.io/api/presentation/2/context.json'
-      IIIF_PRESENTATION_3_MIME = 'application/json;profile=http://iiif.io/api/presentation/3/context.json'
+      IIIF_PRESENTATION_2_MIME = 'application/ld+json;profile="http://iiif.io/api/presentation/2/context.json"'
+      IIIF_PRESENTATION_3_MIME = 'application/ld+json;profile="http://iiif.io/api/presentation/3/context.json"'
 
       def manifest
         add_iiif_header
-        super
+
+        headers['Access-Control-Allow-Origin'] = '*'
+
+        json = iiif_manifest_builder.manifest_for(presenter: iiif_manifest_presenter, iiif_manifest_factory: manifest_factory)
+
+        render json: json
       end
 
       private
 
         # @return true if the request is for IIIF version 3; false otherwise
         def iiif_version_3?
-          presenter.respond_to?(:iiif_version) ? presenter.iiif_version == 3 : false
+          iiif_manifest_presenter.respond_to?(:iiif_version) ? iiif_manifest_presenter.iiif_version == 3 : false
         end
 
         def iiif_mime
@@ -50,11 +55,19 @@ module Hyrax
           headers['Content-Type'] = iiif_mime
         end
 
-        def manifest_builder
+        # Override this method to return classes instead of instances
+        # This forces the manifest action to call Hyrax::ManifestBuilderService.manifest_for
+        # which allows for the passing in of the manifest factory
+        def iiif_manifest_builder
+          self.class.iiif_manifest_builder ||
+            (Flipflop.cache_work_iiif_manifest? ? Hyrax::CachingIiifManifestBuilder : Hyrax::ManifestBuilderService)
+        end
+
+        def manifest_factory
           if iiif_version_3?
-            ::IIIFManifest::V3::ManifestFactory.new(presenter)
+            ::IIIFManifest::V3::ManifestFactory
           else
-            ::IIIFManifest::ManifestFactory.new(presenter)
+            ::IIIFManifest::ManifestFactory
           end
         end
     end

data/app/controllers/hyrax/iiif_av/iiif_av_controller.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+module Hyrax
+  module IiifAv
+    class IiifAvController < ApplicationController
+      include Blacklight::Base
+      include Blacklight::AccessControls::Catalog
+
+      def content
+        file_set_id = params[:id]
+        label = params[:label]
+        if request.head?
+          return head :ok if valid_token? || can?(:read, params[:id])
+          return head :unauthorized
+        else
+          return head :unauthorized unless presenter
+          return redirect_to hyrax.download_path(file_set_id, file: label, locale: nil) unless stream_urls[label]
+          redirect_to stream_urls[label]
+        end
+      end
+
+      def auth_token
+        return head :unauthorized unless can? :read, params[:id]
+        response.set_header('Content-Security-Policy', 'frame-ancestors *')
+        render html: auth_token_html_response(generate_auth_token)
+      end
+
+      # This route is meant to be used with devise's `after_sign_in_path_for` as part of the IIIF Auth flow
+      # See the override of `after_sign_in_path_for` in Hyrax::IiifAv::AuthControllerBehavior
+      def sign_in
+        render inline: "<html><head><script>window.close();</script></head><body></body></html>".html_safe
+      end
+
+      private
+
+        def generate_auth_token
+          # This is the same method used by ActiveRecord::SecureToken
+          token = SecureRandom.base58(24)
+          Rails.cache.write("iiif_auth_token-#{token}", params[:id])
+          token
+        end
+
+        def auth_token_html_response(token)
+          message = { messageId: params[:messageId], accessToken: token }
+          origin = Rails::Html::FullSanitizer.new.sanitize(params[:origin])
+          "<html><body><script>window.parent.postMessage(#{message.to_json}, \"#{origin}\");</script></body></html>".html_safe
+        end
+
+        def valid_token?
+          auth_token = request.headers['Authorization']&.sub('Bearer ', '')&.strip
+          resource_id = Rails.cache.read("iiif_auth_token-#{auth_token}")
+          params[:id] == resource_id
+        end
+
+        # Override of Blacklight::RequestBuilders
+        def search_builder_class
+          Hyrax::FileSetSearchBuilder
+        end
+
+        def presenter
+          @presenter ||= begin
+            _, document_list = search_results(params)
+            curation_concern = document_list.first
+            return nil unless curation_concern
+            # Use the show presenter configured in the FileSetsController
+            Hyrax::FileSetsController.show_presenter.new(curation_concern, current_ability, request)
+          end
+        end
+
+        # Duplicated here from Hyrax::IiifAv::DisplaysContent
+        def stream_urls
+          @stream_urls ||= begin
+            return {} unless presenter.solr_document['derivatives_metadata_ssi'].present?
+            files_metadata = JSON.parse(presenter.solr_document['derivatives_metadata_ssi'])
+            file_locations = files_metadata.select { |f| f['file_location_uri'].present? }
+            return {} unless file_locations.present?
+            streams = {}
+            file_locations.each do |f|
+              streams[f['label']] = Hyrax::IiifAv.config.iiif_av_url_builder.call(
+                f['file_location_uri'],
+                request.base_url
+              )
+            end
+            streams
+          end
+        end
+    end
+  end
+end

data/app/presenters/concerns/hyrax/iiif_av/displays_content.rb

@@ -47,11 +47,24 @@ module Hyrax
         end
 
         def image_content
-          url = Hyrax.config.iiif_image_url_builder.call(
-            solr_document.id,
-            request.base_url,
-            Hyrax.config.iiif_image_size_default
-          )
+          return nil unless latest_file_id
+
+          url_builder = Hyrax.config.iiif_image_url_builder
+          url = if url_builder.arity == 4
+                  url_builder.call(
+                    latest_file_id,
+                    request.base_url,
+                    Hyrax.config.iiif_image_size_default,
+                    # In Hyrax 3, Hyrax.config.iiif_image_url_builder takes a format argument
+                    image_format(alpha_channels)
+                  )
+                else
+                  url_builder.call(
+                    latest_file_id,
+                    request.base_url,
+                    Hyrax.config.iiif_image_size_default
+                  )
+                end
 
           # Look at the request and target prezi 2 or 3 for images
           parent.iiif_version == 3 ? image_content_v3(url) : image_content_v2(url)
@@ -60,18 +73,20 @@ module Hyrax
         def image_content_v3(url)
           # @see https://github.com/samvera-labs/iiif_manifest
           IIIFManifest::V3::DisplayContent.new(url,
-                                               width: 640,
-                                               height: 480,
+                                               format: image_format(alpha_channels),
+                                               width: width,
+                                               height: height,
                                                type: 'Image',
-                                               iiif_endpoint: iiif_endpoint(solr_document.id))
+                                               iiif_endpoint: iiif_endpoint(latest_file_id))
         end
 
         def image_content_v2(url)
           # @see https://github.com/samvera-labs/iiif_manifest
           IIIFManifest::DisplayImage.new(url,
-                                         width: 640,
-                                         height: 480,
-                                         iiif_endpoint: iiif_endpoint(solr_document.id))
+                                         format: image_format(alpha_channels),
+                                         width: width,
+                                         height: height,
+                                         iiif_endpoint: iiif_endpoint(latest_file_id))
         end
 
         def video_content
@@ -84,13 +99,15 @@ module Hyrax
           end
         end
 
-        def video_display_content(url, label = '')
-          IIIFManifest::V3::DisplayContent.new(url,
+        def video_display_content(_url, label = '')
+          IIIFManifest::V3::DisplayContent.new(Hyrax::IiifAv::Engine.routes.url_helpers.iiif_av_content_url(solr_document.id, label: label, host: request.base_url),
                                                label: label,
                                                width: Array(solr_document.width).first.try(:to_i),
                                                height: Array(solr_document.height).first.try(:to_i),
                                                duration: Array(solr_document.duration).first.try(:to_i) / 1000.0,
-                                               type: 'Video')
+                                               type: 'Video',
+                                               format: solr_document.mime_type,
+                                               auth_service: auth_service)
         end
 
         def audio_content
@@ -102,11 +119,13 @@ module Hyrax
           end
         end
 
-        def audio_display_content(url, label = '')
-          IIIFManifest::V3::DisplayContent.new(url,
+        def audio_display_content(_url, label = '')
+          IIIFManifest::V3::DisplayContent.new(Hyrax::IiifAv::Engine.routes.url_helpers.iiif_av_content_url(solr_document.id, label: label, host: request.base_url),
                                                label: label,
                                                duration: Array(solr_document.duration).first.try(:to_i) / 1000.0,
-                                               type: 'Sound')
+                                               type: 'Sound',
+                                               format: solr_document.mime_type,
+                                               auth_service: auth_service)
         end
 
         def download_path(extension)
@@ -128,6 +147,34 @@ module Hyrax
           end
           streams
         end
+
+        def auth_service
+          {
+            "context": "http://iiif.io/api/auth/1/context.json",
+            "@id": Rails.application.routes.url_helpers.new_user_session_url(host: request.base_url, iiif_auth_login: true),
+            "@type": "AuthCookieService1",
+            "confirmLabel": I18n.t('iiif_av.auth.confirmLabel'),
+            "description": I18n.t('iiif_av.auth.description'),
+            "failureDescription": I18n.t('iiif_av.auth.failureDescription'),
+            "failureHeader": I18n.t('iiif_av.auth.failureHeader'),
+            "header": I18n.t('iiif_av.auth.header'),
+            "label": I18n.t('iiif_av.auth.label'),
+            "profile": "http://iiif.io/api/auth/1/login",
+            "service": [
+              {
+                "@id": Hyrax::IiifAv::Engine.routes.url_helpers.iiif_av_auth_token_url(id: id, host: request.base_url),
+                "@type": "AuthTokenService1",
+                "profile": "http://iiif.io/api/auth/1/token"
+              },
+              {
+                "@id": Rails.application.routes.url_helpers.destroy_user_session_url(host: request.base_url),
+                "@type": "AuthLogoutService1",
+                "label": I18n.t('iiif_av.auth.logoutLabel'),
+                "profile": "http://iiif.io/api/auth/1/logout"
+              }
+            ]
+          }
+        end
     end
   end
 end

data/app/presenters/concerns/hyrax/iiif_av/displays_iiif_av.rb

@@ -38,7 +38,7 @@ module Hyrax
 
       def iiif_viewer
         if representative_presenter.video? || representative_presenter.audio?
-          :avalon
+          Hyrax::IiifAv.config.iiif_av_viewer
         else
           super
         end

data/config/locales/en.yml

@@ -0,0 +1,10 @@
+en:
+  iiif_av:
+    auth:
+      confirmLabel: "Login"
+      description: "You must log in to view this content."
+      failureDescription: "<a href=\"http://example.org/policy\">Access Policy</a>"
+      failureHeader: "Authentication Failed"
+      header: "Please Log In"
+      label: "Login Required"
+      logoutLabel: "Log out"

data/config/routes.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+Hyrax::IiifAv::Engine.routes.draw do
+  get '/iiif_av/content/:id/:label', to: 'iiif_av#content', as: :iiif_av_content
+  get '/iiif_av/auth_token/:id', to: 'iiif_av#auth_token', as: :iiif_av_auth_token
+  get '/iiif_av/sign_in', to: 'iiif_av#sign_in', as: :iiif_av_sign_in
+end

data/hyrax-iiif_av.gemspec

@@ -16,18 +16,19 @@ Gem::Specification.new do |s|
   s.license     = 'Apache-2.0'
 
   s.files = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+    f.match(%r{^(test|spec|features)/}) || f == 'bin/rails'
   end
 
-  s.add_dependency "rails", "~>5.1"
+  s.add_dependency "rails", ">= 5.1", "< 8.0"
   s.add_dependency "blacklight"
-  s.add_dependency "hyrax", "~> 2.4"
-  s.add_dependency "iiif_manifest", "~> 0.5"
+  s.add_dependency "hyrax", ">= 3.5", "< 6.0"
+  s.add_dependency "iiif_manifest", "> 0.5"
 
   s.add_development_dependency 'bixby'
   s.add_development_dependency 'coffee-rails'
-  s.add_development_dependency 'engine_cart', '~> 2.0'
-  s.add_development_dependency 'factory_bot_rails'
+  s.add_development_dependency 'engine_cart', '~> 2.2'
+  s.add_development_dependency 'factory_bot'
   s.add_development_dependency 'rails-controller-testing'
   s.add_development_dependency 'rspec-rails', '~> 3.8'
+  s.add_development_dependency 'rspec_junit_formatter'
 end

data/lib/generators/hyrax/iiif_av/install_generator.rb

@@ -6,7 +6,38 @@ module Hyrax
     class InstallGenerator < Rails::Generators::Base
       source_root File.expand_path('../templates', __FILE__)
 
-      # Do nothing for now
+      def install_rack_cors
+        gem 'rack-cors'
+        Bundler.with_clean_env do
+          run "bundle install"
+        end
+      end
+
+      def enable_cors
+        insert_into_file 'config/application.rb', after: 'class Application < Rails::Application' do
+          "\n" \
+          "    require 'rack/cors'\n" \
+          "    config.middleware.insert_before 0, Rack::Cors do\n" \
+          "      allow do\n" \
+          "        origins '*'\n" \
+          "        resource '/concern/*/*/manifest*', headers: :any, methods: [:head, :get]\n" \
+          "        resource '/iiif_av/*', headers: :any, methods: [:head, :get], expose: ['Content-Security-Policy']\n" \
+          "        resource '/downloads/*', headers: :any, methods: [:head, :get]\n" \
+          "      end\n" \
+          "    end\n" \
+        end
+      end
+
+      def mount_routes
+        route "mount Hyrax::IiifAv::Engine, at: '/'"
+      end
+
+      def override_devise_redirect_path
+        insert_into_file 'app/controllers/application_controller.rb', after: 'include Hyrax::Controller' do
+          "\n" \
+          "  include Hyrax::IiifAv::AuthControllerBehavior"
+        end
+      end
     end
   end
 end

data/lib/hyrax/iiif_av/configuration.rb

@@ -16,6 +16,15 @@ module Hyrax
         end
       end
       attr_writer :iiif_av_url_builder
+
+      # A symbol that represents the viewer to render for AV items.
+      # Defaults to :avalon. Known to work with :universal_viewer as well
+
+      # @return [:symbol] viewer partial name
+      def iiif_av_viewer
+        @iiif_av_viewer ||= :avalon
+      end
+      attr_writer :iiif_av_viewer
     end
   end
 end

data/lib/hyrax/iiif_av/spec/shared_specs/controller_behavior.rb

@@ -30,7 +30,7 @@ RSpec.shared_examples "IiifAv::ControllerBehavior" do
     let(:manifest_factory3) { instance_double("IIIFManifest::V3::ManifestBuilder", to_h: { test: 'manifest3' }) }
 
     before do
-      allow(controller).to receive(:presenter).and_return(presenter)
+      allow(controller).to receive(:iiif_manifest_presenter).and_return(presenter)
       allow(IIIFManifest::ManifestFactory).to receive(:new).with(presenter).and_return(manifest_factory2)
       allow(IIIFManifest::V3::ManifestFactory).to receive(:new).with(presenter).and_return(manifest_factory3)
       request.headers['Accept'] = mime

data/lib/hyrax/iiif_av/spec/shared_specs/displays_content.rb

@@ -15,6 +15,7 @@ RSpec.shared_examples "IiifAv::DisplaysContent" do
     allow(ability).to receive(:can?).with(:read, solr_document.id).and_return(read_permission)
     allow(presenter).to receive(:parent).and_return(parent_presenter)
     allow(presenter).to receive(:title).and_return(title)
+    allow(presenter).to receive(:latest_file_id).and_return(id)
   end
 
   describe '#display_content' do
@@ -40,9 +41,9 @@ RSpec.shared_examples "IiifAv::DisplaysContent" do
       end
 
       context "when the file is a sound recording" do
-        let(:solr_document) { SolrDocument.new(id: '12345', duration_tesim: 1000) }
-        let(:mp3_url) { "http://test.host/downloads/#{solr_document.id}?file=mp3" }
-        let(:ogg_url) { "http://test.host/downloads/#{solr_document.id}?file=ogg" }
+        let(:solr_document) { SolrDocument.new(id: '12345', duration_tesim: 1000, mime_type_ssi: 'audio/mp3') }
+        let(:mp3_url) { "http://test.host/iiif_av/content/#{solr_document.id}/mp3" }
+        let(:ogg_url) { "http://test.host/iiif_av/content/#{solr_document.id}/ogg" }
 
         before do
           allow(solr_document).to receive(:audio?).and_return(true)
@@ -52,6 +53,7 @@ RSpec.shared_examples "IiifAv::DisplaysContent" do
           expect(content).to all(be_instance_of IIIFManifest::V3::DisplayContent)
           expect(content.length).to eq 2
           expect(content.map(&:type)).to all(eq 'Sound')
+          expect(content.map(&:format)).to all(eq 'audio/mp3')
           expect(content.map(&:duration)).to all(eq 1.000)
           expect(content.map(&:label)).to match_array(['mp3', 'ogg'])
           expect(content.map(&:url)).to match_array([mp3_url, ogg_url])
@@ -59,9 +61,9 @@ RSpec.shared_examples "IiifAv::DisplaysContent" do
       end
 
       context "when the file is a video" do
-        let(:solr_document) { SolrDocument.new(id: '12345', width_is: 640, height_is: 480, duration_tesim: 1000) }
-        let(:mp4_url) { "http://test.host/downloads/#{id}?file=mp4" }
-        let(:webm_url) { "http://test.host/downloads/#{id}?file=webm" }
+        let(:solr_document) { SolrDocument.new(id: '12345', width_is: 640, height_is: 480, duration_tesim: 1000, mime_type_ssi: 'video/mp4') }
+        let(:mp4_url) { "http://test.host/iiif_av/content/#{id}/mp4" }
+        let(:webm_url) { "http://test.host/iiif_av/content/#{id}/webm" }
 
         before do
           allow(solr_document).to receive(:video?).and_return(true)
@@ -71,6 +73,7 @@ RSpec.shared_examples "IiifAv::DisplaysContent" do
           expect(content).to all(be_instance_of IIIFManifest::V3::DisplayContent)
           expect(content.length).to eq 2
           expect(content.map(&:type)).to all(eq 'Video')
+          expect(content.map(&:format)).to all(eq 'video/mp4')
           expect(content.map(&:width)).to all(eq 640)
           expect(content.map(&:height)).to all(eq 480)
           expect(content.map(&:duration)).to all(eq 1.000)
@@ -83,11 +86,11 @@ RSpec.shared_examples "IiifAv::DisplaysContent" do
         let(:file_set_id) { 'abcdefg' }
         let(:derivatives_metadata) do
           [
-            { id: '1', label: 'high', file_location_uri: Hyrax::DerivativePath.derivative_path_for_reference(file_set_id, 'medium.mp3') },
-            { id: '2', label: 'medium', file_location_uri: Hyrax::DerivativePath.derivative_path_for_reference(file_set_id, 'high.mp3') }
+            { id: '1', label: 'high', file_location_uri: Hyrax::DerivativePath.derivative_path_for_reference(file_set_id, 'high.mp3') },
+            { id: '2', label: 'medium', file_location_uri: Hyrax::DerivativePath.derivative_path_for_reference(file_set_id, 'medium.mp3') }
           ]
         end
-        let(:solr_document) { SolrDocument.new(id: '12345', duration_tesim: 1000, derivatives_metadata_ssi: derivatives_metadata.to_json) }
+        let(:solr_document) { SolrDocument.new(id: file_set_id, duration_tesim: 1000, derivatives_metadata_ssi: derivatives_metadata.to_json) }
 
         before do
           allow(solr_document).to receive(:audio?).and_return(true)
@@ -97,29 +100,8 @@ RSpec.shared_examples "IiifAv::DisplaysContent" do
           expect(content).to all(be_instance_of IIIFManifest::V3::DisplayContent)
           expect(content.length).to eq 2
           expect(content.map(&:label)).to match_array(['high', 'medium'])
-          expect(content.map(&:url)).to match_array([Hyrax::Engine.routes.url_helpers.download_path(file_set_id, file: 'high.mp3'),
-                                                     Hyrax::Engine.routes.url_helpers.download_path(file_set_id, file: 'medium.mp3')])
-        end
-
-        context 'with custom av url builder' do
-          let(:custom_builder) do
-            ->(file_location_uri, _base_url) { "http://streaming.example.com/stream/#{File.basename(file_location_uri)}" }
-          end
-
-          around do |example|
-            default_builder = Hyrax::IiifAv.config.iiif_av_url_builder
-            Hyrax::IiifAv.config.iiif_av_url_builder = custom_builder
-            example.run
-            Hyrax::IiifAv.config.iiif_av_url_builder = default_builder
-          end
-
-          it 'creates an array of content objects with metadata' do
-            expect(content).to all(be_instance_of IIIFManifest::V3::DisplayContent)
-            expect(content.length).to eq 2
-            expect(content.map(&:label)).to match_array(['high', 'medium'])
-            expect(content.map(&:url)).to match_array(['http://streaming.example.com/stream/g-high.mp3.high.mp3',
-                                                       'http://streaming.example.com/stream/g-medium.mp3.medium.mp3'])
-          end
+          expect(content.map(&:url)).to match_array([Hyrax::IiifAv::Engine.routes.url_helpers.iiif_av_content_url(file_set_id, label: 'high', host: request.base_url),
+                                                     Hyrax::IiifAv::Engine.routes.url_helpers.iiif_av_content_url(file_set_id, label: 'medium', host: request.base_url)])
         end
       end
 
@@ -151,7 +133,7 @@ RSpec.shared_examples "IiifAv::DisplaysContent" do
 
         context 'with custom image url builder' do
           let(:custom_builder) do
-            ->(file_id, base_url, _size) { "#{base_url}/downloads/#{file_id.split('/').first}" }
+            ->(file_id, base_url, _size, _format) { "#{base_url}/downloads/#{file_id.split('/').first}" }
           end
 
           around do |example|
@@ -184,6 +166,29 @@ RSpec.shared_examples "IiifAv::DisplaysContent" do
           end
         end
       end
+
+      context 'auth_service' do
+        let(:solr_document) { SolrDocument.new(id: '12345', duration_tesim: 1000) }
+        let(:auth_service) { content.first.auth_service }
+
+        before do
+          allow(solr_document).to receive(:audio?).and_return(true)
+        end
+
+        it 'provides a cookie auth service' do
+          expect(auth_service[:@id]).to eq Rails.application.routes.url_helpers.new_user_session_url(host: request.base_url, iiif_auth_login: true)
+        end
+
+        it 'provides a token service' do
+          token_service = auth_service[:service].find { |s| s[:@type] == "AuthTokenService1" }
+          expect(token_service[:@id]).to eq Hyrax::IiifAv::Engine.routes.url_helpers.iiif_av_auth_token_url(id: solr_document.id, host: request.base_url)
+        end
+
+        it 'provides a logout service' do
+          logout_service = auth_service[:service].find { |s| s[:@type] == "AuthLogoutService1" }
+          expect(logout_service[:@id]).to eq Rails.application.routes.url_helpers.destroy_user_session_url(host: request.base_url)
+        end
+      end
     end
   end
 end

data/lib/hyrax/iiif_av/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Hyrax
   module IiifAv
-    VERSION = '0.2.0'
+    VERSION = '0.4.0'
   end
 end

metadata

@@ -1,32 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: hyrax-iiif_av
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Chris Colvard
 - Brian Keese
 - Ying Feng
 - Phuong Dinh
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -45,28 +50,34 @@ dependencies:
   name: hyrax
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.5'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: iiif_manifest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
@@ -103,16 +114,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: factory_bot_rails
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -153,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.8'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Hyrax plugin for IIIF Presentation 3.0 audiovisual support
 email:
 - cjcolvar@indiana.edu
@@ -163,20 +188,26 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- app/controllers/concerns/hyrax/iiif_av/auth_controller_behavior.rb
 - app/controllers/concerns/hyrax/iiif_av/controller_behavior.rb
+- app/controllers/hyrax/iiif_av/iiif_av_controller.rb
 - app/models/hyrax/iiif_av/manifest_range.rb
 - app/presenters/concerns/hyrax/iiif_av/displays_content.rb
 - app/presenters/concerns/hyrax/iiif_av/displays_iiif_av.rb
 - app/presenters/hyrax/iiif_av/iiif_file_set_presenter.rb
-- bin/rails
+- config/locales/en.yml
+- config/routes.rb
 - hyrax-iiif_av.gemspec
 - lib/generators/hyrax/iiif_av/add_to_work_type_generator.rb
 - lib/generators/hyrax/iiif_av/install_avalon_player_generator.rb
@@ -192,11 +223,9 @@ files:
 - lib/hyrax/iiif_av/spec/shared_specs/displays_iiif_av.rb
 - lib/hyrax/iiif_av/version.rb
 - lib/tasks/hyrax/iiif_av_tasks.rake
-homepage: 
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -211,9 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Hyrax plugin for IIIF Presentation 3.0 audiovisual support
 test_files: []

data/bin/rails

@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-# This command will automatically be run when you run "rails" with Rails gems
-# installed from the root of your application.
-
-ENGINE_ROOT = File.expand_path('..', __dir__)
-ENGINE_PATH = File.expand_path('../lib/hyrax/iiif_av/engine', __dir__)
-# APP_PATH = File.expand_path('../.internal_test_app/config/application', __dir__)
-
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-
-require 'rails/all'
-require 'rails/engine/commands'