-
Notifications
You must be signed in to change notification settings - Fork 124
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Valkyrie Indexer Setup and Specs #4221
Commits on Jan 25, 2020
-
Add indexer to work_resource generator
Julie Allinson committedJan 25, 2020 Configuration menu - View commit details
-
Copy full SHA for 6868bb4 - Browse repository at this point
Copy the full SHA 6868bb4View commit details -
rename index_hash to index_document for consistency
Julie Allinson committedJan 25, 2020 Configuration menu - View commit details
-
Copy full SHA for 69aba72 - Browse repository at this point
Copy the full SHA 69aba72View commit details -
Use the configured storage adapter
We weren't respecting storage adapter configuration for valkyrie! This fixes that.
Tom Johnson committedJan 25, 2020 Configuration menu - View commit details
-
Copy full SHA for 961aeb8 - Browse repository at this point
Copy the full SHA 961aeb8View commit details -
indexer setup, including fixes / tests for activefedoraconverter and …
…modeltransformer monograph indexer spec
Julie Allinson committedJan 25, 2020 3Configuration menu - View commit details
-
Copy full SHA for 0b21d22 - Browse repository at this point
Copy the full SHA 0b21d22View commit details -
active_fedora_converter etc. changes
Julie Allinson committedJan 25, 2020 Configuration menu - View commit details
-
Copy full SHA for e4acc51 - Browse repository at this point
Copy the full SHA e4acc51View commit details
Commits on Jan 26, 2020
-
add registration of indexers into an initializer
Julie Allinson committedJan 26, 2020 Configuration menu - View commit details
-
Copy full SHA for b9d3689 - Browse repository at this point
Copy the full SHA b9d3689View commit details -
remove additional test from valkyrie_indexer_spec.rb - this has moved…
… to generator PR
Julie Allinson committedJan 26, 2020 Configuration menu - View commit details
-
Copy full SHA for fc31e18 - Browse repository at this point
Copy the full SHA fc31e18View commit details -
subscribe the MetadataIndexListener in config/initializers/listeners.…
…rb; call the event after_create_concern
Julie Allinson authored and Tom Johnson committedJan 26, 2020 Configuration menu - View commit details
-
Copy full SHA for ed0ab01 - Browse repository at this point
Copy the full SHA ed0ab01View commit details
Commits on Jan 27, 2020
-
Refactor
CollectionMemberSearchBuilder
to better useFilterByType
`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".
Tom Johnson committedJan 27, 2020 Configuration menu - View commit details
-
Copy full SHA for 48e7525 - Browse repository at this point
Copy the full SHA 48e7525View commit details -
Test
CollectionMemberSearchBuilder
with a Valkyrie collectionAdds tests for collection member search using Valkyrie `Hyrax::PcdmCollection`.
Tom Johnson committedJan 27, 2020 Configuration menu - View commit details
-
Copy full SHA for f11054b - Browse repository at this point
Copy the full SHA f11054bView commit details -
Merge pull request #4217 from samvera/storage-adapter-conf
Use the configured storage adapter
Configuration menu - View commit details
-
Copy full SHA for bccd86e - Browse repository at this point
Copy the full SHA bccd86eView commit details -
handle custom use types for files
* 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 <cjcolvard@indiana.edu>
Configuration menu - View commit details
-
Copy full SHA for fc1f7dc - Browse repository at this point
Copy the full SHA fc1f7dcView commit details -
add tests for custom query methods; refactor file use
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
Configuration menu - View commit details
-
Copy full SHA for 6c51756 - Browse repository at this point
Copy the full SHA 6c51756View commit details -
refactor FileMetadata#use to #type
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 <cjcolvard@indiana.edu>
Configuration menu - View commit details
-
Copy full SHA for fd2d89d - Browse repository at this point
Copy the full SHA fd2d89dView commit details -
Configuration menu - View commit details
-
Copy full SHA for ba4d8f7 - Browse repository at this point
Copy the full SHA ba4d8f7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6e3d83a - Browse repository at this point
Copy the full SHA 6e3d83aView commit details -
Julie Allinson committed
Jan 27, 2020 Configuration menu - View commit details
-
Copy full SHA for 930b5fe - Browse repository at this point
Copy the full SHA 930b5feView commit details -
mark versioning pending; return first for original_file, extracted_te…
…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.
Configuration menu - View commit details
-
Copy full SHA for 3cbcc99 - Browse repository at this point
Copy the full SHA 3cbcc99View commit details -
Merge pull request #4219 from samvera/generate-indexer
Add indexer to work_resource generator
Configuration menu - View commit details
-
Copy full SHA for c7e8353 - Browse repository at this point
Copy the full SHA c7e8353View commit details -
Merge pull request #4224 from samvera/cjcolvar-patch-1
Plant-based spicy
Configuration menu - View commit details
-
Copy full SHA for 4252be9 - Browse repository at this point
Copy the full SHA 4252be9View commit details -
Julie Allinson committed
Jan 27, 2020 Configuration menu - View commit details
-
Copy full SHA for bdd75c1 - Browse repository at this point
Copy the full SHA bdd75c1View commit details
Commits on Jan 28, 2020
-
prefer use of each_with_object
Requested code change to use each_with_object was expanded to include all places where the pattern applied in the effected file. This also includes requested change to case statement.
Configuration menu - View commit details
-
Copy full SHA for 408ae2e - Browse repository at this point
Copy the full SHA 408ae2eView commit details -
Configuration menu - View commit details
-
Copy full SHA for c8e91a5 - Browse repository at this point
Copy the full SHA c8e91a5View commit details -
Configuration menu - View commit details
-
Copy full SHA for fc402da - Browse repository at this point
Copy the full SHA fc402daView commit details -
Merge pull request #4225 from samvera/wings/custom_file_assoc
handle conversion of custom use types for files
Configuration menu - View commit details
-
Copy full SHA for 093ac4a - Browse repository at this point
Copy the full SHA 093ac4aView commit details -
Setup RSpec metadata for selecting a Valkyrie adapter
Use the test adapter in specs by doing: `context 'some context', valkyrie_adapter: :test_adapter do`
Tom Johnson committedJan 28, 2020 Configuration menu - View commit details
-
Copy full SHA for eb5004b - Browse repository at this point
Copy the full SHA eb5004bView commit details -
Create
FileSetDescription
to find characterization for FileSetsValkyrie-based FileSet objects don't have direct access to characterization information. In ActiveFedora, we used a `#characterization_proxy` to provide that information. Here, we provide a small service that can find the "primary" file (`FileMetadata`) for a given FileSet, and ask it about its description.
Tom Johnson committedJan 28, 2020 Configuration menu - View commit details
-
Copy full SHA for f93029a - Browse repository at this point
Copy the full SHA f93029aView commit details -
Move PCDM Use URI constants to
FileMetadata::Use
The concept of "use" is more properly localized to `FileMetadata` than `FileSet`, since `FileMetadata` holds the actual use (`#type`) attribute.
Tom Johnson committedJan 28, 2020 Configuration menu - View commit details
-
Copy full SHA for 6edec00 - Browse repository at this point
Copy the full SHA 6edec00View commit details -
Set a default
FileMetadata#type
Rather than using some branching logic in `FileMetadata.for`, take advantage of Valkyrie attributes' default values. When initializing a `FileMetadata`, assume it's an `ORIGINAL_FILE` unless a different use is passed.
Tom Johnson committedJan 28, 2020 Configuration menu - View commit details
-
Copy full SHA for 9989e38 - Browse repository at this point
Copy the full SHA 9989e38View commit details -
Register the new
:find_many_file_metadata_by_use
queryThis query was added, but never registered. It needs to be added to the `.queries` method for the query handler in order to be picked up by most adapters.
Tom Johnson committedJan 28, 2020 Configuration menu - View commit details
-
Copy full SHA for a65e59a - Browse repository at this point
Copy the full SHA a65e59aView commit details -
Drop
Hyrax::FileMetadata#used_for?
This method is supplanted by a new custom query. Use that query instead whereever `used_for?` was called.
Tom Johnson committedJan 28, 2020 Configuration menu - View commit details
-
Copy full SHA for bb79e44 - Browse repository at this point
Copy the full SHA bb79e44View commit details -
Remove
FileSet
type convienence methodsSince `#type` is located in `FileMetadata` and there's a convenient custom query, these methods mostly function to provide `.first`. My feeling is that this is a bit obfuscating; why not encourage queriers to handle the edge case where there are multiple matches in context appropriate ways instead? In some cases that might be `.first`, but not always. This also has the benefit of removing some business logic from the model.
Tom Johnson committedJan 28, 2020 Configuration menu - View commit details
-
Copy full SHA for 52d8338 - Browse repository at this point
Copy the full SHA 52d8338View commit details -
Implement Valkyrie indexing for Collections
Add an indexer for `Hyrax::PcdmCollection` and index `generic_type_sim`.
Tom Johnson committedJan 28, 2020 Configuration menu - View commit details
-
Copy full SHA for e8e1069 - Browse repository at this point
Copy the full SHA e8e1069View commit details -
Implement indexing for collection thumbnails
Tom Johnson committedJan 28, 2020 Configuration menu - View commit details
-
Copy full SHA for e50f1de - Browse repository at this point
Copy the full SHA e50f1deView commit details -
Update app/services/hyrax/thumbnail_path_service.rb
Tom Johnson committedJan 28, 2020 Configuration menu - View commit details
-
Copy full SHA for e588855 - Browse repository at this point
Copy the full SHA e588855View commit details -
Refactor FileActor handling of PCDM Use vocabulary
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.
Tom Johnson committedJan 28, 2020 Configuration menu - View commit details
-
Copy full SHA for 2a9270a - Browse repository at this point
Copy the full SHA 2a9270aView commit details -
Correct the ThumbnailImage URI in the PCDM Use vocab
The constant previously used an incorrect URI. `Thumbnail` should be `ThumbnailImage`.
Tom Johnson committedJan 28, 2020 Configuration menu - View commit details
-
Copy full SHA for 98298fe - Browse repository at this point
Copy the full SHA 98298feView commit details -
Introduce
Hyrax.custom_queries
Avoid typing `Hyrax.query_service.custom_queries` everywhere. Provide a method on the Hyrax level instead.
Tom Johnson committedJan 28, 2020 Configuration menu - View commit details
-
Copy full SHA for a749f23 - Browse repository at this point
Copy the full SHA a749f23View commit details
Commits on Jan 29, 2020
-
Merge pull request #4223 from samvera/valkyrie_collections_controller
Implement Valkyrie indexing for Collections
Configuration menu - View commit details
-
Copy full SHA for 23e3a25 - Browse repository at this point
Copy the full SHA 23e3a25View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8c7cb5d - Browse repository at this point
Copy the full SHA 8c7cb5dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2d97b68 - Browse repository at this point
Copy the full SHA 2d97b68View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2214537 - Browse repository at this point
Copy the full SHA 2214537View commit details -
Configuration menu - View commit details
-
Copy full SHA for 74428d6 - Browse repository at this point
Copy the full SHA 74428d6View commit details -
Configuration menu - View commit details
-
Copy full SHA for ab432d4 - Browse repository at this point
Copy the full SHA ab432d4View commit details -
remove unnecessary instance variable
Transitions from using the instance variable to using the already included method that returns the resource indexer.
Configuration menu - View commit details
-
Copy full SHA for fe7bd63 - Browse repository at this point
Copy the full SHA fe7bd63View commit details
Commits on Jan 30, 2020
-
Removing Rails 6.0 deprecation warning
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).
Configuration menu - View commit details
-
Copy full SHA for fa429e7 - Browse repository at this point
Copy the full SHA fa429e7View commit details -
Merge pull request #4231 from samvera/removing-constraints-deprecatio…
…n-warning Removing Rails 6.0 deprecation warning
Configuration menu - View commit details
-
Copy full SHA for 226e010 - Browse repository at this point
Copy the full SHA 226e010View commit details -
Merge pull request #4215 from samvera/valk-char
Create `FileSetDescription` to find characterization for FileSets
Configuration menu - View commit details
-
Copy full SHA for 1d5c2f2 - Browse repository at this point
Copy the full SHA 1d5c2f2View commit details -
Configuration menu - View commit details
-
Copy full SHA for c90215c - Browse repository at this point
Copy the full SHA c90215cView commit details -
Support custom URI use/type in
FileSetDescription
When constructing a description of a Valkyrie description, prefer to use URIs.
Tom Johnson committedJan 30, 2020 Configuration menu - View commit details
-
Copy full SHA for 8a597a2 - Browse repository at this point
Copy the full SHA 8a597a2View commit details
Commits on Jan 31, 2020
-
Merge pull request #4235 from samvera/use-uri-use
Support custom URI use/type in `FileSetDescription`
Configuration menu - View commit details
-
Copy full SHA for abe5383 - Browse repository at this point
Copy the full SHA abe5383View commit details -
Ensuring CSV usage has same namespace consideration
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
Configuration menu - View commit details
-
Copy full SHA for 279ccb8 - Browse repository at this point
Copy the full SHA 279ccb8View commit details -
Merge pull request #4238 from samvera/using-same-namespace-convention…
…s-for-csv Ensuring CSV usage has same namespace consideration
Configuration menu - View commit details
-
Copy full SHA for da3b463 - Browse repository at this point
Copy the full SHA da3b463View commit details -
Merge pull request #4227 from samvera/inherit_permissions_job
Valkyrize inherit_permissions_job
Configuration menu - View commit details
-
Copy full SHA for 6fc0b59 - Browse repository at this point
Copy the full SHA 6fc0b59View commit details -
indexer setup, including fixes / tests for activefedoraconverter and …
…modeltransformer monograph indexer spec
Configuration menu - View commit details
-
Copy full SHA for 0d098b6 - Browse repository at this point
Copy the full SHA 0d098b6View commit details -
Configuration menu - View commit details
-
Copy full SHA for e122dd0 - Browse repository at this point
Copy the full SHA e122dd0View commit details -
remove additional test from valkyrie_indexer_spec.rb - this has moved…
… to generator PR
Configuration menu - View commit details
-
Copy full SHA for 6565c88 - Browse repository at this point
Copy the full SHA 6565c88View commit details -
Configuration menu - View commit details
-
Copy full SHA for 12fa4d0 - Browse repository at this point
Copy the full SHA 12fa4d0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 09fe003 - Browse repository at this point
Copy the full SHA 09fe003View commit details