active-fedora 9.12.0 → 9.13.0

data/spec/integration/{contains_association_spec.rb → has_subresource_spec.rb}

@@ -3,7 +3,7 @@ require 'spec_helper'
 RSpec.describe ActiveFedora::Base do
   before do
     class Source < ActiveFedora::Base
-      contains :sub_resource, class_name: "Source"
+      has_subresource :sub_resource, class_name: "Source"
       property :title, predicate: ::RDF::Vocab::DC.title, multiple: false
     end
   end

data/spec/integration/json_serialization_spec.rb

@@ -7,11 +7,16 @@ describe "Objects should be serialized to JSON" do
 
   context "with properties and datastream attributes" do
     before do
-      class Foo < ActiveFedora::Base
-        has_metadata 'descMetadata', type: ActiveFedora::SimpleDatastream do |m|
-          m.field "foo", :text
-          m.field "bar", :text
+      class MyDS < ActiveFedora::OmDatastream
+        set_terminology do |t|
+          t.root(path: "durh")
+          t.foo
+          t.bar
         end
+      end
+
+      class Foo < ActiveFedora::Base
+        has_subresource 'descMetadata', class_name: 'MyDS'
         Deprecation.silence(ActiveFedora::Attributes) do
           has_attributes :foo, datastream: 'descMetadata', multiple: true
           has_attributes :bar, datastream: 'descMetadata', multiple: false
@@ -22,6 +27,7 @@ describe "Objects should be serialized to JSON" do
 
     after do
       Object.send(:remove_const, :Foo)
+      Object.send(:remove_const, :MyDS)
     end
 
     let(:obj) { Foo.new(foo: ["baz"], bar: 'quix', title: ['My Title']) }
@@ -56,7 +62,7 @@ describe "Objects should be serialized to JSON" do
       end
 
       class DummyAsset < ActiveFedora::Base
-        has_metadata 'descMetadata', type: DummyResource
+        has_subresource 'descMetadata', class_name: 'DummyResource'
         Deprecation.silence(ActiveFedora::Attributes) do
           has_attributes :relation, datastream: 'descMetadata', at: [:license, :relation], multiple: false
         end

data/spec/integration/model_spec.rb

@@ -1,25 +1,19 @@
 require 'spec_helper'
 
 describe ActiveFedora::Model do
-  before(:each) do
+  before do
     module ModelIntegrationSpec
       class Base < ActiveFedora::Base
         include ActiveFedora::Model
-        def self.id_namespace
-          "foo"
-        end
-        has_metadata name: "properties", type: ActiveFedora::SimpleDatastream, autocreate: true
       end
       class Basic < Base
       end
     end
-
-    @test_instance = ModelIntegrationSpec::Basic.new
-    @test_instance.save
   end
+  let!(:test_instance) { ModelIntegrationSpec::Basic.create! }
 
-  after(:each) do
-    @test_instance.delete
+  after do
+    test_instance.delete
     Object.send(:remove_const, :ModelIntegrationSpec)
   end
 
@@ -37,15 +31,15 @@ describe ActiveFedora::Model do
 
   describe '#find' do
     describe "#find with a valid id without cast" do
-      subject { ActiveFedora::Base.find(@test_instance.id) }
+      subject { ActiveFedora::Base.find(test_instance.id) }
       it { should be_instance_of ModelIntegrationSpec::Basic }
     end
     describe "#find with a valid id with cast of false" do
-      subject { ActiveFedora::Base.find(@test_instance.id, cast: false) }
+      subject { ActiveFedora::Base.find(test_instance.id, cast: false) }
       it { should be_instance_of ActiveFedora::Base }
     end
     describe "#find with a valid id without cast on a model extending Base" do
-      subject { ModelIntegrationSpec::Basic.find(@test_instance.id) }
+      subject { ModelIntegrationSpec::Basic.find(test_instance.id) }
       it { should be_instance_of ModelIntegrationSpec::Basic }
     end
   end

data/spec/integration/ntriples_datastream_spec.rb

@@ -26,7 +26,7 @@ describe ActiveFedora::NtriplesRDFDatastream do
     end
 
     class RdfTest < ActiveFedora::Base
-      has_metadata 'rdf', type: MyDatastream
+      has_subresource 'rdf', class_name: 'MyDatastream'
       Deprecation.silence(ActiveFedora::Attributes) do
         has_attributes :based_near, :related_url, :part, :date_uploaded, datastream: 'rdf', multiple: true
         has_attributes :title, :filesize, datastream: 'rdf', multiple: false
@@ -227,7 +227,7 @@ EOF
         property :title, predicate: ::RDF::Vocab::DC.title
       end
       class Foobar < ActiveFedora::Base
-        has_metadata 'rdf', type: TitleDatastream
+        has_subresource 'rdf', class_name: 'TitleDatastream'
         Deprecation.silence(ActiveFedora::Attributes) do
           has_attributes :title, datastream: 'rdf', multiple: true
         end

data/spec/integration/om_datastream_spec.rb

@@ -4,7 +4,7 @@ describe ActiveFedora::OmDatastream do
   before(:all) do
     class ModsArticle2 < ActiveFedora::Base
       # Uses the Hydra MODS Article profile for tracking most of the descriptive metadata
-      has_metadata "descMetadata", type: Hydra::ModsArticleDatastream, autocreate: true
+      has_subresource "descMetadata", class_name: 'Hydra::ModsArticleDatastream'
     end
   end
 

data/spec/integration/persistence_spec.rb

@@ -4,9 +4,6 @@ describe "persisting objects" do
   describe "#create!" do
     before do
       class MockAFBaseRelationship < ActiveFedora::Base
-        has_metadata type: ActiveFedora::SimpleDatastream, name: "foo" do |m|
-          m.field "name", :string
-        end
         property :name, predicate: ::RDF::Vocab::DC.title, multiple: false
         validates :name, presence: true
       end

data/spec/integration/query_result_builder_spec.rb

@@ -8,7 +8,7 @@ describe ActiveFedora::QueryResultBuilder do
           "foo"
         end
 
-        has_metadata name: "descMetadata", type: ActiveFedora::QualifiedDublinCoreDatastream
+        has_subresource :descMetadata, class_name: 'ActiveFedora::QualifiedDublinCoreDatastream'
       end
       @test_object = ActiveFedora::Base.new
       @foo_object = FooObject.new

data/spec/integration/relation_delegation_spec.rb

@@ -4,14 +4,9 @@ describe ActiveFedora::Model do
   before(:all) do
     module ModelIntegrationSpec
       class Basic < ActiveFedora::Base
-        has_metadata name: "properties", type: ActiveFedora::SimpleDatastream do |m|
-          m.field "foo", :string
-          m.field "bar", :string
-          m.field "baz", :string
-        end
-
-        Deprecation.silence(ActiveFedora::Attributes) do
-          has_attributes :foo, :bar, :baz, datastream: 'properties', multiple: true
+        property :foo, predicate: ::RDF::URI('http://example.com/foo')
+        property :bar, predicate: ::RDF::URI('http://example.com/bar') do |index|
+          index.as :stored_searchable
         end
 
         def to_solr(doc = {})

data/spec/integration/scoped_query_spec.rb

@@ -4,15 +4,13 @@ describe ActiveFedora::Querying do
   before do
     module ModelIntegrationSpec
       class Basic < ActiveFedora::Base
-        has_metadata "properties", type: ActiveFedora::SimpleDatastream do |m|
-          m.field "foo", :string
-          m.field "bar", :string
-          m.field "baz", :string
+        property :foo, predicate: ::RDF::URI('http://example.com/foo') do |index|
+          index.as :stored_searchable
         end
-
-        Deprecation.silence(ActiveFedora::Attributes) do
-          has_attributes :foo, :bar, :baz, datastream: 'properties', multiple: true
+        property :bar, predicate: ::RDF::URI('http://example.com/bar') do |index|
+          index.as :stored_searchable
         end
+        property :baz, predicate: ::RDF::URI('http://example.com/baz')
 
         def to_solr(doc = {})
           doc = super

data/spec/integration/solr_hit_spec.rb

@@ -2,11 +2,16 @@ require 'spec_helper'
 
 describe ActiveFedora::SolrHit do
   before do
-    class Foo < ActiveFedora::Base
-      has_metadata 'descMetadata', type: ActiveFedora::SimpleDatastream do |m|
-        m.field "foo", :text
-        m.field "bar", :text
+    class MyDS < ActiveFedora::OmDatastream
+      set_terminology do |t|
+        t.root(path: "durh")
+        t.foo
+        t.bar
       end
+    end
+
+    class Foo < ActiveFedora::Base
+      has_subresource 'descMetadata', class_name: 'MyDS'
       Deprecation.silence(ActiveFedora::Attributes) do
         has_attributes :foo, datastream: 'descMetadata', multiple: true
         has_attributes :bar, datastream: 'descMetadata', multiple: false
@@ -29,6 +34,7 @@ describe ActiveFedora::SolrHit do
 
   after do
     Object.send(:remove_const, :Foo)
+    Object.send(:remove_const, :MyDS)
   end
 
   describe "#reify" do

data/spec/integration/solr_instance_loader_spec.rb

@@ -2,11 +2,17 @@ require 'spec_helper'
 
 describe ActiveFedora::SolrInstanceLoader do
   before do
-    class Foo < ActiveFedora::Base
-      has_metadata 'descMetadata', type: ActiveFedora::SimpleDatastream do |m|
-        m.field "foo", :text
-        m.field "bar", :text
+    class MyDS < ActiveFedora::OmDatastream
+      set_terminology do |t|
+        t.root(path: "durh")
+        t.foo
+        t.bar
       end
+    end
+
+    class Foo < ActiveFedora::Base
+      extend Deprecation
+      has_subresource 'descMetadata', class_name: 'MyDS'
       Deprecation.silence(ActiveFedora::Attributes) do
         has_attributes :foo, datastream: 'descMetadata', multiple: true
         has_attributes :bar, datastream: 'descMetadata', multiple: false
@@ -38,6 +44,7 @@ describe ActiveFedora::SolrInstanceLoader do
   after do
     Object.send(:remove_const, :Foo)
     Object.send(:remove_const, :Bar)
+    Object.send(:remove_const, :MyDS)
   end
 
   context "without a solr doc" do

data/spec/integration/versionable_spec.rb

@@ -142,7 +142,7 @@ describe ActiveFedora::Versionable do
       end
 
       class MockAFBase < ActiveFedora::Base
-        contains "descMetadata", class_name: 'VersionableDatastream', autocreate: true
+        has_subresource "descMetadata", class_name: 'VersionableDatastream', autocreate: true
       end
     end
 
@@ -272,7 +272,7 @@ describe ActiveFedora::Versionable do
       end
 
       class MockAFBase < ActiveFedora::Base
-        contains "descMetadata", class_name: 'VersionableDatastream', autocreate: true
+        has_subresource "descMetadata", class_name: 'VersionableDatastream', autocreate: true
       end
     end
 
@@ -395,7 +395,7 @@ describe ActiveFedora::Versionable do
       end
 
       class MockAFBase < ActiveFedora::Base
-        contains "content", class_name: 'BinaryDatastream', autocreate: true
+        has_subresource "content", class_name: 'BinaryDatastream', autocreate: true
       end
     end
 

data/spec/spec_helper.rb

@@ -42,7 +42,11 @@ require 'active_fedora/cleaner'
 RSpec.configure do |config|
   # Stub out test stuff.
   config.before(:each) do
-    ActiveFedora::Cleaner.clean!
+    begin
+      ActiveFedora::Cleaner.clean!
+    rescue Faraday::ConnectionFailed, RSolr::Error::ConnectionRefused => e
+      $stderr.puts e.message
+    end
   end
   config.after(:each) do
     # cleanout_fedora

data/spec/unit/active_fedora_spec.rb

@@ -28,7 +28,7 @@ describe ActiveFedora do
     it "does not connect and warn" do
       expect(ActiveFedora::Base.logger).to receive(:warn)
       expect {
-        ActiveFedora::Fedora.new(url: bad_url, base_path: '/test', user: user, password: password).connection
+        ActiveFedora::Fedora.new(url: bad_url, base_path: '/test', user: user, password: password).connection.head
       }.to raise_error Ldp::HttpError
     end
   end

data/spec/unit/attached_files_spec.rb

@@ -2,15 +2,15 @@ require 'spec_helper'
 
 describe ActiveFedora::AttachedFiles do
   subject { ActiveFedora::Base.new }
-  describe "contains" do
+  describe "has_subresource" do
     before do
       class Z < ActiveFedora::File
       end
       class FooHistory < ActiveFedora::Base
-        contains 'dsid', class_name: 'ActiveFedora::SimpleDatastream'
-        contains 'complex_ds', autocreate: true, class_name: 'Z'
-        contains 'thumbnail'
-        contains 'child_resource', class_name: 'ActiveFedora::Base'
+        has_subresource 'dsid', class_name: 'ActiveFedora::QualifiedDublinCoreDatastream'
+        has_subresource 'complex_ds', autocreate: true, class_name: 'Z'
+        has_subresource 'thumbnail'
+        has_subresource 'child_resource', class_name: 'ActiveFedora::Base'
       end
     end
     after do
@@ -30,24 +30,24 @@ describe ActiveFedora::AttachedFiles do
     end
 
     it "raises an error if you don't give a dsid" do
-      expect { FooHistory.contains nil, type: ActiveFedora::SimpleDatastream }.to raise_error ArgumentError,
-                                                                                              "You must provide a name (dsid) for the datastream"
+      expect { FooHistory.has_subresource nil, type: ActiveFedora::QualifiedDublinCoreDatastream }.to raise_error ArgumentError,
+                                                                                                                  "You must provide a path name (f.k.a. dsid) for the resource"
     end
   end
 
   describe '.has_metadata' do
     before do
-      @original_behavior = Deprecation.default_deprecation_behavior
-      Deprecation.default_deprecation_behavior = :silence
       class Z < ActiveFedora::File
       end
       class FooHistory < ActiveFedora::Base
-        has_metadata name: 'dsid', type: ActiveFedora::SimpleDatastream
-        has_metadata 'complex_ds', autocreate: true, type: 'Z'
+        extend Deprecation
+        Deprecation.silence(FooHistory) do
+          has_metadata name: 'dsid', type: ActiveFedora::QualifiedDublinCoreDatastream
+          has_metadata 'complex_ds', autocreate: true, type: 'Z'
+        end
       end
     end
     after do
-      Deprecation.default_deprecation_behavior = @original_behavior
       Object.send(:remove_const, :FooHistory)
       Object.send(:remove_const, :Z)
     end
@@ -57,7 +57,7 @@ describe ActiveFedora::AttachedFiles do
     end
 
     it "has reasonable defaults" do
-      expect(FooHistory.child_resource_reflections[:dsid].options).to include(class_name: 'ActiveFedora::SimpleDatastream')
+      expect(FooHistory.child_resource_reflections[:dsid].options).to include(class_name: 'ActiveFedora::QualifiedDublinCoreDatastream')
     end
 
     it "lets you override defaults" do
@@ -66,13 +66,21 @@ describe ActiveFedora::AttachedFiles do
     end
 
     it "raises an error if you don't give a type" do
-      expect { FooHistory.has_metadata "bob" }.to raise_error ArgumentError,
-                                                              "You must provide a :type property for the datastream 'bob'"
+      expect {
+        Deprecation.silence(FooHistory) do
+          FooHistory.has_metadata "bob"
+        end
+      }.to raise_error ArgumentError,
+                       "You must provide a :type property for the datastream 'bob'"
     end
 
     it "raises an error if you don't give a dsid" do
-      expect { FooHistory.has_metadata type: ActiveFedora::SimpleDatastream }.to raise_error ArgumentError,
-                                                                                             "You must provide a name (dsid) for the datastream"
+      expect {
+        Deprecation.silence(FooHistory) do
+          FooHistory.has_metadata type: ActiveFedora::QualifiedDublinCoreDatastream
+        end
+      }.to raise_error ArgumentError,
+                       "You must provide a path name (f.k.a. dsid) for the resource"
     end
 
     describe "creates accessors" do
@@ -86,8 +94,11 @@ describe ActiveFedora::AttachedFiles do
   describe '.has_file_datastream' do
     before do
       class FooHistory < ActiveFedora::Base
-        has_file_datastream name: 'dsid'
-        has_file_datastream 'another'
+        extend Deprecation
+        Deprecation.silence(FooHistory) do
+          has_file_datastream name: 'dsid'
+          has_file_datastream 'another'
+        end
       end
     end
     after do
@@ -105,7 +116,7 @@ describe ActiveFedora::AttachedFiles do
       class Bar < ActiveFedora::File; end
 
       class FooHistory < ActiveFedora::Base
-        contains :content, class_name: 'Bar'
+        has_subresource :content, class_name: 'Bar'
       end
     end
 
@@ -183,7 +194,7 @@ describe ActiveFedora::AttachedFiles do
     context "when there are declared attached files" do
       before do
         class FooHistory < ActiveFedora::Base
-          contains 'thumbnail'
+          has_subresource 'thumbnail'
         end
       end
 

data/spec/unit/attributes_spec.rb

@@ -37,7 +37,7 @@ describe ActiveFedora::Base do
       context "with an xml property (default cardinality)" do
         before do
           class BarHistory4 < ActiveFedora::Base
-            has_metadata type: BarStream2, name: "xmlish"
+            has_subresource 'xmlish', class_name: 'BarStream2'
             Deprecation.silence(ActiveFedora::Attributes) do
               property :cow, delegate_to: 'xmlish'
             end
@@ -64,7 +64,7 @@ describe ActiveFedora::Base do
       context "with multiple set to false" do
         before do
           class BarHistory4 < ActiveFedora::Base
-            has_metadata type: BarStream2, name: "xmlish"
+            has_subresource 'xmlish', class_name: 'BarStream2'
             Deprecation.silence(ActiveFedora::Attributes) do
               property :cow, delegate_to: 'xmlish', multiple: false
             end
@@ -86,7 +86,7 @@ describe ActiveFedora::Base do
       context "when updating and saving a property" do
         before do
           class BarHistory4 < ActiveFedora::Base
-            has_metadata type: BarStream2, name: "xmlish"
+            has_subresource 'xmlish', class_name: 'BarStream2'
             Deprecation.silence(ActiveFedora::Attributes) do
               property :cow, delegate_to: 'xmlish', multiple: false
             end
@@ -113,22 +113,20 @@ describe ActiveFedora::Base do
     end
 
     describe "first level delegation" do
-      before :all do
-        class BarHistory2 < ActiveFedora::Base
-          has_metadata type: ActiveFedora::SimpleDatastream, name: "someData" do |m|
-            m.field "fubar", :string
-            m.field "bandana", :string
-            m.field "swank", :text
-            m.field "animal_id", :string
-          end
-          has_metadata type: ActiveFedora::SimpleDatastream, name: "withText" do |m|
-            m.field "fubar", :text
-          end
-          has_metadata type: ActiveFedora::SimpleDatastream, name: "withText2" do |m|
-            m.field "fubar", :text
+      before do
+        class MyDS1 < ActiveFedora::NtriplesRDFDatastream
+          property :animal_id, predicate: ::RDF::Vocab::DC.publisher
+        end
+        class MyDS2 < ActiveFedora::OmDatastream
+          set_terminology do |t|
+            t.root(path: "durh")
+            t.fubar
           end
-
-          has_metadata type: BarStream2, name: "xmlish"
+        end
+        class BarHistory2 < ActiveFedora::Base
+          has_subresource 'someData', class_name: 'MyDS1'
+          has_subresource "withText", class_name: 'MyDS2'
+          has_subresource 'xmlish', class_name: 'BarStream2'
           Deprecation.silence(ActiveFedora::Attributes) do
             has_attributes :cow, datastream: 'xmlish'                      # for testing the default value of multiple
             has_attributes :fubar, datastream: 'withText', multiple: true  # test alternate datastream
@@ -142,7 +140,7 @@ describe ActiveFedora::Base do
         end
       end
 
-      after :all do
+      after do
         Object.send(:remove_const, :BarHistory2)
       end
 
@@ -342,7 +340,7 @@ describe ActiveFedora::Base do
 
       describe ".datastream_class_for_name" do
         it "returns the specifed class" do
-          expect(BarHistory2.send(:datastream_class_for_name, 'someData')).to eq ActiveFedora::SimpleDatastream
+          expect(BarHistory2.send(:datastream_class_for_name, 'someData')).to eq MyDS1
         end
       end
     end
@@ -350,7 +348,7 @@ describe ActiveFedora::Base do
     describe "with a superclass" do
       before :all do
         class BarHistory2 < ActiveFedora::Base
-          has_metadata 'xmlish', type: BarStream2
+          has_subresource 'xmlish', class_name: 'BarStream2'
           Deprecation.silence(ActiveFedora::Attributes) do
             has_attributes :donkey, :cow, datastream: 'xmlish', multiple: true
           end
@@ -386,7 +384,7 @@ describe ActiveFedora::Base do
         property :description, predicate: ::RDF::Vocab::DC.description
       end
       class BarHistory4 < ActiveFedora::Base
-        has_metadata 'rdfish', type: BarRdfDatastream
+        has_subresource 'rdfish', class_name: 'BarRdfDatastream'
         Deprecation.silence(ActiveFedora::Attributes) do
           has_attributes :title, datastream: 'rdfish', multiple: true
           has_attributes :description, datastream: 'rdfish', multiple: false
@@ -478,7 +476,7 @@ describe ActiveFedora::Base do
         property :description, predicate: ::RDF::Vocab::DC.description
       end
       class BarHistory4 < ActiveFedora::Base
-        has_metadata 'rdfish', type: BarRdfDatastream
+        has_subresource 'rdfish', class_name: 'BarRdfDatastream'
         Deprecation.silence(ActiveFedora::Attributes) do
           has_attributes :description, datastream: :rdfish
         end