hyrax 3.0.0.pre.beta1 → 3.0.0.pre.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ea3a1997ae611fde653f50e69be5447644b7c8c1
-  data.tar.gz: 5bd79f0028981330bd6693986a36742ef5ff8c50
+SHA256:
+  metadata.gz: 12ca8250128a0ea9333aacfe4a4b71832c0b1df954c5cd8299d2e8c9a897e097
+  data.tar.gz: ab169cfb14af7a7139e84070f1dce85532241b05654e20de78538799fbe6827a
 SHA512:
-  metadata.gz: a191208ea915f67744c6b42a8f5fb8cc911d3f3c342f70420c74fd2c779919dc9fc4c3199a4ee27e8a59c1ba4c0c79d9452a80cc4994eaedc36998c4b2980316
-  data.tar.gz: '0821db636ba2f45bb2cd19ef71d01ab6d99aecdd28d175e252484964ff2e62edba87ffabff8a8c969adf6d32ed73584e13b9ba3f88550636e4ff6aa00eef53f9'
+  metadata.gz: 3568d5aa17c020e9baafd2e450fe2aeb7748c7a0e32a9e921d774607e9a9dbd9a042edd04c19e7b023578c9dc50f4f43c2f3379d9eb73d61552c610adfb2eaee
+  data.tar.gz: 00d6e736c3741544c4b627b7746ebc8e50cadfaadea9bc362c3b159c2ba5f57cc23fe2756423a29b48bf7ad7533c25922865a091940882734f5253b266674ed7

data/.circleci/config.yml

@@ -2,99 +2,162 @@
 #
 # Check https://circleci.com/docs/2.0/language-ruby/ for more details
 #
-version: 2
-jobs:
-  build:
+version: 2.1
+executors:
+  ruby:
     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
-
+      - image: circleci/ruby:2.5.3
+    working_directory: ~/hyrax
     environment:
-      RAILS_ENV: test
-      RACK_ENV: test
-      FCREPO_TEST_PORT: 8080/fcrepo
+      BUNDLE_PATH: vendor/bundle
       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
-      SPEC_OPTS: --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress
-      COVERALLS_PARALLEL: true
 
+jobs:
+  bundle:
+    executor: ruby
     steps:
     - restore_cache:
         keys:
-        - source-v1-{{ .Branch }}-{{ .Revision }}
-        - source-v1-{{ .Branch }}-
-        - source-v1-
+        - v1-source-{{ .Branch }}-{{ .Revision }}
+        - v1-source-{{ .Branch }}-
+        - v1-source-
 
     - checkout
 
     - save_cache:
-        key: source-v1-{{ .Branch }}-{{ .Revision }}
+        key: v1-source-{{ .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-
+        - v1-bundle-{{ checksum "Gemfile" }}--{{ checksum "hyrax.gemspec" }}
+        - v1-bundle
 
     - run:
         name: Install dependencies
-        command: |
-          gem update --system
-          gem update bundler
-          bundle config path $CIRCLE_WORKING_DIRECTORY/vendor/bundle
-          bundle install
+        command: bundle check || bundle install
+
+    - save_cache:
+        key: v1-bundle-{{ checksum "Gemfile.lock" }}--{{ checksum "hyrax.gemspec" }}
+        paths:
+        - ~/hyrax/vendor/bundle
+
+    - persist_to_workspace:
+        root: ~/
+        paths:
+        - hyrax/*
+        - hyrax/**/*
+
+  lint:
+    executor: ruby
+    steps:
+    - attach_workspace:
+        at: ~/
 
     - run:
         name: Call Rubocop
         command: bundle exec rubocop
 
+  build:
+    docker:
+    - image: circleci/ruby:2.5.3-node
+
+    working_directory: ~/hyrax
+
+    environment:
+      BUNDLE_PATH: vendor/bundle
+      BUNDLE_JOBS: 4
+      BUNDLE_RETRY: 3
+      RAILS_ENV: test
+      RACK_ENV: test
+      FCREPO_TEST_PORT: 8080/fcrepo
+      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
+      SPEC_OPTS: --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress
+      COVERALLS_PARALLEL: true
+
+    steps:
+    - attach_workspace:
+        at: ~/
+    # Update to the latest release of Chrome
+    - run: wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+    - run: sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
+    - run: sudo apt-get update
+    - run: sudo apt-get -y install google-chrome-stable
+    - restore_cache:
+        keys:
+        - v1-test-app-{{ checksum "template.rb" }}--{{ checksum "Gemfile.lock" }}
+
+    - run:
+        name: Check dependencies
+        command: bundle check || bundle install
+
+    - run:
+        name: Generate test app
+        command: (git diff --name-only master | grep -qG 'generators\/hyrax') || bundle exec rake engine_cart:generate
+
     - run:
-        name: Generate test app, ensure top-level Gemfile.lock is valid
+        name: Ensure test app dependencies are installed
         command: |
-          bundle exec rake engine_cart:generate
-          bundle install
+          cd .internal_test_app
+          bundle check || bundle install
 
     - save_cache:
+        key: v1-test-app-{{ checksum "template.rb" }}--{{ checksum "Gemfile.lock" }}
         paths:
-        - ./.internal_test_app
-        key: v1-internal-test-app-{{ .Branch }}-{{ checksum "./.internal_test_app/.generated_engine_cart" }}
+        - ".internal_test_app"
+
+    - persist_to_workspace:
+        root: ~/
+        paths:
+        - hyrax/*
+        - hyrax/**/*
+
+  test:
+    docker:
+    - image: circleci/ruby:2.6.0-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
+
+    working_directory: ~/hyrax
+    parallelism: 2
+
+    environment: &spec_env
+      BUNDLE_PATH: vendor/bundle
+      BUNDLE_JOBS: 4
+      BUNDLE_RETRY: 3
+      RAILS_ENV: test
+      RACK_ENV: test
+      FCREPO_TEST_PORT: 8080/fcrepo
+      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
+      SPEC_OPTS: --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress
+      COVERALLS_PARALLEL: true
+
+    steps: &run_specs
+    - attach_workspace:
+        at: ~/
+
+    - run:
+        name: Ensure top-level Gemfile.lock is valid
+        command: bundle check || bundle install
 
     - run:
-        name: Start headless Chrome
-        command: google-chrome-stable --headless --disable-gpu --no-sandbox --remote-debugging-port=9222 http://localhost
-        background: true
+        name: Uninstall chromedriver Gems
+        command: gem uninstall -ax chromedriver-helper
 
     - run:
-        name: Load config into SolrCloud
+        name: Install chromedriver Gems
+        command: gem install chromedriver-helper
+
+    - run:
+        name: Load config into solr
         command: |
           cd .internal_test_app/solr/config
           zip -1 -r solr_hyrax_config.zip ./*
@@ -107,18 +170,44 @@ jobs:
           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
+
+  test-ruby-2-5:
+    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
+
+    working_directory: ~/hyrax
+    parallelism: 2
+    environment: *spec_env
+    steps:       *run_specs
+
+workflows:
+  version: 2
+  ci:
+    jobs:
+      - bundle
+      - lint:
+          requires:
+            - bundle
+      - build:
+          requires:
+            - bundle
+      - test:
+          requires:
+            - build
+            - lint
+      - test-ruby-2-5:
+          requires:
+            - build
+            - lint

data/.travis.yml

@@ -3,7 +3,9 @@ sudo: required
 dist: trusty
 
 addons:
-  chrome: stable
+  apt:
+    packages:
+      - chromium-chromedriver
 cache:
   bundler: true
 
@@ -31,3 +33,4 @@ services:
   - redis-server
 before_script:
   - jdk_switcher use oraclejdk8
+  - ln -s /usr/lib/chromium-browser/chromedriver ~/bin/chromedriver

data/Gemfile

@@ -5,6 +5,7 @@ gemspec
 
 group :development, :test do
   gem 'coveralls', require: false
+  gem 'easy_translate'
   gem 'i18n-tasks'
   gem 'pry' unless ENV['CI']
   gem 'pry-byebug' unless ENV['CI']

data/README.md

@@ -64,7 +64,7 @@ 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
-v3.0.0-beta1__. If you are looking for instructions on installing a different
+v3.0.0-beta2__. 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.
 
@@ -133,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, 2.4 and 2.5. When starting a new project, we recommend using the latest Ruby 2.5 version.
+Hyrax supports Ruby 2.4, 2.5, and 2.6. When starting a new project, we recommend using the latest Ruby 2.6 version.
 
 ## Redis
 
@@ -163,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.1.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.4.0/template.rb
+rails _5.1.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v3.0.0-beta2/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:

data/app/actors/hyrax/actors/collections_membership_actor.rb

@@ -32,13 +32,9 @@ module Hyrax
         # @return [Boolean]
         #
         # rubocop:disable Metrics/MethodLength
-        # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         def assign_nested_attributes_for_collection(env)
           attributes_collection = env.attributes.delete(:member_of_collections_attributes)
-
-          return assign_for_collection_ids(env) unless attributes_collection
-
-          emit_deprecation if env.attributes.delete(:member_of_collection_ids)
+          return true unless attributes_collection
 
           return false unless
             valid_membership?(env, collection_ids: attributes_collection.map { |_, attributes| attributes['id'] })
@@ -58,46 +54,6 @@ module Hyrax
           true
         end
         # rubocop:enable Metrics/MethodLength
-        # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-
-        ##
-        # @deprecated supports old :member_of_collection_ids arguments
-        def emit_deprecation
-          Deprecation.warn(self, ':member_of_collections_attributes and :member_of_collection_ids were both ' \
-                                 ' passed. :member_of_collection_ids is ignored when both are passed and is ' \
-                                 'deprecated for removal in Hyrax 3.0.')
-        end
-
-        ##
-        # @deprecated supports old :member_of_collection_ids arguments
-        def assign_for_collection_ids(env)
-          collection_ids = env.attributes.delete(:member_of_collection_ids)
-
-          return false unless valid_membership?(env, collection_ids: collection_ids)
-
-          if collection_ids
-            Deprecation.warn(self, ':member_of_collection_ids has been deprecated for removal in Hyrax 3.0. ' \
-                                   'use :member_of_collections_attributes instead.')
-
-            collection_ids = [] if collection_ids.empty?
-            other_collections = collections_without_edit_access(env)
-
-            collections = ::Collection.find(collection_ids)
-            raise "Tried to assign collections with ids: #{collection_ids}, but none were found" unless
-              collections
-
-            env.curation_concern.member_of_collections = collections
-            env.curation_concern.member_of_collections.concat(other_collections)
-          end
-
-          true
-        end
-
-        ##
-        # @deprecated supports old :member_of_collection_ids arguments
-        def collections_without_edit_access(env)
-          env.curation_concern.member_of_collections.select { |coll| env.current_ability.cannot?(:edit, coll) }
-        end
 
         # Adds the item to the ordered members so that it displays in the items
         # along side the FileSets on the show page
@@ -140,17 +96,11 @@ module Hyrax
           attributes_collection =
             env.attributes.fetch(:member_of_collections_attributes) { nil }
 
-          if attributes_collection
-            # Determine if the work is being created in one and only one collection.
-            return unless attributes_collection && attributes_collection.size == 1
+          # Determine if the work is being created in one and only one collection.
+          return unless attributes_collection && attributes_collection.size == 1
 
-            # Extract the collection id from attributes_collection,
-            collection_id = attributes_collection.first.second['id']
-          else
-            collection_ids = env.attributes.fetch(:member_of_collection_ids) { [] }
-            return unless collection_ids.size == 1
-            collection_id = collection_ids.first
-          end
+          # Extract the collection id from attributes_collection,
+          collection_id = attributes_collection.first.second['id']
 
           # Do not apply permissions to work if collection type is configured not to
           collection = ::Collection.find(collection_id)

data/app/actors/hyrax/actors/create_with_remote_files_ordered_members_actor.rb

@@ -42,13 +42,11 @@ module Hyrax
     # Browse everything may also return a local file. And although it's in the
     # url property, it may have spaces, and not be a valid URI.
     class CreateWithRemoteFilesOrderedMembersActor < CreateWithRemoteFilesActor
-      attr_reader :ordered_members
-
       # @param [HashWithIndifferentAccess] remote_files
       # @return [TrueClass]
       def attach_files(env, remote_files)
         return true unless remote_files
-        @ordered_members = env.curation_concern.ordered_members.to_a
+        env.store(self, :ordered_members, env.curation_concern.ordered_members.to_a)
         remote_files.each do |file_info|
           next if file_info.blank? || file_info[:url].blank?
           # Escape any space characters, so that this is a legal URI
@@ -60,7 +58,7 @@ module Hyrax
           auth_header = file_info.fetch(:auth_header, {})
           create_file_from_url(env, uri, file_info[:file_name], auth_header)
         end
-        add_ordered_members(env.user, env.curation_concern)
+        add_ordered_members(env)
         true
       end
 
@@ -72,7 +70,7 @@ module Hyrax
           actor.create_metadata(visibility: env.curation_concern.visibility)
           actor.attach_to_work(env.curation_concern)
           fs.save!
-          ordered_members << fs
+          env.retrieve(self, :ordered_members) << fs
           if uri.scheme == 'file'
             # Turn any %20 into spaces.
             file_path = CGI.unescape(uri.path)
@@ -84,9 +82,9 @@ module Hyrax
       end
 
       # Add all file_sets as ordered_members in a single action
-      def add_ordered_members(user, work)
-        actor = Hyrax::Actors::OrderedMembersActor.new(ordered_members, user)
-        actor.attach_ordered_members_to_work(work)
+      def add_ordered_members(env)
+        actor = Hyrax::Actors::OrderedMembersActor.new(env.retrieve(self, :ordered_members), env.user)
+        actor.attach_ordered_members_to_work(env.curation_concern)
       end
 
       class_attribute :file_set_actor_class