active-fedora 11.0.0.rc1 → 11.0.0.rc2

data/spec/unit/orders/reflection_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe ActiveFedora::Reflection::OrdersReflection do
-  subject { described_class.new(name, scope, options, active_fedora) }
+  let(:orders_reflection) { described_class.new(name, scope, options, active_fedora) }
   let(:macro) { :orders }
   let(:name) { "ordered_member_proxies" }
   let(:options) { {} }
@@ -10,13 +10,13 @@ RSpec.describe ActiveFedora::Reflection::OrdersReflection do
 
   describe "#klass" do
     it "is a proxy" do
-      expect(subject.klass).to eq ActiveFedora::Orders::ListNode
+      expect(orders_reflection.klass).to eq ActiveFedora::Orders::ListNode
     end
   end
 
   describe "#class_name" do
     it "is a list node" do
-      expect(subject.class_name).to eq "ActiveFedora::Orders::ListNode"
+      expect(orders_reflection.class_name).to eq "ActiveFedora::Orders::ListNode"
     end
   end
 end

data/spec/unit/pathing_spec.rb

@@ -17,19 +17,19 @@ describe ActiveFedora::Base do
       Object.send(:remove_const, :FooHistory)
     end
 
-    subject { FooHistory.new(title: ["Root foo"]) }
+    subject(:history) { FooHistory.new(title: ["Root foo"]) }
 
     it { is_expected.to have_uri_prefix }
 
     it "uses the root path in the uri" do
-      expect(subject.uri_prefix).to eql path
+      expect(history.uri_prefix).to eql path
     end
 
     context "when the object is saved" do
-      before { subject.save }
+      before { history.save }
 
       it "persists the path in the uri" do
-        expect(subject.uri.to_s).to include(path)
+        expect(history.uri.to_s).to include(path)
       end
     end
   end

data/spec/unit/persistence_spec.rb

@@ -3,27 +3,27 @@ require 'spec_helper'
 describe ActiveFedora::Persistence do
   describe '#new_record?' do
     context 'with an new object' do
-      subject { ActiveFedora::Base.new }
+      subject(:persistence) { ActiveFedora::Base.new }
       it { is_expected.to be_new_record }
     end
 
     context 'with an destroyed object' do
-      subject { ActiveFedora::Base.create }
-      before { subject.delete }
+      subject(:persistence) { ActiveFedora::Base.create }
+      before { persistence.delete }
       it { is_expected.not_to be_new_record }
     end
   end
 
   describe '.delete' do
     context 'with an unsaved object' do
-      subject { ActiveFedora::Base.new }
-      before { subject.delete }
-      it { is_expected.to eq subject }
+      subject(:persistence) { ActiveFedora::Base.new }
+      before { persistence.delete }
+      it { is_expected.to eq persistence }
     end
 
     context 'with a saved object' do
-      subject { ActiveFedora::Base.create! }
-      before { subject.delete }
+      subject(:persistence) { ActiveFedora::Base.create! }
+      before { persistence.delete }
       it { is_expected.to be_frozen }
     end
   end
@@ -46,68 +46,68 @@ describe ActiveFedora::Persistence do
   end
 
   describe '.destroy' do
-    subject { ActiveFedora::Base.create! }
+    subject(:persistence) { ActiveFedora::Base.create! }
     context 'with no options' do
-      before { subject.destroy }
+      before { persistence.destroy }
       it 'does not clear the id' do
-        expect(subject.id).not_to be_nil
+        expect(persistence.id).not_to be_nil
       end
     end
 
     context 'with option eradicate: true' do
       it 'deletes the tombstone' do
-        expect(subject.class).to receive(:eradicate).with(subject.id).and_return(true)
-        subject.destroy(eradicate: true)
+        expect(persistence.class).to receive(:eradicate).with(persistence.id).and_return(true)
+        persistence.destroy(eradicate: true)
       end
     end
   end
 
   describe "save" do
-    subject { ActiveFedora::Base.new }
+    subject(:persistence) { ActiveFedora::Base.new }
 
     context "when called with option update_index: false" do
       context "on a new record" do
         it "does not update the index" do
-          expect(subject).to_not receive(:update_index)
-          subject.save(update_index: false)
+          expect(persistence).to_not receive(:update_index)
+          persistence.save(update_index: false)
         end
       end
 
       context "on a persisted record" do
         before do
-          allow(subject).to receive(:new_record?) { false }
+          allow(persistence).to receive(:new_record?) { false }
           allow_any_instance_of(Ldp::Orm).to receive(:save) { true }
-          allow(subject).to receive(:update_modified_date)
+          allow(persistence).to receive(:update_modified_date)
         end
 
         it "does not update the index" do
-          expect(subject).to_not receive(:update_index)
-          subject.save(update_index: false)
+          expect(persistence).to_not receive(:update_index)
+          persistence.save(update_index: false)
         end
       end
     end
 
     context "when called with option :update_index=>true" do
       context "on create" do
-        before { allow(subject).to receive(:create_needs_index?) { false } }
+        before { allow(persistence).to receive(:create_needs_index?) { false } }
 
         it "does not override `create_needs_index?'" do
-          expect(subject).to_not receive(:update_index)
-          subject.save(update_index: true)
+          expect(persistence).to_not receive(:update_index)
+          persistence.save(update_index: true)
         end
       end
 
       context "on update" do
         before do
-          allow(subject).to receive(:new_record?) { false }
+          allow(persistence).to receive(:new_record?) { false }
           allow_any_instance_of(Ldp::Orm).to receive(:save) { true }
-          allow(subject).to receive(:update_needs_index?) { false }
-          allow(subject).to receive(:update_modified_date)
+          allow(persistence).to receive(:update_needs_index?) { false }
+          allow(persistence).to receive(:update_modified_date)
         end
 
         it "does not override `update_needs_index?'" do
-          expect(subject).to_not receive(:update_index)
-          subject.save(update_index: true)
+          expect(persistence).to_not receive(:update_index)
+          persistence.save(update_index: true)
         end
       end
     end

data/spec/unit/qualified_dublin_core_datastream_spec.rb

@@ -99,21 +99,21 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
   end
 
   describe 'custom fields' do
-    subject { described_class.new }
+    subject(:datastream) { described_class.new }
     it 'grabs the term' do
       sample_xml = "<dc xmlns:dcterms='http://purl.org/dc/terms/' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><dcterms:cust>custom</dcterms:cust></dc>"
-      subject.content = sample_xml
-      subject.field :cust
-      expect(subject.cust).to eq ['custom']
+      datastream.content = sample_xml
+      datastream.field :cust
+      expect(datastream.cust).to eq ['custom']
     end
   end
 
   describe "#field should accept :path option" do
-    subject { described_class.new }
+    subject(:datastream) { described_class.new }
     it "is able to map :dc_type to the path 'type'" do
-      subject.content = sample_xml
-      subject.field :dc_type, :string, path: "type", multiple: true
-      expect(subject.dc_type).to eq ['sound']
+      datastream.content = sample_xml
+      datastream.field :dc_type, :string, path: "type", multiple: true
+      expect(datastream.dc_type).to eq ['sound']
     end
   end
 end

data/spec/unit/query_spec.rb

@@ -244,7 +244,7 @@ describe ActiveFedora::Base do
   describe '#search_with_conditions' do
     let(:mock_result) { double('Result') }
     let(:klass) { SpecModel::Basic }
-    subject { klass.search_with_conditions(conditions) }
+    subject(:search_with_conditions) { klass.search_with_conditions(conditions) }
 
     before do
       expect(ActiveFedora::SolrService).to receive(:query)
@@ -259,7 +259,7 @@ describe ActiveFedora::Base do
       let(:conditions) { { foo: 'bar', baz: ['quix', 'quack'] } }
 
       it "makes a query to solr and returns the results" do
-        expect(subject).to eq mock_result
+        expect(search_with_conditions).to eq mock_result
       end
     end
 
@@ -271,7 +271,7 @@ describe ActiveFedora::Base do
       let(:conditions) { { foo: '9" Nails', baz: ['7" version', 'quack'] } }
 
       it "escapes quotes" do
-        expect(subject).to eq mock_result
+        expect(search_with_conditions).to eq mock_result
       end
     end
 
@@ -282,7 +282,7 @@ describe ActiveFedora::Base do
         let(:conditions) { { baz: 'quack' } }
         let(:expected_query) { "_query_:\"{!field f=baz}quack\"" }
         it "doesn't use the class if it's called on AF:Base " do
-          expect(subject).to eq mock_result
+          expect(search_with_conditions).to eq mock_result
         end
       end
 
@@ -290,7 +290,7 @@ describe ActiveFedora::Base do
         let(:conditions) { 'chunky:monkey' }
         let(:expected_query) { '(chunky:monkey)' }
         it "uses the query string if it's provided and wrap it in parentheses" do
-          expect(subject).to eq mock_result
+          expect(search_with_conditions).to eq mock_result
         end
       end
     end

data/spec/unit/rdf/indexing_service_spec.rb

@@ -57,27 +57,27 @@ describe ActiveFedora::RDF::IndexingService do
   let(:indexer) { described_class.new(f2) }
 
   describe "#generate_solr_document" do
-    subject { indexer.generate_solr_document(lambda { |key| "solr_rdf__#{key}" }) }
+    let(:solr_obj) { indexer.generate_solr_document(lambda { |key| "solr_rdf__#{key}" }) }
     it "returns the right fields" do
-      expect(subject.keys).to include(ActiveFedora.index_field_mapper.solr_name("solr_rdf__related_url", type: :string),
-                                      ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", type: :string),
-                                      ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", :sortable),
-                                      ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", :facetable),
-                                      ActiveFedora.index_field_mapper.solr_name("solr_rdf__created", :sortable, type: :date),
-                                      ActiveFedora.index_field_mapper.solr_name("solr_rdf__created", :displayable),
-                                      ActiveFedora.index_field_mapper.solr_name("solr_rdf__title", type: :string),
-                                      ActiveFedora.index_field_mapper.solr_name("solr_rdf__title", :sortable),
-                                      ActiveFedora.index_field_mapper.solr_name("solr_rdf__based_near", type: :string),
-                                      ActiveFedora.index_field_mapper.solr_name("solr_rdf__based_near", :facetable))
+      expect(solr_obj.keys).to include(ActiveFedora.index_field_mapper.solr_name("solr_rdf__related_url", type: :string),
+                                       ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", type: :string),
+                                       ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", :sortable),
+                                       ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", :facetable),
+                                       ActiveFedora.index_field_mapper.solr_name("solr_rdf__created", :sortable, type: :date),
+                                       ActiveFedora.index_field_mapper.solr_name("solr_rdf__created", :displayable),
+                                       ActiveFedora.index_field_mapper.solr_name("solr_rdf__title", type: :string),
+                                       ActiveFedora.index_field_mapper.solr_name("solr_rdf__title", :sortable),
+                                       ActiveFedora.index_field_mapper.solr_name("solr_rdf__based_near", type: :string),
+                                       ActiveFedora.index_field_mapper.solr_name("solr_rdf__based_near", :facetable))
     end
 
     it "returns the right values" do
-      expect(subject[ActiveFedora.index_field_mapper.solr_name("solr_rdf__related_url", type: :string)]).to eq ["http://example.org/blogtastic/"]
-      expect(subject[ActiveFedora.index_field_mapper.solr_name("solr_rdf__based_near", type: :string)]).to contain_exactly "Tacoma, WA", "Renton, WA"
-      expect(subject[ActiveFedora.index_field_mapper.solr_name("solr_rdf__based_near", :facetable)]).to contain_exactly "Tacoma, WA", "Renton, WA"
-      expect(subject[ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", type: :string)]).to eq ["Bob's Blogtastic Publishing"]
-      expect(subject[ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", :sortable)]).to eq "Bob's Blogtastic Publishing"
-      expect(subject[ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", :facetable)]).to eq ["Bob's Blogtastic Publishing"]
+      expect(solr_obj[ActiveFedora.index_field_mapper.solr_name("solr_rdf__related_url", type: :string)]).to eq ["http://example.org/blogtastic/"]
+      expect(solr_obj[ActiveFedora.index_field_mapper.solr_name("solr_rdf__based_near", type: :string)]).to contain_exactly "Tacoma, WA", "Renton, WA"
+      expect(solr_obj[ActiveFedora.index_field_mapper.solr_name("solr_rdf__based_near", :facetable)]).to contain_exactly "Tacoma, WA", "Renton, WA"
+      expect(solr_obj[ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", type: :string)]).to eq ["Bob's Blogtastic Publishing"]
+      expect(solr_obj[ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", :sortable)]).to eq "Bob's Blogtastic Publishing"
+      expect(solr_obj[ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", :facetable)]).to eq ["Bob's Blogtastic Publishing"]
     end
   end
 

data/spec/unit/rdf_datastream_spec.rb

@@ -27,22 +27,22 @@ describe ActiveFedora::RDFDatastream do
       Object.send(:remove_const, :MyObj)
     end
 
-    subject { @obj.reload.descMetadata }
+    subject(:desc_metadata) { @obj.reload.descMetadata }
 
     it "does not load the descMetadata datastream when calling content_changed?" do
-      expect(subject).to_not receive(:retrieve_content)
-      expect(subject).to_not be_content_changed
+      expect(desc_metadata).to_not receive(:retrieve_content)
+      expect(desc_metadata).to_not be_content_changed
     end
 
     it "allows asserting an empty string" do
-      subject.title = ['']
-      expect(subject.title).to eq ['']
+      desc_metadata.title = ['']
+      expect(desc_metadata.title).to eq ['']
     end
 
     it "clears stuff" do
-      subject.title = ['one', 'two', 'three']
-      subject.title.clear
-      expect(subject.graph.query([subject.rdf_subject, ::RDF::Vocab::DC.title, nil]).first).to be_nil
+      desc_metadata.title = ['one', 'two', 'three']
+      desc_metadata.title.clear
+      expect(desc_metadata.graph.query([desc_metadata.rdf_subject, ::RDF::Vocab::DC.title, nil]).first).to be_nil
     end
 
     it "has a list of fields" do
@@ -51,12 +51,12 @@ describe ActiveFedora::RDFDatastream do
   end
 
   describe "deserialize" do
-    subject { ActiveFedora::NtriplesRDFDatastream.new }
+    subject(:datastream) { ActiveFedora::NtriplesRDFDatastream.new }
     it "is able to handle non-utf-8 characters" do
       # see https://github.com/ruby-rdf/rdf/issues/142
       data = "<info:fedora/scholarsphere:qv33rx50r> <http://purl.org/dc/terms/description> \"\\n\xE2\x80\x99 \" .\n".force_encoding('ASCII-8BIT')
 
-      result = subject.deserialize(data)
+      result = datastream.deserialize(data)
       expect(result.dump(:ntriples)).to eq "<info:fedora/scholarsphere:qv33rx50r> <http://purl.org/dc/terms/description> \"\\n’ \" .\n"
     end
   end

data/spec/unit/rdf_resource_datastream_spec.rb

@@ -29,49 +29,49 @@ describe ActiveFedora::RDFDatastream do
     Object.send(:remove_const, "DummySubnode")
   end
 
-  subject { DummyResource.new("#{ActiveFedora.fedora.host}/test/test:1") }
+  subject(:resource) { DummyResource.new("#{ActiveFedora.fedora.host}/test/test:1") }
 
   describe "attribute setting" do
     context "on text attributes" do
       before do
-        subject.title = "bla"
+        resource.title = "bla"
       end
 
       it "lets you access" do
-        expect(subject.title).to eq ["bla"]
+        expect(resource.title).to eq ["bla"]
       end
 
       it "marks it as changed" do
-        expect(subject).to be_changed
+        expect(resource).to be_changed
       end
 
       context "after it is persisted" do
         before do
-          subject.save
-          subject.reload
+          resource.save
+          resource.reload
         end
 
         it "is persisted" do
-          expect(subject.resource).to be_persisted
+          expect(resource.resource).to be_persisted
         end
 
         context "and it's reloaded" do
           before do
-            subject.reload
+            resource.reload
           end
 
           it "is accessible after being saved" do
-            expect(subject.title).to eq ["bla"]
+            expect(resource.title).to eq ["bla"]
           end
 
           it "serializes to content" do
-            expect(subject.content).not_to be_blank
+            expect(resource.content).not_to be_blank
           end
         end
 
         context "and it is found again" do
           before do
-            @object = DummyResource.new(subject.uri)
+            @object = DummyResource.new(resource.uri)
           end
 
           it "serializes to content" do
@@ -94,15 +94,15 @@ describe ActiveFedora::RDFDatastream do
         before do
           dummy = DummySubnode.new
           dummy.title = 'subbla'
-          subject.license = dummy
+          resource.license = dummy
         end
 
         it "lets you access" do
-          expect(subject.license.first.title).to eq ['subbla']
+          expect(resource.license.first.title).to eq ['subbla']
         end
 
         it "marks it as changed" do
-          expect(subject).to be_changed
+          expect(resource).to be_changed
         end
       end
       context "persisted to repository" do
@@ -113,15 +113,15 @@ describe ActiveFedora::RDFDatastream do
           # We want to have to manually persist to the repository.
           # Parent objects shouldn't be persisting children they share with other parents
           dummy.persist!
-          subject.license = dummy
+          resource.license = dummy
         end
 
         it "lets you access" do
-          expect(subject.license.first.title).to eq ['subbla']
+          expect(resource.license.first.title).to eq ['subbla']
         end
 
         it "marks it as changed" do
-          expect(subject).to be_changed
+          expect(resource).to be_changed
         end
       end
     end
@@ -130,28 +130,28 @@ describe ActiveFedora::RDFDatastream do
   describe "relationships" do
     before do
       @new_object = DummyAsset.create(something: ["subbla"])
-      subject.title = ["bla"]
-      subject.creator = @new_object
+      resource.title = ["bla"]
+      resource.creator = @new_object
     end
 
     it "can set sub-properties to AF objects" do
-      expect(subject.creator).to eq [@new_object]
+      expect(resource.creator).to eq [@new_object]
     end
 
     it "has accessible relationship attributes" do
-      expect(subject.creator.first.something).to eq ["subbla"]
+      expect(resource.creator.first.something).to eq ["subbla"]
     end
 
     it "lets me get to an AF:Base object" do
-      subject.save
-      resource = DummyResource.new(subject.uri)
-      expect(resource.creator.first).to be_kind_of(ActiveFedora::Base)
+      resource.save
+      new_resource = DummyResource.new(resource.uri)
+      expect(new_resource.creator.first).to be_kind_of(ActiveFedora::Base)
     end
 
     context "when the AF:Base object is deleted" do
       before do
-        subject.save
-        @resource = DummyResource.new(subject.uri)
+        resource.save
+        @resource = DummyResource.new(resource.uri)
         @new_object.destroy
       end
       it "gives back an ActiveTriples::Resource" do
@@ -161,8 +161,8 @@ describe ActiveFedora::RDFDatastream do
     end
 
     it "allows for deep attributes to be set directly" do
-      subject.creator.first.something = ["Bla"]
-      expect(subject.creator.first.something).to eq ["Bla"]
+      resource.creator.first.something = ["Bla"]
+      expect(resource.creator.first.something).to eq ["Bla"]
     end
 
     context "when the subject is set with base_uri" do
@@ -171,37 +171,37 @@ describe ActiveFedora::RDFDatastream do
         DummyResource.resource_class.configure base_uri: 'http://example.org/'
         new_object = DummyAsset.new
         new_object.save
-        subject.creator = new_object
+        resource.creator = new_object
       end
       after do
         DummyResource.resource_class.configure base_uri: @old_uri
       end
 
       it "lets me get to an AF:Base object" do
-        subject.save
-        resource = DummyResource.new(subject.uri)
-        expect(resource.creator.first).to be_kind_of(ActiveFedora::Base)
+        resource.save
+        new_resource = DummyResource.new(resource.uri)
+        expect(new_resource.creator.first).to be_kind_of(ActiveFedora::Base)
       end
     end
 
     context "when the object with a relationship is saved" do
       before do
-        subject.save
+        resource.save
       end
 
       it "is retrievable" do
-        expect(subject.creator.first.something).to eq ["subbla"]
+        expect(resource.creator.first.something).to eq ["subbla"]
       end
     end
 
     context "when the object with a relationship is frozen" do
       before do
-        subject.save
-        subject.freeze
+        resource.save
+        resource.freeze
       end
 
       it "is retrievable" do
-        expect(subject.creator.first.something).to eq ["subbla"]
+        expect(resource.creator.first.something).to eq ["subbla"]
       end
     end
   end