valkyrie 1.4.0 → 1.5.0.RC1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: d66ba588c11dfaa509ab8dfe2c43a1018462103121e43fecb07e06e31878155d
-  data.tar.gz: 235551dbdb14be9f7a2034cbcf6a288ebbe6a11511cac31ea1a62fb3dcadfa39
+SHA1:
+  metadata.gz: f51055953266a92fd0ffcdd70c1204545668897e
+  data.tar.gz: 32effaf156970e235ef047d3198874b3a538533c
 SHA512:
-  metadata.gz: d9f8eafb124d7db30b9b6ab51165327877ac9dbd25a71cc8e074eec99880fa64bce7864abaad28ea81d65634567b8937332d42b27046b42490890158ee10da1c
-  data.tar.gz: 9b2877caed49d8e4e1aff11050391c2ccb8bc8259428e69786f3cc0256fc536f3afb05da40ca98e9878024ccacc4367d216cc61f60c18d2f446f1157e479daaa
+  metadata.gz: d411d99edb4ed3693b03cf40aeee8bcde69f510eaddfd0c28c2ca271480b541325a72d370c1b4f9c12422d8858a3d0e2e49abdb70623d664a21c8ca10cbcd826
+  data.tar.gz: 452bead204181f78df71e2f67f33b0d87f67510bc6c23e7a5eada9e7561f15de1a409370abcef24605e16d564066f902dafea50dc467ad9054729eb9edb2ab85

data/.circleci/config.yml

@@ -11,6 +11,9 @@ jobs:
             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.16.2
       - restore_cache:
          keys:
            - bundle-{{ checksum "Gemfile" }}-{{ checksum "valkyrie.gemspec" }}

data/CHANGELOG.md

@@ -1,3 +1,47 @@
+# v1.5.0 RC1 2018-02-01
+
+## Changes since last release
+
+* Add missing query service requirement to persister shared specs
+  [cjcolvar](https://github.com/cjcolvar)
+* Provide a warning when postgres adapter overwrites an ID, deprecate this
+  behavior so it will throw an exception in the future.
+  [cam156](https://github.com/cam156)
+  [hackmastera](https://github.com/hackmastera)
+  [tpendragon](https://github.com/tpendragon)
+* Add support for passing just an ID to find_inverse_references_by
+  [cam156](https://github.com/cam156)
+  [hackmastera](https://github.com/hackmastera)
+* Fix memory adapter raising an exception in find_by_alternate_identifier when
+  there are resources without the alternate_identifier attribute.
+  [jeremyf](https://github.com/jeremyf)
+* Provide a warning when using the postgres adapter without manually providing
+  the pg gem, so it can be an optional dependency in 2.0.0.
+  [hackmastera](https://github.com/hackmastera)
+* Provide guidance in specs on how to define alternate_ids
+  [cjcolvar](https://github.com/cjcolvar)
+* Upload files to Fedora using form/multipart.
+  [tpendragon](https://github.com/tpendragon)
+* Improve CompositePersister documentation.
+  [tpendragon](https://github.com/tpendragon)
+* Add a Valkyrie::Types::Params::ID type which handles when an HTML form passes
+  an empty string value.
+  [tpendragon](https://github.com/tpendragon)
+* Deprecate .member on Valkyrie::Types::Array & Set
+  [tpendragon](https://github.com/tpendragon)
+* Fix updated_at not being set correctly for the Solr adapter, fix shared specs.
+  [tpendragon](https://github.com/tpendragon)
+
+Additional thanks to the following for code review and issue reports leading to
+this release:
+
+[awead](https://github.com/awead)
+[escowles](https://github.com/escowles)
+[kelynch](https://github.com/kelynch)
+[mbklein](https://github.com/mbklein)
+[no-reply](https://github.com/no-reply)
+[revgum](https://github.com/revgum)
+
 # v1.4.0 2018-01-08
 
 ## Changes since last release.

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,36 @@
+The Samvera community is dedicated to providing a welcoming and
+positive experience for all its members, whether they are at a formal
+gathering, in a social setting, or taking part in activities online.
+The Samvera community welcomes participation from people all over the
+world and these members bring with them a wide variety of
+professional, personal and social backgrounds; whatever these may be,
+we treat colleagues with dignity and respect.
+
+Community members communicate primarily in English, though for many of
+them this is not their native language. We therefore strive to express
+ourselves simply and clearly remembering that unnecessary use of
+jargon and slang will be a barrier to understanding for many of our
+colleagues.  We are sensitive to the fact that the international
+nature of the community means that we span many different social norms
+around language and behaviour and we strive to conduct ourselves,
+online and in person, in ways that are unlikely to cause offence.
+
+Samvera conversations are often information-rich and intended to
+generate discussion and debate.  We discuss ideas from a standpoint of
+mutual respect and reasoned argument.
+
+Community members work together to promote a respectful and safe
+community. In the event that someone’s conduct is causing offence or
+distress, Samvera has a detailed
+[Anti-Harassment Policy and Protocol](https://wiki.duraspace.org/display/samvera/Anti-Harassment+Policy)
+which can be applied to address the problem. The first step in dealing
+with any serious misconduct is to contact a local meeting organizer,
+the
+[Samvera community helpers](https://wiki.duraspace.org/display/samvera/Samvera+Community+Helpers)
+([email](mailto:helpers@samvera.org)), a community member you
+trust, or the
+[Samvera Steering Group](https://wiki.duraspace.org/display/samvera/Samvera+Steering+Group+membership)
+immediately; at Samvera events, these people can be identified by
+distinctive name badges. The
+[Policy and Protocol](https://wiki.duraspace.org/display/samvera/Anti-Harassment+Policy)
+should be consulted for fuller details.

data/CONTRIBUTING.md

@@ -0,0 +1,161 @@
+# How to Contribute
+
+We want your help to make the Samvera community great. There are a few guidelines
+that we need contributors to follow so that we can have a chance of
+keeping on top of things.
+
+## Code of Conduct
+
+The Samvera Community is dedicated to providing a welcoming and positive
+experience for all its members, whether they are at a formal gathering, in
+a social setting, or taking part in activities online. Please see our
+[Code of Conduct](CODE_OF_CONDUCT.md) for more information.
+
+## Samvera Community Intellectual Property Licensing and Ownership
+
+All code contributors must have an Individual Contributor License Agreement
+(iCLA) on file with the Samvera Steering Group. If the contributor works for
+an institution, the institution must have a Corporate Contributor License
+Agreement (cCLA) on file.
+
+https://wiki.duraspace.org/display/samvera/Samvera+Community+Intellectual+Property+Licensing+and+Ownership
+
+You should also add yourself to the `CONTRIBUTORS.md` file in the root of the project.
+
+## Contribution Tasks
+
+* Reporting Issues
+* Making Changes
+* Documenting Code
+* Committing Changes
+* Submitting Changes
+* Reviewing and Merging Changes
+
+### Reporting Issues
+
+* Make sure you have a [GitHub account](https://github.com/signup/free)
+* Submit a [Github issue](https://github.com/samvera-labs/valkyrie/issues/) by:
+  * Clearly describing the issue
+    * Provide a descriptive summary
+    * Explain the expected behavior
+    * Explain the actual behavior
+    * Provide steps to reproduce the actual behavior
+
+### Making Changes
+
+* Fork the repository on GitHub
+* Create a topic branch from where you want to base your work.
+  * This is usually the master branch.
+  * To quickly create a topic branch based on master; `git branch fix/master/my_contribution master`
+  * Then checkout the new branch with `git checkout fix/master/my_contribution`.
+  * Please avoid working directly on the `master` branch.
+  * You may find the [hub suite of commands](https://github.com/defunkt/hub) helpful
+* Make sure you have added sufficient tests and documentation for your changes.
+  * Test functionality with RSpec; Test features / UI with Capybara.
+* Run _all_ the tests to assure nothing else was accidentally broken.
+
+### Documenting Code
+
+* All new public methods, modules, and classes should include inline documentation in [YARD](http://yardoc.org/).
+  * Documentation should seek to answer the question "why does this code exist?"
+* Document private / protected methods as desired.
+* If you are working in a file with no prior documentation, do try to document as you gain understanding of the code.
+  * If you don't know exactly what a bit of code does, it is extra likely that it needs to be documented. Take a stab at it and ask for feedback in your pull request. You can use the 'blame' button on GitHub to identify the original developer of the code and @mention them in your comment.
+  * This work greatly increases the usability of the code base and supports the on-ramping of new committers.
+  * We will all be understanding of one another's time constraints in this area.
+* [Getting started with YARD](http://www.rubydoc.info/gems/yard/file/docs/GettingStarted.md)
+
+### Committing Changes
+
+* Make commits of logical units.
+* Check for unnecessary whitespace with `git diff --check` before committing.
+* Make sure your commit messages are [well formed](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+* If you created an issue, you can close it by including "Closes #issue" in your commit message. See [Github's blog post for more details](https://github.com/blog/1386-closing-issues-via-commit-messages)
+
+```
+    Present tense short summary (50 characters or less)
+
+    More detailed description, if necessary. It should be wrapped to 72
+    characters. Try to be as descriptive as you can, even if you think that
+    the commit content is obvious, it may not be obvious to others. You
+    should add such description also if it's already present in bug tracker,
+    it should not be necessary to visit a webpage to check the history.
+
+    Include Closes #<issue-number> when relavent.
+
+    Description can have multiple paragraphs and you can use code examples
+    inside, just indent it with 4 spaces:
+
+        class PostsController
+          def index
+            respond_to do |wants|
+              wants.html { render 'index' }
+            end
+          end
+        end
+
+    You can also add bullet points:
+
+    - you can use dashes or asterisks
+
+    - also, try to indent next line of a point for readability, if it's too
+      long to fit in 72 characters
+```
+
+* Make sure you have added the necessary tests for your changes.
+* Run _all_ the tests to assure nothing else was accidentally broken.
+* Then you are ready to submit a pull request
+
+### Submitting Changes
+
+* Read the article ["Using Pull Requests"](https://help.github.com/articles/using-pull-requests) on GitHub.
+* Make sure your branch is up to date with its parent branch (i.e. master)
+  * `git checkout master`
+  * `git pull --rebase`
+  * `git checkout <your-branch>`
+  * `git rebase master`
+  * It is a good idea to run your tests again.
+* If you've made more than one commit take a moment to consider whether squashing commits together would help improve their logical grouping.
+  * [Detailed Walkthrough of One Pull Request per Commit](http://ndlib.github.io/practices/one-commit-per-pull-request/)
+  * `git rebase --interactive master` ([See Github help](https://help.github.com/articles/interactive-rebase))
+  * Squashing your branch's changes into one commit is "good form" and helps the person merging your request to see everything that is going on.
+* Push your changes to a topic branch in your fork of the repository.
+* Submit a pull request from your fork to the project.
+
+### Reviewing and Merging Changes
+
+We adopted [Github's Pull Request Review](https://help.github.com/articles/about-pull-request-reviews/) for our repositories.
+Common checks that may occur in our repositories:
+
+1. Travis CI - where our automated tests are running
+2. Approval Required - Github enforces at least one person approve a pull request. Also, all reviewers that have chimed in must approve.
+
+If one or more of the required checks failed (or are incomplete), the code should not be merged (and the UI will not allow it). If all of the checks have passed, then anyone on the project (including the pull request submitter) may merge the code.
+
+*Example: Carolyn submits a pull request, Justin reviews the pull request and approves. However, Justin is still waiting on other checks (Travis CI is usually the culprit), so he does not merge the pull request. Eventually, all of the checks pass. At this point, Carolyn or anyone else may merge the pull request.*
+
+#### Things to Consider When Reviewing
+
+First, the person contributing the code is putting themselves out there. Be mindful of what you say in a review.
+
+* Ask clarifying questions
+* State your understanding and expectations
+* Provide example code or alternate solutions, and explain why
+
+This is your chance for a mentoring moment of another developer. Take time to give an honest and thorough review of what has changed. Things to consider:
+
+  * Does the commit message explain what is going on?
+  * Does the code changes have tests? _Not all changes need new tests, some changes are refactorings_
+  * Do new or changed methods, modules, and classes have documentation?
+  * Does the commit contain more than it should? Are two separate concerns being addressed in one commit?
+  * Does the description of the new/changed specs match your understanding of what the spec is doing?
+  * Did the Travis tests complete successfully?
+
+If you are uncertain, bring other contributors into the conversation by assigning them as a reviewer.
+
+# Additional Resources
+
+* [General GitHub documentation](http://help.github.com/)
+* [GitHub pull request documentation](https://help.github.com/articles/about-pull-requests/)
+* [Pro Git](http://git-scm.com/book) is both a free and excellent book about Git.
+* [A Git Config for Contributing](http://ndlib.github.io/practices/my-typical-per-project-git-config/)

data/README.md

@@ -4,11 +4,17 @@ Valkyrie is a gem for enabling multiple backends for storage of files and metada
 
 ![Valkyrie Logo](valkyrie_logo.png)
 
-[![CircleCI](https://circleci.com/gh/samvera-labs/valkyrie.svg?style=svg)](https://circleci.com/gh/samvera-labs/valkyrie)
+Code: [![Version](https://badge.fury.io/rb/valkyrie.png)](http://badge.fury.io/rb/valkyrie)
+[![Build Status](https://circleci.com/gh/samvera-labs/valkyrie.svg?style=svg)](https://circleci.com/gh/samvera-labs/valkyrie)
 [![Coverage Status](https://coveralls.io/repos/github/samvera-labs/valkyrie/badge.svg?branch=master)](https://coveralls.io/github/samvera-labs/valkyrie?branch=master)
 [![Stories in Ready](https://badge.waffle.io/samvera-labs/valkyrie.png?label=ready&title=Ready)](https://waffle.io/samvera-labs/valkyrie)
+
+Docs: [![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./CONTRIBUTING.md)
+[![Apache 2.0 License](http://img.shields.io/badge/APACHE2-license-blue.svg)](./LICENSE)
 [![Yard Docs](http://img.shields.io/badge/yard-docs-blue.svg)](http://rubydoc.info/github/samvera-labs/valkyrie)
 
+Jump in: [![Slack Status](http://slack.samvera.org/badge.svg)](http://slack.samvera.org/)
+
 ## Primary Contacts
 
 ### Product Owner
@@ -19,7 +25,11 @@ Valkyrie is a gem for enabling multiple backends for storage of files and metada
 
 [Trey Pendragon](https://github.com/tpendragon)
 
-## Installation
+## Help
+
+The Samvera community is here to help. Please see our [support guide](./SUPPORT.md).
+
+## Getting Started
 
 Add this line to your application's Gemfile:
 
@@ -89,6 +99,17 @@ The initializer also registers three `Valkyrie::StorageAdapter` instances for st
 * `:memory` which stores files in an in-memory cache (again, not persistent, so this is only appropriate for
   testing)
 
+### Sample configuration with custom `Valkyrie.config.resource_class_resolver`:
+
+```
+require 'valkyrie'
+Rails.application.config.to_prepare do
+  Valkyrie.config.resource_class_resolver = lambda do |resource_klass_name|
+    # Do complicated lookup based on the string
+  end
+end
+```
+
 ### Sample configuration: `config/valkyrie.yml`:
 
 A sample configuration file that configures your application to use different adapters:
@@ -249,17 +270,12 @@ When configuring your adapter, include the `fedora_version` parameter in your me
 
 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.
 
-## Get Help
-
-If you have any questions regarding Valkyrie you can send a message to [the
-Samvera community tech list](mailto:samvera-tech@googlegroups.com) or the `#valkyrie`
-channel in the [Samvera community Slack
-team](https://wiki.duraspace.org/pages/viewpage.action?pageId=87460391#Getintouch!-Slack).
-
-## License
+## Acknowledgments
 
-Valkyrie is available under [the Apache 2.0 license](../LICENSE).
+This software has been developed by and is brought to you by the Samvera community.  Learn more at the
+[Samvera website](http://samvera.org/).
 
+![Samvera Logo](https://wiki.duraspace.org/download/thumbnails/87459292/samvera-fall-font2-200w.png?version=1&modificationDate=1498550535816&api=v2)
 
 ## Contributing
 

data/SUPPORT.md

@@ -0,0 +1,5 @@
+If you would like to report an issue, first search [the list of issues](https://github.com/samvera-labs/valkyrie/issues/) to see if someone else has already reported it, and then feel free to [create a new issue](https://github.com/samvera-labs/valkyrie/issues/new).
+
+If you have questions or need help, please email [the Samvera community tech list](https://groups.google.com/forum/#!forum/samvera-tech) or stop by the #dev channel in [the Samvera community Slack team](https://wiki.duraspace.org/pages/viewpage.action?pageId=87460391#Getintouch!-Slack).
+
+You can learn more about the various Samvera communication channels on the [Get in touch!](https://wiki.duraspace.org/pages/viewpage.action?pageId=87460391) wiki page.

data/lib/valkyrie.rb

@@ -86,13 +86,39 @@ module Valkyrie
       Valkyrie::StorageAdapter.find(super.to_sym)
     end
 
+    # @api public
+    #
+    # The returned anonymous method (e.g. responds to #call) has a signature of
+    # an unamed parameter that is a string. Calling the anonymous method should
+    # return a Valkyrie::Resource from which Valkyrie will map the persisted
+    # data into.
+    #
+    # @return [#call] with method signature of 1
+    #
+    # @see #default_resource_class_resolver for full interface
+    def resource_class_resolver
+      super
+    end
+
+    # @!attribute [w] resource_class_resolver=
+    #   The setter for #resource_class_resolver; see it's implementation
+
     private
 
       def defaults
         {
-          standardize_query_result: false
+          standardize_query_result: false,
+          resource_class_resolver: method(:default_resource_class_resolver)
         }
       end
+
+      # String constantize is a "by convention" factory. This works, but assumes
+      # the ruby class once used to persist is the model used to now reify.
+      #
+      # @param [String] class_name
+      def default_resource_class_resolver(class_name)
+        class_name.constantize
+      end
   end
 
   module_function :config, :logger, :logger=, :config_root_path, :environment, :warn_about_standard_queries!, :config_file, :config_hash

data/lib/valkyrie/persistence/composite_persister.rb

@@ -7,7 +7,13 @@ module Valkyrie::Persistence
   #   persister = Valkyrie.config.metadata_adapter
   #   index_persister = Valkyrie::MetadataAdapter.find(:index_solr)
   #   Valkyrie::MetadataAdapter.register(
-  #     Valkyrie::Persistence::CompositePersister.new(persister, index_persister),
+  #     Valkyrie::AdapterContainer.new(
+  #       persister: Valkyrie::Persistence::CompositePersister.new(
+  #         persister,
+  #         index_persister
+  #         )
+  #       query_service: Valkyrie.config.metadata_adapter.query_service
+  #     )
   #     :my_composite_persister
   #   )
   #

data/lib/valkyrie/persistence/fedora/query_service.rb

@@ -111,8 +111,10 @@ module Valkyrie::Persistence::Fedora
     # Find all resources referencing a given resource (e. g. parents)
     # *This is done by iterating through the ID of each resource referencing the resource in the query, and requesting each resource over the HTTP*
     # *Also, an initial request is made to find the URIs of the resources referencing the resource in the query*
-    def find_inverse_references_by(resource:, property:)
-      ensure_persisted(resource)
+    def find_inverse_references_by(resource: nil, id: nil, property:)
+      raise ArgumentError, "Provide resource or id" unless resource || id
+      ensure_persisted(resource) if resource
+      resource ||= find_by(id: id)
       if ordered_property?(resource: resource, property: property)
         find_inverse_references_by_ordered(resource: resource, property: property)
       else

data/lib/valkyrie/persistence/memory/query_service.rb

@@ -36,7 +36,10 @@ module Valkyrie::Persistence::Memory
     def find_by_alternate_identifier(alternate_identifier:)
       alternate_identifier = Valkyrie::ID.new(alternate_identifier.to_s) if alternate_identifier.is_a?(String)
       validate_id(alternate_identifier)
-      cache.select { |_key, resource| resource[:alternate_ids].include?(alternate_identifier) }.values.first || raise(::Valkyrie::Persistence::ObjectNotFoundError)
+      cache.select do |_key, resource|
+        next unless resource[:alternate_ids]
+        resource[:alternate_ids].include?(alternate_identifier)
+      end.values.first || raise(::Valkyrie::Persistence::ObjectNotFoundError)
     end
 
     # Get a batch of resources by ID.
@@ -110,10 +113,12 @@ module Valkyrie::Persistence::Memory
     # @return [Array<Valkyrie::Resource>] All resources in the persistence backend
     #   which have the ID of the given `resource` in their `property` property. Not
     #   in order.
-    def find_inverse_references_by(resource:, property:)
-      ensure_persisted(resource)
+    def find_inverse_references_by(resource: nil, id: nil, property:)
+      raise ArgumentError, "Provide resource or id" unless resource || id
+      ensure_persisted(resource) if resource
+      id ||= resource.id
       find_all.select do |obj|
-        Array.wrap(obj[property]).include?(resource.id)
+        Array.wrap(obj[property]).include?(id)
       end
     end
 

data/lib/valkyrie/persistence/postgres.rb

@@ -1,8 +1,14 @@
 # frozen_string_literal: true
-#
 module Valkyrie::Persistence
   # Implements the DataMapper Pattern to store metadata into Postgres
   module Postgres
+    # Deprecation to allow us to make pg an optional dependency
+    path = Bundler.definition.gemfiles.first
+    matches = File.readlines(path).select { |l| l =~ /gem ['"]pg\b/ }
+    if matches.empty?
+      warn "[DEPRECATION] pg will not be included as a dependency in Valkyrie's gemspec as of the next major release. Please add the gem directly to your Gemfile if you use a postgres adapter."
+    end
+
     require 'valkyrie/persistence/postgres/metadata_adapter'
   end
 end

data/lib/valkyrie/persistence/postgres/orm_converter.rb

@@ -56,7 +56,7 @@ module Valkyrie::Persistence::Postgres
       # Retrieve the Class used to construct the Valkyrie Resource
       # @return [Class]
       def resource_klass
-        internal_resource.constantize
+        Valkyrie.config.resource_class_resolver.call(internal_resource)
       end
 
       # Access the String for the Valkyrie Resource type within the attributes

data/lib/valkyrie/persistence/postgres/persister.rb

@@ -19,7 +19,15 @@ module Valkyrie::Persistence::Postgres
     #   was modified in the database between been read into memory and persisted
     def save(resource:)
       orm_object = resource_factory.from_resource(resource: resource)
-      orm_object.save!
+      orm_object.transaction do
+        orm_object.save!
+        if resource.id && resource.id.to_s != orm_object.id
+          warn "[DEPRECATION] Postgres' primary key column can not save with the given ID #{resource.id}. " \
+            "For now a new ID has been assigned (#{orm_object.id}), but in the next major version this will throw an exception and not save. " \
+            "To avoid this warning, set the ID to be nil via `resource.id = nil` before you save it. \n" \
+            "Called from #{Gem.location_of_caller.join(':')}"
+        end
+      end
       resource_factory.to_resource(object: orm_object)
     rescue ActiveRecord::StaleObjectError
       raise Valkyrie::Persistence::StaleObjectError, "The object #{resource.id} has been updated by another process."

data/lib/valkyrie/persistence/postgres/query_service.rb

@@ -112,9 +112,11 @@ module Valkyrie::Persistence::Postgres
     # @param [Valkyrie::Resource] resource
     # @param [String] property
     # @return [Array<Valkyrie::Resource>]
-    def find_inverse_references_by(resource:, property:)
-      ensure_persisted(resource)
-      internal_array = "{\"#{property}\": [{\"id\": \"#{resource.id}\"}]}"
+    def find_inverse_references_by(resource: nil, id: nil, property:)
+      raise ArgumentError, "Provide resource or id" unless resource || id
+      ensure_persisted(resource) if resource
+      id ||= resource.id
+      internal_array = "{\"#{property}\": [{\"id\": \"#{id}\"}]}"
       run_query(find_inverse_references_query, internal_array)
     end
 

data/lib/valkyrie/persistence/solr/model_converter.rb

@@ -41,16 +41,25 @@ module Valkyrie::Persistence::Solr
       if resource_attributes[:created_at]
         DateTime.parse(resource_attributes[:created_at].to_s).utc.iso8601
       else
-        Time.current.utc.iso8601
+        Time.current.utc.iso8601(6)
       end
     end
 
+    # @return [String] ISO-8601 timestamp in UTC of the updated_at for solr
+    # @note Solr stores its own updated_at timestamp, but for performance
+    # reasons we're generating our own. Without doing so, every time we add a
+    # new document we'd have to do a GET to find out the timestamp.
+    def updated_at
+      Time.current.utc.iso8601(6)
+    end
+
     # @return [Hash] Solr document to index.
     def to_h
       {
         "id": id,
         "join_id_ssi": "id-#{id}",
-        "created_at_dtsi": created_at
+        "created_at_dtsi": created_at,
+        "updated_at_dtsi": updated_at
       }.merge(add_single_values(attribute_hash)).merge(lock_hash)
     end
 

data/lib/valkyrie/persistence/solr/orm_converter.rb

@@ -26,7 +26,7 @@ module Valkyrie::Persistence::Solr
     # Access the Class for the Valkyrie Resource
     # @return [Class]
     def resource_klass
-      internal_resource.constantize
+      Valkyrie.config.resource_class_resolver.call(internal_resource)
     end
 
     # Access the String specifying the Valkyrie Resource type in the Solr Document
@@ -54,7 +54,7 @@ module Valkyrie::Persistence::Solr
     # Construct a Time object from the datestamp for the date of the last resource update indexed in Solr
     # @return [Time]
     def updated_at
-      DateTime.parse(solr_document["timestamp"] || solr_document.fetch("created_at_dtsi").to_s).utc
+      DateTime.parse(solr_document.fetch("updated_at_dtsi").to_s || solr_document["timestamp"] || solr_document.fetch("created_at_dtsi").to_s).utc
     end
 
     # Construct the OptimisticLockToken object using the "_version_" field value in the Solr Document

data/lib/valkyrie/persistence/solr/queries/find_inverse_references_query.rb

@@ -3,14 +3,14 @@ module Valkyrie::Persistence::Solr::Queries
   # Responsible for efficiently returning all {Valkyrie::Resource}s which
   # reference a {Valkyrie::Resource} in a given property.
   class FindInverseReferencesQuery
-    attr_reader :resource, :property, :connection, :resource_factory
+    attr_reader :id, :property, :connection, :resource_factory
 
     # @param [Valkyrie::Resource] resource
     # @param [String] property
     # @param [RSolr::Client] connection
     # @param [ResourceFactory] resource_factory
-    def initialize(resource:, property:, connection:, resource_factory:)
-      @resource = resource
+    def initialize(resource: nil, id: nil, property:, connection:, resource_factory:)
+      @id = id ? id : resource.id
       @property = property
       @connection = connection
       @resource_factory = resource_factory
@@ -39,7 +39,7 @@ module Valkyrie::Persistence::Solr::Queries
     # @note the field used here is a _ssim dynamic field and the value is prefixed by "id-"
     # @return [Hash]
     def query
-      "#{property}_ssim:id-#{resource.id}"
+      "#{property}_ssim:id-#{id}"
     end
   end
 end

data/lib/valkyrie/persistence/solr/query_service.rb

@@ -92,9 +92,11 @@ module Valkyrie::Persistence::Solr
     # @param [Valkyrie::Resource] referenced resource
     # @param [Symbol, String] property
     # @return [Array<Valkyrie::Resource>] related resources
-    def find_inverse_references_by(resource:, property:)
-      ensure_persisted(resource)
-      Valkyrie::Persistence::Solr::Queries::FindInverseReferencesQuery.new(resource: resource, property: property, connection: connection, resource_factory: resource_factory).run
+    def find_inverse_references_by(resource: nil, id: nil, property:)
+      raise ArgumentError, "Provide resource or id" unless resource || id
+      ensure_persisted(resource) if resource
+      id ||= resource.id
+      Valkyrie::Persistence::Solr::Queries::FindInverseReferencesQuery.new(id: id, property: property, connection: connection, resource_factory: resource_factory).run
     end
 
     # Construct the Valkyrie::Persistence::CustomQueryContainer object using this query service

data/lib/valkyrie/specs/shared_specs/persister.rb

@@ -2,6 +2,7 @@
 RSpec.shared_examples 'a Valkyrie::Persister' do |*flags|
   before do
     raise 'persister must be set with `let(:persister)`' unless defined? persister
+    raise 'query_service must be set with `let(:query_service)`' unless defined? query_service
     class CustomResource < Valkyrie::Resource
       include Valkyrie::Resource::AccessControls
       attribute :title
@@ -92,6 +93,7 @@ RSpec.shared_examples 'a Valkyrie::Persister' do |*flags|
     expect(book.updated_at).not_to be_blank
     expect(book.created_at).not_to be_kind_of Array
     expect(book.updated_at).not_to be_kind_of Array
+    expect(book.updated_at > book.created_at).to eq true
   end
 
   it "can handle Boolean RDF properties" do
@@ -235,7 +237,7 @@ RSpec.shared_examples 'a Valkyrie::Persister' do |*flags|
   end
 
   it "can store Valkyrie::IDs" do
-    shared_title = persister.save(resource: resource_class.new(id: "test"))
+    shared_title = persister.save(resource: resource_class.new)
     book = persister.save(resource: resource_class.new(title: [shared_title.id, Valkyrie::ID.new("adapter://1"), "test"]))
     reloaded = query_service.find_by(id: book.id)
     expect(reloaded.title).to contain_exactly(shared_title.id, Valkyrie::ID.new("adapter://1"), "test")

data/lib/valkyrie/specs/shared_specs/queries.rb

@@ -4,7 +4,7 @@ RSpec.shared_examples 'a Valkyrie query provider' do
     raise 'adapter must be set with `let(:adapter)`' unless
       defined? adapter
     class CustomResource < Valkyrie::Resource
-      attribute :alternate_ids, Valkyrie::Types::Array
+      attribute :alternate_ids, Valkyrie::Types::Set.of(Valkyrie::Types::ID)
       attribute :title
       attribute :member_ids, Valkyrie::Types::Array
       attribute :a_member_of, Valkyrie::Types::Array
@@ -32,6 +32,7 @@ RSpec.shared_examples 'a Valkyrie query provider' do
   it { is_expected.to respond_to(:find_members).with_keywords(:resource, :model) }
   it { is_expected.to respond_to(:find_references_by).with_keywords(:resource, :property) }
   it { is_expected.to respond_to(:find_inverse_references_by).with_keywords(:resource, :property) }
+  it { is_expected.to respond_to(:find_inverse_references_by).with_keywords(:id, :property) }
   it { is_expected.to respond_to(:find_parents).with_keywords(:resource) }
 
   describe ".find_all" do
@@ -92,7 +93,12 @@ RSpec.shared_examples 'a Valkyrie query provider' do
       expect(found).to be_persisted
     end
 
-    it "returns a Valkyrie::Persistence::ObjectNotFoundError for a non-found alternate identifier" do
+    it 'raises a Valkyrie::Persistence::ObjectNotFoundError when persisted objects do not have alternate_ids' do
+      persister.save(resource: SecondResource.new)
+      expect { query_service.find_by_alternate_identifier(alternate_identifier: Valkyrie::ID.new("123123123")) }.to raise_error ::Valkyrie::Persistence::ObjectNotFoundError
+    end
+
+    it "raises a Valkyrie::Persistence::ObjectNotFoundError for a non-found alternate identifier" do
       expect { query_service.find_by_alternate_identifier(alternate_identifier: Valkyrie::ID.new("123123123")) }.to raise_error ::Valkyrie::Persistence::ObjectNotFoundError
     end
 
@@ -304,6 +310,26 @@ RSpec.shared_examples 'a Valkyrie query provider' do
         end
       end
     end
+
+    context "when id is passed instead of resource" do
+      it "returns everything which references the given resource by the given property" do
+        parent = persister.save(resource: resource_class.new)
+        parent2 = persister.save(resource: resource_class.new)
+        child = persister.save(resource: resource_class.new(a_member_of: [parent.id]))
+        child2 = persister.save(resource: resource_class.new(a_member_of: [parent.id, parent2.id, parent.id]))
+        persister.save(resource: resource_class.new)
+        persister.save(resource: SecondResource.new)
+
+        expect(query_service.find_inverse_references_by(id: parent.id, property: :a_member_of).map(&:id).to_a).to contain_exactly child.id, child2.id
+      end
+    end
+
+    context "when neither id nor resource is passed" do
+      it "raises an error" do
+        expect { query_service.find_inverse_references_by(property: :a_member_of) }.to raise_error ArgumentError
+      end
+    end
+
     context "when the resource is not saved" do
       it "raises an error" do
         parent = resource_class.new

data/lib/valkyrie/storage/fedora.rb

@@ -41,7 +41,8 @@ module Valkyrie::Storage
         request.headers['Content-Disposition'] = "attachment; filename=\"#{original_filename}\""
         request.headers['digest'] = "#{sha1}=#{Digest::SHA1.file(file)}"
         request.headers['link'] = "<http://www.w3.org/ns/ldp#NonRDFSource>; rel=\"type\""
-        request.body = file.tempfile.read
+        io = Faraday::UploadIO.new(file.tempfile.path, file.content_type)
+        request.body = io
       end
       find_by(id: Valkyrie::ID.new(identifier.to_s.sub(/^.+\/\//, PROTOCOL)))
     end

data/lib/valkyrie/types.rb

@@ -29,6 +29,16 @@ module Valkyrie
       end
     end
 
+    module Params
+      ID = Valkyrie::Types::ID.constructor do |input|
+        if input.blank?
+          nil
+        else
+          Valkyrie::Types::ID[input]
+        end
+      end
+    end
+
     # Valkyrie::URI
     URI = Dry::Types::Definition
           .new(RDF::URI)
@@ -51,7 +61,8 @@ module Valkyrie
     # Used for casting {Valkyrie::Resources} if possible.
     Anything = Valkyrie::Types::Any.constructor do |value|
       if value.respond_to?(:fetch) && value.fetch(:internal_resource, nil)
-        value.fetch(:internal_resource).constantize.new(value)
+        resource_klass = Valkyrie.config.resource_class_resolver.call(value.fetch(:internal_resource))
+        resource_klass.new(value)
       else
         value
       end
@@ -87,6 +98,10 @@ module Valkyrie
       end
 
       def member(type)
+        warn "[DEPRECATION] .member has been renamed to .of in dry-types and this " \
+          "method will be removed in the next major version of Valkyrie. Please use " \
+          ".of instead. " \
+          "Called from #{Gem.location_of_caller.join(':')}"
         super.default([].freeze)
       end
     end

data/lib/valkyrie/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Valkyrie
-  VERSION = "1.4.0"
+  VERSION = "1.5.0.RC1"
 end

data/valkyrie.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'json'
   spec.add_dependency 'active-triples'
 
-  spec.add_development_dependency "bundler", "~> 1.13"
+  spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"
@@ -50,4 +50,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'fcrepo_wrapper'
   spec.add_development_dependency 'docker-stack', '~> 0.2.6'
   spec.add_development_dependency 'activerecord', '~> 5.1.0'
+  spec.add_development_dependency 'timecop'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0.RC1
 platform: ruby
 authors:
 - Trey Pendragon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-09 00:00:00.000000000 Z
+date: 2019-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -430,6 +430,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.1.0
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - tpendragon@princeton.edu
@@ -446,10 +460,13 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - CHANGELOG.md
+- CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- SUPPORT.md
 - bin/console
 - bin/jetty_wait
 - bin/rspec
@@ -585,12 +602,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: An ORM using the Data Mapper pattern, specifically built to solve Digital