active-fedora 3.3.2 → 4.0.0.rc1

data/lib/active_fedora/rels_ext_datastream.rb

@@ -57,7 +57,8 @@ module ActiveFedora
     end
 
     def self.short_predicate(predicate)
-      if match = /^(#{Predicates.predicate_mappings.keys.join('|')})(.+)$/.match(predicate.to_str)
+      # for this regex to short-circuit correctly, namespaces must be sorted into descending order by length
+      if match = /^(#{Predicates.predicate_mappings.keys.sort.reverse.join('|')})(.+)$/.match(predicate.to_str)
         namespace = match[1]
         predicate = match[2]
         pred = Predicates.predicate_mappings[namespace].invert[predicate]
@@ -78,18 +79,21 @@ module ActiveFedora
     # ====Warning
     #  Solr must be synchronized with RELS-EXT data in Fedora.
     def from_solr(solr_doc)
+      profile_from_solr(solr_doc)
       #cycle through all possible predicates
       model.relationships_loaded = true
-      Predicates.predicate_mappings[Predicates.default_predicate_namespace].keys.each do |predicate|
-        predicate_symbol = ActiveFedora::SolrService.solr_name(predicate, :symbol)
-        value = (solr_doc[predicate_symbol].nil? ? solr_doc[predicate_symbol.to_s]: solr_doc[predicate_symbol]) 
-        unless value.nil? 
-          if value.is_a? Array
-            value.each do |obj|
-              model.add_relationship(predicate, obj)
+      Predicates.predicate_mappings.each_pair do |namespace,predicates|
+        predicates.keys.each do |predicate|
+          predicate_symbol = ActiveFedora::SolrService.solr_name(predicate, :symbol)
+          value = (solr_doc[predicate_symbol].nil? ? solr_doc[predicate_symbol.to_s]: solr_doc[predicate_symbol]) 
+          unless value.nil? 
+            if value.is_a? Array
+              value.each do |obj|
+                model.add_relationship(predicate, obj)
+              end
+            else
+              model.add_relationship(predicate, value)
             end
-          else
-            model.add_relationship(predicate, value)
           end
         end
       end

data/lib/active_fedora/rubydora_connection.rb

@@ -1,29 +1,16 @@
-require 'singleton'
 require 'rubydora'
 
 module ActiveFedora
   class RubydoraConnection
-    include Singleton
     
-    attr_accessor :options
+    attr_accessor :options, :connection
 
-    def self.connect(params={})
+    def initialize(params={})
       params = params.dup
-      instance = self.instance
-      force = params.delete(:force)
-      instance.options = params
-      instance.connect force
-      instance
+      self.options = params
+      connect
     end
 
-    def connection
-      return @connection if @connection
-      ActiveFedora.load_configs
-      ActiveFedora::RubydoraConnection.connect(ActiveFedora.config_for_environment)
-      @connection
-    end
-    
-
     def connect(force=false)
       return unless @connection.nil? or force
       allowable_options = [:url, :user, :password, :timeout, :open_timeout, :ssl_client_cert, :ssl_client_key, :validateChecksum]
@@ -31,15 +18,5 @@ module ActiveFedora
       #puts "CLIENT OPTS #{client_options.inspect}"
       @connection = Rubydora.connect client_options
     end
-
-    def nextid(attrs={})
-      d = REXML::Document.new(connection.next_pid(:namespace=>attrs[:namespace]))
-      d.elements['//pid'].text
-    end
-
-    def find_model(pid, klass)
-      klass.allocate.init_with(DigitalObject.find(klass, pid))
-    end
-
   end
 end

data/lib/active_fedora/service_definitions.rb

@@ -59,7 +59,7 @@ module ServiceDefinitions
     # inject methods by symbol key
     def add_sdef_methods! sdef_pid
       unless sdef_pid == "fedora-system:3"
-        content = ActiveFedora::RubydoraConnection.instance.connection.datastream_dissemination(:pid=>sdef_pid, :dsid=>"METHODMAP")
+        content = ActiveFedora::Base.connection_for_pid(sdef_pid).datastream_dissemination(:pid=>sdef_pid, :dsid=>"METHODMAP")
         method_map = Nokogiri::XML.parse(content)
         methods = method_map.xpath('//fmm:Method').collect { |method|
           method["operationName"]
@@ -78,9 +78,8 @@ module ServiceDefinitions
         define_method(method_key) { |*args, &block|
             opts = args[0] || {}
             opts = opts.merge({:pid => pid, :sdef => sdef_pid, :method => method_name })
-            repo = ActiveFedora::RubydoraConnection.instance.connection
           # dispatch to the dissemination method on restAPI client
-            repo.dissemination opts, &block
+            ActiveFedora::Base.connection_for_pid(pid).dissemination opts, &block
         }
       end
     end

data/lib/active_fedora/solr_digital_object.rb

@@ -1,19 +1,33 @@
 module ActiveFedora
   class SolrDigitalObject
-    attr_accessor :pid, :attributes, :datastreams
+    attr_reader :pid, :label, :state, :ownerId, :profile, :datastreams
     
-    def initialize(attr)
-      self.datastreams = {}
-      self.attributes = attr
-      self.pid = attr[:pid]
+    def initialize(solr_doc)
+      @pid = solr_doc[SOLR_DOCUMENT_ID]
+      profile_attrs = solr_doc.keys.select { |k| k =~ /^objProfile_/ }
+      @profile = {}
+      profile_attrs.each do |key|
+        attr_name = key.split(/_/)[1..-2].join('_')
+        @profile[attr_name] = solr_doc[key].to_s
+      end
+      @profile['objCreateDate'] ||= Time.now.xmlschema
+      @profile['objLastModDate'] ||= @profile['objCreateDate']
+      
+      @datastreams = {}
+      @label = @profile['objLabel']
+      @state = @profile['objState']
+      @ownerId = @profile['objOwnerId']
     end
 
+    def freeze
+      @profile.freeze
+      @datastreams.freeze
+      self
+    end
+    
     def new?
       false
     end
 
-    def profile
-      attributes
-    end
   end
 end

data/lib/active_fedora/solr_service.rb

@@ -42,7 +42,7 @@ module ActiveFedora
         if opts[:load_from_solr]
           results << classname.load_instance_from_solr(hit[SOLR_DOCUMENT_ID])
         else
-          results << ActiveFedora::RubydoraConnection.instance.find_model(hit[SOLR_DOCUMENT_ID], classname)
+          results << classname.find(hit[SOLR_DOCUMENT_ID])
         end
       end
       return results

data/lib/active_fedora/unsaved_digital_object.rb

@@ -32,10 +32,7 @@ module ActiveFedora
 
     def assign_pid
         return @pid if @pid
-        args = {}
-        args[:namespace] = self.namespace if self.namespace
-        @pid = RubydoraConnection.instance.nextid args
-        @pid
+        self.original_class.assign_pid(self)
     end
 
 

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "3.3.2"
+    VERSION = "4.0.0.rc1"
 end

data/lib/tasks/active_fedora.rake

@@ -19,7 +19,7 @@ namespace :repo do
       rescue Errno::ECONNREFUSED => e
         puts "Can't connect to Fedora! Are you sure jetty is running?"
       end
-      puts "Deleted '#{pid}' from #{ActiveFedora.fedora_config[:url]}"
+      puts "Deleted '#{pid}' from #{ActiveFedora::Base.connection_for_pid(pid).client.url}"
     end
   end
   
@@ -40,7 +40,7 @@ namespace :repo do
       rescue ActiveFedora::ObjectNotFoundError
         # The object has already been deleted (or was never created).  Do nothing.
       end
-      puts "Deleted '#{pid}' from #{ActiveFedora.fedora_config[:url]}"
+      puts "Deleted '#{pid}' from #{ActiveFedora::Base.connection_for_pid(pid).client.url}"
       i += 1
     end
   end
@@ -51,7 +51,7 @@ namespace :repo do
       puts "You must specify a valid pid.  Example: rake repo:export pid=demo:12"
     else
       pid = ENV["pid"]
-      puts "Exporting '#{pid}' from #{ActiveFedora.fedora_config[:url]}"
+      puts "Exporting '#{pid}' from #{ActiveFedora::Base.connection_for_pid(pid).client.url}"
       if !ENV["path"].nil?
         path = ENV["path"]
       else
@@ -78,12 +78,12 @@ namespace :repo do
     end
     
     if !filename.nil?
-      puts "Loading '#{filename}' in #{ActiveFedora.fedora_config[:url]}"
+      puts "Loading '#{filename}' in #{ActiveFedora::Base.connection_for_pid(pid).client.url}"
       file = File.new(filename, "r")
-      result = ActiveFedora::RubydoraConnection.instance.connection.ingest(:file=>file.read)
+      result = ActiveFedora::Base.connection_for_pid(pid).ingest(:file=>file.read)
       if result
         puts "The object has been loaded as #{result.body}"
-	if pid.nil?
+      	if pid.nil?
           pid = result.body
         end
         solrizer = Solrizer::Fedora::Solrizer.new 

data/lib/tasks/active_fedora_dev.rake

@@ -82,7 +82,6 @@ desc 'Set up ActiveFedora environment.  !! Only for use while working within a w
 task :environment do
   puts "Initializing ActiveFedora Rake environment.  This should only be called when working within a workign copy of the active-fedora code."
   require "#{APP_ROOT}/spec/samples/models/hydrangea_article"
-  require 'active_fedora/samples'
 end
 
 end

data/spec/fixtures/mixed_rdf_descMetadata.nt

@@ -0,0 +1,6 @@
+<info:fedora/test:1> <http://purl.org/dc/terms/created> "2010-12-31"^^<http://www.w3.org/2001/XMLSchema#date> .
+<info:fedora/test:1> <http://purl.org/dc/terms/title> "Title of work" .
+<info:fedora/test:1> <http://purl.org/dc/terms/publisher> "Penn State" .
+<info:fedora/test:1> <http://xmlns.com/foaf/0.1/based_near> "New York, NY, US" .
+<info:fedora/test:1> <http://www.w3.org/2000/01/rdf-schema#seeAlso> <http://google.com/> .
+

data/spec/fixtures/rails_root/config/fedora.yml

@@ -1,2 +1,4 @@
 test:
-  url: http://fedoraAdmin:fedoraAdmin@testhost.com:8983/fedora
+  user: fedoraAdmin
+  password: fedoraAdmin
+  url: http://testhost.com:8983/fedora

data/spec/fixtures/sharded_fedora.yml

@@ -0,0 +1,11 @@
+test:
+- user: fedoraAdmin
+  password: fedoraAdmin
+  url: http://127.0.0.1:8983/fedora1 
+- user: fedoraAdmin
+  password: fedoraAdmin
+  url: http://127.0.0.1:8983/fedora2 
+- user: fedoraAdmin
+  password: fedoraAdmin
+  url: http://127.0.0.1:8983/fedora3 
+

data/spec/integration/base_file_management_spec.rb

@@ -3,18 +3,21 @@ require 'spec_helper'
 describe ActiveFedora::Base do
   
   before(:each) do
-    @test_container = ActiveFedora::Base.new
+    class  FileMgmt < ActiveFedora::Base
+      include ActiveFedora::FileManagement
+    end
+    @test_container = FileMgmt.new
     @test_container.add_relationship(:has_collection_member, "info:fedora/foo:2")
     @test_container.save
   end
   
   after(:each) do
     @test_container.delete
+    Object.send(:remove_const, :FileMgmt)
   end
   
   it "should persist and re-load collection members" do
-    ActiveSupport::Deprecation.stubs(:warn)
-    container_copy = ActiveFedora::Base.load_instance(@test_container.pid)
+    container_copy = FileMgmt.load_instance(@test_container.pid)
     container_copy.collection_members(:response_format=>:id_array).should == ["foo:2"]
   end
     

data/spec/integration/base_find_by_fields_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require "active_fedora/samples"
 
 class MockAFBaseQuerySolr < ActiveFedora::Base
   has_metadata :name => "properties", :type => ActiveFedora::MetadataDatastream do |m|
@@ -24,29 +23,29 @@ describe ActiveFedora::Base do
     @test_object = ActiveFedora::Base.new
     #get objects into fedora and solr
     @test_object2 = MockAFBaseQuerySolr.new
-    attributes = {"holding_id"=>{0=>"Holding 1"},
-                  "language"=>{0=>"Italian"},
-                  "creator"=>{0=>"Linguist, A."},
-                  "geography"=>{0=>"Italy"},
-                  "title"=>{0=>"Italian and Spanish: A Comparison of Common Phrases"}}
+    attributes = {[:holding_id]=>{0=>"Holding 1"},
+                  [:language]=>{0=>"Italian"},
+                  [:creator]=>{0=>"Linguist, A."},
+                  [:geography]=>{0=>"Italy"},
+                  [:title]=>{0=>"Italian and Spanish: A Comparison of Common Phrases"}}
     @test_object2.update_indexed_attributes(attributes)
     @test_object2.save
     
     @test_object3 = MockAFBaseQuerySolr.new
-    attributes = {"holding_id"=>{0=>"Holding 2"},
-                  "language"=>{0=>"Spanish;Latin"},
-                  "creator"=>{0=>"Linguist, A."},
-                  "geography"=>{0=>"Spain"},
-                  "title"=>{0=>"A study of the evolution of Spanish from Latin"}}
+    attributes = {[:holding_id]=>{0=>"Holding 2"},
+                  [:language]=>{0=>"Spanish;Latin"},
+                  [:creator]=>{0=>"Linguist, A."},
+                  [:geography]=>{0=>"Spain"},
+                  [:title]=>{0=>"A study of the evolution of Spanish from Latin"}}
     @test_object3.update_indexed_attributes(attributes)
     @test_object3.save      
 
     @test_object4 = MockAFBaseQuerySolr.new
-    attributes = {"holding_id"=>{0=>"Holding 3"},
-                  "language"=>{0=>"Spanish;Latin"},
-                  "creator"=>{0=>"Linguist, A."},
-                  "geography"=>{0=>"Spain"},
-                  "title"=>{0=>"An obscure look into early nomadic tribes of Spain"}}
+    attributes = {[:holding_id]=>{0=>"Holding 3"},
+                  [:language]=>{0=>"Spanish;Latin"},
+                  [:creator]=>{0=>"Linguist, A."},
+                  [:geography]=>{0=>"Spain"},
+                  [:title]=>{0=>"An obscure look into early nomadic tribes of Spain"}}
     @test_object4.update_indexed_attributes(attributes)
     @test_object4.save
       

data/spec/integration/base_spec.rb

@@ -28,7 +28,6 @@ end
 
 describe ActiveFedora::Base do
   before :all do
-    ActiveSupport::Deprecation.stubs(:warn).with("Deprecation: Relationships will not be included by default in the next version.   To use has_relationship add 'include ActiveFedora::Relationships' to your model")
     class MockAFBaseRelationship < ActiveFedora::Base
       include ActiveFedora::FileManagement
       has_relationship "testing", :has_part, :type=>MockAFBaseRelationship
@@ -42,6 +41,7 @@ describe ActiveFedora::Base do
     end
 
     class MockAFBaseFromSolr < ActiveFedora::Base
+      include ActiveFedora::Relationships
       has_relationship "testing", :has_part, :type=>MockAFBaseFromSolr
       has_relationship "testing2", :has_member, :type=>MockAFBaseFromSolr
       has_relationship "testing_inbound", :has_part, :type=>MockAFBaseFromSolr, :inbound=>true
@@ -99,10 +99,19 @@ describe ActiveFedora::Base do
       @test_object.should have(0).errors
       @test_object.pid.should_not be_nil
     end
+  end
 
+  describe '.assign_pid' do
+    it "should get nextid" do
+      one = ActiveFedora::Base.assign_pid(ActiveFedora::UnsavedDigitalObject.new(ActiveFedora::Base, 'changeme'))
+      two = ActiveFedora::Base.assign_pid(ActiveFedora::UnsavedDigitalObject.new(ActiveFedora::Base, 'changeme'))
+      one = one.gsub('changeme:', '').to_i
+      two = two.gsub('changeme:', '').to_i
+      two.should == one + 1
+    end
   end
   
-  describe ".save" do
+  describe "#save" do
     before(:each) do
       @test_object2 = ActiveFedora::Base.new
     end
@@ -661,180 +670,4 @@ describe ActiveFedora::Base do
       
     end
   end
-  
-#   describe '#load_instance_from_solr' do
-#     it 'should populate an instance of an ActiveFedora::Base object using solr instead of Fedora' do
-#       
-#       @test_object2 = MockAFBaseFromSolr.new
-# #      @test_object2.new_object = true
-#       attributes = {"holding_id"=>{0=>"Holding 1"},
-#                     "language"=>{0=>"Italian"},
-#                     "creator"=>{0=>"Linguist, A."},
-#                     "geography"=>{0=>"Italy"},
-#                     "title"=>{0=>"Italian and Spanish: A Comparison of Common Phrases"}}
-#       @test_object2.update_indexed_attributes(attributes)
-#       @test_object2.save
-#       @test_object3 = MockAFBaseFromSolr.new
-# #      @test_object3.new_object = true
-#       attributes = {"holding_id"=>{0=>"Holding 2"},
-#                     "language"=>{0=>"Spanish;Latin"},
-#                     "creator"=>{0=>"Linguist, A."},
-#                     "geography"=>{0=>"Spain"},
-#                     "title"=>{0=>"A study of the evolution of Spanish from Latin"}}
-#       @test_object3.update_indexed_attributes(attributes)
-#       @test_object3.save
-#       @test_object4 = MockAFBaseFromSolr.new
-#       attributes = {"holding_id"=>{0=>"Holding 3"},
-#                     "language"=>{0=>"Spanish;Latin"},
-#                     "creator"=>{0=>"Linguist, A."},
-#                     "geography"=>{0=>"Spain"},
-#                     "title"=>{0=>"An obscure look into early nomadic tribes of Spain"}}
-#       @test_object4.update_indexed_attributes(attributes)
-# #      @test_object4.new_object = true
-#       @test_object4.save
-#       @test_object5 = MockAFBaseFromSolr.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 = MockAFBaseFromSolr.to_class_uri
-#       #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
-#       test_from_solr_object2 = MockAFBaseFromSolr.load_instance_from_solr(@test_object2.pid)
-#       test_from_solr_object3 = MockAFBaseFromSolr.load_instance_from_solr(@test_object3.pid)
-#       test_from_solr_object4 = MockAFBaseFromSolr.load_instance_from_solr(@test_object4.pid)
-#       test_from_solr_object5 = MockAFBaseFromSolr.load_instance_from_solr(@test_object5.pid)
-#       
-#       # need to check pid, system create and system modify
-#       test_from_solr_object2.pid.should == @test_object2.pid
-#       test_from_solr_object3.pid.should == @test_object3.pid
-#       test_from_solr_object4.pid.should == @test_object4.pid
-#       test_from_solr_object5.pid.should == @test_object5.pid
-#       
-#       Time.parse(test_from_solr_object2.create_date).should == Time.parse(@test_object2.create_date)
-#       Time.parse(test_from_solr_object3.create_date).should == Time.parse(@test_object3.create_date)
-#       Time.parse(test_from_solr_object4.create_date).should == Time.parse(@test_object4.create_date)
-#       Time.parse(test_from_solr_object5.create_date).should == Time.parse(@test_object5.create_date)
-#       
-#       Time.parse(test_from_solr_object2.modified_date).should == Time.parse(@test_object2.modified_date)
-#       Time.parse(test_from_solr_object3.modified_date).should == Time.parse(@test_object3.modified_date)
-#       Time.parse(test_from_solr_object4.modified_date).should == Time.parse(@test_object4.modified_date)
-#       Time.parse(test_from_solr_object5.modified_date).should == Time.parse(@test_object5.modified_date)
-# 
-#       # need to test outbound and inbound relationships
-#       test_from_solr_object2.relationships(false).should == {:self=>{:has_model=>[model_rel],
-#                                                             :has_part=>[@test_object3],
-#                                                             :has_member=>[@test_object4]},
-#                                                     :inbound=>{:has_part=>[@test_object5]}}
-#       test_from_solr_object2.relationships_by_name(false).should == {:self=>{"testing"=>[@test_object3],"testing2"=>[@test_object4],
-#         "collection_members"=>[],"part_of"=>[],"parts_outbound"=>[@test_object3]},
-#         :inbound=>{"testing_inbound"=>[@test_object5],"testing_inbound2"=>[],"parts_inbound"=>[]}}
-#       test_from_solr_object3.relationships(false).should == {:self=>{:has_model=>[model_rel]},
-#                                                    :inbound=>{:has_part=>[@test_object2],
-#                                                                :has_member=>[@test_object5]}}
-#       test_from_solr_object3.relationships_by_name(false).should == {:self=>{"testing"=>[],"testing2"=>[], "collection_members"=>[],"part_of"=>[],"parts_outbound"=>[]},
-#                                                                    :inbound=>{"testing_inbound"=>[@test_object2],"testing_inbound2"=>[@test_object5], "parts_inbound"=>[]}}                                                                  
-#       test_from_solr_object4.relationships(false).should == {:self=>{:has_model=>[model_rel]},
-#                                                     :inbound=>{:has_member=>[@test_object2]}}
-#       test_from_solr_object4.relationships_by_name(false).should == {:inbound=>{"parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[@test_object2]}, :self=>{"testing2"=>[], "collection_members"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[]}}                       
-#       test_from_solr_object5.relationships(false).should == {:self=>{:has_model=>[model_rel],
-#                                                             :has_part=>[@test_object2],
-#                                                             :has_member=>[@test_object3]},
-#                                                     :inbound=>{}}
-#       test_from_solr_object5.relationships_by_name(false).should == {:inbound=>{"parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[]}, :self=>{"testing2"=>[@test_object3], "collection_members"=>[], "part_of"=>[], "testing"=>[@test_object2], "parts_outbound"=>[@test_object2]}}
-#       #all inbound should now be empty if no parameter supplied to relationships
-#       test_from_solr_object2.relationships.should == {:self=>{:has_part=>[@test_object3],:has_member=>[@test_object4],:has_model=>[model_rel]}}
-#       test_from_solr_object2.relationships_by_name.should == {:self=>{"testing2"=>[@test_object4], "collection_members"=>[], "part_of"=>[], "testing"=>[@test_object3], "parts_outbound"=>[@test_object3]}}
-#       test_from_solr_object3.relationships.should == {:self=>{:has_model=>[model_rel]}}
-#       test_from_solr_object3.relationships_by_name.should == {:self=>{"testing2"=>[], "collection_members"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[]}}
-#       test_from_solr_object4.relationships.should == {:self=>{:has_model=>[model_rel]}}
-#       test_from_solr_object4.relationships_by_name.should == {:self=>{"testing2"=>[], "collection_members"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[]}} 
-#       test_from_solr_object5.relationships.should == {:self=>{:has_model=>[model_rel],
-#                                                              :has_part=>[@test_object2],
-#                                                              :has_member=>[@test_object3]}}
-#       test_from_solr_object5.relationships_by_name.should == {:self=>{"testing2"=>[@test_object3], "collection_members"=>[], "part_of"=>[], "testing"=>[@test_object2], "parts_outbound"=>[@test_object2]}}
-#       # need to check metadata
-#       test_from_solr_object2.fields[:language][:values].should == ["Italian"]
-#       test_from_solr_object2.fields[:creator][:values].should == ["Linguist, A."]
-#       test_from_solr_object2.fields[:geography][:values].should == ["Italy"]
-#       test_from_solr_object2.fields[:title][:values].should == ["Italian and Spanish: A Comparison of Common Phrases"]
-#       test_from_solr_object2.fields[:holding_id][:values].should == ["Holding 1"]
-#       
-#       test_from_solr_object3.fields[:language][:values].should == ["Spanish;Latin"]
-#       test_from_solr_object3.fields[:creator][:values].should == ["Linguist, A."]
-#       test_from_solr_object3.fields[:geography][:values].should == ["Spain"]
-#       test_from_solr_object3.fields[:title][:values].should == ["A study of the evolution of Spanish from Latin"]
-#       test_from_solr_object3.fields[:holding_id][:values].should == ["Holding 2"]
-#       
-#       test_from_solr_object4.fields[:language][:values].should == ["Spanish;Latin"]
-#       test_from_solr_object4.fields[:creator][:values].should == ["Linguist, A."]
-#       test_from_solr_object4.fields[:geography][:values].should == ["Spain"]
-#       test_from_solr_object4.fields[:title][:values].should == ["An obscure look into early nomadic tribes of Spain"]
-#       test_from_solr_object4.fields[:holding_id][:values].should == ["Holding 3"]
-# 
-#       #need to check system modified and system created values correct
-#       # need to implement for nokogiri datastream as well
-#       #false.should == true
-#     end
-#   end
-#   
-#   describe 'load_from_solr using relationship finders'
-#     it 'resulting finder should accept :load_from_solr as :response_format and return object instantiated using load_instance_from_solr' do
-# #      solr_result = mock("solr result")
-# #      SpecNode.create_inbound_relationship_finders("constituents", :is_constituent_of, :inbound => true)
-# #      local_node = SpecNode.new
-# #      mock_repo = mock("repo")
-# #      mock_repo.expects(:find_model).never
-# #      SpecNode.expects(:load_instance_from_solr).times(1)
-# #      local_node.expects(:internal_uri).returns("info:fedora/test:sample_pid")
-# #      ActiveFedora::SolrService.instance.conn.expects(:query).with("is_constituent_of_s:info\\:fedora/test\\:sample_pid").returns(solr_result)
-# #      local_node.constituents(:response_format => :solr).should equal(solr_result)
-#     end
-#     
-#     it 'when an object is loaded via solr instead of fedora it should automatically load objects from finders from solr as well' do
-#       @test_object2 = MockAFBaseFromSolr.new
-#       @test_object2.save
-#       @test_object3 = MockAFBaseFromSolr.new
-#       @test_object3.save
-#       @test_object2.testing_append(@test_object3)
-#       @test_object2.save
-#       
-#       test_object2_from_solr = MockAFBaseFromSolr.load_instance_from_solr(@test_object2.pid)
-#       test_object3_from_solr = MockAFBaseFromSolr.load_instance_from_solr(@test_object3.pid)
-#       MockAFBaseFromSolr.expects(:load_instance_from_solr).times(4)
-#       test_object2_from_solr.testing({:response_format=>:load_from_solr})
-#       test_object3_from_solr.testing_inbound({:response_format=>:load_from_solr})
-#       test_object2_from_solr.testing
-#       test_object3_from_solr.testing_inbound
-#     end
-#   
-#     it 'when a load_from_solr is not set it should not call load_instance_from_solr for finders unless passing option in' do
-#       @test_object2 = MockAFBaseFromSolr.new
-#       @test_object2.save
-#       @test_object3 = MockAFBaseFromSolr.new
-#       @test_object3.save
-#       @test_object2.testing_append(@test_object3)
-#       @test_object2.save
-#       
-#       MockAFBaseFromSolr.expects(:load_instance_from_solr).never()
-#       @test_object2.testing
-#       @test_object3.testing_inbound
-#       
-#       #now try calling with option
-#       MockAFBaseFromSolr.expects(:load_instance_from_solr).twice()
-#       @test_object2.testing({:response_format=>:load_from_solr})
-#       @test_object3.testing_inbound({:response_format=>:load_from_solr})
-#       
-#       #now call other finder method
-#       MockAFBaseFromSolr.expects(:load_instance_from_solr).twice()
-#       @test_object2.testing_from_solr
-#       @test_object3.testing_inbound_from_solr
-#       
-#     end
-
 end