Valkyrie Indexer Setup and Specs #4221
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We weren't respecting storage adapter configuration for valkyrie! This fixes that.
…modeltransformer monograph indexer spec
ghost
force-pushed
the
valkyrie-indexer
branch
from
7eb881f
to
e4acc51
Compare
ghost
mentioned this pull request
Merged
added 3 commits
January 25, 2020 17:34
…rb; call the event after_create_concern
|
this is looking great! thanks for pushing this forward! i'll give a closer review when we get #4219 in and rebase. |
`Hyrax::FilterByType` already includes infrastructure for filtering by collection and work types. Rather than implement a new switch, use its existing `only_works?` and `only_collections?` to filter by "generic type".
Adds tests for collection member search using Valkyrie `Hyrax::PcdmCollection`.
Use the configured storage adapter
* adjust approach to converting files * add custom query find_file_metadata_by_use which is a valkyrie replacement for af object filter_files_by_type * add helper methods original_file, extracted_text, and thumbnail in FileSet resource Co-authored-by: cjcolvar <[email protected]>
Refactor file use: * added methods to Hyrax::FileSet defining which Valkyrie::Vocab::PCDMUse URIs should be used in all cases for the primary uses of original_file, extracted_text, and thumbnail. * updated all uses of Valkyrie::Vocab::PCDMUse URIs for the primary uses to use the methods defined in FileSet Added tests for new methods
Instead of putting the use in a use attributes, conversion from AF File copies over all types as they exist in AF into the types attribute of FileMetadata. To find the use, the :include? method is used to check for a specific use in the types. This avoids data duplication by not having both type and use. And it avoids data integrity issues when we aren’t able to correctly identify the use out of the array of types. Co-authored-by: cjcolvar <[email protected]>
Supersedes #4208.
…xt, thumbnail 2 changes here… ### Parts of FileSet AF behavior #original_file, #extracted_text, and #thumbnail each return a single PCDM::File, So this now has the methods that get these relatiionships from FileMetadata to return `.first` ### Versioning Versioning was looking through to ActiveFedora through the original_file method defined in wings/hydra/pcdm/pcdm_valkyrization_behavior. Since that was method was removed with the addition of Hyrax::FileSet#original_file, it was no longer getting the lookthrough behavior. The tests related to versioning have been marked pending. Issue #3923 addresses FileMetadata and versioning.
Add indexer to work_resource generator
|
Since #4219 is in now, im going to go ahead and publish this PR. Its ready for review. |
Plant-based spicy
|
I think this is review-able, although note the one failing test. |
|
@geekscruff thanks. i'm taking a look |
added 3 commits
January 28, 2020 15:49
For valkyrie normalization, take advantage for the new `Hyrax::FileMetadata::Use.uri_for` module method to avoid reproducing logic. When the argument is already a URI, just return it to avoid casting unnecessarily. In the ActiveFedora normalizer, `RDF::URI` already implements equality appropriately, so `#casecmp` isn't needed and we can flatten to a simple switch statement.
The constant previously used an incorrect URI. `Thumbnail` should be `ThumbnailImage`.
Avoid typing `Hyrax.query_service.custom_queries` everywhere. Provide a method on the Hyrax level instead.
|
The issue is to do with inheritance of class variables, which impacts |
|
seems connected to samvera/active_fedora#1343 |
Implement Valkyrie indexing for Collections
Transitions from using the instance variable to using the already included method that returns the resource indexer.
Prior to this change, specs reported the following warning: ```console DEPRECATION WARNING: Delegating constraints to arel is deprecated and will be removed in Rails 6.0. ``` I removed the deprecation warnings with this change (e.g. adding an explicit call to #arel).
…n-warning Removing Rails 6.0 deprecation warning
Create `FileSetDescription` to find characterization for FileSets
When constructing a description of a Valkyrie description, prefer to use URIs.
Support custom URI use/type in `FileSetDescription`
This is a bit of a stab in the dark. However, we had a failed Ruby
build with the following message:
```console
1) Hyrax::FileSetCSVService when specifying terms and separator csv
Failure/Error:
::CSV.generate do |csv|
csv << terms.map do |term|
values = file_set.send(term)
values = values.respond_to?(:to_a) ? values.to_a : [values] # make sure we have an array
values.join(multi_value_separator)
end
end
NameError:
uninitialized constant CSV
```
What I suspect to be in play is that the corresponding spec does not
similarly namespace the `CSV` constant. The production ruby file uses
`::CSV` whereas the spec ruby file uses `CSV`. This commit seeks to use
the same namespacing, hopefully reducing an intermittent error.
See the following CircleCI build for the failures:
- https://circleci.com/gh/samvera/hyrax/17063#tests/containers/3
…s-for-csv Ensuring CSV usage has same namespace consideration
Valkyrize inherit_permissions_job
…modeltransformer monograph indexer spec
|
Well, I rebased this onto master and it seems like it picked up on a whole slew of stuff. Not sure why that happened exactly. I can push a new one if needed though since I borked it-ish. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Note: includes a failing test that need a fix (see below).
Indexer:
ValkyrieWorkIndexerconfig/metadata/basic_metadata.ymlMonographIndexer)ActiveFedoraConverter
Wings::Valkyrie::Persister When passing a Valkyrie::Resource that was never an ActiveFedora::Base can save nested resourceswithundefined methodnested_resource_attributes=' for #Wings::CustomResource::GeneratedResourceSchema:xxxx`