valkyrie 2.0.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1b458c0bf12323ee7593ba335f9b11d933bbf3bc8e2dd1174f2a682e0be10c7
-  data.tar.gz: 59ec4d50795fa715b260fd77b773a4113d90731ae12719d8ed35d494f600f056
+  metadata.gz: a9562026fbee014b2e1f3076826af96c850373e9ff94eeb1921facbad11edcec
+  data.tar.gz: '0119066f0cf241db23c9a29d7f9501803c669df197bda350f0706d2b2db6120d'
 SHA512:
-  metadata.gz: 9625fb7adb62fd504dde9e216a4b86b10c3054258f3363eb717da22e5bd1a81c8dc72608022739311a5b914528d9ac045dd66063148ec58da1de63e5cda08575
-  data.tar.gz: 4692ea78e86c4a8a74ddbea67c2b74660f7c7a2f4d69efd0c6755f6f2ba9258620eeaa7d03f1455b24a81e4c61dff5533f47072db6f9945eff92d1779696df6e
+  metadata.gz: 63279c6ea99e08f10dcb8b6aa6cd6fada5d60937852dde46ad08b2923e3d129eb03442be0d4a11640affefeda7367fdabc9d93bb6c90f53b25c71fc12dea7cc4
+  data.tar.gz: cd471fa3caa33b644cca4c5897104225dbdc3fafe0d10a889d102a03e6e5ba74aa9284cd5fc27933ded7c842e2d09f0326d66119290df557f7ca1c29e2c7f2e2

data/.circleci/config.yml

@@ -2,7 +2,6 @@
 version: 2.1
 jobs:
   build:
-    machine: true
     parameters:
       gemfile:
         description: "Gemfile to run"
@@ -10,34 +9,49 @@ jobs:
         type: "string"
       ruby:
         description: "Ruby version"
-        default: "2.6.3"
+        default: "2.6.5"
         type: "string"
+    docker:
+      - image: circleci/ruby:<< parameters.ruby >>-node-browsers
+        environment:
+          RAILS_ENV: test
+      - image: postgres:10.6-alpine
+        environment:
+          POSTGRES_USER: postgres
+          POSTGRES_DB: Valkyrie_gem_test
+          POSTGRES_HOST_AUTH_METHOD: trust
+      - image: samvera/fcrepo4:4.7.5
+        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"
+          JAVA_OPTIONS: "-Djetty.http.port=8988"
+      - image: samvera/fcrepo4:5.1.0
+        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"
+          JAVA_OPTIONS: "-Djetty.http.port=8998 -Dfcrepo.dynamic.jms.port=61618 -Dfcrepo.dynamic.stomp.port=61614"
+      - image: fcrepo/fcrepo:6.0.0-beta-1
+        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 -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true"
+          JAVA_OPTS: "-Djetty.http.port=8978 -Dfcrepo.dynamic.jms.port=61619 -Dfcrepo.dynamic.stomp.port=61615 -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true"
+      - image: solr:7.7-alpine
+        command: bin/solr -cloud -noprompt -f -p 8994
     environment:
       BUNDLE_GEMFILE: << parameters.gemfile >>
+      POSTGRES_PORT: 5432
+      FEDORA_6_PORT: 8080
     steps:
       - checkout
       - run:
-          name: Set ruby version to << parameters.ruby >>
-          command: |
-            rvm install << parameters.ruby >>
-            echo . $(rvm << parameters.ruby >> do rvm env --path) >> $BASH_ENV
-      - run: 
-          shell: /bin/bash -l
-          name: Uninstall global Bundler
-          command: |
-            rvm use << parameters.ruby >>
-            rvm gemset use global
-            gem uninstall bundler -x
-            echo Uninstalled
+          name: Wait for solr
+          command: dockerize -wait tcp://localhost:8994 -timeout 1m
       - run:
-          name: Install Docker Compose
+          name: Load config into solr
           command: |
-            curl -L https://github.com/docker/compose/releases/download/1.19.0/docker-compose-`uname -s`-`uname -m` > ~/docker-compose
-            chmod +x ~/docker-compose
-            sudo mv ~/docker-compose /usr/local/bin/docker-compose
-      - run:
-          name: Update bundler
-          command: gem install bundler -v 1.17.2
+            cd solr/config
+            zip -1 -r solr_config.zip ./*
+            curl -H "Content-type:application/octet-stream" --data-binary @solr_config.zip "http://localhost:8994/solr/admin/configs?action=UPLOAD&name=valkyrie"
+            curl -H 'Content-type: application/json' http://localhost:8994/api/collections/ -d '{create: {name: valkyrie-core-test, config: valkyrie, numShards: 1}}'
+      # Install Bundler
+      - run: gem install bundler -v '~> 2.0'
       - restore_cache:
          keys:
            - bundle-{{ checksum "<< parameters.gemfile >>" }}-{{ checksum "valkyrie.gemspec" }}-<< parameters.ruby >>-6
@@ -57,9 +71,12 @@ jobs:
       - run:
           name: Run Rubocop
           command: bundle exec rake rubocop
+      - run:
+          name: Set up database
+          command: bundle exec rake db:migrate
       - run:
           name: Run Specs
-          command: bundle exec rake docker:spec
+          command: bundle exec rspec spec
       - store_artifacts:
           path: coverage
           destination: coverage
@@ -68,29 +85,25 @@ workflows:
   build:
     jobs:
       - build:
-          gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.6.3
-          name: "Ruby2-6_Rails5-2"
+          gemfile: "gemfiles/activerecord_6_0.gemfile"
+          ruby: 2.7.0
+          name: "Ruby2-7_Rails6-0"
       - build:
-          gemfile: "gemfiles/activerecord_5_1.gemfile"
-          ruby: 2.6.3
-          name: "Ruby2-6_Rails5-1"
+          gemfile: "gemfiles/activerecord_6_0.gemfile"
+          ruby: 2.6.5
+          name: "Ruby2-6_Rails6-0"
       - build:
           gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.5.5
-          name: "Ruby2-5_Rails5-2"
-      - build:
-          gemfile: "gemfiles/activerecord_5_1.gemfile"
-          ruby: 2.5.5
-          name: "Ruby2-5_Rails5-1"
+          ruby: 2.7.0
+          name: "Ruby2-7_Rails5-2"
       - build:
           gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.4.6
-          name: "Ruby2-4_Rails5-2"
+          ruby: 2.6.5
+          name: "Ruby2-6_Rails5-2"
       - build:
-          gemfile: "gemfiles/activerecord_5_1.gemfile"
-          ruby: 2.4.6
-          name: "Ruby2-4_Rails5-1"
+          gemfile: "gemfiles/activerecord_5_2.gemfile"
+          ruby: 2.5.7
+          name: "Ruby2-5_Rails5-2"
   nightly:
     triggers:
       - schedule:
@@ -101,26 +114,22 @@ workflows:
                 - master
     jobs:
       - build:
-          gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.6.3
-          name: "Ruby2-6_Rails5-2"
+          gemfile: "gemfiles/activerecord_6_0.gemfile"
+          ruby: 2.7.0
+          name: "Ruby2-7_Rails6-0"
       - build:
-          gemfile: "gemfiles/activerecord_5_1.gemfile"
-          ruby: 2.6.3
-          name: "Ruby2-6_Rails5-1"
+          gemfile: "gemfiles/activerecord_6_0.gemfile"
+          ruby: 2.6.5
+          name: "Ruby2-6_Rails6-0"
       - build:
           gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.5.5
-          name: "Ruby2-5_Rails5-2"
-      - build:
-          gemfile: "gemfiles/activerecord_5_1.gemfile"
-          ruby: 2.5.5
-          name: "Ruby2-5_Rails5-1"
+          ruby: 2.7.0
+          name: "Ruby2-7_Rails5-2"
       - build:
           gemfile: "gemfiles/activerecord_5_2.gemfile"
-          ruby: 2.4.6
-          name: "Ruby2-4_Rails5-2"
+          ruby: 2.6.5
+          name: "Ruby2-6_Rails5-2"
       - build:
-          gemfile: "gemfiles/activerecord_5_1.gemfile"
-          ruby: 2.4.6
-          name: "Ruby2-4_Rails5-1"
+          gemfile: "gemfiles/activerecord_5_2.gemfile"
+          ruby: 2.5.7
+          name: "Ruby2-5_Rails5-2"

data/.lando.yml

@@ -0,0 +1,58 @@
+name: valkyrie
+app_mount: false
+services:
+  valkyrie_test_solr_7:
+    app_mount: false
+    type: solr:7
+    portforward: 8994
+    core: valkyrie-core-test
+    config:
+      dir: solr/config
+  valkyrie_database:
+    app_mount: false
+    type: postgres:10
+    portforward: 5433
+  valkyrie_fedora_4:
+    type: compose
+    app_mount: false
+    volumes:
+      fedora4:
+    services:
+      image: samvera/fcrepo4:4.7.5
+      command: /fedora-entrypoint.sh
+      volumes:
+      - fedora4:/data
+      ports:
+      - 8988:8080
+    portforward: true
+  valkyrie_fedora_5:
+    type: compose
+    app_mount: false
+    volumes:
+      fedora5:
+    services:
+      image: samvera/fcrepo4:5.1.0
+      command: /fedora-entrypoint.sh
+      volumes:
+      - fedora5:/data
+      ports:
+      - 8998:8080
+    portforward: true
+  valkyrie_fedora_6:
+    type: compose
+    app_mount: false
+    volumes:
+      fedora6:
+    services:
+      image: fcrepo/fcrepo:6.0.0-beta-1
+      command:
+        - "catalina.sh"
+        - "run"
+      volumes:
+      - fedora6:/data
+      ports:
+      - 8978:8080
+      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 -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true"
+        JAVA_OPTS: "-Dfcrepo.dynamic.jms.port=61619 -Dfcrepo.dynamic.stomp.port=61615 -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true"
+    portforward: true

data/.rubocop.yml

@@ -4,7 +4,6 @@ inherit_gem:
   bixby: bixby_default.yml
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.3
   Exclude:
     - 'bin/*'
     - 'db/schema.rb'
@@ -26,6 +25,10 @@ RSpec/MultipleExpectations:
   Enabled: false
 Rails/TimeZone:
   Enabled: false
+Rails/RakeEnvironment:
+  Enabled: false
+Rails/ApplicationRecord:
+  Enabled: false
 Naming/PredicateName:
   Exclude:
     - "lib/valkyrie/resource.rb"

data/.tool-versions

@@ -1 +1 @@
-ruby 2.5.1
+ruby 2.6.6

data/Appraisals

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
-appraise "activerecord-5-2" do
-  gem "activerecord", "~> 5.2.0"
+appraise "activerecord-6-0" do
+  gem "activerecord", "~> 6.0.0"
 end
 
-appraise "activerecord-5-1" do
-  gem "activerecord", "~> 5.1.0"
+appraise "activerecord-5-2" do
+  gem "activerecord", "~> 5.2.0"
 end

data/CHANGELOG.md

@@ -1,3 +1,137 @@
+# v2.2.0 2021-05-06
+
+## Changes since last release
+
+* Add support for Fedora 6.
+  [tpendragon](https://github.com/tpendragon)
+* Deprecate pcdmuse:PreservationMasterFile in favor of pcdmuse:PreservationFile
+  [escowles](https://github.com/escowles)
+* Improve spec docs for resource.rb
+  [dchandekstark](https://github.com/dchandekstark)
+* Memoize resource in Solr queries to reduce Solr calls.
+  [dchandekstark](https://github.com/dchandekstark)
+
+# v2.1.2 2021-04-19
+
+## Changes since last release
+
+* Tighten reform dependency
+  [tpendragon](https://github.com/tpendragon)
+* Loosen RDF Dependency
+  [no-reply](https://github.com/no-reply)
+* Update development ruby version in .tool-versions
+  [hackartisan](https://github.com/hackartisan)
+* Use Lando for development
+  [tpendragon](https://github.com/tpendragon)
+* Deprecate Blacklist in favor of Denylist.
+  [jeremyf](https://github.com/jeremyf)
+* Make DateTime handling in Fedora/Solr persisters consistent with others.
+  [hcayless](https://github.com/hcayless)
+* Add open-ended Rake support.
+  [no-reply](https://github.com/no-reply)
+
+Additional thanks to the following for code review and issue reports leading to
+this release:
+
+[cjcolvar](https://github.com/cjcolvar)
+[escowles](https://github.com/escowles)
+[jeremyf](https://github.com/jeremyf)
+
+# v2.1.1 2020-03-12
+
+## Changes since last release
+
+* Add Ruby 2.7 support.
+  [tpendragon](https://github.com/tpendragon)
+* Make ID & String equality symmetrical
+  [no-reply](https://github.com/no-reply)
+
+Additional thanks to the following for code review and issue reports leading to
+this release:
+
+[cjcolvar](https://github.com/cjcolvar)
+[escowles](https://github.com/escowles)
+[jeremyf](https://github.com/jeremyf)
+
+# v2.1.0 2020-01-09
+
+## Changes since last release
+
+* Use `::` prefixed names for `JSON::LD` references.
+  [no-reply](https://github.com/no-reply)
+* Use SVG instead of PNG for version badge.
+  [hackmastera](https://github.com/hackmastera)
+* Fix Rubocop for latest Bixby.
+  [hackmastera](https://github.com/hackmastera)
+* Valkyrie IDs equal string equivalent of ID to String with config
+  [jlevnhv](https://github.com/jlevnhv)
+* Add optional model parameter to find_inverse_references_by and
+find_references_by
+  [elrayle](https://github.com/elrayle)
+  [laritakr](https://github.com/laritakr)
+* Add parity in schema.key lookup for `ordered_attribute?`
+  [jeremyf](https://github.com/jeremyf)
+* Order member_ids when using schema-style attributes method.
+  [no-reply](https://github.com/no-reply)
+* Use DEFAULT_FEDORA_VERSION constant for Fedora adapter.
+  [no-reply](https://github.com/no-reply)
+* Stop testing ActiveRecord 5.1
+  [scherztc](https://github.com/scherztc)
+* Rename ListNode#target_uri to ListNode#target
+  [mbklein](https://github.com/mbklein)
+* Document that Solr Persister is intended to be used as a secondary persister.
+  [hweng](https://github.com/hweng)
+* Remove unused database tables from schema.rb
+  [scherztc](https://github.com/scherztc)
+* Alternate Identifier documentation
+  [escowles](https://github.com/escowles)
+* Remove suggest component in example Solr Config
+  [hweng](https://github.com/hweng)
+* Remove unused db/seeds.rb
+  [scherztc](https://github.com/scherztc)
+* Replace YARD Doc for Solr adapter with references to Memory Adapter.
+  [afred](https://github.com/afred)
+* Refactor shadowed variable in buffered persister spec.
+  [jeremyf](https://github.com/jeremyf)
+* Use example.com instead of made-up URLs
+  [escowles](https://github.com/escowles)
+* Add count_all_of_model query
+  [christinach](https://github.com/christinach)
+  [blancoj](https://github.com/blancoj)
+* Raise an error when unable to find a StorageAdapter
+  [bkiahstroud](https://github.com/bkiahstroud)
+  [FCRodriguez7](https://github.com/FCRodriguez7)
+  [kcompsci](https://github.com/kcompsci)
+* Allow find_inverse_reference_by property to be either ordered or not.
+  [elrayle](https://github.com/elrayle)
+* Randomized spec order
+  [jeremyf](https://github.com/jeremyf)
+* Allow Valkyrie logging to be tagged with a context and suppressed.
+  [jeremyf](https://github.com/jeremyf)
+* Fix documentation for Valkyrie::Persister::Memory being disassociated.
+  [jeremyf](https://github.com/jeremyf)
+* Suppress Solr warnings in tests.
+  [jeremyf](https://github.com/jeremyf)
+* Add `Valkyrie::Types::Relation` and `Valkyrie::Types::OrderedRelation`
+  [luisgreg99](https://github.com/luisgreg99)
+  [lsat12357](https://github.com/lsat12357)
+  [foglabs](https://github.com/foglabs)
+  [dgcliff](https://github.com/dgcliff)
+
+# v2.0.2 2019-10-17
+
+## Changes since last release
+
+* Fix nil not persisting with the ActiveRecord adapter.
+  [tpendragon](https://github.com/tpendragon)
+* Define setters when building a Resource schema with `.attributes`
+  [no-reply](https://github.com/no-reply)
+
+Additional thanks to the following for code review and issue reports leading to
+this release:
+
+[coblej](https://github.com/coblej)
+
 # v2.0.1 2019-07-03
 
 ## Changes since last release

data/README.md

@@ -4,7 +4,7 @@ Valkyrie is a gem for enabling multiple backends for storage of files and metada
 
 ![Valkyrie Logo](valkyrie_logo.png)
 
-Code: [![Version](https://badge.fury.io/rb/valkyrie.png)](http://badge.fury.io/rb/valkyrie)
+Code: [![Gem Version](https://badge.fury.io/rb/valkyrie.svg)](https://badge.fury.io/rb/valkyrie)
 [![Build Status](https://circleci.com/gh/samvera/valkyrie.svg?style=svg)](https://circleci.com/gh/samvera/valkyrie)
 ![Coverage Status](https://img.shields.io/badge/Coverage-100-brightgreen.svg)
 
@@ -107,7 +107,7 @@ The initializer registers four `Valkyrie::MetadataAdapter` instances for storing
 * `:memory` which stores metadata in an in-memory cache (this cache is not persistent, so it is only
   appropriate for testing).
 * `:postgres` which stores metadata in a PostgreSQL database.
-* `:solr` which stores metadata in a Solr Index.
+* `:solr` which stores metadata in a Solr Index (Solr Persister issues a warning if it has to generate an ID for a new resource because it is intended to be used as a secondary persister).
 
 Other adapter options include `Valkyrie::Persistence::BufferedPersister` for buffering in memory before bulk
 updating another persister, `Valkyrie::Persistence::CompositePersister` for storing in more than one adapter
@@ -252,53 +252,25 @@ config.  If Fedora requires auth, you can also include that in the URL, e.g.:
 
 ## Installing a Development environment
 
-### With Docker
-The development and test stacks use fully contained virtual volumes and bind all services to different ports,
-so they can be running at the same time without issue.
-
-#### External Requirements
-* [Docker](https://store.docker.com/search?offering=community&type=edition) version >= 17.09.0
-
-### Dependency Setup (Mac OSX)
-1. `brew install docker`
-1. `brew install docker-machine`
-1. `brew install docker-compose`
-
-### Starting Docker (Mac OSX)
-1. `docker-machine create default`
-1. `docker-machine start default`
-1. `eval "$(docker-machine env)"`
-
-#### Starting the development mode dependencies
-1. Start Solr, Fedora, and PostgreSQL with `rake docker:dev:daemon` (or `rake docker:dev:up` in a separate
-   shell to run them in the foreground)
-1. Run `rake db:create db:migrate` to initialize the database
-1. Develop!
-1. Run `rake docker:dev:down` to stop the server stack
-   * Development servers maintain data between runs. To clean them out, run `rake docker:dev:clean`
-
-#### To run the test suite with all dependencies in one go
-1. `rake docker:spec`
-
-#### To run the test suite manually
-1. Start Solr, Fedora, and PostgreSQL with `rake docker:test:daemon` (or `rake docker:test:up` in a separate
-   shell to run them in the foreground)
-1. Run `rake db:create db:migrate` to initialize the database
-1. Run the gem's RSpec test suite with `rspec spec` or `rake`
-1. Run `rake docker:test:down` to stop the server stack
-   * The test stack cleans up after itself on exit.
-
-### Without Docker
-
-#### External Requirements
-* PostgreSQL with the uuid-ossp extension.
-  * Note: Enabling uuid-ossp requires database superuser privileges.
-    * From `psql`: `alter user [username] with superuser;`
-
-#### To run the test suite
-1. Start Solr and Fedora servers for testing with `rake server:test`
-1. Run `rake db:create` (First time only)
-1. Run `rake db:migrate`
+For ease of development we use Lando to abstract away some complications of
+using Docker containers for development.
+
+### Running Tests
+
+1. Install the latest released > 3.0 version of Lando from [here](https://github.com/lando/lando/releases).
+2. `bundle install`
+3. `bundle exec rake server:start`
+4. `bundle exec rspec spec`
+
+### Cleaning Data
+
+1. `bundle exec rake server:clean`
+
+### Stopping Servers
+
+1. `bundle exec rake server:stop`
+
+You can also run `lando poweroff` from anywhere.
 
 ## Acknowledgments