active-fedora 9.12.0 → 9.13.0

data/spec/integration/autosave_association_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe ActiveFedora::Base do
   before :all do
     class MockAFBaseRelationship < ActiveFedora::Base
-      has_metadata name: 'foo', type: Hydra::ModsArticleDatastream
     end
   end
   after :all do

data/spec/integration/base_spec.rb

@@ -1,79 +1,32 @@
 require 'spec_helper'
 
 describe ActiveFedora::Base do
-  describe "A base object with metadata" do
-    before :each do
-      class MockAFBaseRelationship < ActiveFedora::Base
-        has_metadata 'foo', type: Hydra::ModsArticleDatastream
+  describe '#reload' do
+    before do
+      class Foo < ActiveFedora::Base
+        property :person, predicate: ::RDF::Vocab::DC.creator
       end
     end
-    after :each do
-      Object.send(:remove_const, :MockAFBaseRelationship)
+    after do
+      Object.send(:remove_const, :Foo)
     end
-    describe "a new document" do
+    context "when persisted" do
+      let(:object) { Foo.create(person: ['bob']) }
+      let(:object2) { Foo.find(object.id) }
       before do
-        @obj = MockAFBaseRelationship.new
-
-        @obj.foo.person = "bob"
-        @obj.save
-      end
-
-      it "saves the datastream." do
-        obj = described_class.find(@obj.id)
-        expect(obj.foo).to_not be_new_record
-        expect(obj.foo.person).to eq ['bob']
-        person_field = ActiveFedora.index_field_mapper.solr_name('foo__person', type: :string)
-        solr_result = ActiveFedora::SolrService.query("{!field f=id}#{@obj.id}", fl: "id #{person_field}").first
-        expect(solr_result).to eq("id" => @obj.id, person_field => ['bob'])
+        object2.update(person: ['dave'])
       end
-    end
 
-    describe "that already exists in the repo" do
-      before do
-        @release = MockAFBaseRelationship.create
-        @release.foo.person = "test foo content"
-        @release.save
-      end
-      describe "and has been changed" do
-        before do
-          @release.foo.person = 'frank'
-          @release.save!
-        end
-        it "saves the datastream." do
-          expect(MockAFBaseRelationship.find(@release.id).foo.person).to eq ['frank']
-          person_field = ActiveFedora.index_field_mapper.solr_name('foo__person', type: :string)
-          expect(ActiveFedora::SolrService.query("id:\"#{@release.id}\"", fl: "id #{person_field}").first).to eq("id" => @release.id, person_field => ['frank'])
-        end
-      end
-      describe "when trying to create it again" do
-        it "raises an error" do
-          expect { MockAFBaseRelationship.create(id: @release.id) }.to raise_error(ActiveFedora::IllegalOperation, "Attempting to recreate existing ldp_source: `#{@release.uri}'")
-          @release.reload
-          expect(@release.foo.person).to include('test foo content')
-        end
+      it 're-queries Fedora' do
+        object.reload
+        expect(object.person).to eq ['dave']
       end
     end
 
-    describe '#reload' do
-      before do
-        @object = MockAFBaseRelationship.new
-        @object.foo.person = 'bob'
-        @object.save
-
-        @object2 = @object.class.find(@object.id)
-
-        @object2.foo.person = 'dave'
-        @object2.save
-      end
-
-      it 'requeries Fedora' do
-        @object.reload
-        expect(@object.foo.person).to eq ['dave']
-      end
-
-      it 'raises an error if not persisted' do
-        @object = MockAFBaseRelationship.new
-        expect { @object.reload }.to raise_error(ActiveFedora::ObjectNotFoundError)
+    context "when not persisted" do
+      let(:object) { Foo.new }
+      it 'raises an error' do
+        expect { object.reload }.to raise_error(ActiveFedora::ObjectNotFoundError)
       end
     end
   end
@@ -93,12 +46,12 @@ describe ActiveFedora::Base do
 
     after { obj.destroy unless obj.destroyed? }
 
-    describe "errors" do
+    describe "#errors" do
       subject { obj.errors }
       it { should be_empty }
     end
 
-    describe "id" do
+    describe "#id" do
       subject { obj.id }
       it { should_not be_nil }
     end

data/spec/integration/basic_contains_association_spec.rb

@@ -0,0 +1,108 @@
+require 'spec_helper'
+
+describe ActiveFedora::Base do
+  let(:model) { Source.new }
+
+  context "with a file" do
+    before do
+      class Source < ActiveFedora::Base
+        is_a_container
+      end
+    end
+
+    after do
+      Object.send(:remove_const, :Source)
+    end
+
+    it 'is empty' do
+      expect(model.contains).to eq []
+    end
+
+    it 'can build a child' do
+      child = model.contains.build
+      expect(child).to be_kind_of ActiveFedora::File
+      child.content = "hello"
+      model.save!
+      expect(child).to be_persisted
+      expect(child.uri.to_s).to include model.uri.to_s
+    end
+
+    it 'can create a child on a persisted parent' do
+      model.save!
+      child = model.contains.build
+      expect(child).to be_kind_of ActiveFedora::File
+      child.content = "hello"
+      model.save!
+      expect(child).to be_persisted
+      expect(child.uri.to_s).to include model.uri.to_s
+    end
+  end
+
+  context "with an AF::Base object" do
+    before do
+      class Thing < ActiveFedora::Base
+        property :title, predicate: ::RDF::Vocab::DC.title
+      end
+      class Source < ActiveFedora::Base
+        is_a_container class_name: 'Thing'
+      end
+    end
+    after do
+      Object.send(:remove_const, :Source)
+      Object.send(:remove_const, :Thing)
+    end
+
+    let(:model) { Source.new }
+
+    it 'is empty' do
+      expect(model.contains).to eq []
+    end
+
+    describe "creating" do
+      it 'can build a child' do
+        child = model.contains.build
+        expect(model.contains.build(title: ['my title'])).to be_kind_of Thing
+        model.save!
+        expect(child).to be_persisted
+        expect(child.uri.to_s).to include model.uri.to_s
+      end
+
+      it 'can create a child on a persisted parent' do
+        model.save!
+        child = model.contains.create(title: ['my title'])
+        expect(child).to be_kind_of Thing
+        expect(child).to be_persisted
+        expect(child.uri.to_s).to include model.uri.to_s
+      end
+    end
+
+    describe "loading" do
+      before do
+        model.save!
+        model.contains.create(title: ['title 1'])
+        model.contains.create(title: ['title 2'])
+        model.reload
+      end
+
+      it "has the two contained objects" do
+        expect(model.contains.size).to eq 2
+        expect(model.contains.map(&:title)).to eq [['title 1'], ['title 2']]
+      end
+    end
+
+    describe "#destroy_all" do
+      before do
+        model.save!
+        model.contains.create(title: ['title 1'])
+        model.contains.create(title: ['title 2'])
+        model.reload
+      end
+
+      it "destroys the two contained objects" do
+        expect { model.contains.destroy_all }
+          .to change { model.contains.size }.by(-2)
+          .and change { Thing.count }.by(-2)
+      end
+    end
+  end
+end

data/spec/integration/complex_rdf_datastream_spec.rb

@@ -177,7 +177,7 @@ END
         end
 
         class SpecContainer < ActiveFedora::Base
-          contains :info, class_name: 'SpecDatastream'
+          has_subresource :info, class_name: 'SpecDatastream'
         end
 
         class SpecDatastream < ActiveFedora::NtriplesRDFDatastream

data/spec/integration/field_to_solr_name_spec.rb

@@ -2,19 +2,19 @@ require 'spec_helper'
 
 describe "An object with RDF backed attributes" do
   before do
-    class TestOne < ActiveFedora::Base
-      class MyMetadata < ActiveFedora::NtriplesRDFDatastream
-        Deprecation.silence(ActiveFedora::RDFDatastream) do
-          property :title, predicate: ::RDF::Vocab::DC.title do |index|
-            index.as :stored_searchable
-          end
-          property :date_uploaded, predicate: ::RDF::Vocab::DC.dateSubmitted do |index|
-            index.type :date
-            index.as :stored_searchable, :sortable
-          end
+    class MyMetadata < ActiveFedora::NtriplesRDFDatastream
+      Deprecation.silence(ActiveFedora::RDFDatastream) do
+        property :title, predicate: ::RDF::Vocab::DC.title do |index|
+          index.as :stored_searchable
+        end
+        property :date_uploaded, predicate: ::RDF::Vocab::DC.dateSubmitted do |index|
+          index.type :date
+          index.as :stored_searchable, :sortable
         end
       end
-      has_metadata 'descMetadata', type: MyMetadata
+    end
+    class TestOne < ActiveFedora::Base
+      has_subresource 'descMetadata', class_name: 'MyMetadata'
       Deprecation.silence(ActiveFedora::Attributes) do
         has_attributes :title, :date_uploaded, datastream: 'descMetadata'
       end
@@ -23,6 +23,7 @@ describe "An object with RDF backed attributes" do
 
   after do
     Object.send(:remove_const, :TestOne)
+    Object.send(:remove_const, :MyMetadata)
   end
 
   it "is able to grab the solr name" do

data/spec/integration/file_fixity_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "Checking fixity" do
   before(:all) do
     class MockAFBase < ActiveFedora::Base
-      contains "data", autocreate: true
+      has_subresource "data", autocreate: true
     end
   end
 

data/spec/integration/file_spec.rb

@@ -53,7 +53,10 @@ describe ActiveFedora::File do
   context "when autocreate is true" do
     before do
       class MockAFBase < ActiveFedora::Base
-        has_metadata "descMetadata", type: ActiveFedora::QualifiedDublinCoreDatastream, autocreate: true
+        extend Deprecation
+        Deprecation.silence(MockAFBase) do
+          has_metadata "descMetadata", type: ActiveFedora::QualifiedDublinCoreDatastream, autocreate: true
+        end
       end
     end
 

data/spec/integration/generators/fedora_generator_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+require 'generators/active_fedora/config/fedora/fedora_generator'
+
+describe ActiveFedora::Config::FedoraGenerator do
+  describe "#fcrepo_wrapper_config" do
+    let(:generator) { described_class.new }
+    let(:files_to_test) {[
+      'config/fcrepo_wrapper_test.yml',
+      '.fcrepo_wrapper'
+    ]}
+
+    before do
+      generator.fcrepo_wrapper_config
+    end
+
+    after do
+      files_to_test.each { |file| File.delete(file) if File.exist?(file) }
+    end
+
+    it "creates config files" do
+      files_to_test.each do |file|
+        expect(File).to exist(file), "Expected #{file} to exist"
+      end
+    end
+  end
+end

data/spec/integration/generators/solr_generator_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+require 'generators/active_fedora/config/solr/solr_generator'
+
+describe ActiveFedora::Config::SolrGenerator do
+  describe "#solr_wrapper_config" do
+    let(:generator) { described_class.new }
+    let(:files_to_test) {[
+      'config/solr_wrapper_test.yml',
+      '.solr_wrapper'
+    ]}
+
+    before do
+      generator.solr_wrapper_config
+    end
+
+    after do
+      files_to_test.each { |file| File.delete(file) if File.exist?(file) }
+    end
+
+    it "creates config files" do
+      files_to_test.each do |file|
+        expect(File).to exist(file), "Expected #{file} to exist"
+      end
+    end
+  end
+end

data/spec/integration/has_and_belongs_to_many_associations_spec.rb

@@ -350,22 +350,12 @@ describe ActiveFedora::Base do
     before do
       class Item < ActiveFedora::Base
         has_many :components
-        has_metadata "foo", type: ActiveFedora::SimpleDatastream do |m|
-          m.field "title", :string
-        end
-        Deprecation.silence(ActiveFedora::Attributes) do
-          has_attributes :title, datastream: 'foo'
-        end
+        property :title, predicate: ::RDF::Vocab::DC.title
       end
 
       class Component < ActiveFedora::Base
         has_and_belongs_to_many :items, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
-        has_metadata "foo", type: ActiveFedora::SimpleDatastream do |m|
-          m.field "description", :string
-        end
-        Deprecation.silence(ActiveFedora::Attributes) do
-          has_attributes :description, datastream: 'foo'
-        end
+        property :description, predicate: ::RDF::Vocab::DC.description
       end
     end
 
@@ -376,11 +366,11 @@ describe ActiveFedora::Base do
 
     describe "From the has_and_belongs_to_many side" do
       describe "dependent records" do
-        let(:component) { Component.create(items: [Item.new(title: 'my title')]) }
+        let(:component) { Component.create(items: [Item.new(title: ['my title'])]) }
 
         it "is saved" do
           component.reload
-          expect(component.items.first.title).to eq 'my title'
+          expect(component.items.first.title).to eq ['my title']
         end
       end
 
@@ -413,11 +403,11 @@ describe ActiveFedora::Base do
     end
 
     describe "From the has_many side" do
-      let(:item) { Item.create(components: [Component.new(description: 'my description')]) }
+      let(:item) { Item.create(components: [Component.new(description: ['my description'])]) }
 
       it "saves dependent records" do
         item.reload
-        expect(item.components.first.description).to eq 'my description'
+        expect(item.components.first.description).to eq ['my description']
       end
     end
   end

data/spec/integration/has_many_associations_spec.rb

@@ -314,21 +314,11 @@ describe ActiveFedora::Associations::HasManyAssociation do
         before do
           class Item < ActiveFedora::Base
             has_many :components
-            has_metadata "foo", type: ActiveFedora::SimpleDatastream do |m|
-              m.field "title", :string
-            end
-            Deprecation.silence(ActiveFedora::Attributes) do
-              has_attributes :title, datastream: 'foo'
-            end
+            property :title, predicate: ::RDF::Vocab::DC.title
           end
           class Component < ActiveFedora::Base
             belongs_to :item, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
-            has_metadata "foo", type: ActiveFedora::SimpleDatastream do |m|
-              m.field "description", :string
-            end
-            Deprecation.silence(ActiveFedora::Attributes) do
-              has_attributes :description, datastream: 'foo'
-            end
+            property :description, predicate: ::RDF::Vocab::DC.description
           end
         end
 
@@ -338,20 +328,20 @@ describe ActiveFedora::Associations::HasManyAssociation do
         end
 
         context "From the belongs_to side" do
-          let(:component) { Component.create(item: Item.new(title: 'my title')) }
+          let(:component) { Component.create(item: Item.new(title: ['my title'])) }
 
           it "saves dependent records" do
             component.reload
-            expect(component.item.title).to eq 'my title'
+            expect(component.item.title).to eq ['my title']
           end
         end
 
         context "From the has_many side" do
-          let(:item) { Item.create(components: [Component.new(description: 'my description')]) }
+          let(:item) { Item.create(components: [Component.new(description: ['my description'])]) }
 
           it "saves dependent records" do
             item.reload
-            expect(item.components.first.description).to eq 'my description'
+            expect(item.components.first.description).to eq ['my description']
           end
         end
       end