valkyrie 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 61b7e04b31c2d342dc23c2a992a3591127100a83
-  data.tar.gz: e52992172aa6f6a7c0b6f0109d0ddf36d97e1af9
+SHA256:
+  metadata.gz: 39e92d9e4892ac5d68a53cbcea67333f51575c4a186f2ffedb97bcc1be846135
+  data.tar.gz: c6776eddd61f9e016c92ff23d97061c45d05beb27069d8b814b08b22b6ea6387
 SHA512:
-  metadata.gz: 572780616a4d8ac782b405f7bee713590789be2b86c3cba5e004701060713561ebf8d71ee4336a17e39eb52f7b2147dce7229933240748533c352870ba1d931c
-  data.tar.gz: bfe2c60c9facf6224abc8c411b7bd9d88f832bf80c00f8c4b0a33c4a8c4fdb03faff4152b6ff6b856c72ce0234e88a5ee165f3caa104b03449f99438e0ff0a8a
+  metadata.gz: 463a7de54cb62d517e50a0923b2a3532a7bb88dfd6389dcd4223834df136ab6c7353bec60d850f2f22eb28a0ca5b3465b48a6be9d51d06730d62523b5febf8eb
+  data.tar.gz: 9682ba62bf4e3071b7c7a2a95a51c540108f80e55b17f39aac9820bfee343531fb20fec2b2573af3ee7db6e99c804ae33e7ec0b76d99963b2618828ed19b5634

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# 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/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/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 }
@@ -47,12 +47,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
 
@@ -94,7 +94,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
 
@@ -193,7 +193,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 []
@@ -202,12 +202,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
@@ -286,7 +286,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
@@ -304,7 +304,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
@@ -318,7 +318,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
@@ -364,7 +364,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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Trey Pendragon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-06 00:00:00.000000000 Z
+date: 2019-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -607,7 +607,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: An ORM using the Data Mapper pattern, specifically built to solve Digital