active-fedora 11.5.6 → 12.0.0

data/spec/integration/base_spec.rb

@@ -1,21 +1,18 @@
 require 'spec_helper'
 
 describe ActiveFedora::Base do
-  describe '#reload' do
-    before do
-      class Foo < ActiveFedora::Base
-        property :person, predicate: ::RDF::Vocab::DC.creator
-      end
-    end
-    after do
-      Object.send(:remove_const, :Foo)
+  before(:all) do
+    class Foo < ActiveFedora::Base
+      property :person, predicate: ::RDF::Vocab::DC.creator
     end
+  end
+  after(:all) { Object.send(:remove_const, :Foo) }
+
+  describe '#reload' do
     context "when persisted" do
       let(:object) { Foo.create(person: ['bob']) }
       let(:object2) { Foo.find(object.id) }
-      before do
-        object2.update(person: ['dave'])
-      end
+      before { object2.update(person: ['dave']) }
 
       it 're-queries Fedora' do
         object.reload
@@ -24,27 +21,22 @@ describe ActiveFedora::Base do
     end
 
     context "when not persisted" do
-      let(:object) { Foo.new }
       it 'raises an error' do
-        expect { object.reload }.to raise_error(ActiveFedora::ObjectNotFoundError)
+        expect { Foo.new.reload }.to raise_error(ActiveFedora::ObjectNotFoundError)
       end
     end
   end
 
   describe "a saved object" do
-    before do
+    before(:all) do
       class Book < ActiveFedora::Base
         type [::RDF::URI("http://www.example.com/Book")]
         property :title, predicate: ::RDF::Vocab::DC.title
       end
     end
-
-    after do
-      Object.send(:remove_const, :Book)
-    end
-    let!(:obj) { Book.create }
-
+    after(:all) { Object.send(:remove_const, :Book) }
     after { obj.destroy unless obj.destroyed? }
+    let!(:obj) { Book.create }
 
     describe "#errors" do
       subject { obj.errors }
@@ -121,43 +113,55 @@ describe ActiveFedora::Base do
     end
   end
 
-  describe "#exists?" do
-    let(:obj) { described_class.create }
+  shared_examples 'ActiveFedora::Base#exists?' do
+    let(:obj) { test_class.create }
     it "returns true for objects that exist" do
-      expect(described_class.exists?(obj)).to be true
+      expect(test_class.exists?(obj)).to be true
     end
     it "returns true for ids that exist" do
-      expect(described_class.exists?(obj.id)).to be true
+      expect(test_class.exists?(obj.id)).to be true
     end
     it "returns false for ids that don't exist" do
-      expect(described_class.exists?('test_missing_object')).to be false
-    end
-    it "returns false for nil" do
-      expect(described_class.exists?(nil)).to be false
-    end
-    it "returns false for false" do
-      expect(described_class.exists?(false)).to be false
+      expect(test_class.exists?('test_missing_object')).to be false
     end
-    it "returns false for empty" do
-      expect(described_class.exists?('')).to be false
+    it "returns false for nil, false and empty" do
+      expect(test_class.exists?(nil)).to be false
+      expect(test_class.exists?(false)).to be false
+      expect(test_class.exists?('')).to be false
     end
     context "when passed a hash of conditions" do
       let(:conditions) { { foo: "bar" } }
       context "and at least one object matches the conditions" do
         it "returns true" do
           allow(ActiveFedora::SolrService).to receive(:query) { [instance_double(RSolr::HashWithResponse)] }
-          expect(described_class.exists?(conditions)).to be true
+          expect(test_class.exists?(conditions)).to be true
         end
       end
       context "and no object matches the conditions" do
         it "returns false" do
           allow(ActiveFedora::SolrService).to receive(:query) { [] }
-          expect(described_class.exists?(conditions)).to be false
+          expect(test_class.exists?(conditions)).to be false
         end
       end
     end
   end
 
+  context 'base class' do
+    let(:test_class) { described_class }
+    it_behaves_like 'ActiveFedora::Base#exists?'
+  end
+
+  context 'subclass' do
+    let(:test_class) { Foo }
+    it_behaves_like 'ActiveFedora::Base#exists?'
+
+    it 'does not mistake other fedora objects for subclass' do
+      obj = described_class.create
+      expect { test_class.exists?(obj.id) }.not_to raise_error
+      expect(test_class.exists?(obj.id)).to be false
+    end
+  end
+
   describe "overriding resource_class_factory" do
     subject(:test_base) { TestBase.new }
     before do

data/spec/integration/indexing/descendant_fetcher_spec.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+
+RSpec.describe ActiveFedora::Indexing::DescendantFetcher 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(:parent) { Source.create }
+  let(:child) { parent.contains.create(title: ['my title']) }
+  let(:other_parent) { Source.create }
+  let!(:source_uris) { [parent, other_parent].map(&:uri).map(&:to_s) }
+  let!(:thing_uris) { [child].map(&:uri).map(&:to_s) }
+  let(:uri) { ActiveFedora.fedora.base_uri }
+  let(:fetcher) { described_class.new(uri) }
+
+  describe '.descendant_and_self_uris' do
+    context 'with default priority models' do
+      it 'returns uris for all objects by walking tree' do
+        expect(fetcher.descendant_and_self_uris).to match_array(source_uris + thing_uris)
+      end
+    end
+    context 'when supplying priority models' do
+      let(:priority_models) { ['Thing'] }
+      let(:fetcher) { described_class.new(uri, priority_models: priority_models) }
+      it 'returns priority model uris first' do
+        expect(fetcher.descendant_and_self_uris.slice(0..(thing_uris.count - 1))).to match_array(thing_uris)
+      end
+    end
+  end
+  describe '.descendant_and_self_uris_partitioned' do
+    context 'with default priority models' do
+      it 'returns' do
+        expect(fetcher.descendant_and_self_uris_partitioned.to_a).to match_array([[:priority, []], [:other, match_array(source_uris + thing_uris)]])
+      end
+    end
+    context 'when supplying priority models' do
+      let(:priority_models) { ['Thing'] }
+      let(:fetcher) { described_class.new(uri, priority_models: priority_models) }
+      it 'returns' do
+        expect(fetcher.descendant_and_self_uris_partitioned.to_a).to match_array([[:priority, match_array(thing_uris)], [:other, match_array(source_uris)]])
+      end
+    end
+  end
+  describe '.descendant_and_self_uris_partitioned_by_model' do
+    it 'returns' do
+      expect(fetcher.descendant_and_self_uris_partitioned_by_model.to_a).to match_array([['Source', match_array(source_uris)], ['Thing', match_array(thing_uris)]])
+    end
+    context 'excluding self' do
+      let(:fetcher) { described_class.new(parent.uri, exclude_self: true) }
+      it 'returns' do
+        expect(fetcher.descendant_and_self_uris_partitioned_by_model.to_a).to match_array([['Thing', [child.uri.to_s]]])
+      end
+    end
+  end
+end

data/spec/integration/relation_spec.rb

@@ -22,10 +22,6 @@ describe ActiveFedora::Base do
   end
 
   it { is_expected.to respond_to(:each_with_index) }
-  it { expect(libraries.any?).to eq false }
-  it { is_expected.to be_blank }
-  it { is_expected.to be_empty }
-  it { is_expected.not_to be_present }
 
   context "when some records exist" do
     before do
@@ -43,41 +39,7 @@ describe ActiveFedora::Base do
 
       it "does not reload" do
         expect_any_instance_of(ActiveFedora::Relation).to_not receive :find_each
-        libraries.each(&:id)
-      end
-    end
-
-    it { expect(libraries.any?).to eq true }
-    it { is_expected.not_to be_blank }
-    it { is_expected.not_to be_empty }
-    it { is_expected.to be_present }
-
-    describe '#each' do
-      before { Book.create }
-
-      it 'returns an enumerator' do
-        expect(libraries.each).to be_a Enumerator
-      end
-
-      it 'yields the items' do
-        expect { |b| libraries.each(&b) }
-          .to yield_successive_args(*Library.all.to_a)
-      end
-
-      it 'when called from Base yields all items' do
-        expect { |b| described_class.all.each(&b) }
-          .to yield_successive_args(*(Library.all.to_a + Book.all.to_a))
-      end
-
-      context 'when cached' do
-        it 'returns an enumerator' do
-          expect(libraries.each).to be_a Enumerator
-        end
-
-        it 'yields the items' do
-          expect { |b| libraries.each(&b) }
-            .to yield_successive_args(*Library.all.to_a)
-        end
+        libraries[0]
       end
     end
 

data/spec/integration/scoping_spec.rb

@@ -1,17 +1,18 @@
 require 'spec_helper'
 
 describe ActiveFedora::Scoping::Named do
-  before do
-    class TestClass < ActiveFedora::Base
-    end
+  before(:all) do
+    class TestClass < ActiveFedora::Base; end
+    class OtherClass < ActiveFedora::Base; end
   end
-  let!(:test_instance) { TestClass.create! }
-
-  after do
-    test_instance.delete
+  after(:all) do
     Object.send(:remove_const, :TestClass)
+    Object.send(:remove_const, :OtherClass)
   end
 
+  let!(:test_instance) { TestClass.create! }
+  after { test_instance.delete }
+
   describe "#all" do
     it "returns an array of instances of the calling Class" do
       result = TestClass.all.to_a
@@ -25,18 +26,23 @@ describe ActiveFedora::Scoping::Named do
   end
 
   describe '#find' do
-    describe "#find with a valid id without cast" do
+    describe "a valid id without cast" do
       subject { ActiveFedora::Base.find(test_instance.id) }
       it { is_expected.to be_instance_of TestClass }
     end
-    describe "#find with a valid id with cast of false" do
+    describe "a valid id with cast of false" do
       subject { ActiveFedora::Base.find(test_instance.id, cast: false) }
       it { is_expected.to be_instance_of ActiveFedora::Base }
     end
-
-    describe "#find with a valid id without cast on a model extending Base" do
+    describe "a valid id without cast on a model extending Base" do
       subject { TestClass.find(test_instance.id) }
       it { is_expected.to be_instance_of TestClass }
     end
+    it "a valid id on an incompatible class raises ModelMismatch" do
+      expect { OtherClass.find(test_instance.id) }.to raise_error(ActiveFedora::ModelMismatch)
+    end
+    it "invalid id raises ObjectNotFoundError" do
+      expect { TestClass.find('some_unused_identifier') }.to raise_error(ActiveFedora::ObjectNotFoundError)
+    end
   end
 end

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@ require 'rspec'
 require 'rspec/its'
 require 'equivalent-xml/rspec_matchers'
 require 'logger'
-require 'pry' unless ENV['CI']
+require 'pry' unless ENV['TRAVIS']
 
 ActiveFedora::Base.logger = Logger.new(STDERR)
 ActiveFedora::Base.logger.level = Logger::WARN

data/spec/unit/active_fedora/indexing/inserter_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+RSpec.describe ActiveFedora::Indexing::Inserter do
+  let(:solr_doc) { {} }
+
+  it "handles many field types" do
+    described_class.create_and_insert_terms('my_name', 'value', [:displayable, :searchable, :sortable], solr_doc)
+    expect(solr_doc).to eq('my_name_ssm' => ['value'], 'my_name_si' => 'value', 'my_name_teim' => ['value'])
+  end
+
+  it "handles dates that are searchable" do
+    described_class.create_and_insert_terms('my_name', Date.parse('2013-01-10'), [:stored_searchable], solr_doc)
+    expect(solr_doc).to eq('my_name_dtsim' => ['2013-01-10T00:00:00Z'])
+  end
+
+  it "handles dates that are stored_sortable" do
+    described_class.create_and_insert_terms('my_name', Date.parse('2013-01-10'), [:stored_sortable], solr_doc)
+    expect(solr_doc).to eq('my_name_dtsi' => '2013-01-10T00:00:00Z')
+  end
+
+  it "handles dates that are displayable" do
+    described_class.create_and_insert_terms('my_name', Date.parse('2013-01-10'), [:displayable], solr_doc)
+    expect(solr_doc).to eq('my_name_ssm' => ['2013-01-10'])
+  end
+
+  it "handles dates that are sortable" do
+    described_class.create_and_insert_terms('my_name', Date.parse('2013-01-10'), [:sortable], solr_doc)
+    expect(solr_doc).to eq('my_name_dti' => '2013-01-10T00:00:00Z')
+  end
+end

data/spec/unit/attributes_spec.rb

@@ -131,17 +131,13 @@ describe ActiveFedora::Base do
         expect { history.title = "Quack" }.to raise_error ArgumentError
         expect { history.title = ["Quack"] }.not_to raise_error
         expect { history.title = nil }.not_to raise_error
-      end
-
-      it "allow setting to multiple properties with unintended legacy behavior" do
-        expect { history.title = '' }.not_to raise_error
-        expect { history.title = ActiveTriples::Resource.new }.not_to raise_error
+        expect { history.title = ActiveTriples::Resource.new }.to raise_error
       end
 
       it "does not allow an enumerable to a unique attribute writer" do
         expect { history.abstract = "Low" }.not_to raise_error
-        expect { history.abstract = ["Low"]
-        }.to raise_error ArgumentError, "You attempted to set the property `abstract' of test:123 to an enumerable value. However, this property is declared as singular."
+        expect { history.abstract = ["Low"] }
+          .to raise_error ArgumentError, "You attempted to set the property `abstract' of test:123 to an enumerable value. However, this property is declared as singular."
         expect { history.abstract = nil }.not_to raise_error
         expect { history.abstract = ActiveTriples::Resource.new }.not_to raise_error
       end

data/spec/unit/fedora_spec.rb

@@ -15,5 +15,17 @@ describe ActiveFedora::Fedora do
         fedora.authorized_connection
       }
     end
+    describe "with request options" do
+      let(:config) {
+        { url: "https://example.com",
+          user: "fedoraAdmin",
+          password: "fedoraAdmin",
+          request: { timeout: 600, open_timeout: 60 } }
+      }
+      specify {
+        expect(Faraday).to receive(:new).with("https://example.com", request: { timeout: 600, open_timeout: 60 }).and_call_original
+        fedora.authorized_connection
+      }
+    end
   end
 end

data/spec/unit/file_configurator_spec.rb

@@ -141,7 +141,6 @@ describe ActiveFedora::FileConfigurator do
         configurator.reset!
       end
       it "loads the file specified in fedora_config_path" do
-        allow(configurator).to receive(:load_solrizer_config)
         expect(configurator).to receive(:config_path).with(:fedora).and_return("/path/to/fedora.yml")
         expect(configurator).to receive(:load_solr_config)
         expect(IO).to receive(:read).with("/path/to/fedora.yml").and_return("development:\n url: http://devfedora:8983\ntest:\n  url: http://myfedora:8080")
@@ -150,7 +149,6 @@ describe ActiveFedora::FileConfigurator do
       end
 
       it "allows sharding" do
-        allow(configurator).to receive(:load_solrizer_config)
         expect(configurator).to receive(:config_path).with(:fedora).and_return("/path/to/fedora.yml")
         expect(configurator).to receive(:load_solr_config)
         expect(IO).to receive(:read).with("/path/to/fedora.yml").and_return("development:\n  url: http://devfedora:8983\ntest:\n- url: http://myfedora:8080\n- url: http://myfedora:8081")
@@ -159,7 +157,6 @@ describe ActiveFedora::FileConfigurator do
       end
 
       it "parses the file using ERb" do
-        allow(configurator).to receive(:load_solrizer_config)
         expect(configurator).to receive(:config_path).with(:fedora).and_return("/path/to/fedora.yml")
         expect(configurator).to receive(:load_solr_config)
         expect(IO).to receive(:read).with("/path/to/fedora.yml").and_return("development:\n  url: http://devfedora:<%= 8983 %>\ntest:\n  url: http://myfedora:<%= 8081 %>")
@@ -173,7 +170,6 @@ describe ActiveFedora::FileConfigurator do
         configurator.reset!
       end
       it "loads the file specified in solr_config_path" do
-        allow(configurator).to receive(:load_solrizer_config)
         expect(configurator).to receive(:config_path).with(:solr).and_return("/path/to/solr.yml")
         expect(configurator).to receive(:load_fedora_config)
         expect(IO).to receive(:read).with("/path/to/solr.yml").and_return("development:\n  default:\n    url: http://devsolr:8983\ntest:\n  default:\n    url: http://mysolr:8080")
@@ -182,7 +178,6 @@ describe ActiveFedora::FileConfigurator do
       end
 
       it "parses the file using ERb" do
-        allow(configurator).to receive(:load_solrizer_config)
         expect(configurator).to receive(:config_path).with(:solr).and_return("/path/to/solr.yml")
         expect(configurator).to receive(:load_fedora_config)
         expect(IO).to receive(:read).with("/path/to/solr.yml").and_return("development:\n  default:\n    url: http://devsolr:<%= 8983 %>\ntest:\n  default:\n    url: http://mysolr:<%= 8081 %>")
@@ -191,7 +186,6 @@ describe ActiveFedora::FileConfigurator do
       end
 
       it "includes update_path and select_path in solr_config" do
-        allow(configurator).to receive(:load_solrizer_config)
         expect(configurator).to receive(:config_path).with(:solr).and_return("/path/to/solr.yml")
         expect(configurator).to receive(:load_fedora_config)
         expect(IO).to receive(:read).with("/path/to/solr.yml").and_return("test:\n  url: http://mysolr:8080\n  update_path: update_test\n  select_path: select_test\n")
@@ -255,7 +249,6 @@ describe ActiveFedora::FileConfigurator do
     end
 
     it "loads a config from the current working directory as a second choice" do
-      allow(configurator).to receive(:load_solrizer_config)
       allow(Dir).to receive(:getwd).and_return(@fake_rails_root)
       configurator.init
       expect(configurator.config_path(:fedora)).to eql("#{@fake_rails_root}/config/fedora.yml")
@@ -264,7 +257,6 @@ describe ActiveFedora::FileConfigurator do
 
     it "loads the config that ships with this gem as a last choice" do
       allow(Dir).to receive(:getwd).and_return("/fake/path")
-      allow(configurator).to receive(:load_solrizer_config)
       expect(ActiveFedora::Base.logger).to receive(:warn).with("Using the default fedora.yml that comes with active-fedora.  If you want to override this, pass the path to fedora.yml to ActiveFedora - ie. ActiveFedora.init(:fedora_config_path => '/path/to/fedora.yml') - or set Rails.root and put fedora.yml into \#{Rails.root}/config.").exactly(3).times
       configurator.init
       expected_config = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "config"))
@@ -288,7 +280,6 @@ describe ActiveFedora::FileConfigurator do
       end
 
       it "loads a config from Rails.root as a first choice" do
-        allow(configurator).to receive(:load_solrizer_config)
         configurator.init
         expect(configurator.config_path(:fedora)).to eql("#{Rails.root}/config/fedora.yml")
         expect(configurator.solr_config_path).to eql("#{Rails.root}/config/solr.yml")