hyrax 2.9.5 → 3.0.0.pre.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: '0148443e7ca6987d77b7ccbad46c89c895ae60e226565819b095293884c040cc'
-  data.tar.gz: 5a2cfda462e5415dc6c736dcbaaf4bb7b7a202fa0afe54c2819026f4559d7942
+SHA1:
+  metadata.gz: ea3a1997ae611fde653f50e69be5447644b7c8c1
+  data.tar.gz: 5bd79f0028981330bd6693986a36742ef5ff8c50
 SHA512:
-  metadata.gz: faaee31b6dec44292d47981fe77d22bc9f8f40865670b9f2b1a470aca00b10193cb01931c1084a9622cb3a4e6fca5803c1b6a8a77965dca75619cc59f5da1d67
-  data.tar.gz: b3232036171e55e8166da5d4886d52b91fe6ce3f0c05018508deee6b594491df87b0d7b925b477e4d8a6a5134c0233026433d4df47d9902c28e074614dd3e18d
+  metadata.gz: a191208ea915f67744c6b42a8f5fb8cc911d3f3c342f70420c74fd2c779919dc9fc4c3199a4ee27e8a59c1ba4c0c79d9452a80cc4994eaedc36998c4b2980316
+  data.tar.gz: '0821db636ba2f45bb2cd19ef71d01ab6d99aecdd28d175e252484964ff2e62edba87ffabff8a8c969adf6d32ed73584e13b9ba3f88550636e4ff6aa00eef53f9'

data/.circleci/config.yml

@@ -1,182 +1,124 @@
-version: 2.1
-orbs:
-  samvera: samvera/circleci-orb@0
+# Ruby CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-ruby/ for more details
+#
+version: 2
 jobs:
-  bundle:
-    parameters:
-      ruby_version:
-        type: string
-        default: 2.5.8
-      bundler_version:
-        type: string
-        default: 1.17.3
-      rails_version:
-        type: string
-        default: '5.2.6'
-    executor:
-      name: 'samvera/ruby'
-      ruby_version: << parameters.ruby_version >>
-    resource_class: medium+
-    environment:
-      RAILS_VERSION: << parameters.rails_version >>
-      NOKOGIRI_USE_SYSTEM_LIBRARIES: true
-    steps:
-      - samvera/cached_checkout
-      - samvera/bundle_for_gem:
-          ruby_version: << parameters.ruby_version >>
-          bundler_version: << parameters.bundler_version >>
-          cache_version: '{{ checksum ".regen" }}'
-          project: hyrax
-      - persist_to_workspace:
-          root: ~/
-          paths:
-          - project/*
-          - project/**/*
-
-  lint:
-    parameters:
-      ruby_version:
-        type: string
-        default: 2.5.5
-    executor:
-      name: 'samvera/ruby'
-      ruby_version: << parameters.ruby_version >>
-    resource_class: medium+
-    steps:
-      - attach_workspace:
-          at: ~/
-      - samvera/rubocop
-
   build:
-    parameters:
-      ruby_version:
-        type: string
-        default: 2.5.8
-      bundler_version:
-        type: string
-        default: 1.17.3
-      rails_version:
-        type: string
-        default: '5.2.6'
-    executor:
-      name: 'samvera/ruby'
-      ruby_version: << parameters.ruby_version >>
-    resource_class: medium+
+    docker:
+    - image: circleci/ruby:2.5.3-node-browsers-legacy
+    - image: circleci/redis:4
+    - image: ualbertalib/docker-fcrepo4:4.7
+      environment:
+        CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC"
+    - image: solr:7-alpine
+      command: bin/solr -cloud -noprompt -f -p 8985
+
+    # Specify service dependencies here if necessary
+    # CircleCI maintains a library of pre-built images
+    # documented at https://circleci.com/docs/2.0/circleci-images/
+    # - image: circleci/postgres:9.4
+
+    working_directory: ~/repo
+    parallelism: 2
+
     environment:
-      RAILS_VERSION: << parameters.rails_version >>
+      RAILS_ENV: test
+      RACK_ENV: test
+      FCREPO_TEST_PORT: 8080/fcrepo
+      BUNDLE_JOBS: 4
+      BUNDLE_RETRY: 3
       NOKOGIRI_USE_SYSTEM_LIBRARIES: true
       ENGINE_CART_RAILS_OPTIONS: --skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-action-cable --skip-coffee --skip-puma --skip-test
-    steps:
-      - attach_workspace:
-          at: ~/
-      - samvera/engine_cart_generate:
-          cache_key: v1-2.x-internal-test-app-{{ checksum "hyrax.gemspec" }}-{{ checksum ".regen" }}-<< parameters.rails_version >>-<< parameters.ruby_version >>
-      - samvera/bundle_for_gem:
-          ruby_version: << parameters.ruby_version >>
-          bundler_version: << parameters.bundler_version >>
-          cache_version: '{{ checksum ".regen" }}'
-          project: hyrax
-      - persist_to_workspace:
-          root: ~/
-          paths:
-          - project/*
-          - project/**/*
-
-  test:
-    parameters:
-      ruby_version:
-        type: string
-        default: 2.5.8
-      bundler_version:
-        type: string
-        default: 1.17.3
-    executor:
-      name: 'samvera/ruby_fcrepo_solr_redis'
-      ruby_version: << parameters.ruby_version >>
-    resource_class: medium+
-    parallelism: 10
-    environment:
+      SPEC_OPTS: --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress
       COVERALLS_PARALLEL: true
+
     steps:
-      - attach_workspace:
-          at: ~/
-      - samvera/install_solr_core:
-          solr_config_path: .internal_test_app/solr/config
-      # Rerun bundler in case this is a different ruby version than bundle and build steps
-      - samvera/bundle_for_gem:
-          ruby_version: << parameters.ruby_version >>
-          bundler_version: << parameters.bundler_version >>
-          cache_version: '{{ checksum ".regen" }}'
-          project: hyrax
-      - samvera/parallel_rspec
-
-workflows:
-  version: 2
-  ruby2-5rails5-1:
-    jobs:
-      - bundle:
-          ruby_version: "2.5.8"
-          rails_version: "5.1.7"
-      - lint:
-          ruby_version: "2.5.8"
-          requires:
-            - bundle
-      - build:
-          ruby_version: "2.5.8"
-          rails_version: "5.1.7"
-          requires:
-            - bundle
-      - test:
-          name: "rails5-1"
-          ruby_version: "2.5.8"
-          requires:
-            - build
-            - lint
-  ruby2-5rails5-2:
-    jobs:
-      - bundle:
-          ruby_version: "2.5.8"
-          rails_version: "5.2.6"
-      - build:
-          ruby_version: "2.5.8"
-          rails_version: "5.2.6"
-          requires:
-            - bundle
-      - test:
-          name: "ruby2-5-8"
-          ruby_version: "2.5.8"
-          requires:
-            - build
-  ruby2-6rails5-2:
-    jobs:
-      - bundle:
-          ruby_version: "2.6.6"
-          rails_version: "5.2.6"
-      - build:
-          ruby_version: "2.6.6"
-          rails_version: "5.2.6"
-          requires:
-            - bundle
-      - test:
-          name: "ruby2-6-6"
-          ruby_version: "2.6.6"
-          requires:
-            - build
-  ruby2-7rails5-2:
-    jobs:
-      - bundle:
-          ruby_version: "2.7.1"
-          rails_version: "5.2.6"
-          bundler_version: "2.1.2"
-      - build:
-          ruby_version: "2.7.1"
-          rails_version: "5.2.6"
-          bundler_version: "2.1.2"
-          requires:
-            - bundle
-      - test:
-          name: "ruby2-7-1"
-          ruby_version: "2.7.1"
-          bundler_version: "2.1.2"
-          requires:
-            - build
+    - restore_cache:
+        keys:
+        - source-v1-{{ .Branch }}-{{ .Revision }}
+        - source-v1-{{ .Branch }}-
+        - source-v1-
+
+    - checkout
+
+    - save_cache:
+        key: source-v1-{{ .Branch }}-{{ .Revision }}
+        paths:
+        - ".git"
+
+    # BUNDLE_PATH is unset to allow for `bundle config path` to take precedence.
+    - run:
+        name: Extra environment setup
+        command: |
+          echo 'unset BUNDLE_PATH' >> $BASH_ENV
+
+    - restore_cache:
+        keys:
+        - v1-internal-test-app-{{ .Branch }}
+        - v1-internal-test-app-
+
+    # Download and cache dependencies
+    - restore_cache:
+        keys:
+        - v1-dependencies-{{ .Branch }}-{{ checksum "./.internal_test_app/.generated_engine_cart" }}
+        - v1-dependencies-{{ .Branch }}
+        - v1-dependencies-
+
+    - run:
+        name: Install dependencies
+        command: |
+          gem update --system
+          gem update bundler
+          bundle config path $CIRCLE_WORKING_DIRECTORY/vendor/bundle
+          bundle install
+
+    - run:
+        name: Call Rubocop
+        command: bundle exec rubocop
+
+    - run:
+        name: Generate test app, ensure top-level Gemfile.lock is valid
+        command: |
+          bundle exec rake engine_cart:generate
+          bundle install
+
+    - save_cache:
+        paths:
+        - ./.internal_test_app
+        key: v1-internal-test-app-{{ .Branch }}-{{ checksum "./.internal_test_app/.generated_engine_cart" }}
+
+    - run:
+        name: Start headless Chrome
+        command: google-chrome-stable --headless --disable-gpu --no-sandbox --remote-debugging-port=9222 http://localhost
+        background: true
+
+    - run:
+        name: Load config into SolrCloud
+        command: |
+          cd .internal_test_app/solr/config
+          zip -1 -r solr_hyrax_config.zip ./*
+          curl -H "Content-type:application/octet-stream" --data-binary @solr_hyrax_config.zip "http://localhost:8985/solr/admin/configs?action=UPLOAD&name=hyrax"
+          curl -H 'Content-type: application/json' http://localhost:8985/api/collections/ -d '{create: {name: hydra-test, config: hyrax, numShards: 1}}'
+
+    - run:
+        name: Run rspec in parallel
+        command: |
+          mkdir /tmp/test-results
+          bundle exec rspec $(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
+
+    - run:
+        name: Clean dependencies
+        command: bundle clean
+
+    - save_cache:
+        paths:
+        - ./vendor/bundle
+        key: v1-dependencies-{{ .Branch }}-{{ checksum "./.internal_test_app/.generated_engine_cart" }}
+
+    # collect reports
+    - store_test_results:
+        path: /tmp/test-results
+    - store_artifacts:
+        path: /tmp/test-results
+        destination: test-results

data/.gitignore

@@ -78,4 +78,3 @@ _yardoc
 lib/bundler/man
 spec/reports
 /spec/examples.txt
-node_modules

data/.travis.yml

@@ -0,0 +1,33 @@
+language: ruby
+sudo: required
+dist: trusty
+
+addons:
+  chrome: stable
+cache:
+  bundler: true
+
+before_install:
+  - gem update --system
+  - gem install bundler
+  - google-chrome-stable --headless --disable-gpu --no-sandbox --remote-debugging-port=9222 http://localhost &
+
+rvm:
+  - 2.5.3
+
+env:
+  global:
+    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+    - ENGINE_CART_RAILS_OPTIONS='--skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-action-cable --skip-coffee --skip-puma --skip-test'
+  # Travis should check every minor version in a range of supported versions, because
+  # rails does not follow sem-ver conventions, see http://guides.rubyonrails.org/maintenance_policy.html
+  # It should be sufficient to test only the latest of the patch versions for a minor version, they
+  # should be compatible across patch versions (only bug fixes are released in patch versions).
+  matrix:
+    - "RAILS_VERSION=5.1.6"
+    - "RAILS_VERSION=5.0.7"
+
+services:
+  - redis-server
+before_script:
+  - jdk_switcher use oraclejdk8

data/README.md

@@ -1,6 +1,7 @@
 ![Logo](https://raw.githubusercontent.com/samvera/hyrax/gh-pages/assets/images/hyrax_logo_horizontal_white_background.png)
 
 Code: [![Version](https://badge.fury.io/rb/hyrax.png)](http://badge.fury.io/rb/hyrax)
+[![Build Status](https://travis-ci.org/samvera/hyrax.png?branch=master)](https://travis-ci.org/samvera/hyrax)
 [![CircleCI](https://circleci.com/gh/samvera/hyrax.svg?style=svg)](https://circleci.com/gh/samvera/hyrax)
 [![Coverage Status](https://coveralls.io/repos/github/samvera/hyrax/badge.svg?branch=master)](https://coveralls.io/github/samvera/hyrax?branch=master)
 [![Code Climate](https://codeclimate.com/github/samvera/hyrax/badges/gpa.svg)](https://codeclimate.com/github/samvera/hyrax)
@@ -12,7 +13,7 @@ Docs: [![Documentation Status](https://inch-ci.org/github/samvera/hyrax.svg?bran
 [![Apache 2.0 License](http://img.shields.io/badge/APACHE2-license-blue.svg)](./LICENSE)
 
 Jump in: [![Slack Status](http://slack.samvera.org/badge.svg)](http://slack.samvera.org/)
-[![Ready Tickets](https://badge.waffle.io/samvera/hyrax.png?label=ready&milestone=2.x%20series&title=Ready)](https://waffle.io/samvera/hyrax?milestone=2.x%20series)
+[![Ready Tickets](https://badge.waffle.io/samvera/hyrax.png?label=ready&milestone=2.x%20series&title=Ready)](https://waffle.io/samvera/hyrax?milestone=3.x%20series)
 
 # Table of Contents
 
@@ -63,10 +64,14 @@ The Samvera community is here to help. Please see our [support guide](./.github/
 # Getting started
 
 This document contains instructions specific to setting up an app with __Hyrax
-v2.5.0__. If you are looking for instructions on installing a different
+v3.0.0-beta1__. If you are looking for instructions on installing a different
 version, be sure to select the appropriate branch or tag from the drop-down
 menu above.
 
+## Quickstart
+
+If you're looking to spin up a vanilla Hyrax application very quickly for demonstration purposes, you may be interested in [the samvera-vagrant project](https://github.com/samvera-labs/samvera-vagrant) which may be used to "kick the tires" of Hyrax and [Hyku](https://github.com/samvera-labs/hyku). It requires VirtualBox and Vagrant.
+
 ## Prerequisites
 
 Prerequisites are required for both creating a Hyrax\-based app and contributing new features to Hyrax. After installing the prerequisites...
@@ -114,7 +119,7 @@ Hyrax includes support for transcoding audio and video files with ffmpeg > 1.0 i
 
 On OSX, you can use Homebrew to install ffmpeg:
 
-`brew install libvpx ffmpeg`
+`brew install ffmpeg --with-fdk-aac --with-libvpx --with-libvorbis`
 
 Otherwise, to compile ffmpeg yourself, see the [ffmpeg compilation guide](https://trac.ffmpeg.org/wiki/CompilationGuide).
 
@@ -128,7 +133,7 @@ Note here that the following commands assume you're setting up Hyrax in a develo
 
 First, you'll need a working Ruby installation. You can install this via your operating system's package manager -- you are likely to get farther with OSX, Linux, or UNIX than Windows but your mileage may vary -- but we recommend using a Ruby version manager such as [RVM](https://rvm.io/) or [rbenv](https://github.com/sstephenson/rbenv).
 
-Hyrax supports Ruby 2.3 and up. When starting a new project, we recommend using the latest Ruby 2.7 version.
+Hyrax supports Ruby 2.3, 2.4 and 2.5. When starting a new project, we recommend using the latest Ruby 2.5 version.
 
 ## Redis
 
@@ -138,11 +143,11 @@ Starting up Redis will depend on your operating system, and may in fact already
 
 ## Rails
 
-Hyrax 2.x supports Rails 5.1 and 5.2. We recommend the latest Rails 5.2 release.
+Hyrax requires Rails 5. We recommend the latest Rails 5.1 release.
 
 ```
 # If you don't already have Rails at your disposal...
-gem install rails -v '5.2.4.3'
+gem install rails -v 5.1.6
 ```
 
 ### JavaScript runtime
@@ -158,7 +163,7 @@ NOTE: The steps need to be done in order to create a new Hyrax based app.
 Generate a new Rails application using the template.
 
 ```
-rails _5.2.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.9.5/template.rb
+rails _5.1.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.4.0/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:
@@ -181,7 +186,7 @@ bin/rails hydra:server
 And now you should be able to browse to [localhost:3000](http://localhost:3000/) and see the application.
 
 Notes:
-* This web server is purely for development purposes. You will want to use a more fully featured [web server](#web-server) for production-like environments.
+* This web server is purely for development purposes. You will want to use a more fully featured [web server](https://github.com/samvera/hyrax/wiki/Hyrax-Management-Guide#web-server) for production-like environments.
 * You have the option to start each of these services individually.  More information on [solr_wrapper](https://github.com/cbeer/solr_wrapper) and [fcrepo_wrapper](https://github.com/cbeer/fcrepo_wrapper) will help you set this up.  Start rails with `rails s`.
 
 ## Start background workers
@@ -321,7 +326,7 @@ If you'd like to help the development effort and you're not sure where to get st
 
 # Development
 
-The [Hyrax Development Guide](https://github.com/samvera/hyrax/wiki/Hyrax-Development-Guide) is for people who want to modify Hyrax itself, not an application that uses Hyrax. See especially the [Quick Start](https://github.com/samvera/hyrax/wiki/Hyrax-Development-Guide#quick-start-for-hyrax-development) guide and instructions for running the [Hyrax test suite](https://github.com/samvera/hyrax/wiki/Hyrax-Development-Guide#run-the-test-suite).
+The [Hyrax Development Guide](https://github.com/samvera/hyrax/wiki/Hyrax-Development-Guide) is for people who want to modify Hyrax itself, not an application that uses Hyrax.
 
 ## Reporting Security Issues
 

data/app/actors/hyrax/actors/add_to_work_actor.rb

@@ -5,8 +5,7 @@ module Hyrax
       # @return [Boolean] true if create was successful
       def create(env)
         work_ids = env.attributes.delete(:in_works_ids)
-
-        can_edit_works?(env, work_ids) && next_actor.create(env) && add_to_works(env, work_ids)
+        next_actor.create(env) && add_to_works(env, work_ids)
       end
 
       # @param [Hyrax::Actors::Environment] env
@@ -22,15 +21,6 @@ module Hyrax
           env.current_ability.can?(:edit, work) && env.current_ability.can?(:edit, env.curation_concern)
         end
 
-        def can_edit_works?(env, work_ids)
-          unless Array(work_ids).all? { |work_id| env.current_ability.can?(:edit, work_id) }
-            add_permissions_error(env.curation_concern)
-            return false
-          end
-
-          true
-        end
-
         def add_to_works(env, new_work_ids)
           return true if new_work_ids.nil?
           cleanup_ids_to_remove_from_curation_concern(env, new_work_ids)
@@ -49,25 +39,16 @@ module Hyrax
 
         def add_new_work_ids_not_already_in_curation_concern(env, new_work_ids)
           # add to new so long as the depositor for the parent and child matches, otherwise inject an error
-          new_works_for(env, new_work_ids).each do |work|
+          (new_work_ids - env.curation_concern.in_works_ids).each do |work_id|
+            work = ::ActiveFedora::Base.find(work_id)
             if can_edit_both_works?(env, work)
               work.ordered_members << env.curation_concern
               work.save!
             else
-              add_permissions_error(env.curation_concern)
+              env.curation_concern.errors[:in_works_ids] << "Works can only be related to each other if user has ability to edit both."
             end
           end
         end
-
-        def new_works_for(env, new_work_ids)
-          (new_work_ids - env.curation_concern.in_works_ids).map do |work_id|
-            ::ActiveFedora::Base.find(work_id)
-          end
-        end
-
-        def add_permissions_error(work)
-          work.errors[:in_works_ids] << "Works can only be related to each other if user has ability to edit both."
-        end
     end
   end
 end