active-fedora 5.7.1 → 6.0.0.pre1

data/spec/integration/ntriples_datastream_spec.rb

@@ -68,15 +68,15 @@ describe ActiveFedora::NtriplesRDFDatastream do
     subject.date_uploaded = Date.parse('2012-11-02')
     subject.date_uploaded.first.should be_kind_of Date
     solr_document = subject.to_solr
-    solr_document[ActiveFedora::SolrService.solr_name('rdf__date_uploaded', :date, :searchable)].should == ['2012-11-02T00:00:00Z']
+    solr_document[ActiveFedora::SolrService.solr_name('rdf__date_uploaded', type: :date)].should == ['2012-11-02T00:00:00Z']
   end
 
   it "should produce a solr document" do
     @subject = RdfTest.new(title: "War and Peace")
     solr_document = @subject.to_solr
-    solr_document[ActiveFedora::SolrService.solr_name('rdf__title', :string, :displayable)].should == ["War and Peace"]
-    solr_document[ActiveFedora::SolrService.solr_name('rdf__title', :string, :facetable)].should == ["War and Peace"]
-    solr_document[ActiveFedora::SolrService.solr_name('rdf__title', :string, :searchable)].should == ["War and Peace"]
+    solr_document[ActiveFedora::SolrService.solr_name('rdf__title', :displayable)].should == ["War and Peace"]
+    solr_document[ActiveFedora::SolrService.solr_name('rdf__title', :facetable)].should == ["War and Peace"]
+    solr_document[ActiveFedora::SolrService.solr_name('rdf__title', type: :string)].should == ["War and Peace"]
   end
 
   it "should set and recall values" do

data/spec/integration/om_datastream_spec.rb

@@ -26,6 +26,7 @@ describe ActiveFedora::OmDatastream do
       @test_object = HydrangeaArticle2.find(@pid)
 
       @test_object.descMetadata.ng_xml = @test_object.descMetadata.ng_xml
+
       @test_object.descMetadata.should_not be_changed
     end
 
@@ -118,7 +119,7 @@ describe ActiveFedora::OmDatastream do
 
     end
     it "should solrize terms with :type=>'date' to *_dt solr terms" do
-      @test_object.to_solr[ActiveFedora::SolrService.solr_name('mods_journal_issue_publication_date', :date)].should == ['2012-11-02T00:00:00Z']
+      @test_object.to_solr[ActiveFedora::SolrService.solr_name('mods_journal_issue_publication_date', type: :date)].should == ['2012-11-02T00:00:00Z']
     end
   end
 end

data/spec/integration/rels_ext_datastream_spec.rb

@@ -74,95 +74,7 @@ describe ActiveFedora::RelsExtDatastream do
     # make sure that _something_ was actually added to the object's relationships hash
     @test_object.ids_for_outbound(:is_member_of).size.should == 1
     new_rels = ActiveFedora::Base.find(@test_object.pid).relationships
-
-    new_rels.to_a.each do |stmt|
-      @test_object.relationships.should have_statement(stmt)
-    end
-
-
-    @test_object.relationships.to_a.each do |stmt|
-      new_rels.should have_statement(stmt)
-    end
-
- #   new_rels.should == @test_object.relationships
+    new_rels.should == @test_object.relationships
   end
 
-  describe '#from_solr' do     
-   before(:all) do
-        @behavior = ActiveFedora::Relationships.deprecation_behavior
-        @c_behavior = ActiveFedora::Relationships::ClassMethods.deprecation_behavior
-        ActiveFedora::Relationships.deprecation_behavior = :silence
-        ActiveFedora::Relationships::ClassMethods.deprecation_behavior = :silence
-      end
-  
-      after :all do
-        ActiveFedora::Relationships.deprecation_behavior = @behavior
-        ActiveFedora::Relationships::ClassMethods.deprecation_behavior = @c_behavior
-      end
-    before do
-      class MockAFRelsSolr < ActiveFedora::Base
-        include ActiveFedora::FileManagement
-        has_relationship "testing", :has_part, :type=>MockAFRelsSolr
-        has_relationship "testing2", :has_member, :type=>MockAFRelsSolr
-        has_relationship "testing_inbound", :has_part, :type=>MockAFRelsSolr, :inbound=>true
-        has_relationship "testing_inbound2", :has_member, :type=>MockAFRelsSolr, :inbound=>true
-      end
-    end
-    it "should respond_to from_solr" do
-      @test_datastream.respond_to?(:from_solr).should be_true
-    end
-    
-    it 'should populate the relationships hash based on data in solr only for any possible fedora predicates' do
-      @test_object2 = MockAFRelsSolr.new
-      #@test_object2.new_object = true
-      @test_object2.save
-      @test_object3 = MockAFRelsSolr.new
-      #@test_object3.new_object = true
-      @test_object3.save
-      @test_object4 = MockAFRelsSolr.new
-      #@test_object4.new_object = true
-      @test_object4.save
-      @test_object5 = MockAFRelsSolr.new
-      #@test_object5.new_object = true
-      @test_object5.save
-      #append to named relationship 'testing'
-      @test_object2.testing_append(@test_object3)
-      @test_object2.testing2_append(@test_object4)
-      @test_object5.testing_append(@test_object2)
-      @test_object5.testing2_append(@test_object3)
-      @test_object2.save
-      @test_object5.save
-      model_rel = MockAFRelsSolr.to_class_uri
-      #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
-      #get solr doc for @test_object2
-      solr_doc = MockAFRelsSolr.find_with_conditions(:id=>@test_object2.pid).first
-      test_from_solr_object2 = MockAFRelsSolr.new
-      test_from_solr_object2.rels_ext.from_solr(solr_doc)
-      solr_doc = MockAFRelsSolr.find_with_conditions(:id=>@test_object3.pid).first
-      test_from_solr_object3 = MockAFRelsSolr.new
-      test_from_solr_object3.rels_ext.from_solr(solr_doc)
-      solr_doc = MockAFRelsSolr.find_with_conditions(:id=>@test_object4.pid).first
-      test_from_solr_object4 = MockAFRelsSolr.new
-      test_from_solr_object4.rels_ext.from_solr(solr_doc)
-      solr_doc = MockAFRelsSolr.find_with_conditions(:id=>@test_object5.pid).first
-      test_from_solr_object5 = MockAFRelsSolr.new
-      test_from_solr_object5.rels_ext.from_solr(solr_doc)
-      
-      test_from_solr_object2.object_relations[:has_part].should include @test_object3.internal_uri
-      test_from_solr_object2.object_relations[:has_member].should include @test_object4.internal_uri
-      test_from_solr_object2.object_relations[:has_model].should include model_rel
-
-      test_from_solr_object2.relationships_by_name.should == {:self=>{"testing"=>[@test_object3.internal_uri],"testing2"=>[@test_object4.internal_uri], "collection_members"=>[], "part_of"=>[], "parts_outbound"=>[@test_object3.internal_uri]}}
-      test_from_solr_object3.object_relations[:has_model].should include model_rel
-      test_from_solr_object3.relationships_by_name.should == {:self=>{"testing2"=>[], "collection_members"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[]}}
-      test_from_solr_object4.object_relations[:has_model].should include model_rel
-      test_from_solr_object4.relationships_by_name.should == {:self=>{"testing2"=>[], "collection_members"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[]}}
-
-      test_from_solr_object5.object_relations[:has_model].should include model_rel
-      test_from_solr_object5.object_relations[:has_part].should include @test_object2.internal_uri
-      test_from_solr_object5.object_relations[:has_member].should include @test_object3.internal_uri
-
-      test_from_solr_object5.relationships_by_name.should == {:self=>{"testing2"=>[@test_object3.internal_uri], "collection_members"=>[], "part_of"=>[], "testing"=>[@test_object2.internal_uri], "parts_outbound"=>[@test_object2.internal_uri]}} 
-    end
-  end
 end

data/spec/integration/scoped_query_spec.rb

@@ -15,7 +15,7 @@ describe ActiveFedora::Model do
 
         def to_solr(doc = {})
           doc = super
-          doc[ActiveFedora::SolrService.solr_name('foo', :string, :sortable)] = doc[ActiveFedora::SolrService.solr_name('foo', :string, :searchable)]
+          doc[ActiveFedora::SolrService.solr_name('foo', :sortable)] = doc[ActiveFedora::SolrService.solr_name('foo', type: :string)]
           doc
         end
       
@@ -71,18 +71,18 @@ describe ActiveFedora::Model do
       @test_instance3.delete
     end
     it "should query" do
-      ModelIntegrationSpec::Basic.where(ActiveFedora::SolrService.solr_name('foo', :string, :searchable)=> 'Beta').should == [@test_instance1]
+      ModelIntegrationSpec::Basic.where(ActiveFedora::SolrService.solr_name('foo', type: :string)=> 'Beta').should == [@test_instance1]
       ModelIntegrationSpec::Basic.where('foo' => 'Beta').should == [@test_instance1]
     end
     it "should order" do
-      ModelIntegrationSpec::Basic.order(ActiveFedora::SolrService.solr_name('foo', :string, :sortable) + ' asc').should == [@test_instance2, @test_instance1, @test_instance3]
+      ModelIntegrationSpec::Basic.order(ActiveFedora::SolrService.solr_name('foo', :sortable) + ' asc').should == [@test_instance2, @test_instance1, @test_instance3]
     end
     it "should limit" do
       ModelIntegrationSpec::Basic.limit(1).should == [@test_instance1]
     end
 
     it "should chain them" do
-      ModelIntegrationSpec::Basic.where(ActiveFedora::SolrService.solr_name('bar', :string, :searchable) => 'Peanuts').order(ActiveFedora::SolrService.solr_name('foo', :string, :sortable) + ' asc').limit(1).should == [@test_instance2]
+      ModelIntegrationSpec::Basic.where(ActiveFedora::SolrService.solr_name('bar', type: :string) => 'Peanuts').order(ActiveFedora::SolrService.solr_name('foo', :sortable) + ' asc').limit(1).should == [@test_instance2]
     end
   end
 end

data/spec/samples/hydra-mods_article_datastream.rb

@@ -508,8 +508,8 @@ module Hydra
     def to_solr(solr_doc=Hash.new)
       super(solr_doc)
             
-      ::Solrizer::Extractor.insert_solr_field_value(solr_doc, Solrizer.default_field_mapper.solr_name('object_type', :string, :facetable), "Article")
-      ::Solrizer::Extractor.insert_solr_field_value(solr_doc, Solrizer.default_field_mapper.solr_name('mods_journal_title_info', :string, :facetable), "Unknown") if solr_doc["mods_journal_title_info_facet"].nil? 
+      ::Solrizer::Extractor.insert_solr_field_value(solr_doc, Solrizer.default_field_mapper.solr_name('object_type', :facetable), "Article")
+      ::Solrizer::Extractor.insert_solr_field_value(solr_doc, Solrizer.default_field_mapper.solr_name('mods_journal_title_info', :facetable), "Unknown") if solr_doc["mods_journal_title_info_facet"].nil? 
 
       solr_doc
     end

data/spec/spec_helper.rb

@@ -2,6 +2,9 @@ ENV["environment"] ||= 'test'
 require "bundler/setup"
 
 require 'simplecov'
+require 'simplecov-rcov'
+
+SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
 SimpleCov.start
 
 require 'active-fedora'

data/spec/unit/base_spec.rb

@@ -392,16 +392,16 @@ describe ActiveFedora::Base do
         @test_object.should_receive(:create_date).and_return("2012-03-04T03:12:02Z")
         @test_object.should_receive(:modified_date).and_return("2012-03-07T03:12:02Z")
         solr_doc = @test_object.to_solr
-        solr_doc[ActiveFedora::SolrService.solr_name("system_create", :date, :searchable)].should eql("2012-03-04T03:12:02Z")
-        solr_doc[ActiveFedora::SolrService.solr_name("system_modified", :date, :searchable)].should eql("2012-03-07T03:12:02Z")
+        solr_doc[ActiveFedora::SolrService.solr_name("system_create", type: :date)].should eql("2012-03-04T03:12:02Z")
+        solr_doc[ActiveFedora::SolrService.solr_name("system_modified", type: :date)].should eql("2012-03-07T03:12:02Z")
         solr_doc[:id].should eql("#{@test_object.pid}")
       end
 
       it "should omit base metadata and RELS-EXT if :model_only==true" do
         @test_object.add_relationship(:has_part, "foo", true)
         solr_doc = @test_object.to_solr(Hash.new, :model_only => true)
-        solr_doc[ActiveFedora::SolrService.solr_name("system_create", :date, :searchable)].should be_nil
-        solr_doc[ActiveFedora::SolrService.solr_name("system_modified", :date, :searchable)].should be_nil
+        solr_doc[ActiveFedora::SolrService.solr_name("system_create", type: :date)].should be_nil
+        solr_doc[ActiveFedora::SolrService.solr_name("system_modified", type: :date)].should be_nil
         solr_doc["id"].should be_nil
         solr_doc[ActiveFedora::SolrService.solr_name("has_part", :symbol)].should be_nil
       end
@@ -540,87 +540,13 @@ pending "This is broken, and deprecated.  I don't want to fix it - jcoyne"
     end
 
     describe '#relationships_by_name' do
-      before(:all) do
-        @behavior = ActiveFedora::Relationships.deprecation_behavior
-        @c_behavior = ActiveFedora::Relationships::ClassMethods.deprecation_behavior
-        ActiveFedora::Relationships.deprecation_behavior = :silence
-        ActiveFedora::Relationships::ClassMethods.deprecation_behavior = :silence
-      end
-  
-      after :all do
-        ActiveFedora::Relationships.deprecation_behavior = @behavior
-        ActiveFedora::Relationships::ClassMethods.deprecation_behavior = @c_behavior
-      end
-
       before do
         class MockNamedRelationships < ActiveFedora::Base
-          include ActiveFedora::FileManagement
-          has_relationship "testing", :has_part, :type=>ActiveFedora::Base
-          has_relationship "testing2", :has_member, :type=>ActiveFedora::Base
-          has_relationship "testing_inbound", :has_part, :type=>ActiveFedora::Base, :inbound=>true
+          # has_relationship "testing", :has_part, :type=>ActiveFedora::Base
+          # has_relationship "testing2", :has_member, :type=>ActiveFedora::Base
+          # has_relationship "testing_inbound", :has_part, :type=>ActiveFedora::Base, :inbound=>true
         end
       end
-      
-      it 'should return current relationships by name' do
-        next_pid = increment_pid.to_s
-        ActiveFedora::Base.stub(:assign_pid).and_return(next_pid)
-        stub_get(next_pid)
-        @test_object2 = MockNamedRelationships.new
-        @test_object2.add_relationship(:has_model, MockNamedRelationships.to_class_uri)
-        @test_object.add_relationship(:has_model, ActiveFedora::Base.to_class_uri)
-        #should return expected named relationships
-        @test_object2.relationships_by_name
-        @test_object2.relationships_by_name[:self]["testing"].should == []
-        @test_object2.relationships_by_name[:self]["testing2"].should == []
-        @test_object2.relationships_by_name[:self]["parts_outbound"].should == []
-        @test_object2.add_relationship_by_name("testing",@test_object)
-        # @test_object2.relationships_by_name.should == {:self=>{"testing"=>[@test_object.internal_uri],"testing2"=>[],"part_of"=>[], "parts_outbound"=>[@test_object.internal_uri], "collection_members"=>[]}}
-
-        @test_object2.relationships_by_name[:self]["testing"].should == [@test_object.internal_uri]
-        @test_object2.relationships_by_name[:self]["testing2"].should == []
-        @test_object2.relationships_by_name[:self]["parts_outbound"].should == [@test_object.internal_uri]
-      end 
-    end
-
-    
-    describe '#create_relationship_name_methods' do
-      before(:all) do
-        @behavior = ActiveFedora::Relationships.deprecation_behavior
-        @c_behavior = ActiveFedora::Relationships::ClassMethods.deprecation_behavior
-        ActiveFedora::Relationships.deprecation_behavior = :silence
-        ActiveFedora::Relationships::ClassMethods.deprecation_behavior = :silence
-      end
-  
-      after :all do
-        ActiveFedora::Relationships.deprecation_behavior = @behavior
-        ActiveFedora::Relationships::ClassMethods.deprecation_behavior = @c_behavior
-      end
-
-      before do
-        class MockCreateNamedRelationshipMethodsBase < ActiveFedora::Base
-          include ActiveFedora::Relationships
-          register_relationship_desc :self, "testing", :is_part_of, :type=>ActiveFedora::Base
-          create_relationship_name_methods "testing"
-        end
-      end
-        
-      it 'should append and remove using helper methods for each outbound relationship' do
-        next_pid = increment_pid.to_s
-        ActiveFedora::Base.stub(:assign_pid).and_return(next_pid)
-        stub_get(next_pid)
-        @test_object2 = MockCreateNamedRelationshipMethodsBase.new 
-        @test_object2.should respond_to(:testing_append)
-        @test_object2.should respond_to(:testing_remove)
-        #test executing each one to make sure code added is correct
-        model_pid =ActiveFedora::Base.to_class_uri
-        @test_object.add_relationship(:has_model,model_pid)
-        @test_object2.add_relationship(:has_model,model_pid)
-        @test_object2.testing_append(@test_object)
-        #create relationship to access generate_uri method for an object
-        @test_object2.relationships_by_name[:self]["testing"].should == [@test_object.internal_uri]
-        @test_object2.testing_remove(@test_object)
-        @test_object2.relationships_by_name[:self]["testing"].should == []
-      end
     end
 
     describe ".solrize_relationships" do

data/spec/unit/datastream_spec.rb

@@ -107,29 +107,4 @@ describe ActiveFedora::Datastream do
       @test_datastream.size.should be_nil
     end
   end
-  
-  describe ".from_xml" do
-    it "should load a FOXML datastream node" do
-      ds_xml = <<-EOS
-        <foxml:datastream ID="DC" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true" xmlns:foxml="info:fedora/fedora-system:def/foxml#">
-          <foxml:xmlContent>
-            <datastream ID="DC" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
-              <datastreamVersion ID="DC.1" LABEL="Dublin Core Record for this object" CREATED="2011-09-28T22:50:18.626Z" MIMETYPE="text/xml" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" SIZE="526">
-                <xmlContent>
-                  <oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-                    <dc:title>Title</dc:title>
-                    <dc:identifier>0123456789</dc:identifier>
-                  </oai_dc:dc>
-                </xmlContent>
-              </datastreamVersion>
-            </datastream>
-          </foxml:xmlContent>
-        </foxml:datastream>
-      EOS
-      ds_node = Nokogiri::XML(ds_xml).root
-      ds = ActiveFedora::Datastream.from_xml(@test_datastream, ds_node)
-      ds.should be_a(ActiveFedora::Datastream)
-    end
-  end
-
 end

data/spec/unit/has_many_collection_spec.rb

@@ -1,35 +1,10 @@
 require 'spec_helper'
 
 describe ActiveFedora::Associations::HasManyAssociation do
-  it "should call add_relationship" do
-    subject = stub("subject", :new_record? => false, :pid => 'subject:a', :internal_uri => 'info:fedora/subject:a')
-    predicate = stub(:klass => mock.class, :options=>{:property=>'predicate'}, :class_name=> nil)
-    ActiveFedora::SolrService.stub(:query).and_return([])
-    ac = ActiveFedora::Associations::HasManyAssociation.new(subject, predicate)
-    object = stub("object", :new_record? => false, :pid => 'object:b', :save => nil)
-  
-    object.should_receive(:add_relationship).with('predicate', subject)
- 
-    ac << object
-
-  end
-  
-  it "should call remove_relationship" do
-    subject = stub("subject", :new_record? => false, :pid => 'subject:a', :internal_uri => 'info:fedora/subject:a')
-    predicate = stub(:klass => mock.class, :options=>{:property=>'predicate'}, :class_name=> nil)
-    ActiveFedora::SolrService.stub(:query).and_return([])
-    ac = ActiveFedora::Associations::HasManyAssociation.new(subject, predicate)
-    object = stub("object", :new_record? => false, :pid => 'object:b', :save => nil)
-  
-    object.should_receive(:remove_relationship).with('predicate', subject)
- 
-    ac.delete(object)
-
-  end
-
   it "should be able to replace the collection" do
     @owner = stub(:new_record? => false, :to_ary => nil, :internal_uri => 'info:fedora/changeme:99')
-    @reflection = stub(:klass => mock.class, :options=>{:property=>'predicate'}, :class_name=> nil)
+    @reflection = stub(:klass => mock.class, :options=>{:property=>'predicate'})
+    #ac = ActiveFedora::Associations::AssociationCollection.new(@owner, @reflection)
     ac = ActiveFedora::Associations::HasManyAssociation.new(@owner, @reflection)
     @target = [stub(:to_ary => nil, :new_record? => false, :remove_relationship=>true), stub(:to_ary => nil, :new_record? => false, :remove_relationship=>true), stub(:to_ary => nil, :new_record? => false, :remove_relationship=>true)]
     ac.target = @target 

data/spec/unit/ntriples_datastream_spec.rb

@@ -9,7 +9,6 @@ describe ActiveFedora::NtriplesRDFDatastream do
           map.title(:in => RDF::DC)
           map.publisher(:in => RDF::DC)
           map.creator(:in => RDF::DC)
-          map.educationLevel(:in => RDF::DC)
           map.based_near(:in => RDF::FOAF)
           map.related_url(:to => "seeAlso", :in => RDF::RDFS)
         end
@@ -40,16 +39,6 @@ describe ActiveFedora::NtriplesRDFDatastream do
       @subject.related_url.should == ["http://google.com/"]
     end
 
-    it "should be able to call enumerable methods on the fields" do
-      @subject.title.join(', ').should == "Title of work"
-      @subject.title.count.should == 1 
-      @subject.title.size.should == 1 
-      @subject.title[0].should == "Title of work" 
-      @subject.title.to_a.should == ["Title of work"]
-      val = []
-      @subject.title.each_with_index {|v, i| val << "#{i}. #{v}"}
-      val.should == ["0. Title of work"]
-    end
 
     it "should return fields that are not TermProxies" do
       @subject.created.should be_kind_of Array
@@ -184,19 +173,19 @@ describe ActiveFedora::NtriplesRDFDatastream do
     end
     it "should iterate through @fields hash" do
       solr_doc = @subject.to_solr
-      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__publisher", :string, :searchable)].should == ["publisher1"]
-      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__publisher", :string, :sortable)].should == ["publisher1"]
-      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__publisher", :string, :displayable)].should == ["publisher1"]
-      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__publisher", :string, :facetable)].should == ["publisher1"]
-      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__based_near", :string, :searchable)].should == ["coverage1", "coverage2"]
-      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__based_near", :string, :displayable)].should == ["coverage1", "coverage2"]
-      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__based_near", :string, :facetable)].should == ["coverage1", "coverage2"]
-      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__created", :string, :sortable)].should == ["2009-10-10"]
-      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__created", :string, :displayable)].should == ["2009-10-10"]
-      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__title", :string, :searchable)].should == ["fake-title"]
-      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__title", :string, :sortable)].should == ["fake-title"]
-      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__title", :string, :displayable)].should == ["fake-title"]
-      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__related_url", :string, :searchable)].should == ["http://example.org/"]
+      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__publisher", type: :string)].should == ["publisher1"]
+      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__publisher", :sortable)].should == ["publisher1"]
+      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__publisher", :displayable)].should == ["publisher1"]
+      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__publisher", :facetable)].should == ["publisher1"]
+      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__based_near", type: :string)].should == ["coverage1", "coverage2"]
+      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__based_near", :displayable)].should == ["coverage1", "coverage2"]
+      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__based_near", :facetable)].should == ["coverage1", "coverage2"]
+      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__created", :sortable)].should == ["2009-10-10"]
+      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__created", :displayable)].should == ["2009-10-10"]
+      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__title", type: :string)].should == ["fake-title"]
+      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__title", :sortable)].should == ["fake-title"]
+      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__title", :displayable)].should == ["fake-title"]
+      solr_doc[ActiveFedora::SolrService.solr_name("solr_rdf__related_url", type: :string)].should == ["http://example.org/"]
     end
 
     describe "with an actual object" do
@@ -240,25 +229,25 @@ describe ActiveFedora::NtriplesRDFDatastream do
       end
       describe ".to_solr()" do
         it "should return the right fields" do
-          @obj.to_solr.keys.should include(ActiveFedora::SolrService.solr_name("solr_rdf__related_url", :string, :searchable),
-                ActiveFedora::SolrService.solr_name("solr_rdf__publisher", :string, :searchable),
-                ActiveFedora::SolrService.solr_name("solr_rdf__publisher", :string, :sortable),
-                ActiveFedora::SolrService.solr_name("solr_rdf__publisher", :string, :displayable),
-                ActiveFedora::SolrService.solr_name("solr_rdf__publisher", :string, :facetable), 
-                ActiveFedora::SolrService.solr_name("solr_rdf__created", :string, :sortable),
-                ActiveFedora::SolrService.solr_name("solr_rdf__created", :string, :displayable), 
-                ActiveFedora::SolrService.solr_name("solr_rdf__title", :string, :searchable),
-                ActiveFedora::SolrService.solr_name("solr_rdf__title", :string, :sortable),
-                ActiveFedora::SolrService.solr_name("solr_rdf__title", :string, :displayable),
-                ActiveFedora::SolrService.solr_name("solr_rdf__based_near", :string, :searchable),
-                ActiveFedora::SolrService.solr_name("solr_rdf__based_near", :string, :facetable),
-                ActiveFedora::SolrService.solr_name("solr_rdf__based_near", :string, :displayable))
+          @obj.to_solr.keys.should include(ActiveFedora::SolrService.solr_name("solr_rdf__related_url", type: :string),
+                ActiveFedora::SolrService.solr_name("solr_rdf__publisher", type: :string),
+                ActiveFedora::SolrService.solr_name("solr_rdf__publisher", :sortable),
+                ActiveFedora::SolrService.solr_name("solr_rdf__publisher", :displayable),
+                ActiveFedora::SolrService.solr_name("solr_rdf__publisher", :facetable), 
+                ActiveFedora::SolrService.solr_name("solr_rdf__created", :sortable),
+                ActiveFedora::SolrService.solr_name("solr_rdf__created", :displayable), 
+                ActiveFedora::SolrService.solr_name("solr_rdf__title", type: :string),
+                ActiveFedora::SolrService.solr_name("solr_rdf__title", :sortable),
+                ActiveFedora::SolrService.solr_name("solr_rdf__title", :displayable),
+                ActiveFedora::SolrService.solr_name("solr_rdf__based_near", type: :string),
+                ActiveFedora::SolrService.solr_name("solr_rdf__based_near", :facetable),
+                ActiveFedora::SolrService.solr_name("solr_rdf__based_near", :displayable))
 
         end
 
         it "should return the right values" do
-          @obj.to_solr[ActiveFedora::SolrService.solr_name("solr_rdf__related_url", :string, :searchable)].should == ["http://example.org/blogtastic/"]
-          @obj.to_solr[ActiveFedora::SolrService.solr_name("solr_rdf__based_near", :string, :searchable)].should == ["Tacoma, WA","Renton, WA"]
+          @obj.to_solr[ActiveFedora::SolrService.solr_name("solr_rdf__related_url", type: :string)].should == ["http://example.org/blogtastic/"]
+          @obj.to_solr[ActiveFedora::SolrService.solr_name("solr_rdf__based_near", type: :string)].should == ["Tacoma, WA","Renton, WA"]
         end
       end
     end