active-fedora 4.5.1 → 4.5.2

data/lib/active_fedora/associations/association_collection.rb

@@ -160,6 +160,10 @@ module ActiveFedora
           @target = Array.new
         end
 
+        def construct_query
+          @counter_query = @finder_query = ActiveFedora::SolrService.construct_query_for_rel(@reflection.options[:property], @owner.internal_uri)
+        end
+
 
       private 
 

data/lib/active_fedora/associations/has_and_belongs_to_many_association.rb

@@ -43,12 +43,6 @@ module ActiveFedora
             r.remove_relationship(@reflection.options[:property], @owner)
           end
         end
-
-        def construct_query
-          internal_uri = @owner.internal_uri
-          escaped_uri = internal_uri.gsub(/(:)/, '\\:')
-          @counter_query = @finder_query = "#{@reflection.options[:property]}_s:#{escaped_uri}" 
-        end
     end
   end
 end

data/lib/active_fedora/associations/has_many_association.rb

@@ -44,13 +44,6 @@ module ActiveFedora
             r.remove_relationship(@reflection.options[:property], @owner)
           end
         end
-
-
-        def construct_query
-          internal_uri = @owner.internal_uri
-          escaped_uri = internal_uri.gsub(/(:)/, '\\:')
-          @counter_query = @finder_query = "#{@reflection.options[:property]}_s:#{escaped_uri}" 
-        end
     end
   end
 end

data/lib/active_fedora/base.rb

@@ -306,7 +306,7 @@ module ActiveFedora
       end
       datastreams.each_value do |ds|
         ds.ensure_xml_loaded if ds.respond_to? :ensure_xml_loaded  ### Can't put this in the model because it's often implemented in Solrizer::XML::TerminologyBasedSolrizer 
-        solr_doc = ds.to_solr(solr_doc) if ds.kind_of?(ActiveFedora::RDFDatastream) || ds.kind_of?(ActiveFedora::NokogiriDatastream) || ds.kind_of?(ActiveFedora::MetadataDatastream)
+        solr_doc = ds.to_solr(solr_doc)
       end
       solr_doc = solrize_relationships(solr_doc) unless opts[:model_only]
       solr_doc
@@ -397,8 +397,7 @@ module ActiveFedora
         raise "Solr document record id and pid do not match" unless pid == solr_doc[SOLR_DOCUMENT_ID]
       end
       klass = if class_str = solr_doc['has_model_s']
-        # Parse RDF string "info:fedora/afmodel:ActiveFedora_Base"
-        class_str.first.split(/:/).last.gsub(/_/,"::").constantize
+        ActiveFedora::SolrService.class_from_solr_document(solr_doc)
       else
         ActiveFedora::Base
       end
@@ -416,9 +415,7 @@ module ActiveFedora
         if ds.respond_to?(:profile_from_hash) and (ds_prof = profile_hash['datastreams'][ds.dsid])
           ds.profile_from_hash(ds_prof)
         end
-        if ds.respond_to?(:from_solr)
-          ds.from_solr(solr_doc) if ds.kind_of?(ActiveFedora::MetadataDatastream) || ds.kind_of?(ActiveFedora::NokogiriDatastream) || ( ds.kind_of?(ActiveFedora::RelsExtDatastream))
-        end
+        ds.from_solr(solr_doc) if ds.respond_to?(:from_solr)
       end
       obj.inner_object.freeze
       obj

data/lib/active_fedora/datastream.rb

@@ -119,6 +119,10 @@ module ActiveFedora
         profile[key] = value.to_s
       end
     end
+    
+    def to_solr(solr_doc = Hash.new)
+      solr_doc
+    end
   end
   
   class DatastreamConcurrencyException < Exception # :nodoc:

data/lib/active_fedora/model.rb

@@ -99,14 +99,18 @@ module ActiveFedora
       # @param [Hash] opts the options to create a message with.
       # @option opts [Integer] :rows when :all is passed, the maximum number of rows to load from solr
       # @option opts [Boolean] :cast when true, examine the model and cast it to the first known cModel
-      def find(args, opts={})
+      def find(args, opts={}, &block)
         return find_one(args, opts[:cast]) if args.class == String
+        return to_enum(:find, args, opts).to_a unless block_given?
+
         args = {} if args == :all
-        results = []
         find_each(args, opts) do |obj|
-           results << obj
+          yield obj
         end
-        results
+      end
+
+      def all(opts = {}, &block)
+        find(:all, opts, &block)
       end
 
 
@@ -314,7 +318,7 @@ module ActiveFedora
       end
 
       def quote_for_solr(value)
-        '"' + value.gsub(/(:)/, '\\:').gsub(/"/, '\\"') + '"'
+        '"' + value.gsub(/(:)/, '\\:').gsub(/(\/)/, '\\/').gsub(/"/, '\\"') + '"'
       end
     
       # @deprecated
@@ -362,8 +366,7 @@ module ActiveFedora
       # Return the solr clause that queries for this type of class
       def search_model_clause
         unless self == ActiveFedora::Base
-          escaped_class_uri = SolrService.escape_uri_for_query(self.to_class_uri)
-          return "#{ActiveFedora::SolrService.solr_name(:has_model, :symbol)}:#{escaped_class_uri}"
+          return ActiveFedora::SolrService.construct_query_for_rel(:has_model, self.to_class_uri)
         end
       end
 

data/lib/active_fedora/relationships.rb

@@ -354,9 +354,7 @@ module ActiveFedora
         subject = :inbound
         if relationships_desc.has_key?(subject) && relationships_desc[subject].has_key?(relationship_name)
           predicate = relationships_desc[subject][relationship_name][:predicate]
-          internal_uri = "info:fedora/#{pid}"
-          escaped_uri = internal_uri.gsub(/(:)/, '\\:')
-          query = "#{predicate}_s:#{escaped_uri}" 
+          query = ActiveFedora::SolrService.construct_query_for_rel(predicate, "info:fedora/#{pid}")
           if relationships_desc.has_key?(subject) && relationships_desc[subject].has_key?(relationship_name) && relationships_desc[subject][relationship_name].has_key?(:solr_fq)
             solr_fq = relationships_desc[subject][relationship_name][:solr_fq]
             query << " AND " unless query.empty?

data/lib/active_fedora/solr_service.rb

@@ -51,8 +51,10 @@ module ActiveFedora
     end
   
     def self.class_from_solr_document(hit)
-        model_value = hit[solr_name("has_model", :symbol)].first
-        Model.from_class_uri(model_value)
+        model_value = nil
+        hit[solr_name("has_model", :symbol)].each {|value| model_value ||= Model.from_class_uri(value)}
+        logger.warn "Could not find a model for #{hit["id"]}, defaulting to ActiveFedora::Base" unless model_value
+        model_value || ActiveFedora::Base
     end
     
     # Construct a solr query for a list of pids
@@ -70,7 +72,11 @@ module ActiveFedora
     end
     
     def self.escape_uri_for_query(uri)
-      return uri.gsub(/(:)/, '\\:')
+      return uri.gsub(/(:)/, '\\:').gsub(/(\/)/, '\\/')
+    end
+    
+    def self.construct_query_for_rel(predicate, target_uri)
+      "#{solr_name(predicate, :symbol)}:#{escape_uri_for_query(target_uri)}"
     end
 
     def self.query(query, args={})

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "4.5.1"
+  VERSION = "4.5.2"
 end

data/spec/integration/semantic_node_spec.rb

@@ -18,11 +18,11 @@ describe ActiveFedora::SemanticNode do
     class SpecNodeSolrFilterQuery < ActiveFedora::Base
       include ActiveFedora::Relationships
       has_relationship("parts", :is_part_of, :inbound => true)
-      has_relationship("special_parts", :is_part_of, :inbound => true, :solr_fq=>"has_model_s:info\\:fedora/afmodel\\:SpecialPart")
+      has_relationship("special_parts", :is_part_of, :inbound => true, :solr_fq=>"has_model_s:info\\:fedora\\/afmodel\\:SpecialPart")
       has_relationship("containers", :is_member_of)
-      has_relationship("special_containers", :is_member_of, :solr_fq=>"has_model_s:info\\:fedora/afmodel\\:SpecialContainer")
+      has_relationship("special_containers", :is_member_of, :solr_fq=>"has_model_s:info\\:fedora\\/afmodel\\:SpecialContainer")
       has_bidirectional_relationship("bi_containers", :is_member_of, :has_member)
-      has_bidirectional_relationship("bi_special_containers", :is_member_of, :has_member, :solr_fq=>"has_model_s:info\\:fedora/afmodel\\:SpecialContainer")
+      has_bidirectional_relationship("bi_special_containers", :is_member_of, :has_member, :solr_fq=>"has_model_s:info\\:fedora\\/afmodel\\:SpecialContainer")
     end
 
     @test_object = SNSpecModel.new
@@ -89,7 +89,9 @@ describe ActiveFedora::SemanticNode do
     @special_part.add_relationship(:has_model, SpecialPart.to_class_uri)
     @special_part.add_relationship(:is_part_of, @test_object_query)
     @special_part.save
-   
+    
+    @special_container_query = "has_model_s:#{solr_uri("info:fedora/afmodel:SpecialContainer")}"
+    @special_part_query = "has_model_s:#{solr_uri("info:fedora/afmodel:SpecialPart")}"
   end
   
   after(:all) do
@@ -251,17 +253,17 @@ describe ActiveFedora::SemanticNode do
     end
 
     it "should return a solr query for an inbound relationship" do
-      @test_object_query.special_parts_query.should == "#{@test_object_query.relationship_predicates[:inbound]['special_parts']}_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')} AND has_model_s:info\\:fedora/afmodel\\:SpecialPart"
+      @test_object_query.special_parts_query.should == "#{@test_object_query.relationship_predicates[:inbound]['special_parts']}_s:#{solr_uri(@test_object_query.internal_uri)} AND #{@special_part_query}"
     end
   end
 
   describe "inbound relationship query" do
     it "should return a properly formatted query for a relationship that has a solr filter query defined" do
-      SpecNodeSolrFilterQuery.inbound_relationship_query(@test_object_query.pid,"special_parts").should == "#{@test_object_query.relationship_predicates[:inbound]['special_parts']}_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')} AND has_model_s:info\\:fedora/afmodel\\:SpecialPart"
+      SpecNodeSolrFilterQuery.inbound_relationship_query(@test_object_query.pid,"special_parts").should == "#{@test_object_query.relationship_predicates[:inbound]['special_parts']}_s:#{solr_uri(@test_object_query.internal_uri)} AND #{@special_part_query}"
     end
 
     it "should return a properly formatted query for a relationship that does not have a solr filter query defined" do
-      SpecNodeSolrFilterQuery.inbound_relationship_query(@test_object_query.pid,"parts").should == "is_part_of_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')}"
+      SpecNodeSolrFilterQuery.inbound_relationship_query(@test_object_query.pid,"parts").should == "is_part_of_s:#{solr_uri(@test_object_query.internal_uri)}"
     end
   end
 
@@ -270,7 +272,7 @@ describe ActiveFedora::SemanticNode do
       expected_string = ""
       @test_object_query.containers_ids.each_with_index do |id,index|
         expected_string << " OR " if index > 0
-        expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND has_model_s:info\\:fedora/afmodel\\:SpecialContainer)"
+        expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND #{@special_container_query})"
       end
       SpecNodeSolrFilterQuery.outbound_relationship_query("special_containers",@test_object_query.containers_ids).should == expected_string
     end
@@ -290,10 +292,10 @@ describe ActiveFedora::SemanticNode do
       expected_string = ""
       @test_object_query.bi_containers_outbound_ids.each_with_index do |id,index|
         expected_string << " OR " if index > 0
-        expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND has_model_s:info\\:fedora/afmodel\\:SpecialContainer)"
+        expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND #{@special_container_query})"
       end
       expected_string << " OR "
-      expected_string << "(#{@test_object_query.relationship_predicates[:inbound]['bi_special_containers_inbound']}_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')} AND has_model_s:info\\:fedora/afmodel\\:SpecialContainer)"
+      expected_string << "(#{@test_object_query.relationship_predicates[:inbound]['bi_special_containers_inbound']}_s:#{solr_uri(@test_object_query.internal_uri)} AND #{@special_container_query})"
       SpecNodeSolrFilterQuery.bidirectional_relationship_query(@test_object_query.pid,"bi_special_containers",@test_object_query.bi_containers_outbound_ids).should == expected_string
     end
 
@@ -304,7 +306,7 @@ describe ActiveFedora::SemanticNode do
         expected_string << "id:" + id.gsub(/(:)/, '\\:')
       end
       expected_string << " OR "
-      expected_string << "(#{@test_object_query.relationship_predicates[:inbound]['bi_special_containers_inbound']}_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')})"
+      expected_string << "(#{@test_object_query.relationship_predicates[:inbound]['bi_special_containers_inbound']}_s:#{solr_uri(@test_object_query.internal_uri)})"
       SpecNodeSolrFilterQuery.bidirectional_relationship_query(@test_object_query.pid,"bi_containers",@test_object_query.bi_containers_outbound_ids).should == expected_string
     end
   end
@@ -367,7 +369,7 @@ describe ActiveFedora::SemanticNode do
       expected_string = ""
       @test_object_query.containers_ids.each_with_index do |id,index|
         expected_string << " OR " if index > 0
-        expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND has_model_s:info\\:fedora/afmodel\\:SpecialContainer)"
+        expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND #{@special_container_query})"
       end
       @test_object_query.special_containers_query.should == expected_string
     end 
@@ -412,10 +414,10 @@ describe ActiveFedora::SemanticNode do
       expected_string = ""
       @test_object_query.bi_containers_outbound_ids.each_with_index do |id,index|
         expected_string << " OR " if index > 0
-        expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND has_model_s:info\\:fedora/afmodel\\:SpecialContainer)"
+        expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND #{@special_container_query})"
       end
       expected_string << " OR "
-      expected_string << "(#{@test_object_query.relationship_predicates[:inbound]['bi_special_containers_inbound']}_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')} AND has_model_s:info\\:fedora/afmodel\\:SpecialContainer)"
+      expected_string << "(#{@test_object_query.relationship_predicates[:inbound]['bi_special_containers_inbound']}_s:#{solr_uri(@test_object_query.internal_uri)} AND #{@special_container_query})"
       @test_object_query.bi_special_containers_query.should == expected_string
     end
   end

data/spec/spec_helper.rb

@@ -35,3 +35,7 @@ end
 def fixture(file)
   File.open(File.join(File.dirname(__FILE__), 'fixtures', file), 'rb')
 end
+
+def solr_uri(uri)
+  uri.gsub(/(:)/, "\\:").gsub(/(\/)/,"\\/")
+end

data/spec/unit/base_extra_spec.rb

@@ -87,19 +87,12 @@ describe ActiveFedora::Base do
       # Actually uses self.to_solr internally to gather solr info from all metadata datastreams
       mock1 = mock("ds1", :to_solr)
       mock2 = mock("ds2", :to_solr)
-      mock3 = mock("RELS-EXT")
+      mock3 = mock("RELS-EXT", :to_solr)
       
       mock_datastreams = {:ds1 => mock1, :ds2 => mock2, :rels_ext => mock3}
-      mock_datastreams.values.each do |ds| 
-        ds.stubs(:kind_of?).with(ActiveFedora::RDFDatastream).returns(false)
-        ds.stubs(:kind_of?).with(ActiveFedora::NokogiriDatastream).returns(false)
-      end
       mock1.expects(:solrize_profile).returns({})
       mock2.expects(:solrize_profile).returns({})
       mock3.expects(:solrize_profile).returns({})
-      mock1.expects(:kind_of?).with(ActiveFedora::NokogiriDatastream).returns(true)
-      mock2.expects(:kind_of?).with(ActiveFedora::NokogiriDatastream).returns(true)
-      mock3.expects(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(false)
       @test_object.expects(:datastreams).twice.returns(mock_datastreams)
       @test_object.expects(:solrize_relationships)
       @test_object.update_index
@@ -109,19 +102,12 @@ describe ActiveFedora::Base do
       # Actually uses self.to_solr internally to gather solr info from all metadata datastreams
       mock1 = mock("ds1", :to_solr)
       mock2 = mock("ds2", :to_solr)
-      mock3 = mock("RELS-EXT")
+      mock3 = mock("RELS-EXT", :to_solr)
       
       mock_datastreams = {:ds1 => mock1, :ds2 => mock2, :rels_ext => mock3}
-      mock_datastreams.values.each do |ds| 
-        ds.stubs(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(false)
-        ds.stubs(:kind_of?).with(ActiveFedora::NokogiriDatastream).returns(false)
-      end
       mock1.expects(:solrize_profile).returns({})
       mock2.expects(:solrize_profile).returns({})
       mock3.expects(:solrize_profile).returns({})
-      mock1.expects(:kind_of?).with(ActiveFedora::RDFDatastream).returns(true)
-      mock2.expects(:kind_of?).with(ActiveFedora::RDFDatastream).returns(true)
-      mock3.expects(:kind_of?).with(ActiveFedora::RDFDatastream).returns(false)
       @test_object.expects(:datastreams).twice.returns(mock_datastreams)
       @test_object.expects(:solrize_relationships)
       @test_object.update_index

data/spec/unit/base_spec.rb

@@ -623,12 +623,6 @@ describe ActiveFedora::Base do
         ngds.expects(:solrize_profile)
         mock1.expects(:solrize_profile)
         mock2.expects(:solrize_profile)
-        mock1.expects(:kind_of?).with(ActiveFedora::RDFDatastream).returns(false)
-        mock1.expects(:kind_of?).with(ActiveFedora::NokogiriDatastream).returns(true)
-        mock2.expects(:kind_of?).with(ActiveFedora::RDFDatastream).returns(false)
-        mock2.expects(:kind_of?).with(ActiveFedora::NokogiriDatastream).returns(true)
-        ngds.expects(:kind_of?).with(ActiveFedora::RDFDatastream).returns(false)
-        ngds.expects(:kind_of?).with(ActiveFedora::NokogiriDatastream).returns(true)
         
         @test_object.expects(:datastreams).twice.returns({:ds1 => mock1, :ds2 => mock2, :ngds => ngds})
         @test_object.expects(:solrize_relationships)
@@ -637,7 +631,6 @@ describe ActiveFedora::Base do
       it "should call .to_solr on all RDFDatastreams, passing the resulting document to solr" do
         mock = mock("ds1", :to_solr)
         mock.expects(:solrize_profile)
-        mock.expects(:kind_of?).with(ActiveFedora::RDFDatastream).returns(true)
         
         @test_object.expects(:datastreams).twice.returns({:ds1 => mock})
         @test_object.expects(:solrize_relationships)

data/spec/unit/model_spec.rb

@@ -10,6 +10,7 @@ describe ActiveFedora::Model do
         end
       end
     end
+    @model_query = "has_model_s:#{solr_uri("info:fedora/afmodel:SpecModel_Basic")}"
   end
   
   after(:all) do
@@ -27,7 +28,7 @@ describe ActiveFedora::Model do
             mock_docs = mock('docs')
             mock_docs.expects(:each).multiple_yields([{"id" => "changeme:30"}],[{"id" => "changeme:22"}])
             mock_docs.expects(:has_next?).returns(false)
-            ActiveFedora::SolrService.instance.conn.expects(:paginate).with(1, 1000, 'select', :params=>{:q=>'has_model_s:info\\:fedora/afmodel\\:SpecModel_Basic', :qt => 'standard', :sort => ['system_create_dt asc'], :fl=> 'id', }).returns('response'=>{'docs'=>mock_docs})
+            ActiveFedora::SolrService.instance.conn.expects(:paginate).with(1, 1000, 'select', :params=>{:q=>@model_query, :qt => 'standard', :sort => ['system_create_dt asc'], :fl=> 'id', }).returns('response'=>{'docs'=>mock_docs})
             SpecModel::Basic.find(:all).should == ["Fake Object1", "Fake Object2"]
           end
         end
@@ -79,7 +80,7 @@ describe ActiveFedora::Model do
             hash[:params] &&
             hash[:params][:sort] == ['system_create_dt asc'] &&
             hash[:params][:fl] == 'id' && 
-            hash[:params][:q].split(" AND ").include?("has_model_s:info\\:fedora/afmodel\\:SpecModel_Basic") &&
+            hash[:params][:q].split(" AND ").include?(@model_query) &&
             hash[:params][:q].split(" AND ").include?("foo:\"bar\"") &&
             hash[:params][:q].split(" AND ").include?("baz:\"quix\"") &&
             hash[:params][:q].split(" AND ").include?("baz:\"quack\"")
@@ -89,12 +90,19 @@ describe ActiveFedora::Model do
     end
   end
 
+  describe '#all' do
+    it "should pass everything through to .find" do
+      SpecModel::Basic.expects(:find).with(:all, {})
+      SpecModel::Basic.all
+    end
+  end
+
   describe '#find_each' do
     it "should query solr for all objects with :active_fedora_model_s of self.class" do
       mock_docs = mock('docs')
       mock_docs.expects(:each).multiple_yields([{"id" => "changeme:30"}],[{"id" => "changeme:22"}])
       mock_docs.expects(:has_next?).returns(false)
-      ActiveFedora::SolrService.instance.conn.expects(:paginate).with(1, 1000, 'select', :params=>{:q=>'has_model_s:info\\:fedora/afmodel\\:SpecModel_Basic', :qt => 'standard', :sort => ['system_create_dt asc'], :fl=> 'id', }).returns('response'=>{'docs'=>mock_docs})
+      ActiveFedora::SolrService.instance.conn.expects(:paginate).with(1, 1000, 'select', :params=>{:q=>@model_query, :qt => 'standard', :sort => ['system_create_dt asc'], :fl=> 'id', }).returns('response'=>{'docs'=>mock_docs})
       
       SpecModel::Basic.expects(:find_one).with("changeme:30", nil).returns(SpecModel::Basic.new(:pid=>'changeme:30'))
       SpecModel::Basic.expects(:find_one).with("changeme:22", nil).returns(SpecModel::Basic.new(:pid=>'changeme:22'))
@@ -117,7 +125,7 @@ describe ActiveFedora::Model do
             hash[:params] &&
             hash[:params][:sort] == ['system_create_dt asc'] && 
             hash[:params][:fl] == 'id' && 
-            hash[:params][:q].split(" AND ").include?("has_model_s:info\\:fedora/afmodel\\:SpecModel_Basic") &&
+            hash[:params][:q].split(" AND ").include?(@model_query) &&
             hash[:params][:q].split(" AND ").include?("foo:\"bar\"") &&
             hash[:params][:q].split(" AND ").include?("baz:\"quix\"") &&
             hash[:params][:q].split(" AND ").include?("baz:\"quack\"")
@@ -141,7 +149,7 @@ describe ActiveFedora::Model do
             hash[:params] &&
             hash[:params][:sort] == ['system_create_dt asc'] && 
             hash[:params][:fl] == 'id' && 
-            hash[:params][:q].split(" AND ").include?("has_model_s:info\\:fedora/afmodel\\:SpecModel_Basic") &&
+            hash[:params][:q].split(" AND ").include?(@model_query) &&
             hash[:params][:q].split(" AND ").include?("foo:\"bar\"") &&
             hash[:params][:q].split(" AND ").include?("baz:\"quix\"") &&
             hash[:params][:q].split(" AND ").include?("baz:\"quack\"")
@@ -157,12 +165,12 @@ describe ActiveFedora::Model do
     
     it "should return a count" do
       mock_result = {'response'=>{'numFound'=>7}}
-      ActiveFedora::SolrService.expects(:query).with('has_model_s:info\\:fedora/afmodel\\:SpecModel_Basic', :rows=>0, :raw=>true).returns(mock_result)
+      ActiveFedora::SolrService.expects(:query).with(@model_query, :rows=>0, :raw=>true).returns(mock_result)
       SpecModel::Basic.count.should == 7
     end
     it "should allow conditions" do
       mock_result = {'response'=>{'numFound'=>7}}
-      ActiveFedora::SolrService.expects(:query).with('has_model_s:info\\:fedora/afmodel\\:SpecModel_Basic AND foo:bar', :rows=>0, :raw=>true).returns(mock_result)
+      ActiveFedora::SolrService.expects(:query).with("#{@model_query} AND foo:bar", :rows=>0, :raw=>true).returns(mock_result)
       SpecModel::Basic.count(:conditions=>'foo:bar').should == 7
     end
   end
@@ -188,7 +196,7 @@ describe ActiveFedora::Model do
            ActiveFedora::SolrService.expects(:query).with() { |args|
             q = args.first if args.is_a? Array
             q ||= args
-            q.split(" AND ").include?("has_model_s:info\\:fedora/afmodel\\:SpecModel_Basic") &&
+            q.split(" AND ").include?(@model_query) &&
             q.split(" AND ").include?("foo:\"bar\"") &&
             q.split(" AND ").include?("baz:\"quix\"") &&
             q.split(" AND ").include?("baz:\"quack\"")
@@ -201,8 +209,8 @@ describe ActiveFedora::Model do
            ActiveFedora::SolrService.expects(:query).with() { |args|
             q = args.first if args.is_a? Array
             q ||= args
-            q.split(" AND ").include?("has_model_s:info\\:fedora/afmodel\\:SpecModel_Basic") &&
-            q.split(" AND ").include?("has_model_s:info\\:fedora/afmodel\\:SpecModel_Basic") &&
+            q.split(" AND ").include?(@model_query) &&
+            q.split(" AND ").include?(@model_query) &&
             q.split(" AND ").include?('foo:"9\\" Nails"') &&
             q.split(" AND ").include?('baz:"7\\" version"') &&
             q.split(" AND ").include?('baz:"quack"')

data/spec/unit/relationships_spec.rb

@@ -6,6 +6,12 @@ describe ActiveFedora::Relationships do
     def increment_pid
       @@last_pid += 1    
     end
+    
+    before(:all) do
+      @part_of_sample = "is_part_of_s:#{solr_uri("info:fedora/test:sample_pid")}"
+      @constituent_of_sample = "is_constituent_of_s:#{solr_uri("info:fedora/test:sample_pid")}"
+      @is_part_query = "has_model_s:#{solr_uri("info:fedora/SpecialPart")}"
+    end
 
     before(:each) do
       class SpecNode
@@ -169,7 +175,7 @@ describe ActiveFedora::Relationships do
         local_node = SpecNode.new()
         local_node.expects(:pid).returns("test:sample_pid")
         SpecNode.expects(:relationships_desc).returns({:inbound=>{"parts"=>{:predicate=>:is_part_of}}}).at_least_once()
-        ActiveFedora::SolrService.expects(:query).with("is_part_of_s:info\\:fedora/test\\:sample_pid", :rows=>25).returns(@sample_solr_hits)
+        ActiveFedora::SolrService.expects(:query).with(@part_of_sample, :rows=>25).returns(@sample_solr_hits)
         local_node.parts_ids.should == ["_PID1_", "_PID2_", "_PID3_"]
       end
       
@@ -182,7 +188,7 @@ describe ActiveFedora::Relationships do
         local_node.expects(:pid).returns("test:sample_pid")
         SpecNode.expects(:relationships_desc).returns({:inbound=>{"constituents"=>{:predicate=>:is_constituent_of}}}).at_least_once()
         instance = stub(:conn=>stub(:conn))
-        ActiveFedora::SolrService.expects(:query).with("is_constituent_of_s:info\\:fedora/test\\:sample_pid", :raw=>true, :rows=>101).returns(solr_result)
+        ActiveFedora::SolrService.expects(:query).with(@constituent_of_sample, :raw=>true, :rows=>101).returns(solr_result)
         local_node.constituents(:response_format => :solr, :rows=>101).should == solr_result
       end
       
@@ -192,7 +198,7 @@ describe ActiveFedora::Relationships do
         local_node = SpecNode.new
         local_node.expects(:pid).returns("test:sample_pid")
         SpecNode.expects(:relationships_desc).returns({:inbound=>{"parts"=>{:predicate=>:is_part_of}}}).at_least_once() 
-        ActiveFedora::SolrService.expects(:query).with("is_part_of_s:info\\:fedora/test\\:sample_pid", :rows=>25).returns([Hash["id"=>"pid1"], Hash["id"=>"pid2"]])
+        ActiveFedora::SolrService.expects(:query).with(@part_of_sample, :rows=>25).returns([Hash["id"=>"pid1"], Hash["id"=>"pid2"]])
         local_node.parts(:response_format => :id_array).should == ["pid1", "pid2"]
       end
       
@@ -320,7 +326,7 @@ describe ActiveFedora::Relationships do
         @local_node.expects(:ids_for_outbound).with(:has_part).returns(["mypid:1"])
         id_array_query = ActiveFedora::SolrService.construct_query_for_pids(["mypid:1"])
         solr_result = mock("solr result")
-        ActiveFedora::SolrService.expects(:query).with("#{id_array_query} OR (is_part_of_s:info\\:fedora/test\\:sample_pid)", :rows=>25).returns(solr_result)
+        ActiveFedora::SolrService.expects(:query).with("#{id_array_query} OR (#{@part_of_sample})", :rows=>25).returns(solr_result)
         @local_node.all_parts(:response_format=>:solr)
       end
 
@@ -747,8 +753,8 @@ describe ActiveFedora::Relationships do
     describe "bidirectional_relationship_query" do
       before do
         class MockBiNamedRelationshipQuery < SpecNode
-          register_relationship_desc(:self, "testing_query_outbound", :has_part, :type=>SpecNode, :solr_fq=>"has_model_s:info\\:fedora/SpecialPart")
-          register_relationship_desc(:inbound, "testing_query_inbound", :is_part_of, :type=>SpecNode, :solr_fq=>"has_model_s:info\\:fedora/SpecialPart")
+          register_relationship_desc(:self, "testing_query_outbound", :has_part, :type=>SpecNode, :solr_fq=>"has_model_s:info\\:fedora\\/SpecialPart")
+          register_relationship_desc(:inbound, "testing_query_inbound", :is_part_of, :type=>SpecNode, :solr_fq=>"has_model_s:info\\:fedora\\/SpecialPart")
           create_bidirectional_relationship_name_methods("testing","testing_outbound")
           register_relationship_desc(:self, "testing_no_solr_fq_outbound", :has_part, :type=>SpecNode)
           register_relationship_desc(:inbound, "testing_no_solr_fq_inbound", :is_part_of, :type=>SpecNode)
@@ -774,10 +780,10 @@ describe ActiveFedora::Relationships do
         ids = ["changeme:1","changeme:2","changeme:3","changeme:4","changeme:5"]
         ids.each_with_index do |id,index|
           expected_string << " OR " if index > 0
-          expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND has_model_s:info\\:fedora/SpecialPart)"
+          expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND #{@is_part_query})"
         end
         expected_string << " OR "
-        expected_string << "(is_part_of_s:info\\:fedora/changeme\\:6 AND has_model_s:info\\:fedora/SpecialPart)"
+        expected_string << "(is_part_of_s:info\\:fedora\\/changeme\\:6 AND #{@is_part_query})"
         MockBiNamedRelationshipQuery.bidirectional_relationship_query("changeme:6","testing_query",ids).should == expected_string
       end
 
@@ -789,7 +795,7 @@ describe ActiveFedora::Relationships do
           expected_string << "id:" + id.gsub(/(:)/, '\\:')
         end
         expected_string << " OR "
-        expected_string << "(is_part_of_s:info\\:fedora/changeme\\:6)"
+        expected_string << "(is_part_of_s:info\\:fedora\\/changeme\\:6)"
         MockBiNamedRelationshipQuery.bidirectional_relationship_query("changeme:6","testing_no_solr_fq",ids).should == expected_string
       end
     end
@@ -797,7 +803,7 @@ describe ActiveFedora::Relationships do
     describe "inbound_relationship_query" do
       before do
         class MockInboundNamedRelationshipQuery < SpecNode
-          register_relationship_desc(:inbound, "testing_inbound_query", :is_part_of, :type=>SpecNode, :solr_fq=>"has_model_s:info\\:fedora/SpecialPart")
+          register_relationship_desc(:inbound, "testing_inbound_query", :is_part_of, :type=>SpecNode, :solr_fq=>"has_model_s:#{solr_uri("info:fedora/SpecialPart")}")
           register_relationship_desc(:inbound, "testing_inbound_no_solr_fq", :is_part_of, :type=>SpecNode)
         end
       end
@@ -806,11 +812,11 @@ describe ActiveFedora::Relationships do
       end
 
       it "should return a properly formatted query for a relationship that has a solr filter query defined" do
-        MockInboundNamedRelationshipQuery.inbound_relationship_query("changeme:1","testing_inbound_query").should == "is_part_of_s:info\\:fedora/changeme\\:1 AND has_model_s:info\\:fedora/SpecialPart"
+        MockInboundNamedRelationshipQuery.inbound_relationship_query("changeme:1","testing_inbound_query").should == "is_part_of_s:info\\:fedora\\/changeme\\:1 AND #{@is_part_query}"
       end
       
       it "should return a properly formatted query for a relationship that does not have a solr filter query defined" do
-        MockInboundNamedRelationshipQuery.inbound_relationship_query("changeme:1","testing_inbound_no_solr_fq").should == "is_part_of_s:info\\:fedora/changeme\\:1"
+        MockInboundNamedRelationshipQuery.inbound_relationship_query("changeme:1","testing_inbound_no_solr_fq").should == "is_part_of_s:info\\:fedora\\/changeme\\:1"
       end
     end
 
@@ -820,7 +826,7 @@ describe ActiveFedora::Relationships do
     describe "outbound_relationship_query" do
       before do
         class MockOutboundNamedRelationshipQuery < SpecNode
-          register_relationship_desc(:self, "testing_query", :is_part_of, :type=>SpecNode, :solr_fq=>"has_model_s:info\\:fedora/SpecialPart")
+          register_relationship_desc(:self, "testing_query", :is_part_of, :type=>SpecNode, :solr_fq=>"has_model_s:#{solr_uri("info:fedora/SpecialPart")}")
           register_relationship_desc(:self,"testing_no_solr_fq", :is_part_of, :type=>SpecNode)
         end
       end
@@ -833,7 +839,7 @@ describe ActiveFedora::Relationships do
         expected_string = ""
         ids.each_with_index do |id,index|
           expected_string << " OR " if index > 0
-          expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND has_model_s:info\\:fedora/SpecialPart)"
+          expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND has_model_s:#{solr_uri("info:fedora/SpecialPart")})"
         end
         MockOutboundNamedRelationshipQuery.outbound_relationship_query("testing_query",ids).should == expected_string
       end

data/spec/unit/solr_config_options_spec.rb

@@ -51,7 +51,7 @@ describe ActiveFedora do
 
     it "should be used by ActiveFedora::Base#find_with_conditions" do
       mock_response = mock("SolrResponse")
-      ActiveFedora::SolrService.expects(:query).with("has_model_s:info\\:fedora/afmodel\\:SolrSpecModel_Basic AND " + SOLR_DOCUMENT_ID + ':"changeme\\:30"', {:sort => ['system_create_dt asc']}).returns(mock_response)
+      ActiveFedora::SolrService.expects(:query).with("has_model_s:info\\:fedora\\/afmodel\\:SolrSpecModel_Basic AND " + SOLR_DOCUMENT_ID + ':"changeme\\:30"', {:sort => ['system_create_dt asc']}).returns(mock_response)
   
       SolrSpecModel::Basic.find_with_conditions(:id=>"changeme:30").should equal(mock_response)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 4.5.1
+  version: 4.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -522,7 +522,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 580091629
+      hash: -146245566086376860
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -531,12 +531,139 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 580091629
+      hash: -146245566086376860
 requirements: []
 rubyforge_project: rubyfedora
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A convenience libary for manipulating documents in the Fedora Repository.
-test_files: []
+test_files:
+- spec/config_helper.rb
+- spec/fixtures/changeme155.xml
+- spec/fixtures/dino.jpg
+- spec/fixtures/dino_jpg_no_file_ext
+- spec/fixtures/dublin_core_rdf_descMetadata.nt
+- spec/fixtures/hydrangea_fixture_mods_article1.foxml.xml
+- spec/fixtures/minivan.jpg
+- spec/fixtures/mixed_rdf_descMetadata.nt
+- spec/fixtures/mods_articles/hydrangea_article1.xml
+- spec/fixtures/rails_root/config/fake_fedora.yml
+- spec/fixtures/rails_root/config/fedora.yml
+- spec/fixtures/rails_root/config/predicate_mappings.yml
+- spec/fixtures/rails_root/config/solr.yml
+- spec/fixtures/rails_root/config/solr_mappings.yml
+- spec/fixtures/rails_root/config/solr_mappings_af_0.1.yml
+- spec/fixtures/rails_root/config/solr_mappings_bl_2.4.yml
+- spec/fixtures/sharded_fedora.yml
+- spec/fixtures/solr_rdf_descMetadata.nt
+- spec/fixtures/test_12.foxml.xml
+- spec/hydrangea_fixture_mods_article1.foxml.xml
+- spec/integration/associations_spec.rb
+- spec/integration/base_file_management_spec.rb
+- spec/integration/base_find_by_fields_spec.rb
+- spec/integration/base_spec.rb
+- spec/integration/bug_spec.rb
+- spec/integration/datastream_collections_spec.rb
+- spec/integration/datastream_spec.rb
+- spec/integration/datastreams_spec.rb
+- spec/integration/full_featured_model_spec.rb
+- spec/integration/metadata_datastream_helper_spec.rb
+- spec/integration/metadata_datastream_spec.rb
+- spec/integration/model_spec.rb
+- spec/integration/mods_article_integration_spec.rb
+- spec/integration/nested_attribute_spec.rb
+- spec/integration/nokogiri_datastream_spec.rb
+- spec/integration/ntriples_datastream_spec.rb
+- spec/integration/rels_ext_datastream_spec.rb
+- spec/integration/semantic_node_spec.rb
+- spec/integration/solr_service_spec.rb
+- spec/rails3_test_app/.gitignore
+- spec/rails3_test_app/.rspec
+- spec/rails3_test_app/.rvmrc
+- spec/rails3_test_app/Gemfile
+- spec/rails3_test_app/Gemfile.lock
+- spec/rails3_test_app/Rakefile
+- spec/rails3_test_app/app/controllers/application_controller.rb
+- spec/rails3_test_app/app/helpers/application_helper.rb
+- spec/rails3_test_app/app/views/layouts/application.html.erb
+- spec/rails3_test_app/config.ru
+- spec/rails3_test_app/config/application.rb
+- spec/rails3_test_app/config/boot.rb
+- spec/rails3_test_app/config/database.yml
+- spec/rails3_test_app/config/environment.rb
+- spec/rails3_test_app/config/environments/development.rb
+- spec/rails3_test_app/config/environments/production.rb
+- spec/rails3_test_app/config/environments/test.rb
+- spec/rails3_test_app/config/initializers/backtrace_silencers.rb
+- spec/rails3_test_app/config/initializers/inflections.rb
+- spec/rails3_test_app/config/initializers/mime_types.rb
+- spec/rails3_test_app/config/initializers/secret_token.rb
+- spec/rails3_test_app/config/initializers/session_store.rb
+- spec/rails3_test_app/config/locales/en.yml
+- spec/rails3_test_app/config/routes.rb
+- spec/rails3_test_app/db/seeds.rb
+- spec/rails3_test_app/run_tests
+- spec/rails3_test_app/script/rails
+- spec/rails3_test_app/spec/spec_helper.rb
+- spec/rails3_test_app/spec/unit/rails_3_init.rb
+- spec/rcov.opts
+- spec/samples/hydra-mods_article_datastream.rb
+- spec/samples/hydra-rights_metadata_datastream.rb
+- spec/samples/marpa-dc_datastream.rb
+- spec/samples/models/audio_record.rb
+- spec/samples/models/hydrangea_article.rb
+- spec/samples/models/image.rb
+- spec/samples/models/oral_history.rb
+- spec/samples/models/seminar.rb
+- spec/samples/models/seminar_audio_file.rb
+- spec/samples/oral_history_sample.xml
+- spec/samples/oral_history_sample_model.rb
+- spec/samples/oral_history_xml.xml
+- spec/samples/samples.rb
+- spec/samples/special_thing.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/support/mock_fedora.rb
+- spec/unit/active_fedora_spec.rb
+- spec/unit/association_proxy_spec.rb
+- spec/unit/base_active_model_spec.rb
+- spec/unit/base_cma_spec.rb
+- spec/unit/base_datastream_management_spec.rb
+- spec/unit/base_delegate_spec.rb
+- spec/unit/base_delegate_to_spec.rb
+- spec/unit/base_extra_spec.rb
+- spec/unit/base_file_management_spec.rb
+- spec/unit/base_spec.rb
+- spec/unit/callback_spec.rb
+- spec/unit/code_configurator_spec.rb
+- spec/unit/config_spec.rb
+- spec/unit/content_model_spec.rb
+- spec/unit/datastream_collections_spec.rb
+- spec/unit/datastream_spec.rb
+- spec/unit/datastreams_spec.rb
+- spec/unit/file_configurator_spec.rb
+- spec/unit/has_many_collection_spec.rb
+- spec/unit/inheritance_spec.rb
+- spec/unit/metadata_datastream_spec.rb
+- spec/unit/model_spec.rb
+- spec/unit/nokogiri_datastream_spec.rb
+- spec/unit/ntriples_datastream_spec.rb
+- spec/unit/predicates_spec.rb
+- spec/unit/property_spec.rb
+- spec/unit/qualified_dublin_core_datastream_spec.rb
+- spec/unit/rdf_xml_writer_spec.rb
+- spec/unit/rdfxml_rdf_datastream_spec.rb
+- spec/unit/relationship_graph_spec.rb
+- spec/unit/relationships_spec.rb
+- spec/unit/rels_ext_datastream_spec.rb
+- spec/unit/rubydora_connection_spec.rb
+- spec/unit/semantic_node_spec.rb
+- spec/unit/service_definitions_spec.rb
+- spec/unit/simple_datastream_spec.rb
+- spec/unit/solr_config_options_spec.rb
+- spec/unit/solr_digital_object_spec.rb
+- spec/unit/solr_service_spec.rb
+- spec/unit/unsaved_digital_object_spec.rb
+- spec/unit/validations_spec.rb
 has_rdoc: