active-fedora 11.0.0.rc1 → 11.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e30d9865f03aa8fde7431fa449c1fd1b0fa8a3c5
-  data.tar.gz: ad33f54129ac32831e5917b980d2607e2fd6bc1d
+  metadata.gz: 4b833ffd608a93150c266715fe4a7407b4123226
+  data.tar.gz: 3eb0722fd8dd81dba86b8de505859e464a321145
 SHA512:
-  metadata.gz: edf50b69bdd72334819f4470868936646752c79da2091413721ea35410ce45ec00e14445f8853df15f36fa18fff89dfe443b3171985395b910237f7de54531e7
-  data.tar.gz: 09720448439264991177243424a6f9bf1d133c62ad916b00d9075d22ab04625b6548d6a166883ae229c1509e7cf5c4fd85ee1466b7b2d05bbc45ba8a76a3ccb4
+  metadata.gz: 6956d0ea72523e17d0ae7b856565f8abab7a20f9247e3fe6a410ec56c0227468a1aa242148cf10f91d6ca47279b798b04b203fb161a5b38b2ff0dd5e4879e310
+  data.tar.gz: c9202017657e945638899468958d79205fc7cbe44e41b5638347a3363a61cd24e23d4e0b81ad8781faa9f0a48e3da30804f5d8453c62d1d2cbaaca8dec762dab

data/lib/active_fedora/railtie.rb

@@ -1,7 +1,7 @@
 module ActiveFedora
   class Railtie < Rails::Railtie
-    config.app_middleware.insert_after "::ActionDispatch::Callbacks",
-                                       "ActiveFedora::LdpCache"
+    config.app_middleware.insert_after ::ActionDispatch::Callbacks,
+                                       ActiveFedora::LdpCache
 
     initializer 'active_fedora.autoload', before: :set_autoload_paths do |app|
       app.config.autoload_paths << 'app/models/datastreams'

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "11.0.0.rc1".freeze
+  VERSION = "11.0.0.rc2".freeze
 end

data/spec/integration/associations_spec.rb

@@ -17,7 +17,7 @@ describe ActiveFedora::Base do
     end
 
     let(:person) { Person.create }
-    let(:book) { Book.new(author: person) }
+    subject(:book) { Book.new(author: person) }
 
     it "goes" do
       book.save
@@ -524,18 +524,19 @@ describe ActiveFedora::Base do
       end
 
       describe "removing association" do
-        subject { LibraryBook.create }
-        before do
-          @p1 = Page.create
-          @p2 = Page.create
-          subject.pages << @p1 << @p2
-          subject.save!
+        let(:p1) { Page.create }
+        let(:p2) { Page.create }
+        subject(:book) do
+          book = LibraryBook.create
+          book.pages << p1 << p2
+          book.save!
+          book
         end
         it "saves between the before and after hooks" do
-          expect(subject).to receive(:before_count).with(1)
-          expect(subject).to receive(:after_count).with(0)
-          expect(subject).to receive(:say_hi).with(@p2).twice
-          subject.pages.delete(@p2)
+          expect(book).to receive(:before_count).with(1)
+          expect(book).to receive(:after_count).with(0)
+          expect(book).to receive(:say_hi).with(p2).twice
+          book.pages.delete(p2)
         end
       end
     end
@@ -555,14 +556,12 @@ describe ActiveFedora::Base do
       end
 
       describe "removing association" do
-        subject { LibraryBook.new }
-        before do
-          @p1 = subject.pages.build
-          @p2 = subject.pages.build
-        end
+        let(:p1) { book.pages.build }
+        let(:p2) { book.pages.build }
+        let(:book) { LibraryBook.new }
         it "runs the hooks" do
-          expect(subject).to receive(:say_hi).with(@p2)
-          subject.pages.delete(@p2)
+          expect(book).to receive(:say_hi).with(p2)
+          book.pages.delete(p2)
         end
       end
     end

data/spec/integration/attached_files_spec.rb

@@ -65,14 +65,14 @@ describe ActiveFedora::AttachedFiles do
     let(:obj) { ActiveFedora::Base.new }
 
     describe ".attached_files" do
-      subject { obj.attached_files }
+      subject(:attached_files) { obj.attached_files }
       it "returns a Hash of datastreams from fedora" do
-        expect(subject).to be_a_kind_of(ActiveFedora::FilesHash)
-        expect(subject).to be_empty
+        expect(attached_files).to be_a_kind_of(ActiveFedora::FilesHash)
+        expect(attached_files).to be_empty
       end
 
       it "initializes the datastream pointers with @new_object=false" do
-        subject.each_value do |ds|
+        attached_files.each_value do |ds|
           expect(ds).to_not be_new
         end
       end

data/spec/integration/attributes_spec.rb

@@ -20,9 +20,9 @@ describe "delegating attributes" do
 
   describe "#index_config" do
     context "on a class with properties" do
-      subject { RdfObject.index_config }
+      subject(:index_config) { RdfObject.index_config }
       it "has configuration" do
-        expect(subject[:resource_type].behaviors).to eq [:stored_searchable, :facetable]
+        expect(index_config[:resource_type].behaviors).to eq [:stored_searchable, :facetable]
       end
     end
 
@@ -36,42 +36,38 @@ describe "delegating attributes" do
         Object.send(:remove_const, :InheritedObject)
       end
 
-      subject { InheritedObject.index_config }
+      subject(:index_config) { InheritedObject.index_config }
 
       it "has configuration" do
-        expect(subject[:resource_type].behaviors).to eq [:stored_searchable, :facetable]
+        expect(index_config[:resource_type].behaviors).to eq [:stored_searchable, :facetable]
       end
 
       context "when the inherited config is modifed" do
         before do
           InheritedObject.index_config[:resource_type].behaviors.delete(:stored_searchable)
         end
-        subject { RdfObject.index_config }
+        subject(:index_config) { RdfObject.index_config }
 
         it "the parent config is unchanged" do
-          expect(subject[:resource_type].behaviors).to eq [:stored_searchable, :facetable]
+          expect(index_config[:resource_type].behaviors).to eq [:stored_searchable, :facetable]
         end
       end
     end
   end
 
   describe "previous_changes" do
-    subject do
-      TitledObject.create(title: ["Hydra for Dummies"])
-    end
+    subject(:titled_object) { TitledObject.create(title: ["Hydra for Dummies"]) }
     it "keeps a list of changes after a successful save" do
-      expect(subject.previous_changes).to_not be_empty
-      expect(subject.previous_changes.keys).to include("title")
+      expect(titled_object.previous_changes).to_not be_empty
+      expect(titled_object.previous_changes.keys).to include("title")
     end
   end
 
   describe "#changes" do
-    subject do
-      TitledObject.create(title: ["Hydra for Dummies"])
-    end
+    let(:titled_object) { TitledObject.create(title: ["Hydra for Dummies"]) }
     it "cleans out changes" do
-      expect(subject).to_not be_title_changed
-      expect(subject.changes).to be_empty
+      expect(titled_object).to_not be_title_changed
+      expect(titled_object.changes).to be_empty
     end
   end
 end

data/spec/integration/autosave_association_spec.rb

@@ -9,16 +9,16 @@ describe ActiveFedora::Base do
     Object.send(:remove_const, :MockAFBaseRelationship)
   end
 
-  subject { MockAFBaseRelationship.new }
+  subject(:relationship) { MockAFBaseRelationship.new }
 
   context '#changed_for_autosave?' do
     before(:each) do
-      expect(subject).to receive(:new_record?).and_return(false)
-      expect(subject).to receive(:changed?).and_return(false)
-      expect(subject).to receive(:marked_for_destruction?).and_return(false)
+      expect(relationship).to receive(:new_record?).and_return(false)
+      expect(relationship).to receive(:changed?).and_return(false)
+      expect(relationship).to receive(:marked_for_destruction?).and_return(false)
     end
     it {
-      expect { subject.changed_for_autosave? }.to_not raise_error
+      expect { relationship.changed_for_autosave? }.to_not raise_error
     }
   end
 end

data/spec/integration/base_spec.rb

@@ -159,7 +159,7 @@ describe ActiveFedora::Base do
   end
 
   describe "overriding resource_class_factory" do
-    subject { TestBase.new }
+    subject(:test_base) { TestBase.new }
     before do
       class TestResource < ActiveTriples::Resource
       end
@@ -174,7 +174,7 @@ describe ActiveFedora::Base do
       Object.send(:remove_const, :TestBase)
     end
     it "uses that factory for #resource" do
-      expect(subject.resource.class.ancestors).to include TestResource
+      expect(test_base.resource.class.ancestors).to include TestResource
     end
   end
 end

data/spec/integration/collection_association_spec.rb

@@ -135,10 +135,9 @@ describe ActiveFedora::Base do
       end
 
       let(:instance) { SpecContainer.new }
-      subject { instance.items }
 
       it "raises an error" do
-        expect { subject }.to raise_error "No :inverse_of or :predicate attribute was set or could be inferred for has_many :items on SpecContainer"
+        expect { instance.items }.to raise_error "No :inverse_of or :predicate attribute was set or could be inferred for has_many :items on SpecContainer"
       end
     end
 
@@ -161,9 +160,7 @@ describe ActiveFedora::Base do
       let(:instance) { Foo::Container.new }
       subject { instance.items }
 
-      it "finds the association" do
-        expect(subject).to eq []
-      end
+      it { is_expected.to eq [] }
     end
   end
 end

data/spec/integration/datastream_rdf_nested_attributes_spec.rb

@@ -60,7 +60,7 @@ describe "Nesting attribute behavior of RDFDatastream" do
         Object.send(:remove_const, :ComplexRDFDatastream)
         Object.send(:remove_const, :DummyMADS)
       end
-      subject { ComplexRDFDatastream.new }
+      subject(:complex_datastream) { ComplexRDFDatastream.new }
       let(:params) do
         { myResource:
           {
@@ -95,15 +95,15 @@ describe "Nesting attribute behavior of RDFDatastream" do
       end
 
       describe "on lists" do
-        subject { ComplexRDFDatastream::PersonalName.new(nil) }
+        subject(:personal_name) { ComplexRDFDatastream::PersonalName.new(nil) }
         it "accepts a hash" do
-          subject.elementList_attributes = [{ topicElement_attributes: { '0' => { elementValue: "Quantum Behavior" }, '1' => { elementValue: "Wave Function" } } }]
-          expect(subject.elementList.first[0].elementValue).to eq ["Quantum Behavior"]
-          expect(subject.elementList.first[1].elementValue).to eq ["Wave Function"]
+          personal_name.elementList_attributes = [{ topicElement_attributes: { '0' => { elementValue: "Quantum Behavior" }, '1' => { elementValue: "Wave Function" } } }]
+          expect(personal_name.elementList.first[0].elementValue).to eq ["Quantum Behavior"]
+          expect(personal_name.elementList.first[1].elementValue).to eq ["Wave Function"]
         end
         it "accepts an array" do
-          subject.elementList_attributes = [{ topicElement_attributes: [{ elementValue: "Quantum Behavior" }, { elementValue: "Wave Function" }] }]
-          element_values = subject.elementList.first.map(&:elementValue)
+          personal_name.elementList_attributes = [{ topicElement_attributes: [{ elementValue: "Quantum Behavior" }, { elementValue: "Wave Function" }] }]
+          element_values = personal_name.elementList.first.map(&:elementValue)
           expect(element_values).to contain_exactly ["Quantum Behavior"], ["Wave Function"]
         end
       end
@@ -111,30 +111,30 @@ describe "Nesting attribute behavior of RDFDatastream" do
       context "from nested objects" do
         before do
           # Replace the graph's contents with the Hash
-          subject.attributes = params[:myResource]
+          complex_datastream.attributes = params[:myResource]
         end
 
         it 'has attributes' do
-          element_values = subject.topic.map { |x| x.elementList.first[0].elementValue }
+          element_values = complex_datastream.topic.map { |x| x.elementList.first[0].elementValue }
           expect(element_values).to contain_exactly ["Cosmology"], ["Quantum Behavior"]
-          expect(subject.personalName.first.elementList.first.fullNameElement).to contain_exactly "Jefferson, Thomas"
-          expect(subject.personalName.first.elementList.first.dateNameElement).to contain_exactly "1743-1826"
+          expect(complex_datastream.personalName.first.elementList.first.fullNameElement).to contain_exactly "Jefferson, Thomas"
+          expect(complex_datastream.personalName.first.elementList.first.dateNameElement).to contain_exactly "1743-1826"
         end
 
         it 'builds nodes with ids' do
-          element_list_elements = subject.topic.flat_map { |y| y.elementList.first[0].rdf_subject }
+          element_list_elements = complex_datastream.topic.flat_map { |y| y.elementList.first[0].rdf_subject }
           expect(element_list_elements).to include 'http://library.ucsd.edu/ark:/20775/bb3333333x'
-          expect(subject.personalName.first.rdf_subject).to eq 'http://library.ucsd.edu/ark:20775/jefferson'
+          expect(complex_datastream.personalName.first.rdf_subject).to eq 'http://library.ucsd.edu/ark:20775/jefferson'
         end
 
         it 'fails when writing to a non-predicate' do
           attributes = { topic_attributes: { '0' => { elementList_attributes: [{ topicElement_attributes: [{ fake_predicate: "Cosmology" }] }] } } }
-          expect { subject.attributes = attributes }.to raise_error ArgumentError
+          expect { complex_datastream.attributes = attributes }.to raise_error ArgumentError
         end
 
         it 'fails when writing to a non-predicate with a setter method' do
           attributes = { topic_attributes: { '0' => { elementList_attributes: [{ topicElement_attributes: [{ name: "Cosmology" }] }] } } }
-          expect { subject.attributes = attributes }.to raise_error ArgumentError
+          expect { complex_datastream.attributes = attributes }.to raise_error ArgumentError
         end
       end
     end
@@ -154,26 +154,26 @@ describe "Nesting attribute behavior of RDFDatastream" do
       after(:each) do
         Object.send(:remove_const, :SpecDatastream)
       end
-      subject { SpecDatastream.new }
+      subject(:spec_datastream) { SpecDatastream.new }
       before do
-        subject.attributes = { parts_attributes: [
+        spec_datastream.attributes = { parts_attributes: [
           { label: 'Alternator' },
           { label: 'Distributor' },
           { label: 'Transmission' },
           { label: 'Fuel Filter' }
         ] }
       end
-      let(:replace_object_id) { subject.parts.find { |x| x.label == ['Distributor'] }.rdf_subject.to_s }
-      let(:remove_object_id) { subject.parts.find { |x| x.label == ['Fuel Filter'] }.rdf_subject.to_s }
+      let(:replace_object_id) { spec_datastream.parts.find { |x| x.label == ['Distributor'] }.rdf_subject.to_s }
+      let(:remove_object_id) { spec_datastream.parts.find { |x| x.label == ['Fuel Filter'] }.rdf_subject.to_s }
 
       it "updates nested objects" do
-        subject.parts_attributes = [{ id: replace_object_id, label: "Universal Joint" }, { label: "Oil Pump" }, { id: remove_object_id, _destroy: '1', label: "bar1 uno" }]
+        spec_datastream.parts_attributes = [{ id: replace_object_id, label: "Universal Joint" }, { label: "Oil Pump" }, { id: remove_object_id, _destroy: '1', label: "bar1 uno" }]
 
-        expect(subject.parts.map { |p| p.label.first }).to contain_exactly 'Alternator', 'Universal Joint', 'Transmission', 'Oil Pump'
+        expect(spec_datastream.parts.map { |p| p.label.first }).to contain_exactly 'Alternator', 'Universal Joint', 'Transmission', 'Oil Pump'
       end
       it "create a new object when the id is provided" do
-        subject.parts_attributes = [{ id: 'http://example.com/part#1', label: "Universal Joint" }]
-        expect(subject.parts.map(&:rdf_subject)).to include RDF::URI('http://example.com/part#1')
+        spec_datastream.parts_attributes = [{ id: 'http://example.com/part#1', label: "Universal Joint" }]
+        expect(spec_datastream.parts.map(&:rdf_subject)).to include RDF::URI('http://example.com/part#1')
       end
     end
   end

data/spec/integration/date_time_properties_spec.rb

@@ -34,9 +34,8 @@ describe ActiveFedora::Base do
   describe 'serializing' do
     let(:object) { Foo.new(date: [date]) }
     let(:triple) { object.resource.query(predicate: ::RDF::Vocab::DC.date).to_a.first }
-    subject { triple.to_s }
     it 'time zone must have semicolin to be a cannonical XMLSchema#dateTime' do
-      expect(subject).to match(/\+01:00/)
+      expect(triple.to_s).to match(/\+01:00/)
     end
   end
 end

data/spec/integration/direct_container_spec.rb

@@ -32,16 +32,16 @@ describe "Direct containers" do
         end
 
         describe "#first" do
-          subject { reloaded.files.first }
+          subject(:first_file) { reloaded.files.first }
           it "has the content" do
-            expect(subject.content).to eq 'HMMM'
+            expect(first_file.content).to eq 'HMMM'
           end
         end
 
         describe "#to_a" do
-          subject { reloaded.files }
+          subject(:files) { reloaded.files }
           it "has the content" do
-            expect(subject.to_a).to eq [file]
+            expect(files.to_a).to eq [file]
           end
         end
 
@@ -102,9 +102,9 @@ describe "Direct containers" do
         end
 
         describe "#first" do
-          subject { reloaded.files.first }
+          subject(:first_file) { reloaded.files.first }
           it "has the content" do
-            expect(subject.content).to eq 'HMMM'
+            expect(first_file.content).to eq 'HMMM'
           end
         end
       end
@@ -140,9 +140,9 @@ describe "Direct containers" do
         end
 
         describe "#first" do
-          subject { reloaded.files.first }
+          subject(:first_file) { reloaded.files.first }
           it "has the content" do
-            expect(subject.content).to eq 'HMMM'
+            expect(first_file.content).to eq 'HMMM'
           end
         end
       end

data/spec/integration/directly_contains_one_association_spec.rb

@@ -36,15 +36,15 @@ describe ActiveFedora::Base do
         primary_file.content = "I'm in a container all alone!"
         page_image.save!
       end
-      subject { reloaded_page_image.primary_file }
+      subject(:reloaded_file) { reloaded_page_image.primary_file }
       it "initializes an object within the container" do
-        expect(subject.content).to eq("I'm in a container all alone!")
-        expect(subject.metadata_node.type).to include(::RDF::URI.new("http://example.com/primaryFile"))
+        expect(reloaded_file.content).to eq("I'm in a container all alone!")
+        expect(reloaded_file.metadata_node.type).to include(::RDF::URI.new("http://example.com/primaryFile"))
       end
       it "relies on info from the :through association, including class_name" do
         expect(page_image.files).to include(primary_file)
         expect(primary_file.uri.to_s).to include("/files/")
-        expect(subject.class).to eq FileWithMetadata
+        expect(reloaded_file.class).to eq FileWithMetadata
       end
     end
   end
@@ -61,9 +61,7 @@ describe ActiveFedora::Base do
         primary_file.content = "I am too"
         page_image.save!
       end
-      it "returns the matching object" do
-        expect(subject).to eq primary_file
-      end
+      it { is_expected.to eq primary_file }
     end
     context "if class_name is set" do
       before do
@@ -71,10 +69,10 @@ describe ActiveFedora::Base do
         alternative_file.content = "I am too"
         page_image.save!
       end
-      subject { reloaded_page_image.alternative_file }
+      subject(:reloaded_file) { reloaded_page_image.alternative_file }
       it "uses the specified class to load objects" do
-        expect(subject).to eq alternative_file
-        expect(subject).to be_instance_of AlternativeFileWithMetadata
+        expect(reloaded_file).to eq alternative_file
+        expect(reloaded_file).to be_instance_of AlternativeFileWithMetadata
       end
     end
   end
@@ -85,13 +83,13 @@ describe ActiveFedora::Base do
       primary_file.content = "I am too"
       page_image.save!
     end
-    subject { reloaded_page_image.files }
+    subject(:reloaded_file) { reloaded_page_image.files }
     it "replaces existing record without disturbing the other contents of the container" do
       replacement_file = page_image.primary_file = FileWithMetadata.new
       replacement_file.content = "I'm a replacement"
       page_image.save
-      expect(subject).to_not include(primary_file)
-      expect(subject).to contain_exactly(a_file, replacement_file)
+      expect(reloaded_file).to_not include(primary_file)
+      expect(reloaded_file).to contain_exactly(a_file, replacement_file)
       expect(reloaded_page_image.primary_file).to eq(replacement_file)
     end
   end