active-fedora 11.0.0.rc1 → 11.0.0.rc2

data/spec/unit/rdfxml_datastream_spec.rb

@@ -2,12 +2,12 @@ require 'spec_helper'
 
 describe ActiveFedora::RDFXMLDatastream do
   describe "a new instance" do
+    subject(:my_datastream) { MyRdfxmlDatastream.new }
     before(:each) do
       class MyRdfxmlDatastream < ActiveFedora::RDFXMLDatastream
         property :publisher, predicate: ::RDF::Vocab::DC.publisher
       end
-      @subject = MyRdfxmlDatastream.new
-      allow(@subject).to receive(:id).and_return('test:1')
+      allow(my_datastream).to receive(:id).and_return('test:1')
     end
 
     after(:each) do
@@ -15,8 +15,8 @@ describe ActiveFedora::RDFXMLDatastream do
     end
 
     it "saves and reload" do
-      @subject.publisher = ["St. Martin's Press"]
-      expect(@subject.serialize).to match(/<rdf:RDF/)
+      my_datastream.publisher = ["St. Martin's Press"]
+      expect(my_datastream.serialize).to match(/<rdf:RDF/)
     end
   end
 
@@ -79,27 +79,27 @@ describe ActiveFedora::RDFXMLDatastream do
     end
 
     describe "a new instance" do
-      subject { MyDatastream.new(about: "http://library.ucsd.edu/ark:/20775/") }
+      let(:my_datastream) { MyDatastream.new(about: "http://library.ucsd.edu/ark:/20775/") }
       it "has a subject" do
-        expect(subject.rdf_subject.to_s).to eq "http://library.ucsd.edu/ark:/20775/"
+        expect(my_datastream.rdf_subject.to_s).to eq "http://library.ucsd.edu/ark:/20775/"
       end
     end
 
     describe "an instance with content" do
-      subject do
-        subject = MyDatastream.new(about: "http://library.ucsd.edu/ark:/20775/")
-        subject.content = File.new('spec/fixtures/damsObjectModel.xml').read
-        subject
+      let(:my_datastream) do
+        my_datastream = MyDatastream.new(about: "http://library.ucsd.edu/ark:/20775/")
+        my_datastream.content = File.new('spec/fixtures/damsObjectModel.xml').read
+        my_datastream
       end
       it "has a subject" do
-        expect(subject.rdf_subject.to_s).to eq "http://library.ucsd.edu/ark:/20775/"
+        expect(my_datastream.rdf_subject.to_s).to eq "http://library.ucsd.edu/ark:/20775/"
       end
       it "has mimeType" do
-        expect(subject.mime_type).to eq 'text/xml'
+        expect(my_datastream.mime_type).to eq 'text/xml'
       end
       it "has fields" do
-        expect(subject.resource_type).to eq ["image"]
-        expect(subject.title.first.value).to eq ["example title"]
+        expect(my_datastream.resource_type).to eq ["image"]
+        expect(my_datastream.title.first.value).to eq ["example title"]
       end
     end
   end

data/spec/unit/readonly_spec.rb

@@ -1,23 +1,24 @@
 require 'spec_helper'
 
 describe ActiveFedora::Base do
+  subject(:object) { described_class.new }
   it { is_expected.not_to be_readonly }
 
   describe "#readonly!" do
     it "makes the object readonly" do
-      expect { subject.readonly! }.to change { subject.readonly? }.from(false).to(true)
+      expect { object.readonly! }.to change { object.readonly? }.from(false).to(true)
     end
   end
 
   context "a readonly record" do
-    before { subject.readonly! }
+    before { object.readonly! }
 
     it "does not be destroyable" do
-      expect { subject.destroy }.to raise_error ActiveFedora::ReadOnlyRecord
+      expect { object.destroy }.to raise_error ActiveFedora::ReadOnlyRecord
     end
 
     it "does not be mutable" do
-      expect { subject.save }.to raise_error ActiveFedora::ReadOnlyRecord
+      expect { object.save }.to raise_error ActiveFedora::ReadOnlyRecord
     end
   end
 end

data/spec/unit/rspec_matchers/belong_to_associated_active_fedora_object_matcher_spec.rb

@@ -3,30 +3,30 @@ require 'ostruct'
 require "active_fedora/rspec_matchers/belong_to_associated_active_fedora_object_matcher"
 
 describe RSpec::Matchers, ".belong_to_associated_active_fedora_object" do
-  subject { OpenStruct.new(id: id) }
+  let(:open_struct) { OpenStruct.new(id: id) }
   let(:id) { 123 }
   let(:object1) { Object.new }
   let(:object2) { Object.new }
   let(:association) { :association }
 
   it 'matches when association is properly stored in fedora' do
-    expect(subject.class).to receive(:find).with(id).and_return(subject)
-    expect(subject).to receive(association).and_return(object1)
-    expect(subject).to belong_to_associated_active_fedora_object(association).with_object(object1)
+    expect(open_struct.class).to receive(:find).with(id).and_return(open_struct)
+    expect(open_struct).to receive(association).and_return(object1)
+    expect(open_struct).to belong_to_associated_active_fedora_object(association).with_object(object1)
   end
 
   it 'does not match when association is different' do
-    expect(subject.class).to receive(:find).with(id).and_return(subject)
-    expect(subject).to receive(association).and_return(object1)
+    expect(open_struct.class).to receive(:find).with(id).and_return(open_struct)
+    expect(open_struct).to receive(association).and_return(object1)
     expect {
-      expect(subject).to belong_to_associated_active_fedora_object(association).with_object(object2)
+      expect(open_struct).to belong_to_associated_active_fedora_object(association).with_object(object2)
     }.to raise_error RSpec::Expectations::ExpectationNotMetError,
-                     /expected #{subject.class} ID=#{id} association: #{association.inspect}/
+                     /expected #{open_struct.class} ID=#{id} association: #{association.inspect}/
   end
 
   it 'requires :with_object option' do
     expect {
-      expect(subject).to belong_to_associated_active_fedora_object(association)
+      expect(open_struct).to belong_to_associated_active_fedora_object(association)
     }.to(
       raise_error(
         ArgumentError,

data/spec/unit/rspec_matchers/have_many_associated_active_fedora_objects_matcher_spec.rb

@@ -3,7 +3,7 @@ require 'ostruct'
 require "active_fedora/rspec_matchers/have_many_associated_active_fedora_objects_matcher"
 
 describe RSpec::Matchers, ".have_many_associated_active_fedora_objects" do
-  subject { OpenStruct.new(id: id) }
+  let(:open_struct) { OpenStruct.new(id: id) }
   let(:id) { 123 }
   let(:object1) { Object.new }
   let(:object2) { Object.new }
@@ -11,23 +11,23 @@ describe RSpec::Matchers, ".have_many_associated_active_fedora_objects" do
   let(:association) { :association }
 
   it 'matches when association is properly stored in fedora' do
-    expect(subject.class).to receive(:find).with(id).and_return(subject)
-    expect(subject).to receive(association).and_return([object1, object2])
-    expect(subject).to have_many_associated_active_fedora_objects(association).with_objects([object1, object2])
+    expect(open_struct.class).to receive(:find).with(id).and_return(open_struct)
+    expect(open_struct).to receive(association).and_return([object1, object2])
+    expect(open_struct).to have_many_associated_active_fedora_objects(association).with_objects([object1, object2])
   end
 
   it 'does not match when association is different' do
-    expect(subject.class).to receive(:find).with(id).and_return(subject)
-    expect(subject).to receive(association).and_return([object1, object3])
+    expect(open_struct.class).to receive(:find).with(id).and_return(open_struct)
+    expect(open_struct).to receive(association).and_return([object1, object3])
     expect {
-      expect(subject).to have_many_associated_active_fedora_objects(association).with_objects([object1, object2])
+      expect(open_struct).to have_many_associated_active_fedora_objects(association).with_objects([object1, object2])
     }.to raise_error RSpec::Expectations::ExpectationNotMetError,
-                     /expected #{subject.class} ID=#{id} association: #{association.inspect}/
+                     /expected #{open_struct.class} ID=#{id} association: #{association.inspect}/
   end
 
   it 'requires :with_objects option' do
     expect {
-      expect(subject).to have_many_associated_active_fedora_objects(association)
+      expect(open_struct).to have_many_associated_active_fedora_objects(association)
     }.to(
       raise_error(
         ArgumentError,

data/spec/unit/rspec_matchers/have_predicate_matcher_spec.rb

@@ -3,7 +3,7 @@ require 'ostruct'
 require "active_fedora/rspec_matchers/have_predicate_matcher"
 
 describe RSpec::Matchers, ".have_predicate" do
-  subject { OpenStruct.new(id: id) }
+  let(:open_struct) { OpenStruct.new(id: id) }
   let(:id) { 123 }
   let(:object1) { Object.new }
   let(:object2) { Object.new }
@@ -11,23 +11,23 @@ describe RSpec::Matchers, ".have_predicate" do
   let(:predicate) { :predicate }
 
   it 'matches when relationship is "what we have in Fedora"' do
-    expect(subject.class).to receive(:find).with(id).and_return(subject)
-    expect(subject).to receive(:relationships).with(predicate).and_return([object1, object2])
-    expect(subject).to have_predicate(predicate).with_objects([object1, object2])
+    expect(open_struct.class).to receive(:find).with(id).and_return(open_struct)
+    expect(open_struct).to receive(:relationships).with(predicate).and_return([object1, object2])
+    expect(open_struct).to have_predicate(predicate).with_objects([object1, object2])
   end
 
   it 'does not match when relationship is different' do
-    expect(subject.class).to receive(:find).with(id).and_return(subject)
-    expect(subject).to receive(:relationships).with(predicate).and_return([object1, object3])
+    expect(open_struct.class).to receive(:find).with(id).and_return(open_struct)
+    expect(open_struct).to receive(:relationships).with(predicate).and_return([object1, object3])
     expect {
-      expect(subject).to have_predicate(predicate).with_objects([object1, object2])
+      expect(open_struct).to have_predicate(predicate).with_objects([object1, object2])
     }.to raise_error RSpec::Expectations::ExpectationNotMetError,
-                     /expected #{subject.class} ID=#{id} relationship: #{predicate.inspect}/
+                     /expected #{open_struct.class} ID=#{id} relationship: #{predicate.inspect}/
   end
 
   it 'requires :with_objects option' do
     expect {
-      expect(subject).to have_predicate(predicate)
+      expect(open_struct).to have_predicate(predicate)
     }.to(
       raise_error(
         ArgumentError,

data/spec/unit/schema_indexing_strategy_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe ActiveFedora::SchemaIndexingStrategy do
-  subject { described_class.new(property_indexer_factory) }
+  subject(:index_strategy) { described_class.new(property_indexer_factory) }
 
   describe "#apply" do
     let(:property) do
@@ -40,9 +40,9 @@ RSpec.describe ActiveFedora::SchemaIndexingStrategy do
     end
     let(:index_types) {}
     context "with no index types" do
-      subject { described_class.new }
+      subject(:index_strategy) { described_class.new }
       it "does not try to index it" do
-        subject.apply(object, property)
+        index_strategy.apply(object, property)
 
         expect(object).to have_received(:property).with(property.name, property.to_h)
         expect(index_configuration).not_to have_received(:as)
@@ -51,7 +51,7 @@ RSpec.describe ActiveFedora::SchemaIndexingStrategy do
     context "with one index type" do
       let(:index_types) { :symbol }
       it "applies that one" do
-        subject.apply(object, property)
+        index_strategy.apply(object, property)
 
         expect(index_configuration).to have_received(:as).with(:symbol)
       end
@@ -59,7 +59,7 @@ RSpec.describe ActiveFedora::SchemaIndexingStrategy do
     context "with multiple index types" do
       let(:index_types) { [:symbol, :stored_searchable] }
       it "applies all of them" do
-        subject.apply(object, property)
+        index_strategy.apply(object, property)
 
         expect(index_configuration).to have_received(:as).with(:symbol, :stored_searchable)
       end

data/spec/unit/serializers_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe ActiveFedora::Attributes::Serializers do
-  subject { ActiveFedora::Base }
   describe "deserialize_dates_from_form" do
     before do
       class Foo < ActiveFedora::Base
@@ -11,10 +10,10 @@ describe ActiveFedora::Attributes::Serializers do
     after do
       Object.send(:remove_const, :Foo)
     end
-    subject { Foo.new }
+    subject(:serializer) { Foo.new }
     it "deserializes dates" do
-      subject.attributes = { 'birthday(1i)' => '2012', 'birthday(2i)' => '10', 'birthday(3i)' => '31' }
-      expect(subject.birthday).to eq '2012-10-31'
+      serializer.attributes = { 'birthday(1i)' => '2012', 'birthday(2i)' => '10', 'birthday(3i)' => '31' }
+      expect(serializer.birthday).to eq '2012-10-31'
     end
   end
 end

data/spec/unit/solr_hit_spec.rb

@@ -9,50 +9,50 @@ describe ActiveFedora::SolrHit do
     end
   end
 
-  subject { described_class.new "id" => "my:_ID1_", ActiveFedora.index_field_mapper.solr_name("has_model", :symbol) => ["AudioRecord"] }
+  subject(:solr_hit) { described_class.new "id" => "my:_ID1_", ActiveFedora.index_field_mapper.solr_name("has_model", :symbol) => ["AudioRecord"] }
 
   describe "#reify" do
     it "uses .find to instantiate objects" do
       expect(AudioRecord).to receive(:find).with("my:_ID1_", cast: true)
-      subject.reify
+      solr_hit.reify
     end
   end
 
   describe "#id" do
     it "extracts the id from the solr hit" do
-      expect(subject.id).to eq "my:_ID1_"
+      expect(solr_hit.id).to eq "my:_ID1_"
     end
   end
 
   describe "#rdf_uri" do
     it "provides an RDF URI for the solr hit" do
-      expect(subject.rdf_uri).to eq ::RDF::URI.new(ActiveFedora::Base.id_to_uri("my:_ID1_"))
+      expect(solr_hit.rdf_uri).to eq ::RDF::URI.new(ActiveFedora::Base.id_to_uri("my:_ID1_"))
     end
   end
 
   describe "#model" do
     it "selects the appropriate model for the solr result" do
-      expect(subject.model).to eq AudioRecord
+      expect(solr_hit.model).to eq AudioRecord
     end
   end
 
   describe "#models" do
     it "provides all the relevant models for the solr result" do
-      expect(subject.models).to match_array [AudioRecord]
+      expect(solr_hit.models).to match_array [AudioRecord]
     end
   end
 
   describe "#model?" do
     it 'is true if the object has the given model' do
-      expect(subject.model?(AudioRecord)).to eq true
+      expect(solr_hit.model?(AudioRecord)).to eq true
     end
 
     it 'is true if the object has an ancestor of the given model' do
-      expect(subject.model?(ActiveFedora::Base)).to eq true
+      expect(solr_hit.model?(ActiveFedora::Base)).to eq true
     end
 
     it 'is false if the given model is not in the ancestor tree for the models' do
-      expect(subject.model?(String)).to eq false
+      expect(solr_hit.model?(String)).to eq false
     end
   end
 end

data/spec/unit/sparql_insert_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe ActiveFedora::SparqlInsert do
   let(:change_set) { ActiveFedora::ChangeSet.new(base, base.resource, base.changed_attributes.keys) }
-  subject { described_class.new(change_set.changes) }
+  subject(:sparql_insert) { described_class.new(change_set.changes) }
 
   context "with a changed object" do
     before do
@@ -25,7 +25,7 @@ describe ActiveFedora::SparqlInsert do
     let(:base) { Book.create }
 
     it "returns the string" do
-      expect(subject.build).to eq "DELETE { <> <info:fedora/fedora-system:def/relations-external#hasConstituent> ?change . }\n  WHERE { <> <info:fedora/fedora-system:def/relations-external#hasConstituent> ?change . } ;\nDELETE { <> <http://purl.org/dc/terms/title> ?change . }\n  WHERE { <> <http://purl.org/dc/terms/title> ?change . } ;\nINSERT { \n<> <info:fedora/fedora-system:def/relations-external#hasConstituent> <#{ActiveFedora.fedora.host}/test/foo> .\n<> <http://purl.org/dc/terms/title> \"bar\" .\n}\n WHERE { }"
+      expect(sparql_insert.build).to eq "DELETE { <> <info:fedora/fedora-system:def/relations-external#hasConstituent> ?change . }\n  WHERE { <> <info:fedora/fedora-system:def/relations-external#hasConstituent> ?change . } ;\nDELETE { <> <http://purl.org/dc/terms/title> ?change . }\n  WHERE { <> <http://purl.org/dc/terms/title> ?change . } ;\nINSERT { \n<> <info:fedora/fedora-system:def/relations-external#hasConstituent> <#{ActiveFedora.fedora.host}/test/foo> .\n<> <http://purl.org/dc/terms/title> \"bar\" .\n}\n WHERE { }"
     end
   end
 end

data/spec/unit/validations_spec.rb

@@ -11,7 +11,7 @@ describe ActiveFedora::Base do
     end
   end
 
-  subject { ValidationStub.new }
+  subject(:validation_stub) { ValidationStub.new }
 
   after :all do
     Object.send(:remove_const, :ValidationStub)
@@ -19,19 +19,19 @@ describe ActiveFedora::Base do
 
   describe "a valid object" do
     before do
-      subject.attributes = { fubar: ['here'], swank: 'long enough' }
+      validation_stub.attributes = { fubar: ['here'], swank: 'long enough' }
     end
 
     it { should be_valid }
   end
   describe "an invalid object" do
     before do
-      subject.attributes = { swank: 'smal' }
+      validation_stub.attributes = { swank: 'smal' }
     end
     it "has errors" do
-      expect(subject).to_not be_valid
-      expect(subject.errors[:fubar]).to eq ["can't be blank"]
-      expect(subject.errors[:swank]).to eq ["is too short (minimum is 5 characters)"]
+      expect(validation_stub).to_not be_valid
+      expect(validation_stub.errors[:fubar]).to eq ["can't be blank"]
+      expect(validation_stub.errors[:swank]).to eq ["is too short (minimum is 5 characters)"]
     end
   end
 
@@ -41,11 +41,11 @@ describe ActiveFedora::Base do
   end
 
   describe "#save!" do
-    before { allow(subject).to receive(:_create_record) } # prevent saving to Fedora/Solr
+    before { allow(validation_stub).to receive(:_create_record) } # prevent saving to Fedora/Solr
 
     it "validates only once" do
-      expect(subject).to receive(:perform_validations).once.and_return(true)
-      subject.save!
+      expect(validation_stub).to receive(:perform_validations).once.and_return(true)
+      validation_stub.save!
     end
   end
 end

data/spec/unit/with_metadata/default_metadata_class_factory_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe ActiveFedora::WithMetadata::DefaultMetadataClassFactory do
   let(:parent) { double("Parent") }
+  let(:object) { described_class.new }
 
   describe "default class attributes" do
     its(:metadata_base_class)    { is_expected.to eq(ActiveFedora::WithMetadata::MetadataNode) }
@@ -22,7 +23,7 @@ describe ActiveFedora::WithMetadata::DefaultMetadataClassFactory do
                                                 to: :metadata_node)
       expect(parent).to receive(:delegate).with(:byte_order, :byte_order=, :byte_order_changed?, to: :metadata_node)
       expect(parent).to receive(:delegate).with(:file_hash, :file_hash=, :file_hash_changed?, to: :metadata_node)
-      subject.class.build(parent)
+      object.class.build(parent)
     end
   end
 end

data/spec/unit/with_metadata/metadata_node_spec.rb

@@ -24,7 +24,8 @@ describe ActiveFedora::WithMetadata::MetadataNode do
   end
 
   describe "changes_for_update" do
-    subject { node.send(:changes_for_update) }
+    let(:changes_for_update) { node.send(:changes_for_update) }
+    subject { changes_for_update }
 
     context "when type is not set" do
       it { is_expected.to eq({}) }
@@ -36,7 +37,7 @@ describe ActiveFedora::WithMetadata::MetadataNode do
       end
 
       it "is expected to have the rdf type statement" do
-        expect(subject[::RDF.type]).to be_kind_of RDF::Queryable::Enumerator
+        expect(changes_for_update[::RDF.type]).to be_kind_of RDF::Queryable::Enumerator
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 11.0.0.rc1
+  version: 11.0.0.rc2
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr