active-fedora 5.5.1 → 5.5.2

data/History.txt

@@ -1,3 +1,6 @@
+5.5.2
+#25 When multiple has_many relationships share a predicate, the solr_query should use class_name to distinguish the sets.
+
 5.5.1
 #34 Allow passing RDF::URI to rdf_type
 

data/lib/active_fedora/associations.rb

@@ -12,24 +12,27 @@ module ActiveFedora
 
     autoload :AssociationCollection, 'active_fedora/associations/association_collection'
     autoload :AssociationProxy, 'active_fedora/associations/association_proxy'
+
+    # Clears out the association cache.
+    def clear_association_cache #:nodoc:
+      @association_cache.clear if persisted?
+    end
+
+    # :nodoc:
+    attr_reader :association_cache
+    
     private 
 
       # Returns the specified association instance if it responds to :loaded?, nil otherwise.
       def association_instance_get(name)
-        ivar = "@#{name}"
-        if instance_variable_defined?(ivar)
-          association = instance_variable_get(ivar)
-          association if association.respond_to?(:loaded?)
-        end
+        @association_cache[name.to_sym]
       end
 
       # Set the specified association instance.
       def association_instance_set(name, association)
-        instance_variable_set("@#{name}", association)
+        @association_cache[name] = association
       end
 
-    
-
     module ClassMethods
 
       def has_many(association_id, options={})

data/lib/active_fedora/associations/association_collection.rb

@@ -180,7 +180,9 @@ module ActiveFedora
         end
 
         def construct_query
-          @counter_query = @finder_query = ActiveFedora::SolrService.construct_query_for_rel(@reflection.options[:property], @owner.internal_uri)
+          clauses = {@reflection.options[:property] => @owner.internal_uri}
+          clauses[:has_model] = @reflection.class_name.constantize.to_class_uri if @reflection.class_name
+          @counter_query = @finder_query = ActiveFedora::SolrService.construct_query_for_rel(clauses)
         end
 
 

data/lib/active_fedora/base.rb

@@ -68,6 +68,7 @@ module ActiveFedora
     # the given namespace.
     def initialize(attrs = nil)
       attrs = {} if attrs.nil?
+      @association_cache = {}
       attributes = attrs.dup
       @inner_object = UnsavedDigitalObject.new(self.class, attributes.delete(:namespace), attributes.delete(:pid))
       self.relationships_loaded = true
@@ -80,6 +81,7 @@ module ActiveFedora
 
     # Reloads the object from Fedora.
     def reload
+      clear_association_cache
       init_with(self.class.find(self.pid).inner_object)
     end
 
@@ -94,6 +96,7 @@ module ActiveFedora
     #   post.init_with(DigitalObject.find(pid))
     #   post.properties.title # => 'hello world'
     def init_with(inner_obj)
+      @association_cache = {}
       @inner_object = inner_obj
       unless @inner_object.is_a? SolrDigitalObject
         @inner_object.original_class = self.class

data/lib/active_fedora/querying.rb

@@ -145,7 +145,7 @@ module ActiveFedora
     # Return the solr clause that queries for this type of class
     def search_model_clause
       unless self == ActiveFedora::Base
-        return ActiveFedora::SolrService.construct_query_for_rel(:has_model, self.to_class_uri)
+        return ActiveFedora::SolrService.construct_query_for_rel(:has_model => self.to_class_uri)
       end
     end
   end

data/lib/active_fedora/relationships.rb

@@ -365,7 +365,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]
-          query = ActiveFedora::SolrService.construct_query_for_rel(predicate, "info:fedora/#{pid}")
+          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

@@ -72,8 +72,13 @@ module ActiveFedora
       return uri.gsub(/(:)/, '\\:').gsub(/(\/)/, '\\/')
     end
     
-    def self.construct_query_for_rel(predicate, target_uri)
-      "#{solr_name(predicate, :symbol)}:#{escape_uri_for_query(target_uri)}"
+    # Create a query with a clause for each key, value
+    # @param [Hash] args key is the predicate, value is the target_uri
+    def self.construct_query_for_rel(args)
+      clauses = args.map do |predicate, target_uri|
+        "#{solr_name(predicate, :symbol)}:#{escape_uri_for_query(target_uri)}"
+      end
+      clauses.join(" AND ")
     end
 
     def self.query(query, args={})

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "5.5.1"
+  VERSION = "5.5.2"
 end

data/spec/integration/has_many_associations_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe "When two or more relationships share the same property" do 
+  before do
+    class Book < ActiveFedora::Base 
+      has_many :collections, :property=>:is_part_of, :class_name=>'Collection'
+      has_many :people, :property=>:is_part_of#, :class_name=>'Person'
+    end
+
+    class Person < ActiveFedora::Base
+      belongs_to :book, :property=>:is_part_of
+    end
+
+    class Collection < ActiveFedora::Base
+      belongs_to :book, :property=>:is_part_of
+    end
+
+    @book = Book.create!#(:collections=>[@collection1, @collection2], :people=>[@person1, @person2])
+    @person1 = Person.create!(:book=>@book)
+    @person2 = Person.create!(:book=>@book)
+  end
+  after do
+      Object.send(:remove_const, :Collection)
+      Object.send(:remove_const, :Person)
+      Object.send(:remove_const, :Book)
+  end
+
+  it "Should only return relationships of the correct class" do
+    @book.reload
+    @book.people.should == [@person1, @person2]
+    @book.collections.should == []
+  end
+end

data/spec/unit/has_many_collection_spec.rb

@@ -3,8 +3,7 @@ require 'spec_helper'
 describe ActiveFedora::Associations::HasManyAssociation do
   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'})
-    #ac = ActiveFedora::Associations::AssociationCollection.new(@owner, @reflection)
+    @reflection = stub(:klass => mock.class, :options=>{:property=>'predicate'}, :class_name=> nil)
     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 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 5.5.1
+  version: 5.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -442,6 +442,7 @@ files:
 - spec/integration/datastreams_spec.rb
 - spec/integration/delete_all_spec.rb
 - spec/integration/full_featured_model_spec.rb
+- spec/integration/has_many_associations_spec.rb
 - spec/integration/metadata_datastream_helper_spec.rb
 - spec/integration/model_spec.rb
 - spec/integration/mods_article_integration_spec.rb
@@ -565,7 +566,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2863321787483919709
+      hash: -3856753217323380109
 requirements: []
 rubyforge_project: rubyfedora
 rubygems_version: 1.8.24
@@ -605,6 +606,7 @@ test_files:
 - spec/integration/datastreams_spec.rb
 - spec/integration/delete_all_spec.rb
 - spec/integration/full_featured_model_spec.rb
+- spec/integration/has_many_associations_spec.rb
 - spec/integration/metadata_datastream_helper_spec.rb
 - spec/integration/model_spec.rb
 - spec/integration/mods_article_integration_spec.rb