sunspot_index_queue 1.1.1 → 1.1.2

data/CHANGE_LOG.txt

@@ -1,3 +1,7 @@
+1.1.2
+
+- Optimization for ActiveRecord to eager load includes declared in sunspot_options for indexing.
+
 1.1.1
 
 - Fix bug where entries were lost if they failed to be submitted individually after they failed to be submitted in a batch.

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/sunspot/index_queue/entry.rb

@@ -99,13 +99,17 @@ module Sunspot
         end
         
         # Load all records in an array of entries. This can be faster than calling load on each DataAccessor
-        # depending on them implementation
+        # depending on the implementation
         def load_all_records(entries)
           classes = entries.collect{|entry| entry.record_class_name}.uniq.collect{|name| Sunspot::Util.full_const_get(name) rescue nil}.compact
           map = entries.inject({}){|hash, entry| hash[entry.record_id.to_s] = entry; hash}
           classes.each do |klass|
             ids = entries.collect{|entry| entry.record_id}
-            Sunspot::Adapters::DataAccessor.create(klass).load_all(ids).each do |record|
+            adapter = Sunspot::Adapters::DataAccessor.create(klass)
+            if klass.respond_to?(:sunspot_options) && klass.sunspot_options && klass.sunspot_options[:include] && adapter.respond_to?(:include=)
+              adapter.include = klass.sunspot_options[:include]
+            end
+            adapter.load_all(ids).each do |record|
               entry = map[Sunspot::Adapters::InstanceAdapter.adapt(record).id.to_s]
               entry.instance_variable_set(:@record, record) if entry
             end

data/spec/batch_spec.rb

@@ -30,6 +30,21 @@ describe Sunspot::IndexQueue::Batch do
     entry_2.processed?.should == true
   end
   
+  it "should submit all entries in a batch to Solr using include options if they are supported on the model and data adapters" do
+    record = Sunspot::IndexQueue::Test::Searchable::IncludeClass.new(1)
+    entry = Sunspot::IndexQueue::Entry::MockImpl.new(:record => record, :delete => false)
+    entry.stub!(:record).and_return(record)
+    session.should_receive(:batch).and_yield
+    session.should_receive(:index).with(record)
+    session.should_receive(:commit)
+    adapter = Sunspot::Adapters::DataAccessor.create(Sunspot::IndexQueue::Test::Searchable::IncludeClass)
+    Sunspot::Adapters::DataAccessor.should_receive(:create).with(Sunspot::IndexQueue::Test::Searchable::IncludeClass).and_return(adapter)
+    Sunspot::IndexQueue::Entry.implementation.should_receive(:delete_entries).with([entry])
+    batch = Sunspot::IndexQueue::Batch.new(queue, [entry])
+    batch.submit!
+    adapter.include.should == :test
+  end
+  
   it "should submit all entries individually and commit them if the batch errors out" do
     entry_1.stub!(:record).and_return(record_1)
     session.should_receive(:batch).and_yield

data/spec/spec_helper.rb

@@ -81,10 +81,22 @@ module Sunspot
         
         class Subclass < Searchable
         end
+        
+        # This class mocks out the behavior of ActiveRecord DataAccessor where an include can be attached for eager loading.
+        class IncludeClass < Searchable
+          def self.sunspot_options
+            {:include => :test}
+          end
+          
+          class IncludeDataAccessor < DataAccessor
+            attr_accessor :include
+          end
+        end
       end
 
       Sunspot::Adapters::InstanceAdapter.register(Searchable::InstanceAdapter, Searchable)
       Sunspot::Adapters::DataAccessor.register(Searchable::DataAccessor, Searchable)
+      Sunspot::Adapters::DataAccessor.register(Searchable::IncludeClass::IncludeDataAccessor, Searchable::IncludeClass)
       Sunspot.setup(Searchable) do
         string :value
       end

data/sunspot_index_queue.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sunspot_index_queue}
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Durand"]
-  s.date = %q{2011-04-08}
+  s.date = %q{2011-06-23}
   s.description = %q{This gem provides asynchronous indexing to Solr for the sunspot gem. It uses a pluggable model for the backing queue and provides support for ActiveRecord and MongoDB out of the box.}
   s.email = %q{brian@embellishedvisions.com}
   s.extra_rdoc_files = [
@@ -46,18 +46,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.5.2}
   s.summary = %q{Asynchronous Solr indexing support for the sunspot gem with an emphasis on reliablity and throughput.}
-  s.test_files = [
-    "spec/active_record_impl_spec.rb",
-    "spec/batch_spec.rb",
-    "spec/data_mapper_impl_spec.rb",
-    "spec/entry_impl_examples.rb",
-    "spec/entry_spec.rb",
-    "spec/index_queue_spec.rb",
-    "spec/integration_spec.rb",
-    "spec/mongo_impl_spec.rb",
-    "spec/session_proxy_spec.rb",
-    "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sunspot_index_queue
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Brian Durand
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-08 00:00:00 -05:00
+date: 2011-06-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -225,14 +225,5 @@ rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Asynchronous Solr indexing support for the sunspot gem with an emphasis on reliablity and throughput.
-test_files: 
-- spec/active_record_impl_spec.rb
-- spec/batch_spec.rb
-- spec/data_mapper_impl_spec.rb
-- spec/entry_impl_examples.rb
-- spec/entry_spec.rb
-- spec/index_queue_spec.rb
-- spec/integration_spec.rb
-- spec/mongo_impl_spec.rb
-- spec/session_proxy_spec.rb
-- spec/spec_helper.rb
+test_files: []
+