hyrax 3.0.0.pre.beta1 → 3.0.0.pre.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ea3a1997ae611fde653f50e69be5447644b7c8c1
-  data.tar.gz: 5bd79f0028981330bd6693986a36742ef5ff8c50
+SHA256:
+  metadata.gz: 80d651ec9f588b25d242b2b6dcb5c1a98695b3eb9f8bb1f4706a9664a4ce6dbd
+  data.tar.gz: a145d9fdce4f1577c02b4a521b11b64a91d0dff6f20f9b63b4a663942410e346
 SHA512:
-  metadata.gz: a191208ea915f67744c6b42a8f5fb8cc911d3f3c342f70420c74fd2c779919dc9fc4c3199a4ee27e8a59c1ba4c0c79d9452a80cc4994eaedc36998c4b2980316
-  data.tar.gz: '0821db636ba2f45bb2cd19ef71d01ab6d99aecdd28d175e252484964ff2e62edba87ffabff8a8c969adf6d32ed73584e13b9ba3f88550636e4ff6aa00eef53f9'
+  metadata.gz: 6d4ca532232ec1d92221da0dbb738a4d081c5ad94dd316f9b878fb3461909a1a6dbbe9520fab6ea11f3a84b55bef41160b3797a7d2318b505163d51c899885eb
+  data.tar.gz: dc49090b11ff8a4c1c6c57ba97c912d3ae28dd22c3d838154eac4dc76ca20f87fffda64d94f92846342c814bc12fd2bf5fa4ae1265b6243f1bfaacc37899ac71

data/.circleci/config.yml

@@ -1,124 +1,183 @@
-# Ruby CircleCI 2.0 configuration file
-#
-# Check https://circleci.com/docs/2.0/language-ruby/ for more details
-#
-version: 2
+version: 2.1
+orbs:
+  samvera: samvera/circleci-orb@0
 jobs:
-  build:
-    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
-
+  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.2'
+    executor:
+      name: 'samvera/ruby'
+      ruby_version: << parameters.ruby_version >>
+    resource_class: medium+
     environment:
-      RAILS_ENV: test
-      RACK_ENV: test
-      FCREPO_TEST_PORT: 8080/fcrepo
-      BUNDLE_JOBS: 4
-      BUNDLE_RETRY: 3
+      RAILS_VERSION: << parameters.rails_version >>
       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:
-    - 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
+      - samvera/cached_checkout
+      - samvera/bundle_for_gem:
+          ruby_version: << parameters.ruby_version >>
+          bundler_version: << parameters.bundler_version >>
+          project: hyrax
+
+      # Run rubocop in parallel with caching
+      # This should get added to the orb once proven here
+
+      - restore_cache:
+          name: Restore rubocop cache
+          keys:
+            - v1-ruby<< parameters.ruby_version >>-bundle{{ checksum "Gemfile.lock" }}
+            - v1-ruby<< parameters.ruby_version >>
+            - v1
+
+      - run:
+          name: Run rubocop in parallel
+          command: bundle exec rubocop --parallel
+
+      - save_cache:
+          name: Save rubocop cache
+          key: v1-ruby<< parameters.ruby_version >>-bundle{{ checksum "Gemfile.lock" }}
+          paths:
+            - ~/.cache
+
+      - persist_to_workspace:
+          root: ~/
+          paths:
+          - project/*
+          - project/**/*
 
-    - 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
+  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.2'
+    executor:
+      name: 'samvera/ruby_fcrepo_solr_redis_postgres'
+      ruby_version: << parameters.ruby_version >>
+    resource_class: medium+
+    environment:
+      RAILS_VERSION: << parameters.rails_version >>
+      NOKOGIRI_USE_SYSTEM_LIBRARIES: true
+      ENGINE_CART_RAILS_OPTIONS: --database=postgresql --skip-git --skip-bundle --skip-listen --skip-spring --skip-keeps --skip-test --skip-bootsnap
+      DATABASE_URL: postgresql://postgres@127.0.0.1/circle_test # Hard-coded with data from CircleCI orb, related to https://github.com/samvera-labs/samvera-circleci-orb/issues/42
+    steps:
+      - attach_workspace:
+          at: ~/
+      - samvera/engine_cart_generate:
+          cache_key: v1-internal-test-app-{{ checksum "hyrax.gemspec" }}-{{ checksum ".regen" }}-{{ checksum ".circleci/config.yml" }}-<< parameters.rails_version >>-<< parameters.ruby_version >>
+      - samvera/bundle_for_gem:
+          ruby_version: << parameters.ruby_version >>
+          bundler_version: << parameters.bundler_version >>
+          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
+      hyrax_valkyrie:
+        type: string
+        default: "false"
+    executor:
+      name: 'samvera/ruby_fcrepo_solr_redis_postgres'
+      ruby_version: << parameters.ruby_version >>
+    resource_class: medium+
+    parallelism: 10
+    environment:
+      HYRAX_VALKYRIE: << parameters.hyrax_valkyrie >>
+      VALKYRIE_SOLR_PORT: 8985
+      DATABASE_URL: postgresql://postgres@127.0.0.1/circle_test # Hard-coded with data from CircleCI orb, related to https://github.com/samvera-labs/samvera-circleci-orb/issues/42
+    steps:
+      - attach_workspace:
+          at: ~/
+      - samvera/install_solr_core:
+          solr_config_path: .internal_test_app/solr/conf
+      - samvera/install_solr_core:
+          solr_config_path: .internal_test_app/solr/conf
+          core_name: hyrax-valkyrie-test
+      # 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 >>
+          project: hyrax
+      - run:
+          command: bundle exec rake app:db:migrate
+      - samvera/parallel_rspec
+
+workflows:
+  version: 2
+  ruby2-5-8:
+    jobs:
+      - bundle:
+          ruby_version: "2.5.8"
+          rails_version: "5.2.4.3"
+      - build:
+          ruby_version: "2.5.8"
+          rails_version: "5.2.4.3"
+          requires:
+            - bundle
+      - test:
+          name: "ruby2-5-8"
+          ruby_version: "2.5.8"
+          requires:
+            - build
+  ruby2-6-6:
+    jobs:
+      - bundle:
+          ruby_version: "2.6.6"
+          rails_version: "5.2.4.3"
+      - build:
+          ruby_version: "2.6.6"
+          rails_version: "5.2.4.3"
+          requires:
+            - bundle
+      - test:
+          name: "ruby2-6-6"
+          ruby_version: "2.6.6"
+          requires:
+            - build
+      - test:
+          name: "ruby2-6-6-valkyrie"
+          ruby_version: "2.6.6"
+          hyrax_valkyrie: "true"
+          requires:
+            - build
+  ruby2-7-2:
+    jobs:
+      - bundle:
+          ruby_version: "2.7.2"
+          rails_version: "5.2.4.3"
+          bundler_version: "2.1.4"
+      - build:
+          ruby_version: "2.7.2"
+          rails_version: "5.2.4.3"
+          bundler_version: "2.1.4"
+          requires:
+            - bundle
+      - test:
+          name: "ruby2-7-2"
+          ruby_version: "2.7.2"
+          bundler_version: "2.1.4"
+          requires:
+            - build

data/.dassie/.env

@@ -0,0 +1,4 @@
+MEMCACHED_HOST=memcached
+HYRAX_ANALYTICS=1
+REDIS_PROVIDER=SIDEKIQ_REDIS_URL
+SIDEKIQ_REDIS_URL=redis://redis:6379/0

data/.dassie/.gitignore

@@ -0,0 +1,27 @@
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore all logfiles and tempfiles.
+/log/*
+/tmp/*
+!/log/.keep
+!/tmp/.keep
+
+# Ignore uploaded files in development
+/storage/*
+!/storage/.keep
+
+/node_modules
+/yarn-error.log
+
+/public/assets
+.byebug_history
+
+# Ignore master key for decrypting credentials and more.
+/config/master.key

data/.dassie/Gemfile

@@ -0,0 +1,57 @@
+source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+ruby '2.7.2'
+
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '~> 5.2.4', '>= 5.2.4.4'
+# Use postgresql as the database for Active Record
+gem 'pg', '>= 0.18', '< 2.0'
+# Use Puma as the app server
+gem 'puma', '~> 3.11'
+# Use SCSS for stylesheets
+gem 'sass-rails', '~> 5.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 '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 '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
+
+group :development do
+  # 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'
+  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+  gem 'spring'
+  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]
+
+begin # this is a hack to allow `eval_gemfile` to work correctly
+  gem 'hyrax', path: ENV.fetch('HYRAX_ENGINE_PATH', '..')
+rescue; end
+
+gem 'rsolr', '>= 1.0', '< 3'
+gem 'bootstrap-sass', '~> 3.0'
+gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
+gem 'jquery-rails'
+gem 'devise'
+gem 'devise-guests', '~> 0.6'
+gem 'riiif', '~> 2.1'
+gem 'sidekiq', '~> 6.0'

data/.dassie/README.md

@@ -0,0 +1,3 @@
+# Dassie
+
+Dassie is a basic Hyrax application for development and testing purposes.

data/.dassie/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require_relative 'config/application'
+
+Rails.application.load_tasks

data/.dassie/app/actors/hyrax/actors/generic_work_actor.rb

@@ -0,0 +1,8 @@
+# Generated via
+#  `rails generate hyrax:work GenericWork`
+module Hyrax
+  module Actors
+    class GenericWorkActor < Hyrax::Actors::BaseActor
+    end
+  end
+end

data/.dassie/app/actors/hyrax/actors/namespaced_works/nested_work_actor.rb

@@ -0,0 +1,8 @@
+# Generated via
+#  `rails generate hyrax:work NamespacedWorks::NestedWork`
+module Hyrax
+  module Actors
+    class NamespacedWorks::NestedWorkActor < Hyrax::Actors::BaseActor
+    end
+  end
+end

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

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css