active-fedora 6.0.0.pre6 → 6.0.0.pre7

data/active-fedora.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency('rsolr')
   s.add_dependency('om', '~> 1.8.0')
   s.add_dependency('nom-xml', '>=0.5.1')
-  s.add_dependency('solrizer', '~>3.0.0.pre4')
+  s.add_dependency('solrizer', '~>3.0.0.pre6')
   s.add_dependency("activeresource", '>= 3.0.0')
   s.add_dependency("activesupport", '>= 3.0.0')
   s.add_dependency("builder", '~> 3.0.0')

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
@@ -304,8 +307,8 @@ module ActiveFedora
         c_time = Time.parse(c_time) unless c_time.is_a?(Time)
         m_time = modified_date
         m_time = Time.parse(m_time) unless m_time.is_a?(Time)
-        Solrizer.set_field(solr_doc, 'system_create', c_time)
-        Solrizer.set_field(solr_doc, 'system_modified', m_time)
+        Solrizer.set_field(solr_doc, 'system_create', c_time, :stored_sortable)
+        Solrizer.set_field(solr_doc, 'system_modified', m_time, :stored_sortable)
         Solrizer.set_field(solr_doc, 'active_fedora_model', self.class.inspect, :symbol)
         solr_doc.merge!(SOLR_DOCUMENT_ID.to_sym => pid)
         solrize_profile(solr_doc)

data/lib/active_fedora/querying.rb

@@ -40,7 +40,7 @@ module ActiveFedora
     end
 
     def default_sort_params
-      [ActiveFedora::SolrService.solr_name(:system_create, type: :date)+' asc'] 
+      [ActiveFedora::SolrService.solr_name(:system_create, :stored_sortable, type: :date)+' asc'] 
     end
 
     # Yields the found ActiveFedora::Base object to the passed block
@@ -149,7 +149,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/relation.rb

@@ -94,8 +94,8 @@ module ActiveFedora
         options[:order] ||= sort if sort.present?
       end
 
-
       if options.present?
+        options = args.first unless args.empty?
         options = {conditions: options}
         apply_finder_options(options).all
       else

data/lib/active_fedora/solr_service.rb

@@ -75,8 +75,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 = "6.0.0.pre6"
+  VERSION = "6.0.0.pre7"
 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/base_spec.rb

@@ -392,8 +392,8 @@ describe ActiveFedora::Base do
         @test_object.should_receive(:create_date).and_return("2012-03-04T03:12:02Z")
         @test_object.should_receive(:modified_date).and_return("2012-03-07T03:12:02Z")
         solr_doc = @test_object.to_solr
-        solr_doc[ActiveFedora::SolrService.solr_name("system_create", type: :date)].should eql(["2012-03-04T03:12:02Z"])
-        solr_doc[ActiveFedora::SolrService.solr_name("system_modified", type: :date)].should eql(["2012-03-07T03:12:02Z"])
+        solr_doc[ActiveFedora::SolrService.solr_name("system_create", :stored_sortable, type: :date)].should eql(["2012-03-04T03:12:02Z"])
+        solr_doc[ActiveFedora::SolrService.solr_name("system_modified", :stored_sortable, type: :date)].should eql(["2012-03-07T03:12:02Z"])
         solr_doc[:id].should eql("#{@test_object.pid}")
       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 

data/spec/unit/query_spec.rb

@@ -8,7 +8,7 @@ describe ActiveFedora::Base do
       end
     end
     @model_query = ActiveFedora::SolrService.solr_name("has_model", :symbol) + ":#{solr_uri("info:fedora/afmodel:SpecModel_Basic")}"
-    @sort_query = ActiveFedora::SolrService.solr_name("system_create", type: :date) + ' asc'
+    @sort_query = ActiveFedora::SolrService.solr_name("system_create", :stored_sortable, type: :date) + ' asc'
   end
   
   after(:all) do
@@ -81,6 +81,28 @@ describe ActiveFedora::Base do
         }.and_return('response'=>{'docs'=>mock_docs})
         SpecModel::Basic.find({:foo=>'bar', :baz=>['quix','quack']}).should == ["Fake Object1", "Fake Object2"]
       end
+
+      it "should add options" do
+        SpecModel::Basic.should_receive(:find_one).with("changeme:30", nil).and_return("Fake Object1")
+        SpecModel::Basic.should_receive(:find_one).with("changeme:22", nil).and_return("Fake Object2")
+
+        mock_docs = [{"id" => "changeme:30"},{"id" => "changeme:22"}]
+        mock_docs.should_receive(:has_next?).and_return(false)
+        ActiveFedora::SolrService.instance.conn.should_receive(:paginate).with() { |page, rows, method, hash|
+            page == 1 &&
+            rows == 1000 &&
+            method == 'select' &&
+            hash[:params] &&
+            hash[:params][:fl] == 'id' && 
+            hash[:params][:sort] == [@sort_query] &&
+            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\"")
+        }.and_return('response'=>{'docs'=>mock_docs})
+        SpecModel::Basic.find({:foo=>'bar', :baz=>['quix','quack']}, :sort=>'title_t desc').should == ["Fake Object1", "Fake Object2"]
+      end
+
     end
   end
 

data/spec/unit/solr_config_options_spec.rb

@@ -34,7 +34,7 @@ describe ActiveFedora do
 
     it "should be used by ActiveFedora::Base#find_with_conditions" do
       mock_response = mock("SolrResponse")
-      ActiveFedora::SolrService.should_receive(:query).with("#{ActiveFedora::SolrService.solr_name("has_model", :symbol)}:info\\:fedora\\/afmodel\\:SolrSpecModel_Basic AND " + SOLR_DOCUMENT_ID + ':"changeme\\:30"', {:sort => ["#{ActiveFedora::SolrService.solr_name("system_create", type: :date)} asc"]}).and_return(mock_response)
+      ActiveFedora::SolrService.should_receive(:query).with("#{ActiveFedora::SolrService.solr_name("has_model", :symbol)}:info\\:fedora\\/afmodel\\:SolrSpecModel_Basic AND " + SOLR_DOCUMENT_ID + ':"changeme\\:30"', {:sort => ["#{ActiveFedora::SolrService.solr_name("system_create", :stored_sortable, type: :date)} asc"]}).and_return(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: 6.0.0.pre6
+  version: 6.0.0.pre7
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-27 00:00:00.000000000 Z
+date: 2013-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -68,7 +68,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0.pre4
+        version: 3.0.0.pre6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -76,7 +76,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0.pre4
+        version: 3.0.0.pre6
 - !ruby/object:Gem::Dependency
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
@@ -438,6 +438,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/model_spec.rb
 - spec/integration/mods_article_integration_spec.rb
 - spec/integration/nested_attribute_spec.rb
@@ -594,6 +595,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/model_spec.rb
 - spec/integration/mods_article_integration_spec.rb
 - spec/integration/nested_attribute_spec.rb