active-fedora 3.2.0.pre6 → 3.2.0.pre7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (3.2.0.pre6)
+    active-fedora (3.2.0.pre7)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
       equivalent-xml

data/History.txt

@@ -1,16 +1,21 @@
 3.2.0
 
+Added a count method
+HYDRA-731 running count on a has_many relationship returns zero unless the relationship has been loaded
 Added ActiveModel validations.
 Added callbacks on initialize, save, update, create, delete and find
 Added Base.create
 HYDRA-730 ActiveFedora isn't being initialized unless it is specified in the project Gemfile
-Don't create pids until save
-inspect and equality methods
-Deprecate datastream_collections
+Don't create pids until save so that we don't cycle through pids we don't intend to save
+inspect method gives less information (more readable)
+Added an equality method
+Deprecate the automatic inclusion of datastream_collections (you should include this optional module in your models if you intend to use it)
+Deprecate the automatic inclusion of relationships (you should include this optional module in your models if you intend to use it)
+Deprecate the automatic inclusion of file_management (you should include this optional module in your models if you intend to use it)
 Disseminators have been added
 HYDRA-729 don't update xml datastreams unless they've changed
-Adapt To
-ActiveFedora::Relationship is deprecated
+Added adapt_to method to reduce number of round trips to fedora.
+ActiveFedora::Relationship is deprecated (was not being used)
 Rails 3.1 compatibility
 Ruby 1.9 compatibility
 

data/lib/active_fedora/associations/association_collection.rb

@@ -3,6 +3,7 @@ module ActiveFedora
     class AssociationCollection < AssociationProxy #:nodoc:
       def initialize(owner, reflection)
         super
+        construct_query
       end
 
       # Returns the size of the collection 
@@ -129,23 +130,12 @@ module ActiveFedora
       end
 
       def find_target
-        load_inbound_relationship(@owner.pid, @reflection.options[:property])
-      end
-
-      def load_inbound_relationship(pid, predicate, opts={})
-        opts = {:rows=>25}.merge(opts)
-        query = inbound_relationship_query(pid, predicate)
-        return [] if query.empty?
-        solr_result = SolrService.instance.conn.query(query, :rows=>opts[:rows])
+        return [] if @finder_query.empty?
+        solr_result = SolrService.instance.conn.query(@finder_query, :rows=>1000)
 #TODO, don't reify, just store the solr results and lazily reify.
         return ActiveFedora::SolrService.reify_solr_results(solr_result)
       end
 
-      def inbound_relationship_query(pid,predicate)
-        internal_uri = "info:fedora/#{pid}"
-        escaped_uri = internal_uri.gsub(/(:)/, '\\:')
-        "#{predicate}_s:#{escaped_uri}" 
-      end
 
       def add_record_to_target_with_callbacks(record)
       #  callback(:before_add, record)

data/lib/active_fedora/associations/has_and_belongs_to_many_association.rb

@@ -68,18 +68,11 @@ module ActiveFedora
           end
         end
 
-        # def construct_sql
-        #   if @reflection.options[:finder_sql]
-        #     @finder_sql = interpolate_and_sanitize_sql(@reflection.options[:finder_sql])
-        #   else
-        #     @finder_sql = "#{@owner.connection.quote_table_name @reflection.options[:join_table]}.#{@reflection.primary_key_name} = #{owner_quoted_id} "
-        #     @finder_sql << " AND (#{conditions})" if conditions
-        #   end
-
-        #   @join_sql = "INNER JOIN #{@owner.connection.quote_table_name @reflection.options[:join_table]} ON #{@reflection.quoted_table_name}.#{@reflection.klass.primary_key} = #{@owner.connection.quote_table_name @reflection.options[:join_table]}.#{@reflection.association_foreign_key}"
-
-        #   construct_counter_sql
-        # 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
 
         def construct_scope
           { :find => {  :conditions => @finder_sql,

data/lib/active_fedora/associations/has_many_association.rb

@@ -14,10 +14,12 @@ module ActiveFedora
       # If the collection is empty the target is set to an empty array and
       # the loaded flag is set to true as well.
       def count_records
-        count = if @target
+        count = if loaded? 
           @target.size
         else
-          0
+          @reflection.klass.count(:conditions => @counter_query)
+          # load_target
+          # @target.size
         end
 
         # If there's nothing in the database and @target has no new records
@@ -44,9 +46,11 @@ module ActiveFedora
         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

@@ -157,7 +157,7 @@ module ActiveFedora
       ds_specs[args[:name]]= {:type => args[:type], :label =>  args.fetch(:label,""), :control_group => args.fetch(:control_group,"X"), :disseminator => args.fetch(:disseminator,""), :url => args.fetch(:url,""),:block => block}
     end
 
-    def self.create(args)
+    def self.create(args = {})
       obj = self.new(args)
       obj.save
       obj

data/lib/active_fedora/model.rb

@@ -119,6 +119,15 @@ module ActiveFedora
         end
       end
 
+      # Get a count of the number of objects from solr
+      # Takes :conditions as an argument
+      def count(args = {})
+          escaped_class_uri = SolrService.escape_uri_for_query(self.to_class_uri)
+          q = "#{ActiveFedora::SolrService.solr_name(:has_model, :symbol)}:#{escaped_class_uri}"
+          q << " AND #{args[:conditions]}" if args[:conditions]
+          SolrService.instance.conn.query(q, :rows=>0).total_hits
+      end
+
       #Sends a query directly to SolrService
       def solr_search(query, args={})
         SolrService.instance.conn.query(query, args)

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "3.2.0.pre6"
+    VERSION = "3.2.0.pre7"
 end

data/spec/integration/associations_spec.rb

@@ -34,28 +34,29 @@ describe ActiveFedora::Base do
         @library.books.to_ary.should == []
         @library.book_ids.should ==[]
         @library.books << @book
-        @library.books.map(&:pid).should == [@book.pid]
+        @library.books.to_a.should == [@book]
         @library.book_ids.should ==[@book.pid]
+
       end
 
       it "should let you set an array of objects" do
         @library.books = [@book, @book2]
-        @library.books.map(&:pid).should == [@book.pid, @book2.pid]
+        @library.books.to_a.should == [@book, @book2]
         @library.save
 
         @library.books = [@book]
-        @library.books.map(&:pid).should == [@book.pid]
+        @library.books.to_a.should == [@book]
       
       end
       it "should let you set an array of object ids" do
         @library.book_ids = [@book.pid, @book2.pid]
-        @library.books.map(&:pid).should == [@book.pid, @book2.pid]
+        @library.books.to_a.should == [@book, @book2]
       end
 
       it "setter should wipe out previously saved relations" do
         @library.book_ids = [@book.pid, @book2.pid]
         @library.book_ids = [@book2.pid]
-        @library.books.map(&:pid).should == [@book2.pid]
+        @library.books.to_a.should == [@book2]
         
       end
 
@@ -97,7 +98,7 @@ describe ActiveFedora::Base do
         @book = Book.new
         @book.topics << @topic1
         @book.topics.map(&:pid).should == [@topic1.pid]
-        Topic.find(@topic1.pid).books.map(&:pid).should == [] #Can't have saved it because @book isn't saved yet.
+        Topic.find(@topic1.pid).books.to_a.should == [] #Can't have saved it because @book isn't saved yet.
       end
       after do
         @topic1.delete
@@ -124,11 +125,22 @@ describe ActiveFedora::Base do
 
         @book.library.pid.should == @library.pid
         @library.books.reload
-        @library.books.map(&:pid).should == [@book.pid]
+        @library.books.to_a.should == [@book]
 
+        @library2 = Library.find(@library.pid)
+        @library2.books.to_a.should == [@book]
+      end
+
+      it "should have a count once it has been saved" do
+        @library.books << @book << Book.create 
+        @library.save
+
+        # @book.library.pid.should == @library.pid
+        # @library.books.reload
+        # @library.books.to_a.should == [@book]
 
         @library2 = Library.find(@library.pid)
-        @library2.books.map(&:pid).should == [@book.pid]
+        @library2.books.size.should == 2
       end
 
       it "should respect the :class_name parameter" do
@@ -154,8 +166,8 @@ describe ActiveFedora::Base do
       end
       it "habtm should set relationships bidirectionally" do
         @book.topics << @topic1
-        @book.topics.map(&:pid).should == [@topic1.pid]
-        Topic.find(@topic1.pid).books.map(&:pid).should == [@book.pid] #Can't have saved it because @book isn't saved yet.
+        @book.topics.to_a.should == [@topic1]
+        Topic.find(@topic1.pid).books.to_a.should == [@book] #Can't have saved it because @book isn't saved yet.
       end
       it "should save new child objects" do
         @book.topics << Topic.new

data/spec/unit/has_many_collection_spec.rb

@@ -2,7 +2,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)
+    @owner = stub(:new_record? => false, :to_ary => nil, :internal_uri => 'info:fedora/changeme:99')
     @reflection = stub(:klass => Mocha::Mock, :options=>{:property=>'predicate'})
     #ac = ActiveFedora::Associations::AssociationCollection.new(@owner, @reflection)
     ac = ActiveFedora::Associations::HasManyAssociation.new(@owner, @reflection)
@@ -17,11 +17,10 @@ describe ActiveFedora::Associations::HasManyAssociation do
   end
 
   it "should build" do
-    class Foo; end
-    @owner = stub(:new_record? => false)
+    @owner = stub(:new_record? => false, :internal_uri => 'info:fedora/changeme:99')
+    @reflection = stub(:klass => Mocha::Mock, :options=>{:property=>'predicate'})
     @assoc = ActiveFedora::Associations::HasManyAssociation.new(@owner, @reflection)
     @assoc.should respond_to :build
-    Object.send(:remove_const, :Foo)
       
   end
 

data/spec/unit/model_spec.rb

@@ -102,7 +102,6 @@ describe ActiveFedora::Model do
       mock_solr = mock("SolrConnection")
       mock_result = mock("MockResult")
       mock_result.expects(:hits).returns([{"id" => "changeme:30"}, {"id" => "changeme:22"}])
-      #mock_solr.expects(:query).with('has_model_s:info\\:fedora/afmodel\\:SpecModel\:\:Basic', :rows=>1001).returns(mock_result)
       mock_solr.expects(:query).with('has_model_s:info\\:fedora/afmodel\\:SpecModel_Basic', :rows=>1001).returns(mock_result)
       ActiveFedora::SolrService.expects(:instance).returns(mock("SolrService", :conn => mock_solr))
       ActiveFedora::RubydoraConnection.instance.expects(:find_model).with("changeme:30", SpecModel::Basic).returns("Fake Object1")
@@ -150,6 +149,26 @@ describe ActiveFedora::Model do
     end
     
   end
+
+  describe '#count' do
+    
+    it "should return a count" do
+      mock_solr = mock("SolrConnection")
+      mock_result = mock("MockResult")
+      mock_result.expects(:total_hits).returns(7)
+      mock_solr.expects(:query).with('has_model_s:info\\:fedora/afmodel\\:SpecModel_Basic', :rows=>0).returns(mock_result)
+      ActiveFedora::SolrService.expects(:instance).returns(mock("SolrService", :conn => mock_solr))
+      SpecModel::Basic.count.should == 7
+    end
+    it "should allow conditions" do
+      mock_solr = mock("SolrConnection")
+      mock_result = mock("MockResult")
+      mock_result.expects(:total_hits).returns(7)
+      mock_solr.expects(:query).with('has_model_s:info\\:fedora/afmodel\\:SpecModel_Basic AND foo:bar', :rows=>0).returns(mock_result)
+      ActiveFedora::SolrService.expects(:instance).returns(mock("SolrService", :conn => mock_solr))
+      SpecModel::Basic.count(:conditions=>'foo:bar').should == 7
+    end
+  end
   
   
   it 'should provide #find_by_solr' do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 1923832037
+  hash: 1923832039
   prerelease: 6
   segments: 
   - 3
   - 2
   - 0
   - pre
-  - 6
-  version: 3.2.0.pre6
+  - 7
+  version: 3.2.0.pre7
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-02 00:00:00 -06:00
+date: 2012-01-04 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency