active-fedora 9.9.1 → 9.10.0.pre1

data/spec/spec_helper.rb

@@ -1,15 +1,11 @@
 ENV["environment"] ||= 'test'
 require "bundler/setup"
 
-if ENV["COVERAGE"]
-  require 'simplecov'
-  require 'coveralls'
-
-  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-  SimpleCov.start do
-    add_filter "/spec/"
-    add_filter "/gemfiles/"
-  end
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.start do
+  add_filter "/spec/"
 end
 
 require 'active-fedora'

data/spec/unit/active_fedora_spec.rb

@@ -115,30 +115,4 @@ describe ActiveFedora do
       end
     end
   end
-
-  describe "#class_from_string" do
-    before do
-      module ParentClass
-        class SiblingClass
-        end
-        class OtherSiblingClass
-        end
-      end
-    end
-    it "returns class constants based on strings" do
-      expect(described_class.class_from_string("Om")).to eq Om
-      expect(described_class.class_from_string("ActiveFedora::RDF::IndexingService")).to eq ActiveFedora::RDF::IndexingService
-      expect(described_class.class_from_string("IndexingService", ActiveFedora::RDF)).to eq ActiveFedora::RDF::IndexingService
-    end
-
-    it "finds sibling classes" do
-      expect(described_class.class_from_string("SiblingClass", ParentClass::OtherSiblingClass)).to eq ParentClass::SiblingClass
-    end
-
-    it "raises a NameError if the class isn't found" do
-      expect {
-        described_class.class_from_string("FooClass", ParentClass::OtherSiblingClass)
-      }.to raise_error NameError, "uninitialized constant FooClass"
-    end
-  end
 end

data/spec/unit/base_spec.rb

@@ -333,4 +333,24 @@ describe ActiveFedora::Base do
       end
     end
   end
+
+  describe '.dangerous_attribute_method?' do
+    before do
+      class FooHistory < ActiveFedora::Base
+        type ::RDF::URI.new('http://example.com/foo')
+        property :title, predicate: ::RDF::Vocab::DC.title
+      end
+    end
+    after do
+      Object.send(:remove_const, :FooHistory)
+    end
+
+    it 'is dangerous if it is defined by the class' do
+      expect(FooHistory.dangerous_attribute_method?(:save)).to eq true
+    end
+
+    it 'is not dangerous if it is defined outside of ActiveFedora' do
+      expect(FooHistory.dangerous_attribute_method?(:puts)).to eq false
+    end
+  end
 end

data/spec/unit/builder/has_and_belongs_to_many_spec.rb

@@ -2,8 +2,7 @@ require 'spec_helper'
 
 describe ActiveFedora::Associations::Builder::HasAndBelongsToMany do
   describe "valid_options" do
-    subject { described_class.valid_options }
-    it { should eq [:class_name, :predicate, :type_validator, :before_add, :after_add, :before_remove,
-                    :after_remove, :inverse_of, :solr_page_size, :autosave] }
+    subject { described_class.valid_options({}) }
+    it { should match_array [:class_name, :predicate, :type_validator, :before_add, :after_add, :before_remove, :after_remove, :inverse_of, :solr_page_size, :autosave] }
   end
 end

data/spec/unit/callback_spec.rb

@@ -2,11 +2,6 @@ require 'spec_helper'
 
 describe ActiveFedora::Base do
   before :each do
-    begin
-      described_class.find('test:123').delete
-    rescue
-    end
-
     class CallbackStub < ActiveFedora::Base
       has_metadata type: ActiveFedora::SimpleDatastream, name: "someData" do |m|
         m.field "fubar", :string
@@ -43,7 +38,7 @@ describe ActiveFedora::Base do
     allow_any_instance_of(CallbackStub).to receive :a_create
     allow_any_instance_of(CallbackStub).to receive(:b_save)
     allow_any_instance_of(CallbackStub).to receive(:a_save)
-    @cb = CallbackStub.new 'test:123'
+    @cb = CallbackStub.new
     @cb.save
   end
 
@@ -53,7 +48,7 @@ describe ActiveFedora::Base do
     allow_any_instance_of(CallbackStub).to receive(:a_create)
     allow_any_instance_of(CallbackStub).to receive(:b_save)
     allow_any_instance_of(CallbackStub).to receive(:a_save)
-    @cb = CallbackStub.new 'test:123'
+    @cb = CallbackStub.new
     @cb.save
     allow_any_instance_of(CallbackStub).to receive(:a_init)
     allow_any_instance_of(CallbackStub).to receive(:b_save)
@@ -63,7 +58,7 @@ describe ActiveFedora::Base do
     allow_any_instance_of(CallbackStub).to receive(:a_update)
     allow_any_instance_of(CallbackStub).to receive(:do_stuff)
 
-    @cb = CallbackStub.find('test:123')
+    @cb = CallbackStub.find(@cb.id)
     @cb.save!
 
     @cb.destroy

data/spec/unit/default_model_mapper_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe ActiveFedora::DefaultModelMapper do
+  let(:classifier) { double }
+  let(:classifier_instance) { double }
+  let(:solr_field) { 'solr_field' }
+  let(:predicate) { 'info:predicate' }
+  subject { described_class.new classifier_class: classifier, solr_field: solr_field, predicate: predicate }
+
+  describe '#classifier' do
+    context 'with a solr document' do
+      let(:solr_document) { { 'solr_field' => ['xyz'] } }
+
+      before do
+        expect(classifier).to receive(:new).with(['xyz']).and_return(classifier_instance)
+      end
+
+      it 'creates a classifier from the solr field data' do
+        expect(subject.classifier(solr_document)).to eq classifier_instance
+      end
+    end
+
+    context 'with a resource' do
+      let(:graph) do
+        RDF::Graph.new << [:hello, predicate, 'xyz']
+      end
+
+      let(:resource) { double(graph: graph) }
+
+      before do
+        expect(classifier).to receive(:new).with(['xyz']).and_return(classifier_instance)
+      end
+
+      it 'creates a classifier from the resource model predicate' do
+        expect(subject.classifier(resource)).to eq classifier_instance
+      end
+    end
+  end
+end

data/spec/unit/finder_methods_spec.rb

@@ -46,17 +46,17 @@ describe ActiveFedora::FinderMethods do
 
     context "when value is an id" do
       let(:value) { 'one/two/three' }
-      it { is_expected.to eq "_query_:\"{!raw f=library_id}one/two/three\"" }
+      it { is_expected.to eq "_query_:\"{!field f=library_id}one/two/three\"" }
     end
 
     context "when value is an array" do
       let(:value) { ['one', 'four'] }
-      it { is_expected.to eq "_query_:\"{!raw f=library_id}one\" AND " \
-                             "_query_:\"{!raw f=library_id}four\"" }
+      it { is_expected.to eq "_query_:\"{!field f=library_id}one\" AND " \
+                             "_query_:\"{!field f=library_id}four\"" }
     end
   end
 
-  describe "#find_in_batches" do
+  describe "#search_in_batches" do
     let(:docs) { double('docs', has_next?: false) }
     let(:select_handler) { 'select' }
     let(:connection) { double('conn') }
@@ -70,14 +70,38 @@ describe ActiveFedora::FinderMethods do
     end
     it "yields the docs" do
       expect { |b|
-        finder.find_in_batches({ 'age_t' => '21' }, { other_opt: 'test' }, &b)
+        finder.search_in_batches({ 'age_t' => '21' }, { other_opt: 'test' }, &b)
       }.to yield_with_args(docs)
     end
 
     context "with custom select handler" do
       let(:select_handler) { 'select_test' }
       it "uses the custom select handler" do
-        finder.find_in_batches({ 'age_t' => '21' }, other_opt: 'test') do end
+        finder.search_in_batches({ 'age_t' => '21' }, other_opt: 'test') do end
+      end
+    end
+  end
+
+  describe '#search_by_id' do
+    context 'with a document in solr' do
+      let(:doc) { double('Document') }
+
+      before do
+        expect(finder).to receive(:search_with_conditions).with({ id: 'x' }, hash_including(rows: 1)).and_return([doc])
+      end
+
+      it "returns the document" do
+        expect(finder.search_by_id('x')).to eq doc
+      end
+    end
+
+    context 'without a document in solr' do
+      before do
+        expect(finder).to receive(:search_with_conditions).with({ id: 'x' }, hash_including(rows: 1)).and_return([])
+      end
+
+      it "returns the document" do
+        expect { finder.search_by_id('x') }.to raise_error ActiveFedora::ObjectNotFoundError
       end
     end
   end

data/spec/unit/has_many_association_spec.rb

@@ -65,10 +65,32 @@ describe ActiveFedora::Associations::HasManyAssociation do
     end
 
     let(:owner) { TimeSpan.new }
-    let(:reflection) { TimeSpan.reflect_on_association(:images) }
+    let(:reflection) { TimeSpan._reflect_on_association(:images) }
 
     it "finds the predicate" do
       expect { described_class.new(owner, reflection) }.not_to raise_error
     end
   end
+
+  describe "scope" do
+    before do
+      class Library < ActiveFedora::Base
+        has_many :images
+      end
+
+      class Image < ActiveFedora::Base
+        belongs_to :library, predicate: ::RDF::URI('http://example.com/library')
+      end
+    end
+
+    after do
+      Object.send(:remove_const, :Library)
+      Object.send(:remove_const, :Image)
+    end
+
+    context "of an unsaved target" do
+      subject { Library.new.images.scope }
+      it { is_expected.to be_kind_of ActiveFedora::NullRelation }
+    end
+  end
 end

data/spec/unit/indexing_spec.rb

@@ -1,6 +1,20 @@
 require 'spec_helper'
 
 describe ActiveFedora::Indexing do
+  describe '.indexer' do
+    let(:indexing_class) { Class.new }
+    let(:klass) { Class.new }
+    before do
+      klass.include described_class
+    end
+
+    it "is settable as a class attribute" do
+      expect(klass.indexer).to eq ActiveFedora::IndexingService
+      klass.indexer = indexing_class
+      expect(klass.indexer).to eq indexing_class
+    end
+  end
+
   context "internal methods" do
     before :all do
       class SpecNode
@@ -52,13 +66,13 @@ describe ActiveFedora::Indexing do
       expect(test_object).to receive(:modified_date).and_return(DateTime.parse("2012-03-07T03:12:02Z")).twice
       allow(test_object).to receive(:id).and_return('changeme:123')
       solr_doc = test_object.to_solr
-      expect(solr_doc[ActiveFedora::SolrQueryBuilder.solr_name("system_create", :stored_sortable, type: :date)]).to eql("2012-03-04T03:12:02Z")
-      expect(solr_doc[ActiveFedora::SolrQueryBuilder.solr_name("system_modified", :stored_sortable, type: :date)]).to eql("2012-03-07T03:12:02Z")
+      expect(solr_doc[ActiveFedora.index_field_mapper.solr_name("system_create", :stored_sortable, type: :date)]).to eql("2012-03-04T03:12:02Z")
+      expect(solr_doc[ActiveFedora.index_field_mapper.solr_name("system_modified", :stored_sortable, type: :date)]).to eql("2012-03-07T03:12:02Z")
       expect(solr_doc[:id]).to eql("changeme:123")
     end
 
     it "adds self.class as the :active_fedora_model" do
-      expect(subject[ActiveFedora::SolrQueryBuilder.solr_name("active_fedora_model", :stored_sortable)]).to eql "SpecNode"
+      expect(subject[ActiveFedora.index_field_mapper.solr_name("active_fedora_model", :stored_sortable)]).to eql "SpecNode"
     end
 
     context "with attached files" do

data/spec/unit/model_classifier_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+describe ActiveFedora::ModelClassifier do
+  module ParentClass
+    class SiblingClass
+    end
+    class OtherSiblingClass
+    end
+    class SubclassClass < SiblingClass
+    end
+  end
+
+  let(:class_names) { ["ParentClass::SiblingClass", "ParentClass::OtherSiblingClass", "ParentClass::SubclassClass", "ParentClass::NoSuchClass"] }
+  subject { described_class.new class_names }
+
+  describe ".class_from_string" do
+    it "returns class constants based on strings" do
+      expect(described_class.class_from_string("Om")).to eq Om
+      expect(described_class.class_from_string("ActiveFedora::RDF::IndexingService")).to eq ActiveFedora::RDF::IndexingService
+      expect(described_class.class_from_string("IndexingService", ActiveFedora::RDF)).to eq ActiveFedora::RDF::IndexingService
+    end
+
+    it "finds sibling classes" do
+      expect(described_class.class_from_string("SiblingClass", ParentClass::OtherSiblingClass)).to eq ParentClass::SiblingClass
+    end
+
+    it "raises a NameError if the class isn't found" do
+      expect {
+        described_class.class_from_string("FooClass", ParentClass::OtherSiblingClass)
+      }.to raise_error NameError, /uninitialized constant (Object::)?FooClass/
+    end
+  end
+
+  describe '#models' do
+    it 'converts class names to classes' do
+      expect(subject.models).to match_array [ParentClass::SiblingClass, ParentClass::OtherSiblingClass, ParentClass::SubclassClass]
+    end
+  end
+
+  describe '#best_model' do
+    it 'selects the most specific matching model' do
+      expect(subject.best_model(default: nil)).to eq ParentClass::SubclassClass
+    end
+
+    it 'filters models to subclasses of the default' do
+      expect(subject.best_model(default: ActiveFedora::Base)).to eq ActiveFedora::Base
+    end
+  end
+end

data/spec/unit/model_spec.rb

@@ -27,13 +27,4 @@ describe ActiveFedora::Model do
       it { should eq 'search' }
     end
   end
-
-  describe ".from_class_uri" do
-    subject { described_class.from_class_uri(uri) }
-    context "a blank string" do
-      before { expect(ActiveFedora::Base.logger).to receive(:warn) }
-      let(:uri) { '' }
-      it { should be_nil }
-    end
-  end
 end

data/spec/unit/ntriples_datastream_spec.rb

@@ -216,25 +216,25 @@ EOF
       describe ".to_solr()" do
         subject { @obj.to_solr({}, name: 'solrRdf') }
         it "returns the right fields" do
-          expect(subject.keys).to include(ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__related_url", type: :string),
-                                          ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__publisher", type: :string),
-                                          ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__publisher", :sortable),
-                                          ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__publisher", :facetable),
-                                          ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__created", :sortable, type: :date),
-                                          ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__created", :displayable),
-                                          ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__title", type: :string),
-                                          ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__title", :sortable),
-                                          ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__based_near", type: :string),
-                                          ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__based_near", :facetable))
+          expect(subject.keys).to include(ActiveFedora.index_field_mapper.solr_name("solr_rdf__related_url", type: :string),
+                                          ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", type: :string),
+                                          ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", :sortable),
+                                          ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", :facetable),
+                                          ActiveFedora.index_field_mapper.solr_name("solr_rdf__created", :sortable, type: :date),
+                                          ActiveFedora.index_field_mapper.solr_name("solr_rdf__created", :displayable),
+                                          ActiveFedora.index_field_mapper.solr_name("solr_rdf__title", type: :string),
+                                          ActiveFedora.index_field_mapper.solr_name("solr_rdf__title", :sortable),
+                                          ActiveFedora.index_field_mapper.solr_name("solr_rdf__based_near", type: :string),
+                                          ActiveFedora.index_field_mapper.solr_name("solr_rdf__based_near", :facetable))
         end
 
         it "returns the right values" do
-          expect(subject[ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__related_url", type: :string)]).to eq ["http://example.org/blogtastic/"]
-          expect(subject[ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__based_near", type: :string)]).to eq ["Tacoma, WA", "Renton, WA"]
-          expect(subject[ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__based_near", :facetable)]).to eq ["Tacoma, WA", "Renton, WA"]
-          expect(subject[ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__publisher", type: :string)]).to eq ["Bob's Blogtastic Publishing"]
-          expect(subject[ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__publisher", :sortable)]).to eq "Bob's Blogtastic Publishing"
-          expect(subject[ActiveFedora::SolrQueryBuilder.solr_name("solr_rdf__publisher", :facetable)]).to eq ["Bob's Blogtastic Publishing"]
+          expect(subject[ActiveFedora.index_field_mapper.solr_name("solr_rdf__related_url", type: :string)]).to eq ["http://example.org/blogtastic/"]
+          expect(subject[ActiveFedora.index_field_mapper.solr_name("solr_rdf__based_near", type: :string)]).to eq ["Tacoma, WA", "Renton, WA"]
+          expect(subject[ActiveFedora.index_field_mapper.solr_name("solr_rdf__based_near", :facetable)]).to eq ["Tacoma, WA", "Renton, WA"]
+          expect(subject[ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", type: :string)]).to eq ["Bob's Blogtastic Publishing"]
+          expect(subject[ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", :sortable)]).to eq "Bob's Blogtastic Publishing"
+          expect(subject[ActiveFedora.index_field_mapper.solr_name("solr_rdf__publisher", :facetable)]).to eq ["Bob's Blogtastic Publishing"]
         end
       end
     end

data/spec/unit/om_datastream_spec.rb

@@ -257,16 +257,16 @@ describe ActiveFedora::OmDatastream do
   end
 
   describe '.has_solr_name?' do
-    let(:name0_role0) { ActiveFedora::SolrQueryBuilder.solr_name("desc_metadata__name_0_role_0_roleTerm", type: :string) }
-    let(:name1_role1) { ActiveFedora::SolrQueryBuilder.solr_name("desc_metadata__name_1_role_1_roleTerm", type: :string) }
+    let(:name0_role0) { ActiveFedora.index_field_mapper.solr_name("desc_metadata__name_0_role_0_roleTerm", type: :string) }
+    let(:name1_role1) { ActiveFedora.index_field_mapper.solr_name("desc_metadata__name_1_role_1_roleTerm", type: :string) }
     let(:solr_doc) do
       { "id" => "mods_article1",
-        ActiveFedora::SolrQueryBuilder.solr_name("desc_metadata__name_role_roleTerm", type: :string) => ["creator", "submitter", "teacher"],
-        ActiveFedora::SolrQueryBuilder.solr_name("desc_metadata__name_0_role", type: :string) => "\r\ncreator\r\nsubmitter\r\n",
-        ActiveFedora::SolrQueryBuilder.solr_name("desc_metadata__name_1_role", type: :string) => "\r\n teacher \r\n",
+        ActiveFedora.index_field_mapper.solr_name("desc_metadata__name_role_roleTerm", type: :string) => ["creator", "submitter", "teacher"],
+        ActiveFedora.index_field_mapper.solr_name("desc_metadata__name_0_role", type: :string) => "\r\ncreator\r\nsubmitter\r\n",
+        ActiveFedora.index_field_mapper.solr_name("desc_metadata__name_1_role", type: :string) => "\r\n teacher \r\n",
         name0_role0 => "creator",
-        ActiveFedora::SolrQueryBuilder.solr_name("desc_metadata__name_0_role_1_roleTerm", type: :string) => "submitter",
-        ActiveFedora::SolrQueryBuilder.solr_name("desc_metadata__name_1_role_0_roleTerm", type: :string) => ["teacher"] }
+        ActiveFedora.index_field_mapper.solr_name("desc_metadata__name_0_role_1_roleTerm", type: :string) => "submitter",
+        ActiveFedora.index_field_mapper.solr_name("desc_metadata__name_1_role_0_roleTerm", type: :string) => ["teacher"] }
     end
 
     it "returns true if the given key exists in the solr document passed in" do

data/spec/unit/qualified_dublin_core_datastream_spec.rb

@@ -94,7 +94,7 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
       @test_ds = described_class.new
       @test_ds.title = "War and Peace"
       solr = @test_ds.to_solr
-      expect(solr[ActiveFedora::SolrQueryBuilder.solr_name('title', type: :string)]).to eq "War and Peace"
+      expect(solr[ActiveFedora.index_field_mapper.solr_name('title', type: :string)]).to eq "War and Peace"
     end
   end
 

data/spec/unit/query_result_builder_spec.rb

@@ -3,20 +3,14 @@ require 'spec_helper'
 describe ActiveFedora::QueryResultBuilder do
   describe "reify solr results" do
     before(:all) do
-      class AudioRecord
+      class AudioRecord < ActiveFedora::Base
         attr_accessor :id
         def self.connection_for_id(_id)
         end
       end
-      @sample_solr_hits = [{ "id" => "my:_ID1_", ActiveFedora::SolrQueryBuilder.solr_name("has_model", :symbol) => ["AudioRecord"] },
-                           { "id" => "my:_ID2_", ActiveFedora::SolrQueryBuilder.solr_name("has_model", :symbol) => ["AudioRecord"] },
-                           { "id" => "my:_ID3_", ActiveFedora::SolrQueryBuilder.solr_name("has_model", :symbol) => ["AudioRecord"] }]
-    end
-    describe ".reify_solr_result" do
-      it "uses .find to instantiate objects" do
-        expect(AudioRecord).to receive(:find).with("my:_ID1_", cast: true)
-        described_class.reify_solr_result(@sample_solr_hits.first)
-      end
+      @sample_solr_hits = [{ "id" => "my:_ID1_", ActiveFedora.index_field_mapper.solr_name("has_model", :symbol) => ["AudioRecord"] },
+                           { "id" => "my:_ID2_", ActiveFedora.index_field_mapper.solr_name("has_model", :symbol) => ["AudioRecord"] },
+                           { "id" => "my:_ID3_", ActiveFedora.index_field_mapper.solr_name("has_model", :symbol) => ["AudioRecord"] }]
     end
     describe ".reify_solr_results" do
       it "uses AudioRecord.find to instantiate objects" do