active-fedora 4.0.0.rc1 → 4.0.0.rc2

data/lib/active_fedora/relationships.rb

@@ -161,13 +161,14 @@ module ActiveFedora
       opts = {:rows=>25}.merge(opts)
       query = self.class.inbound_relationship_query(self.pid,"#{name}")
       return [] if query.empty?
-      solr_result = SolrService.instance.conn.query(query, :rows=>opts[:rows])
       if opts[:response_format] == :solr
+        solr_result = SolrService.query query, :raw=>true, :rows=>opts[:rows]
         return solr_result
       else
+        solr_result = SolrService.query(query, :rows=>opts[:rows]) 
         if opts[:response_format] == :id_array
           id_array = []
-          solr_result.hits.each do |hit|
+          solr_result.each do |hit|
             id_array << hit[SOLR_DOCUMENT_ID]
           end
           return id_array
@@ -187,7 +188,7 @@ module ActiveFedora
           predicate = outbound_relationship_predicates["#{name}_outbound"]
           outbound_id_array = ids_for_outbound(predicate)
           query = self.class.bidirectional_relationship_query(self.pid,"#{name}",outbound_id_array)
-          solr_result = SolrService.instance.conn.query(query, :rows=>opts[:rows])
+          solr_result = SolrService.query(query, :rows=>opts[:rows])
           
           if opts[:response_format] == :solr
             return solr_result
@@ -208,15 +209,11 @@ module ActiveFedora
         return id_array
       else
         query = self.class.outbound_relationship_query(name,id_array)
-        solr_result = SolrService.instance.conn.query(query)
+        solr_result = SolrService.query(query)
         if opts[:response_format] == :solr
           return solr_result
         elsif opts[:response_format] == :id_array
-          id_array = []
-          solr_result.hits.each do |hit|
-            id_array << hit[SOLR_DOCUMENT_ID]
-          end
-          return id_array
+          return solr_result.map {|hit| hit[SOLR_DOCUMENT_ID] }
         elsif opts[:response_format] == :load_from_solr || self.load_from_solr
           return ActiveFedora::SolrService.reify_solr_results(solr_result,{:load_from_solr=>true})
         else

data/lib/active_fedora/service_definitions.rb

@@ -7,7 +7,7 @@ module ServiceDefinitions
       model_uri = mod.to_class_uri
     # load ContentModel, pull Sdef pointers
       begin
-        cmodel = ActiveFedora::ContentModel.load_instance(mod.to_class_uri)
+        cmodel = ActiveFedora::ContentModel.find(mod.to_class_uri)
         sdef_pids = cmodel.ids_for_outbound(:has_service).collect { |uri|
           uri.split('/')[-1]
         }

data/lib/active_fedora/solr_service.rb

@@ -1,5 +1,5 @@
-require 'solr'
 require "solrizer"
+require 'rsolr'
 
 module ActiveFedora
   class SolrService 
@@ -17,8 +17,10 @@ module ActiveFedora
     end
     def initialize(host, args)
       host = 'http://localhost:8080/solr' unless host
-      opts = {:autocommit=>:on}.merge(args)
-      @conn = Solr::Connection.new(host, opts)
+      args = args.dup
+      args.merge!(:url=>host)
+      @conn = RSolr.connect args
+ #     @conn = Solr::Connection.new(host, opts)
     end
     
     def self.instance
@@ -33,11 +35,8 @@ module ActiveFedora
     end
     
     def self.reify_solr_results(solr_result,opts={})
-      unless solr_result.is_a?(Solr::Response::Standard)
-        raise ArgumentError.new("Only solr responses (Solr::Response::Standard) are allowed. You provided a #{solr_result.class}")
-      end
       results = []
-      solr_result.hits.each do |hit|
+      solr_result.each do |hit|
         classname = class_from_solr_document(hit)
         if opts[:load_from_solr]
           results << classname.load_instance_from_solr(hit[SOLR_DOCUMENT_ID])
@@ -70,7 +69,15 @@ module ActiveFedora
     def self.escape_uri_for_query(uri)
       return uri.gsub(/(:)/, '\\:')
     end
-    
+
+    def self.query(query, args={})
+      raw = args.delete(:raw)
+      args = args.merge(:q=>query)
+      result = SolrService.instance.conn.get('select', :params=>args)
+      return result if raw
+      result['response']['docs']
+    end
+
   
 end #SolrService
 class SolrNotInitialized < StandardError;end

data/lib/active_fedora/version.rb

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

data/lib/tasks/active_fedora.rake

@@ -1,5 +1,4 @@
 require "active-fedora"
-require "solrizer-fedora"
 require "active_support" # This is just to load ActiveSupport::CoreExtensions::String::Inflections
 namespace :repo do
   
@@ -13,7 +12,7 @@ namespace :repo do
     else
       pid = ENV["pid"]
       begin
-        ActiveFedora::Base.load_instance(pid).delete
+        ActiveFedora::Base.find(pid).delete
       rescue ActiveFedora::ObjectNotFoundError
         puts "The object #{pid} has already been deleted (or was never created)."
       rescue Errno::ECONNREFUSED => e
@@ -36,7 +35,7 @@ namespace :repo do
     while i <= stop_point do
       pid = namespace + ":" + i.to_s
       begin
-        ActiveFedora::Base.load_instance(pid).delete
+        ActiveFedora::Base.find(pid).delete
       rescue ActiveFedora::ObjectNotFoundError
         # The object has already been deleted (or was never created).  Do nothing.
       end
@@ -86,8 +85,7 @@ namespace :repo do
       	if pid.nil?
           pid = result.body
         end
-        solrizer = Solrizer::Fedora::Solrizer.new 
-        solrizer.solrize(pid) 
+        ActiveFedora::Base.find(pid).update_index
       else
         puts "Failed to load the object."
       end

data/lib/tasks/active_fedora_dev.rake

@@ -65,7 +65,6 @@ require 'rspec/core/rake_task'
 desc "Hudson build"
 task :hudson do
   ENV['environment'] = "test"
-  Rake::Task["active_fedora:doc"].invoke
   Rake::Task["active_fedora:configure_jetty"].invoke
   jetty_params = Jettywrapper.load_config
   jetty_params[:startup_wait]= 30
@@ -74,6 +73,8 @@ task :hudson do
     Rake::Task["active_fedora:rspec"].invoke
   end
   raise "test failures: #{error}" if error
+  # Only create documentation if the tests have passed
+  Rake::Task["active_fedora:doc"].invoke
 end
 
 # Provides an :environment task for use while working within a working copy of active-fedora

data/spec/fixtures/solr_rdf_descMetadata.nt

@@ -0,0 +1,7 @@
+<info:fedora/test:1> <http://purl.org/dc/terms/created> "fake-date" .
+<info:fedora/test:1> <http://purl.org/dc/terms/title> "fake-title" .
+<info:fedora/test:1> <http://purl.org/dc/terms/publisher> "publisher1" .
+<info:fedora/test:1> <http://xmlns.com/foaf/0.1/based_near> "coverage1" .
+<info:fedora/test:1> <http://xmlns.com/foaf/0.1/based_near> "coverage2" .
+<info:fedora/test:1> <http://www.w3.org/2000/01/rdf-schema#seeAlso> <http://example.org/> .
+

data/spec/integration/base_file_management_spec.rb

@@ -17,7 +17,7 @@ describe ActiveFedora::Base do
   end
   
   it "should persist and re-load collection members" do
-    container_copy = FileMgmt.load_instance(@test_container.pid)
+    container_copy = FileMgmt.find(@test_container.pid)
     container_copy.collection_members(:response_format=>:id_array).should == ["foo:2"]
   end
     

data/spec/integration/base_find_by_fields_spec.rb

@@ -30,6 +30,7 @@ describe ActiveFedora::Base do
                   [:title]=>{0=>"Italian and Spanish: A Comparison of Common Phrases"}}
     @test_object2.update_indexed_attributes(attributes)
     @test_object2.save
+    sleep(1)
     
     @test_object3 = MockAFBaseQuerySolr.new
     attributes = {[:holding_id]=>{0=>"Holding 2"},
@@ -39,6 +40,7 @@ describe ActiveFedora::Base do
                   [:title]=>{0=>"A study of the evolution of Spanish from Latin"}}
     @test_object3.update_indexed_attributes(attributes)
     @test_object3.save      
+    sleep(1)
 
     @test_object4 = MockAFBaseQuerySolr.new
     attributes = {[:holding_id]=>{0=>"Holding 3"},
@@ -75,7 +77,7 @@ describe ActiveFedora::Base do
       #query based on just model
       results = MockAFBaseQuerySolr.find_by_fields_by_solr({})
       found_pids = []
-      results.hits.each do |hit|
+      results.each do |hit|
         found_pids.push(hit[SOLR_DOCUMENT_ID])
       end
       
@@ -86,7 +88,7 @@ describe ActiveFedora::Base do
       #query on certain fields
       results = MockAFBaseQuerySolr.find_by_fields_by_solr({"language"=>"Latin"})
       found_pids = []
-      results.hits.each do |hit|
+      results.each do |hit|
         found_pids.push(hit[SOLR_DOCUMENT_ID])
       end
       
@@ -94,7 +96,7 @@ describe ActiveFedora::Base do
       
       results = MockAFBaseQuerySolr.find_by_fields_by_solr({"language"=>"Italian"})
       found_pids = []
-      results.hits.each do |hit|
+      results.each do |hit|
         found_pids.push(hit[SOLR_DOCUMENT_ID])
       end
       
@@ -102,7 +104,7 @@ describe ActiveFedora::Base do
       
       results = MockAFBaseQuerySolr.find_by_fields_by_solr({"language"=>"Spanish"})
       found_pids = []
-      results.hits.each do |hit|
+      results.each do |hit|
         found_pids.push(hit[SOLR_DOCUMENT_ID])
       end
       
@@ -114,7 +116,7 @@ describe ActiveFedora::Base do
       
       results = MockAFBaseQuerySolr.find_by_fields_by_solr({"creator"=>"Linguist,A.","title"=>"latin"})
       found_pids = []
-      results.hits.each do |hit|
+      results.each do |hit|
         found_pids.push(hit[SOLR_DOCUMENT_ID])
       end
       
@@ -126,7 +128,7 @@ describe ActiveFedora::Base do
       #query with value with embedded ':' (pid)
       results = MockAFBaseQuerySolr.find_by_fields_by_solr({"id"=>@test_object3.pid})
       found_pids = []
-      results.hits.each do |hit|
+      results.each do |hit|
         found_pids.push(hit[SOLR_DOCUMENT_ID])
       end
       
@@ -137,7 +139,7 @@ describe ActiveFedora::Base do
     it "should sort by default by system_create_date" do
       results = MockAFBaseQuerySolr.find_by_fields_by_solr({"creator"=>"Linguist,A.","language"=>"Spanish"})
       found_pids = []
-      results.hits.each do |hit|
+      results.each do |hit|
         found_pids.push(hit[SOLR_DOCUMENT_ID])
       end
       
@@ -147,7 +149,7 @@ describe ActiveFedora::Base do
     it "should be able to change the sort direction" do 
       results = MockAFBaseQuerySolr.find_by_fields_by_solr({"creator"=>"Linguist,A."},{:sort=>[{"system_create"=>"desc"}]})
       found_pids = []
-      results.hits.each do |hit|
+      results.each do |hit|
         found_pids.push(hit[SOLR_DOCUMENT_ID])
       end
       
@@ -157,7 +159,7 @@ describe ActiveFedora::Base do
     it "should default the sort direction to ascending" do
       results = MockAFBaseQuerySolr.find_by_fields_by_solr({"creator"=>"Linguist,A."},{:sort=>["system_create"]})
       found_pids = []
-      results.hits.each do |hit|
+      results.each do |hit|
         found_pids.push(hit[SOLR_DOCUMENT_ID])
       end
       
@@ -168,7 +170,7 @@ describe ActiveFedora::Base do
     it "should sort by multiple fields" do
       results = MockAFBaseQuerySolr.find_by_fields_by_solr({"creator"=>"Linguist,A."},{:sort=>["geography",{"system_create"=>"desc"}]})
       found_pids = []
-      results.hits.each do |hit|
+      results.each do |hit|
         found_pids.push(hit[SOLR_DOCUMENT_ID])
       end
       
@@ -179,7 +181,7 @@ describe ActiveFedora::Base do
       #check appropriate logic for system_modified_date field name transformation
       results = MockAFBaseQuerySolr.find_by_fields_by_solr({"creator"=>"Linguist,A."},{:sort=>["geography",{"system_mod"=>"desc"}]})
       found_pids = []
-      results.hits.each do |hit|
+      results.each do |hit|
         found_pids.push(hit[SOLR_DOCUMENT_ID])
       end
       
@@ -190,7 +192,7 @@ describe ActiveFedora::Base do
       #check pass in rows values
       results = MockAFBaseQuerySolr.find_by_fields_by_solr({"creator"=>"Linguist,A."},{:rows=>2})
       found_pids = []
-      results.hits.each do |hit|
+      results.each do |hit|
         found_pids.push(hit[SOLR_DOCUMENT_ID])
       end
       
@@ -201,7 +203,7 @@ describe ActiveFedora::Base do
       #check query with field mapping to solr field and with solr field that is not a field in object
       #should be able to query by either active fedora model field name or solr key name
       results = MockAFBaseQuerySolr.find_by_fields_by_solr({"geography_t"=>"Italy"})
-      found_pids = results.hits.map{|h| h[SOLR_DOCUMENT_ID]}
+      found_pids = results.map{|h| h[SOLR_DOCUMENT_ID]}
       found_pids.should == [@test_object2.pid]
     end
 
@@ -212,7 +214,7 @@ describe ActiveFedora::Base do
       end
       it "should query Nokogiri based datastreams if you use the solr field names (doesn't do mapping)" do
         results = MockAFBaseQuerySolr.find_by_fields_by_solr({"journal_title_t" => "foo"})
-        found_pids = results.hits.map{|h| h[SOLR_DOCUMENT_ID]}
+        found_pids = results.map{|h| h[SOLR_DOCUMENT_ID]}
         found_pids.should == [@test_object2.pid]
       end
     end

data/spec/integration/base_spec.rb

@@ -147,6 +147,7 @@ describe ActiveFedora::Base do
   
   describe "#load_instance" do
     it "should return an object loaded from fedora" do
+      ActiveSupport::Deprecation.expects(:warn).with("load_instance is deprecated.  Use find instead")
       result = ActiveFedora::Base.load_instance(@test_object.pid)
       result.should be_instance_of(ActiveFedora::Base)
     end
@@ -258,26 +259,26 @@ describe ActiveFedora::Base do
      f = File.new(File.join( File.dirname(__FILE__), "../fixtures/dino_jpg_no_file_ext" ))
      @test_object.add_file_datastream(f)
      @test_object.save
-     test_obj = ActiveFedora::Base.load_instance(@test_object.pid)
+     test_obj = ActiveFedora::Base.find(@test_object.pid)
      #check case where nothing passed in does not have correct mime type
      test_obj.datastreams["DS1"].mimeType.should == "application/octet-stream"
      @test_object2 = ActiveFedora::Base.new
      f = File.new(File.join( File.dirname(__FILE__), "../fixtures/dino_jpg_no_file_ext" ))
      @test_object2.add_file_datastream(f,{:mimeType=>"image/jpeg"})
      @test_object2.save
-     test_obj = ActiveFedora::Base.load_instance(@test_object2.pid)
+     test_obj = ActiveFedora::Base.find(@test_object2.pid)
      test_obj.datastreams["DS1"].mimeType.should == "image/jpeg"
      @test_object3 = ActiveFedora::Base.new
      f = File.new(File.join( File.dirname(__FILE__), "../fixtures/dino_jpg_no_file_ext" ))
      @test_object3.add_file_datastream(f,{:mime_type=>"image/jpeg"})
      @test_object3.save
-     test_obj = ActiveFedora::Base.load_instance(@test_object3.pid)
+     test_obj = ActiveFedora::Base.find(@test_object3.pid)
      test_obj.datastreams["DS1"].mimeType.should == "image/jpeg"
      @test_object4 = ActiveFedora::Base.new
      f = File.new(File.join( File.dirname(__FILE__), "../fixtures/dino_jpg_no_file_ext" ))
      @test_object4.add_file_datastream(f,{:content_type=>"image/jpeg"})
      @test_object4.save
-     test_obj = ActiveFedora::Base.load_instance(@test_object4.pid)
+     test_obj = ActiveFedora::Base.find(@test_object4.pid)
      test_obj.datastreams["DS1"].mimeType.should == "image/jpeg"
    end
   end
@@ -328,10 +329,10 @@ describe ActiveFedora::Base do
     
     it "should delete the object from Fedora and Solr" do
       @test_object.save
-      ActiveFedora::Base.find_by_solr(@test_object.pid).hits.first["id"].should == @test_object.pid
+      ActiveFedora::Base.find_by_solr(@test_object.pid).first["id"].should == @test_object.pid
       pid = @test_object.pid # store so we can access it after deletion
       @test_object.delete
-      ActiveFedora::Base.find_by_solr(pid).hits.should be_empty
+      ActiveFedora::Base.find_by_solr(pid).should be_empty
     end
 
     describe '#delete' do
@@ -364,7 +365,7 @@ describe ActiveFedora::Base do
 
         @test_object2.delete
         #need to reload since removed from rels_ext in memory
-        @test_object5 = MockAFBaseRelationship.load_instance(@test_object5.pid)
+        @test_object5 = MockAFBaseRelationship.find(@test_object5.pid)
       
         #check any test_object2 inbound rels gone from source
         @test_object3.relationships_by_name(false)[:inbound]["testing_inbound"].should == []
@@ -384,7 +385,7 @@ describe ActiveFedora::Base do
       @test_object.save
       @pid = @test_object.pid
       begin
-        @test_object = ActiveFedora::Base.load_instance(@pid)
+        @test_object = ActiveFedora::Base.find(@pid)
       rescue => e
         puts "#{e.message}\n#{e.backtrace}"
         raise e
@@ -392,7 +393,7 @@ describe ActiveFedora::Base do
       @test_object.object_relations[:has_part].should include @test_object2.internal_uri
       @test_object.remove_relationship(:has_part,@test_object2)
       @test_object.save
-      @test_object = ActiveFedora::Base.load_instance(@pid)
+      @test_object = ActiveFedora::Base.find(@pid)
       @test_object.object_relations[:has_part].should be_empty
     end
   end

data/spec/integration/datastream_collections_spec.rb

@@ -24,7 +24,7 @@ describe ActiveFedora::DatastreamCollections do
       ds = @test_object2.thumbnail.first
       ds2 = @test_object2.high.first
       @test_object2.save
-      @test_object2 = MockAFBaseDatastream.load_instance(@test_object2.pid)
+      @test_object2 = MockAFBaseDatastream.find(@test_object2.pid)
       @test_object2.named_datastreams.keys.size.should == 2
       @test_object2.named_datastreams.keys.include?("thumbnail").should == true
       @test_object2.named_datastreams.keys.include?("high").should == true
@@ -54,7 +54,7 @@ describe ActiveFedora::DatastreamCollections do
       @test_object2.add_named_file_datastream("thumbnail",f)
       ds = @test_object2.thumbnail.first
       @test_object2.save
-      @test_object2 = MockAFBaseDatastream.load_instance(@test_object2.pid)
+      @test_object2 = MockAFBaseDatastream.find(@test_object2.pid)
       @test_object2.named_datastreams["thumbnail"].size.should == 1
       t2_thumb1 = @test_object2.named_datastreams["thumbnail"].first
       t2_thumb1.dsid.should == "THUMB1"
@@ -86,7 +86,7 @@ describe ActiveFedora::DatastreamCollections do
       #check raise exception if dsid not supplied
       @test_object2.add_named_datastream("thumbnail",{:file=>f})
       @test_object2.save
-      @test_object2 = MockAFBaseDatastream.load_instance(@test_object2.pid)
+      @test_object2 = MockAFBaseDatastream.find(@test_object2.pid)
       
       @test_object2.thumbnail.size.should == 1
       @test_object2.thumbnail_ids == ["THUMB1"]
@@ -100,7 +100,7 @@ describe ActiveFedora::DatastreamCollections do
       ds.content.should == minivan 
       @test_object2.update_named_datastream("thumbnail",{:file=>f2,:dsid=>"THUMB1"})
       @test_object2.save
-      @test_object2 = MockAFBaseDatastream.load_instance(@test_object2.pid)
+      @test_object2 = MockAFBaseDatastream.find(@test_object2.pid)
       @test_object2.thumbnail.size.should == 1
       @test_object2.thumbnail_ids == ["THUMB1"]
       ds2 = @test_object2.thumbnail.first
@@ -124,7 +124,7 @@ describe ActiveFedora::DatastreamCollections do
       @test_object2.add_named_datastream("thumbnail",{:content_type=>"image/jpeg",:blob=>f, :label=>"testDS"})
       @test_object2.add_named_datastream("thumbnail",{:content_type=>"image/jpeg",:blob=>f2})
       @test_object2.save
-      @test_object2 = MockAFBaseDatastream.load_instance(@test_object2.pid)
+      @test_object2 = MockAFBaseDatastream.find(@test_object2.pid)
       @test_object2.named_datastreams_ids.should == {"high"=>[], "thumbnail"=>["THUMB1", "THUMB2"]}
     end
   end

data/spec/integration/datastream_spec.rb

@@ -48,7 +48,7 @@ describe ActiveFedora::Datastream do
     ds.content = fixture('dino.jpg')
     @test_object.add_datastream(ds).should be_true
     @test_object.save
-    to = ActiveFedora::Base.load_instance(@test_object.pid) 
+    to = ActiveFedora::Base.find(@test_object.pid) 
     to.should_not be_nil 
     to.datastreams[dsid].should_not be_nil
     to.datastreams[dsid].content.should == fixture('dino.jpg').read

data/spec/integration/full_featured_model_spec.rb

@@ -139,7 +139,7 @@ describe ActiveFedora::Base do
     
     @test_history.save
     
-    @solr_result = OralHistory.find_by_solr(@test_history.pid).hits[0]
+    @solr_result = OralHistory.find_by_solr(@test_history.pid)[0]
     @properties_sample_values.each_pair do |field, value|
       (@solr_result["#{field.to_s}_t"] || @solr_result["#{field.to_s}_dt"]).should == [::Solrizer::Extractor.format_node_value(value)] 
     end