valkyrie 2.0.0.RC3 → 2.0.0.RC4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46ec28ef4c223e885ba6b6e5c8cb9e53d87ee08e550db09dd1d655af768a4043
-  data.tar.gz: 87b33c7db9d9211b4a8c294a9f6aeef8e2b06487523324eedcec2850960e6963
+  metadata.gz: f9151d2366b77d6dd72a8303e9e33cea7b9b5204e6eaa6decbfd112242632317
+  data.tar.gz: 6dd48e9383552796429bec2e2d1e1968f0566478eb9398292407dcc48d3e9739
 SHA512:
-  metadata.gz: 475e3c5bc3064c1515fcad708c682eb90151dcea9d13628402125eccddceb786b4892b8d8945ec6bbc1bcc6429561c7e458f34aac45d3a8cb035db0c0a4328c4
-  data.tar.gz: a938133503843f807466f4ebb4bff76b09eaab6d615fe6d17b6b3dcf2d6af9841a6561815d8e16191fcbacfe5b4513094804140f3433e5214bc45427f4d1ac87
+  metadata.gz: 63e754028fe8545504a5788b5f6415d7d9a132296b71d6235146977c1941705f6497a0ea4d9040920a995e43aa66acd6e6ee32cfdddf9662c97a08ff64b420b2
+  data.tar.gz: 34a16fa89f9a969cf42b6f9f55acf3f0e171b62996971234ce93e2a31ba028a42421d3a6bae4b54cb43bf9fb0f5b470f087ea79c35e1ec51adcfedb96ff3ce06

data/.circleci/config.yml

@@ -1,10 +1,34 @@
 ---
-version: 2
+version: 2.1
 jobs:
   build:
     machine: true
+    parameters:
+      gemfile:
+        description: "Gemfile to run"
+        default: "Gemfile"
+        type: "string"
+      ruby:
+        description: "Ruby version"
+        default: "2.6.2"
+        type: "string"
+    environment:
+      BUNDLE_GEMFILE: << parameters.gemfile >>
     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
       - run:
           name: Install Docker Compose
           command: |
@@ -13,30 +37,60 @@ jobs:
             sudo mv ~/docker-compose /usr/local/bin/docker-compose
       - run:
           name: Update bundler
-          command: gem install bundler -v 1.16.2
+          command: gem install bundler -v 1.17.2
       - restore_cache:
          keys:
-           - bundle-{{ checksum "Gemfile" }}-{{ checksum "valkyrie.gemspec" }}
-           - bundle- # used if checksum fails
+           - bundle-{{ checksum "<< parameters.gemfile >>" }}-{{ checksum "valkyrie.gemspec" }}-<< parameters.ruby >>-6
       - run: sudo apt-get update && sudo apt-get install -y libpq-dev
+      - run:
+          name: Set BUNDLE_GEMFILE
+          command: |
+            export BUNDLE_GEMFILE=~/project/<< parameters.gemfile >>
       - run:
           name: Install dependencies
           command: bundle install --path=vendor/bundle --jobs 4 --retry 3
       - save_cache:
-          key: bundle-{{ checksum "Gemfile" }}-{{ checksum "valkyrie.gemspec" }}
+          key: bundle-{{ checksum "<< parameters.gemfile >>" }}-{{ checksum "valkyrie.gemspec" }}-<< parameters.ruby >>-6
           paths:
             - "vendor/bundle"
+            - "gemfiles/vendor/bundle"
       - run:
           name: Run Rubocop
           command: bundle exec rake rubocop
       - run:
           name: Run Specs
           command: bundle exec rake docker:spec
+      - store_artifacts:
+          path: coverage
+          destination: coverage
 workflows:
   version: 2
   build:
     jobs:
-      - build
+      - build:
+          gemfile: "gemfiles/activerecord_5_2.gemfile"
+          ruby: 2.6.2
+          name: "Ruby2-6_Rails5-2"
+      - build:
+          gemfile: "gemfiles/activerecord_5_1.gemfile"
+          ruby: 2.6.2
+          name: "Ruby2-6_Rails5-1"
+      - 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"
+      - build:
+          gemfile: "gemfiles/activerecord_5_2.gemfile"
+          ruby: 2.4.5
+          name: "Ruby2-4_Rails5-2"
+      - build:
+          gemfile: "gemfiles/activerecord_5_1.gemfile"
+          ruby: 2.4.5
+          name: "Ruby2-4_Rails5-1"
   nightly:
     triggers:
       - schedule:
@@ -46,4 +100,27 @@ workflows:
               only:
                 - master
     jobs:
-      - build
+      - build:
+          gemfile: "gemfiles/activerecord_5_2.gemfile"
+          ruby: 2.6.2
+          name: "Ruby2-6_Rails5-2"
+      - build:
+          gemfile: "gemfiles/activerecord_5_1.gemfile"
+          ruby: 2.6.2
+          name: "Ruby2-6_Rails5-1"
+      - 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"
+      - build:
+          gemfile: "gemfiles/activerecord_5_2.gemfile"
+          ruby: 2.4.5
+          name: "Ruby2-4_Rails5-2"
+      - build:
+          gemfile: "gemfiles/activerecord_5_1.gemfile"
+          ruby: 2.4.5
+          name: "Ruby2-4_Rails5-1"

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 /vendor
+/gemfiles/*.lock

data/.rubocop.yml

@@ -9,6 +9,7 @@ AllCops:
     - 'bin/*'
     - 'db/schema.rb'
     - 'vendor/**/*'
+    - 'gemfiles/vendor/**/*'
 RSpec/ScatteredSetup:
   Enabled: false
 Metrics/BlockLength:
@@ -31,3 +32,7 @@ Naming/PredicateName:
     - "lib/valkyrie/persistence/solr/queries/default_paginator.rb"
 Lint/UnusedMethodArgument:
   AllowUnusedKeywordArguments: true
+Naming/FileName:
+  Exclude:
+    - 'Appraisals'
+    - 'Gemfile'

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.5.1

data/Appraisals

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

data/CHANGELOG.md

@@ -1,3 +1,34 @@
+# v1.6.0 2018-04-17
+
+## Changes since last release
+
+* Deprecation in preparation for LDP to be optional
+* Deprecation in preparation for RSolr to be optional
+* Deprecation in preparation for ActiveRecord to be optional
+* Remove Rails requirement
+* Remove ActiveTriples dependency.
+
+Additional thanks to the following for code review and issue reports leading to
+this release:
+
+[carolyncole](https://github.com/carolyncole)
+[dgcliff](https://github.com/dgcliff)
+[escowles](https://github.com/escowles)
+[no-reply](https://github.com/no-reply)
+
+# v1.5.1 2018-02-08
+
+## Changes since last release
+
+* Namespace shared-spec resources to avoid conflict in apps.
+  [tpendragon](https://github.com/tpendragon)
+
+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)
+
 # v1.5.0 2018-02-06
 
 ## Changes since last release

data/Gemfile

@@ -4,4 +4,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in valkyrie.gemspec
 gemspec
 
+gem 'activerecord'
+gem 'ldp'
 gem 'pg'
+gem 'rsolr'

data/README.md

@@ -5,13 +5,12 @@ 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)
-[![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)
+[![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)
 
 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)
+[![Yard Docs](http://img.shields.io/badge/yard-docs-blue.svg)](http://rubydoc.info/gems/valkyrie)
 
 Jump in: [![Slack Status](http://slack.samvera.org/badge.svg)](http://slack.samvera.org/)
 
@@ -62,6 +61,24 @@ Rails.application.config.to_prepare do
     :postgres
   )
 
+  # To use the solr adapter you must add gem 'rsolr' to your Gemfile
+  Valkyrie::MetadataAdapter.register(
+    Valkyrie::Persistence::Solr::MetadataAdapter.new(
+      connection: Blacklight.default_index.connection
+    ),
+    :solr
+  )
+
+  # To use the fedora adapter you must add `gem 'ldp'` to your Gemfile
+  Valkyrie::MetadataAdapter.register(
+    Valkyrie::Persistence::Fedora::MetadataAdapter.new(
+      connection: ::Ldp::Client.new("http://localhost:8988/rest"),
+      base_path: "test_fed",
+      schema: Valkyrie::Persistence::Fedora::PermissiveSchema.new(title: RDF::URI("http://bad.com/title"))
+    ),
+    :fedora
+  )
+
   Valkyrie::MetadataAdapter.register(
     Valkyrie::Persistence::Memory::MetadataAdapter.new,
     :memory
@@ -85,8 +102,10 @@ Rails.application.config.to_prepare do
 end
 ```
 
-The initializer registers two `Valkyrie::MetadataAdapter` instances for storing metadata:
+The initializer registers four `Valkyrie::MetadataAdapter` instances for storing metadata:
 * `:postgres` which stores metadata in a PostgreSQL database
+* `:solr` which stores metadata in a Solr Index
+* `:fedora` which stores metadata in a Fedora server.
 * `:memory` which stores metadata in an in-memory cache (this cache is not persistent, so it is only
   appropriate for testing)
 
@@ -135,7 +154,7 @@ For each environment, you must set two values:
 The values are the short names used in your initializer.
 
 Further details can be found on the [Persistence Wiki
-page](https://github.com/samvera-labs/valkyrie/wiki/Persistence).
+page](https://github.com/samvera/valkyrie/wiki/Persistence).
 
 ## Usage
 
@@ -159,7 +178,7 @@ attribute :authors, Valkyrie::Types::Array.meta(ordered: true)
 ```
 
 Defining resource attributes is explained in greater detail on the [Using Types Wiki
-page](https://github.com/samvera-labs/valkyrie/wiki/Using-Types).
+page](https://github.com/samvera/valkyrie/wiki/Using-Types).
 
 #### Work Types Generator
 
@@ -195,16 +214,16 @@ objects = adapter.query_service.find_all
 Valkyrie.config.metadata_adapter.query_service.find_all_of_model(model: MyModel)
 ```
 
-The Wiki documents the usage of [Queries](https://github.com/samvera-labs/valkyrie/wiki/Queries),
-[Persistence](https://github.com/samvera-labs/valkyrie/wiki/Persistence), and
-[ChangeSets and Dirty Tracking](https://github.com/samvera-labs/valkyrie/wiki/ChangeSets-and-Dirty-Tracking).
+The Wiki documents the usage of [Queries](https://github.com/samvera/valkyrie/wiki/Queries),
+[Persistence](https://github.com/samvera/valkyrie/wiki/Persistence), and
+[ChangeSets and Dirty Tracking](https://github.com/samvera/valkyrie/wiki/ChangeSets-and-Dirty-Tracking).
 
 ### Concurrency Support
 A Valkyrie repository may have concurrent updates, for example, from a load-balanced Rails application, or
 from multiple [Sidekiq](https://github.com/mperham/sidekiq) background workers).  In order to prevent multiple
 simultaneous updates applied to the same resource from losing or corrupting data, Valkyrie supports optimistic
 locking.  How to use optimistic locking with Valkyrie is documented on the [Optimistic Locking Wiki
-page](https://github.com/samvera-labs/valkyrie/wiki/Optimistic-Locking).
+page](https://github.com/samvera/valkyrie/wiki/Optimistic-Locking).
 
 ### The Public API
 Valkyrie's public API is defined by the shared specs that are used to test each of its core classes.
@@ -218,7 +237,7 @@ shared specs, but there may be new ones. These new shared specs will fail in you
 custom adapters, but your application will still work.
 
 Using the shared specs in your own models is described in more detail on the [Shared Specs Wiki
-page](https://github.com/samvera-labs/valkyrie/wiki/Shared-Specs).
+page](https://github.com/samvera/valkyrie/wiki/Shared-Specs).
 
 ### Fedora 5 Compatibility
 When configuring your adapter, include the `fedora_version` parameter in your metadata or storage adapter
@@ -290,4 +309,4 @@ This software has been developed by and is brought to you by the Samvera communi
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/samvera-labs/valkyrie/.
+Bug reports and pull requests are welcome on GitHub at https://github.com/samvera/valkyrie/.

data/Rakefile

@@ -57,8 +57,14 @@ namespace :db do
       scope   = ENV['SCOPE']
       verbose_was = ActiveRecord::Migration.verbose
       ActiveRecord::Migration.verbose = verbose
-      ActiveRecord::Migrator.migrate(MIGRATIONS_DIR, version) do |migration|
-        scope.blank? || scope == migration.scope
+      if ActiveRecord::Migrator.respond_to?(:migrate)
+        ActiveRecord::Migrator.migrate(MIGRATIONS_DIR, version) do |migration|
+          scope.blank? || scope == migration.scope
+        end
+      else
+        ActiveRecord::Base.connection.migration_context.migrate(version) do |migration|
+          scope.blank? || scope == migration.scope
+        end
       end
       ActiveRecord::Base.clear_cache!
     ensure

data/gemfiles/activerecord_5_1.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.1.0"
+gem "ldp"
+gem "pg"
+gem "rsolr"
+
+gemspec path: "../"

data/gemfiles/activerecord_5_2.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.2.0"
+gem "ldp"
+gem "pg"
+gem "rsolr"
+
+gemspec path: "../"

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

@@ -63,7 +63,7 @@ module Valkyrie::Persistence::Fedora
       g.proxy_in = proxy_in.try(:uri)
       g.next = self.next.try(:rdf_subject)
       g.prev = prev.try(:rdf_subject)
-      g
+      g.graph
     end
 
     # Resolves the URI for the value of the list expression
@@ -104,10 +104,10 @@ module Valkyrie::Persistence::Fedora
         # Populates attributes for the LinkedNode
         # @param instance [ListNode]
         def populate(instance)
-          instance.proxy_for = resource.proxy_for.first
-          instance.proxy_in = resource.proxy_in.first
-          instance.next_uri = resource.next.first
-          instance.prev_uri = resource.prev.first
+          instance.proxy_for = resource.proxy_for
+          instance.proxy_in = resource.proxy_in
+          instance.next_uri = resource.next
+          instance.prev_uri = resource.prev
         end
 
         private
@@ -115,16 +115,33 @@ module Valkyrie::Persistence::Fedora
           # Constructs a set of triples using ActiveTriples as objects
           # @return [Valkyrie::Persistence::Fedora::ListNode::Resource]
           def resource
-            @resource ||= Resource.new(uri, data: graph)
+            @resource ||= Resource.new(uri, graph: graph)
           end
       end
 
       # Class for providing a set of triples modeling linked list nodes
-      class Resource < ActiveTriples::Resource
-        property :proxy_for, predicate: ::RDF::Vocab::ORE.proxyFor, cast: false
-        property :proxy_in, predicate: ::RDF::Vocab::ORE.proxyIn, cast: false
-        property :next, predicate: ::RDF::Vocab::IANA.next, cast: false
-        property :prev, predicate: ::RDF::Vocab::IANA.prev, cast: false
+      class Resource
+        def self.property(property, predicate:)
+          define_method property do
+            graph.query([uri, predicate, nil]).objects.first
+          end
+
+          define_method "#{property}=" do |val|
+            return if val.nil?
+            graph << [uri, predicate, val]
+          end
+        end
+
+        property :proxy_for, predicate: ::RDF::Vocab::ORE.proxyFor
+        property :proxy_in, predicate: ::RDF::Vocab::ORE.proxyIn
+        property :next, predicate: ::RDF::Vocab::IANA.next
+        property :prev, predicate: ::RDF::Vocab::IANA.prev
+
+        attr_reader :graph, :uri
+        def initialize(uri, graph: RDF::Graph.new)
+          @uri = uri
+          @graph = graph
+        end
       end
   end
 end

data/lib/valkyrie/persistence/fedora.rb

@@ -1,9 +1,16 @@
 # frozen_string_literal: true
-#
+# :nocov:
+begin
+  gem 'ldp'
+rescue Gem::LoadError => e
+  raise Gem::LoadError,
+        "You are using the Fedora adapter without installing the #{e.name} gem.  "\
+        "Add `gem '#{e.name}'` to your Gemfile."
+end
+# :nocov:
 module Valkyrie::Persistence
   # Implements the DataMapper Pattern to store metadata into Fedora
   module Fedora
-    require 'active_triples'
     require 'ldp'
     require 'valkyrie/persistence/fedora/permissive_schema'
     require 'valkyrie/persistence/fedora/metadata_adapter'

data/lib/valkyrie/persistence/postgres.rb

@@ -1,14 +1,18 @@
 # frozen_string_literal: true
+# :nocov:
 begin
   gem 'pg'
+  gem 'activerecord'
 rescue Gem::LoadError => e
   raise Gem::LoadError,
         "You are using the Postgres adapter without installing the #{e.name} gem.  "\
         "Add `gem '#{e.name}'` to your Gemfile."
 end
+# :nocov:
 module Valkyrie::Persistence
   # Implements the DataMapper Pattern to store metadata into Postgres
   module Postgres
+    require 'active_record'
     require 'valkyrie/persistence/postgres/metadata_adapter'
   end
 end

data/lib/valkyrie/persistence/solr.rb

@@ -1,7 +1,17 @@
 # frozen_string_literal: true
+# :nocov:
+begin
+  gem 'rsolr'
+rescue Gem::LoadError => e
+  raise Gem::LoadError,
+        "You are using the Solr adapter without installing the #{e.name} gem.  "\
+        "Add `gem '#{e.name}'` to your Gemfile."
+end
+# :nocov:
 module Valkyrie::Persistence
   # Implements the DataMapper Pattern to store metadata into Solr
   module Solr
+    require 'valkyrie/persistence/postgres/metadata_adapter'
     require 'valkyrie/persistence/solr/metadata_adapter'
     require 'valkyrie/persistence/solr/composite_indexer'
   end

data/lib/valkyrie/resource.rb

@@ -52,14 +52,8 @@ module Valkyrie
     # @param type [Dry::Types::Type]
     # @note Overridden from {Dry::Struct} to make the default type
     #   {Valkyrie::Types::Set}
-    # @todo Remove ability to override built in attributes.
     def self.attribute(name, type = Valkyrie::Types::Set.optional, internal: false)
-      if reserved_attributes.include?(name.to_sym) && schema[name] && !internal
-        warn "#{name} is a reserved attribute in Valkyrie::Resource and defined by it. You can remove your definition of `attribute :#{name}`. " \
-             "For now your version will be used, but in the next major version the type will be overridden. " \
-             "Called from #{Gem.location_of_caller.join(':')}"
-        schema.delete(name)
-      end
+      raise ReservedAttributeError, "#{name} is a reserved attribute and defined by Valkyrie::Resource, do not redefine it." if reserved_attributes.include?(name.to_sym) && schema[name] && !internal
       define_method("#{name}=") do |value|
         set_value(name, value)
       end
@@ -166,5 +160,7 @@ module Valkyrie
     def set_value(key, value)
       @attributes[key.to_sym] = self.class.schema[key.to_sym].call(value)
     end
+
+    class ReservedAttributeError < StandardError; end
   end
 end

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

@@ -2,25 +2,25 @@
 RSpec.shared_examples 'a Valkyrie::ChangeSetPersister' do |*_flags|
   before do
     raise 'adapter must be set with `let(:change_set_persister)`' unless defined? change_set_persister
-    class CustomResource < Valkyrie::Resource
+    class Valkyrie::Specs::CustomResource < Valkyrie::Resource
       include Valkyrie::Resource::AccessControls
       attribute :title
       attribute :member_ids
       attribute :nested_resource
     end
-    class CustomChangeSet < Valkyrie::ChangeSet
+    class Valkyrie::Specs::CustomChangeSet < Valkyrie::ChangeSet
       self.fields = [:title]
     end
   end
   after do
-    Object.send(:remove_const, :CustomResource)
-    Object.send(:remove_const, :CustomChangeSet)
+    Valkyrie::Specs.send(:remove_const, :CustomResource)
+    Valkyrie::Specs.send(:remove_const, :CustomChangeSet)
   end
 
   subject { change_set_persister }
-  let(:resource_class) { CustomResource }
+  let(:resource_class) { Valkyrie::Specs::CustomResource }
   let(:resource) { resource_class.new }
-  let(:change_set) { CustomChangeSet.new(resource) }
+  let(:change_set) { Valkyrie::Specs::CustomChangeSet.new(resource) }
 
   it { is_expected.to respond_to(:save).with_keywords(:change_set) }
   it { is_expected.to respond_to(:save_all).with_keywords(:change_sets) }
@@ -32,7 +32,7 @@ RSpec.shared_examples 'a Valkyrie::ChangeSetPersister' do |*_flags|
     it "saves a resource and returns it" do
       output = subject.save(change_set: change_set)
 
-      expect(output).to be_kind_of CustomResource
+      expect(output).to be_kind_of Valkyrie::Specs::CustomResource
       expect(output).to be_persisted
     end
   end
@@ -40,7 +40,7 @@ RSpec.shared_examples 'a Valkyrie::ChangeSetPersister' do |*_flags|
   describe "#delete" do
     it "deletes a resource" do
       output = subject.save(change_set: change_set)
-      subject.delete(change_set: CustomChangeSet.new(output))
+      subject.delete(change_set: Valkyrie::Specs::CustomChangeSet.new(output))
 
       expect do
         subject.metadata_adapter.query_service.find_by(id: output.id)
@@ -50,7 +50,7 @@ RSpec.shared_examples 'a Valkyrie::ChangeSetPersister' do |*_flags|
 
   describe "#save_all" do
     it "saves multiple change_sets and returns them" do
-      change_set2 = CustomChangeSet.new(resource_class.new)
+      change_set2 = Valkyrie::Specs::CustomChangeSet.new(resource_class.new)
       output = subject.save_all(change_sets: [change_set, change_set2])
 
       expect(output.map(&:id).compact.length).to eq 2

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

@@ -3,21 +3,21 @@ RSpec.shared_examples 'a Valkyrie query provider' do
   before do
     raise 'adapter must be set with `let(:adapter)`' unless
       defined? adapter
-    class CustomResource < Valkyrie::Resource
+    class Valkyrie::Specs::CustomResource < Valkyrie::Resource
       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
       attribute :an_ordered_member_of, Valkyrie::Types::Array.meta(ordered: true)
     end
-    class SecondResource < Valkyrie::Resource
+    class Valkyrie::Specs::SecondResource < Valkyrie::Resource
     end
   end
   after do
-    Object.send(:remove_const, :CustomResource)
-    Object.send(:remove_const, :SecondResource)
+    Valkyrie::Specs.send(:remove_const, :CustomResource)
+    Valkyrie::Specs.send(:remove_const, :SecondResource)
   end
-  let(:resource_class) { CustomResource }
+  let(:resource_class) { Valkyrie::Specs::CustomResource }
   let(:query_service) { adapter.query_service } unless defined? query_service
   let(:persister) { adapter.persister }
   subject { adapter.query_service }
@@ -45,12 +45,12 @@ RSpec.shared_examples 'a Valkyrie query provider' do
   describe ".find_all_of_model" do
     it "returns all of that model" do
       persister.save(resource: resource_class.new)
-      resource2 = persister.save(resource: SecondResource.new)
+      resource2 = persister.save(resource: Valkyrie::Specs::SecondResource.new)
 
-      expect(query_service.find_all_of_model(model: SecondResource).map(&:id)).to contain_exactly resource2.id
+      expect(query_service.find_all_of_model(model: Valkyrie::Specs::SecondResource).map(&:id)).to contain_exactly resource2.id
     end
     it "returns an empty array if there are none" do
-      expect(query_service.find_all_of_model(model: SecondResource).to_a).to eq []
+      expect(query_service.find_all_of_model(model: Valkyrie::Specs::SecondResource).to_a).to eq []
     end
   end
 
@@ -92,7 +92,7 @@ RSpec.shared_examples 'a Valkyrie query provider' do
     end
 
     it 'raises a Valkyrie::Persistence::ObjectNotFoundError when persisted objects do not have alternate_ids' do
-      persister.save(resource: SecondResource.new)
+      persister.save(resource: Valkyrie::Specs::SecondResource.new)
       expect { query_service.find_by_alternate_identifier(alternate_identifier: Valkyrie::ID.new("123123123")) }.to raise_error ::Valkyrie::Persistence::ObjectNotFoundError
     end
 
@@ -191,7 +191,7 @@ RSpec.shared_examples 'a Valkyrie query provider' do
       end
 
       context "when the model doesn't have member_ids" do
-        let(:parent) { persister.save(resource: SecondResource.new) }
+        let(:parent) { persister.save(resource: Valkyrie::Specs::SecondResource.new) }
 
         it "returns an empty array" do
           expect(subject.to_a).to eq []
@@ -200,12 +200,12 @@ RSpec.shared_examples 'a Valkyrie query provider' do
     end
 
     context "filtering by model" do
-      subject { query_service.find_members(resource: parent, model: SecondResource) }
+      subject { query_service.find_members(resource: parent, model: Valkyrie::Specs::SecondResource) }
 
       context "when the object has members" do
-        let(:child1) { persister.save(resource: SecondResource.new) }
+        let(:child1) { persister.save(resource: Valkyrie::Specs::SecondResource.new) }
         let(:child2) { persister.save(resource: resource_class.new) }
-        let(:child3) { persister.save(resource: SecondResource.new) }
+        let(:child3) { persister.save(resource: Valkyrie::Specs::SecondResource.new) }
         let(:parent) { persister.save(resource: resource_class.new(member_ids: [child3.id, child2.id, child1.id])) }
 
         it "returns all a resource's members in order" do
@@ -284,7 +284,7 @@ RSpec.shared_examples 'a Valkyrie query provider' do
           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)
+          persister.save(resource: Valkyrie::Specs::SecondResource.new)
 
           expect(query_service.find_inverse_references_by(resource: parent, property: :a_member_of).map(&:id).to_a).to contain_exactly child.id, child2.id
         end
@@ -302,7 +302,7 @@ RSpec.shared_examples 'a Valkyrie query provider' do
           child = persister.save(resource: resource_class.new(an_ordered_member_of: [parent.id]))
           child2 = persister.save(resource: resource_class.new(an_ordered_member_of: [parent.id, parent.id]))
           persister.save(resource: resource_class.new)
-          persister.save(resource: SecondResource.new)
+          persister.save(resource: Valkyrie::Specs::SecondResource.new)
 
           expect(query_service.find_inverse_references_by(resource: parent, property: :an_ordered_member_of).map(&:id).to_a).to contain_exactly child.id, child2.id
         end
@@ -316,7 +316,7 @@ RSpec.shared_examples 'a Valkyrie query provider' do
         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)
+        persister.save(resource: Valkyrie::Specs::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
@@ -362,7 +362,7 @@ RSpec.shared_examples 'a Valkyrie query provider' do
     end
 
     context "when the model doesn't have member_ids" do
-      let(:child1) { persister.save(resource: SecondResource.new) }
+      let(:child1) { persister.save(resource: Valkyrie::Specs::SecondResource.new) }
 
       it "returns an empty array if there are none" do
         expect(query_service.find_parents(resource: child1).to_a).to eq []

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

@@ -52,16 +52,16 @@ RSpec.shared_examples 'a Valkyrie::Resource' do
 
   describe "#human_readable_type" do
     before do
-      class MyCustomResource < Valkyrie::Resource
+      class Valkyrie::Specs::MyCustomResource < Valkyrie::Resource
         attribute :title, Valkyrie::Types::Set
       end
     end
 
     after do
-      Object.send(:remove_const, :MyCustomResource)
+      Valkyrie::Specs.send(:remove_const, :MyCustomResource)
     end
 
-    subject(:my_custom_resource) { MyCustomResource.new }
+    subject(:my_custom_resource) { Valkyrie::Specs::MyCustomResource.new }
 
     it "returns a human readable rendering of the resource class" do
       expect(my_custom_resource.human_readable_type).to eq "My Custom Resource"

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

@@ -11,7 +11,7 @@ RSpec.shared_examples 'a Valkyrie::Persistence::Solr::Indexer' do |*_flags|
     }
   end
   let(:resource) do
-    Resource.new(
+    Valkyrie::Specs::Resource.new(
       id: "1",
       internal_resource: 'Resource',
       attributes: attributes
@@ -20,7 +20,7 @@ RSpec.shared_examples 'a Valkyrie::Persistence::Solr::Indexer' do |*_flags|
   let(:indexer) { described_class.new(resource: resource) }
 
   before do
-    class Resource < Valkyrie::Resource
+    class Valkyrie::Specs::Resource < Valkyrie::Resource
       attribute :title, Valkyrie::Types::Set
       attribute :author, Valkyrie::Types::Set
       attribute :birthday, Valkyrie::Types::DateTime.optional
@@ -29,7 +29,7 @@ RSpec.shared_examples 'a Valkyrie::Persistence::Solr::Indexer' do |*_flags|
   end
 
   after do
-    Object.send(:remove_const, :Resource)
+    Valkyrie::Specs.send(:remove_const, :Resource)
   end
 
   describe '#to_solr' do

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

@@ -5,11 +5,11 @@ RSpec.shared_examples 'a Valkyrie::StorageAdapter' do
       defined? storage_adapter
     raise 'file must be set with `let(:file)`' unless
       defined? file
-    class CustomResource < Valkyrie::Resource
+    class Valkyrie::Specs::CustomResource < Valkyrie::Resource
     end
   end
   after do
-    Object.send(:remove_const, :CustomResource)
+    Valkyrie::Specs.send(:remove_const, :CustomResource)
   end
   subject { storage_adapter }
   it { is_expected.to respond_to(:handles?).with_keywords(:id) }
@@ -18,7 +18,7 @@ RSpec.shared_examples 'a Valkyrie::StorageAdapter' do
   it { is_expected.to respond_to(:upload).with_keywords(:file, :resource, :original_filename) }
 
   it "can upload, validate, re-fetch, and delete a file" do
-    resource = CustomResource.new(id: "test")
+    resource = Valkyrie::Specs::CustomResource.new(id: "test")
     sha1 = Digest::SHA1.file(file).to_s
     size = file.size
     expect(uploaded_file = storage_adapter.upload(file: file, original_filename: 'foo.jpg', resource: resource)).to be_kind_of Valkyrie::StorageAdapter::File

data/lib/valkyrie/specs/shared_specs.rb

@@ -1,4 +1,9 @@
 # frozen_string_literal: true
+module Valkyrie
+  # Define a wrapper namespace for test resources.
+  module Specs
+  end
+end
 require 'valkyrie/specs/shared_specs/persister.rb'
 require 'valkyrie/specs/shared_specs/queries.rb'
 require 'valkyrie/specs/shared_specs/metadata_adapter'

data/lib/valkyrie/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Valkyrie
-  VERSION = "2.0.0.RC3"
+  VERSION = "2.0.0.RC4"
 end

data/lib/valkyrie.rb

@@ -14,7 +14,6 @@ require 'valkyrie/rdf_patches'
 require 'json/ld'
 require 'logger'
 require 'rdf/vocab'
-require 'rails'
 
 module Valkyrie
   require 'valkyrie/id'
@@ -49,11 +48,15 @@ module Valkyrie
   end
 
   def environment
-    Rails.env
+    if const_defined?(:Rails) && Rails.respond_to?(:env)
+      Rails.env
+    else
+      ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
+    end
   end
 
   def config_root_path
-    if const_defined?(:Rails) && Rails.root
+    if const_defined?(:Rails) && Rails.respond_to?(:root)
       Rails.root
     else
       Pathname.new(Dir.pwd)

data/solr/config/schema.xml

@@ -168,7 +168,6 @@
     <fieldType class="solr.TextField" name="textSuggest" positionIncrementGap="100">
       <analyzer>
         <tokenizer class="solr.KeywordTokenizerFactory"/>
-        <filter class="solr.StandardFilterFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
       </analyzer>

data/tasks/dev.rake

@@ -3,6 +3,7 @@
 namespace :server do
   desc "Start solr and fedora servers for testing"
   task :test do
+    require 'rails'
     require 'solr_wrapper'
     require 'fcrepo_wrapper'
     SolrWrapper.wrap(shared_solr_opts.merge(port: 8984, instance_dir: 'tmp/blacklight-core-test')) do |solr|
@@ -21,6 +22,7 @@ namespace :server do
 
   desc "Cleanup test servers"
   task :clean_test do
+    require 'rails'
     require 'solr_wrapper'
     require 'fcrepo_wrapper'
     SolrWrapper.instance(shared_solr_opts.merge(port: 8984, instance_dir: 'tmp/blacklight-core-test')).remove_instance_dir!
@@ -31,6 +33,7 @@ namespace :server do
 
   desc "Start solr and fedora servers for development"
   task :development do
+    require 'rails'
     require 'solr_wrapper'
     require 'fcrepo_wrapper'
 

data/tasks/docker.rake

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'valkyrie'
 
-if Rails.env.development? || Rails.env.test?
+if Valkyrie.environment == "development" || Valkyrie.environment == "test"
   begin
     require 'docker/stack/rake_task'
 
@@ -17,7 +17,7 @@ if Rails.env.development? || Rails.env.test?
 
       desc 'Spin up test stack and run specs'
       task :spec do
-        Rails.env = 'test'
+        ENV["RACK_ENV"] = "test"
         Docker::Stack::Controller.new(project: 'valkyrie', cleanup: true).with_containers do
           Rake::Task['db:create'].invoke
           Rake::Task['db:migrate'].invoke

data/valkyrie.gemspec

@@ -25,15 +25,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'dry-types', '~> 0.13.0'
   spec.add_dependency 'rdf'
   spec.add_dependency 'activesupport'
-  spec.add_dependency 'activerecord'
   spec.add_dependency 'railties' # To use generators and engines
   spec.add_dependency 'reform'
   spec.add_dependency 'reform-rails'
   spec.add_dependency 'json-ld'
   spec.add_dependency 'json'
-  spec.add_dependency 'active-triples'
-  spec.add_dependency 'ldp'
-  spec.add_dependency 'rsolr'
+  spec.add_dependency 'rdf-vocab'
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
@@ -43,12 +40,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "database_cleaner"
   spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "coveralls"
   spec.add_development_dependency "bixby"
   spec.add_development_dependency 'yard'
   spec.add_development_dependency 'solr_wrapper'
   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'
+  spec.add_development_dependency 'appraisal'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie
 version: !ruby/object:Gem::Version
-  version: 2.0.0.RC3
+  version: 2.0.0.RC4
 platform: ruby
 authors:
 - Trey Pendragon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-07 00:00:00.000000000 Z
+date: 2019-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -179,35 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: active-triples
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ldp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rsolr
+  name: rdf-vocab
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -332,20 +290,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  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'
 - !ruby/object:Gem::Dependency
   name: bixby
   requirement: !ruby/object:Gem::Requirement
@@ -417,21 +361,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.6
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -459,6 +403,8 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".tool-versions"
+- Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -484,6 +430,8 @@ files:
 - db/migrate/20180802220739_add_optimistic_locking_to_orm_resources.rb
 - db/schema.rb
 - db/seeds.rb
+- gemfiles/activerecord_5_1.gemfile
+- gemfiles/activerecord_5_2.gemfile
 - lib/config/database_connection.rb
 - lib/generators/valkyrie/resource_generator.rb
 - lib/generators/valkyrie/templates/resource.rb.erb
@@ -607,7 +555,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: An ORM using the Data Mapper pattern, specifically built to solve Digital