outoftime-sunspot_rails 0.9.9 → 0.9.10

data/LICENSE

@@ -0,0 +1,18 @@
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -234,27 +234,9 @@ http://outoftime.lighthouseapp.com/projects/20339-sunspot
 
 == Contributors
 
-Mat Brown <mat@patch.com>
-
-== MIT License
-
-Copyright (c) 2009 Mat Brown
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Mat Brown (mat@patch.com)
+Peer Allan (peer.allan@gmail.com)
+
+== License
+
+Sunspot::Rails is distributed under the MIT License, copyright (c) 2009 Mat Brown

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 9
+:patch: 10
 :major: 0
 :minor: 9

data/lib/sunspot/rails/searchable.rb

@@ -143,22 +143,35 @@ module Sunspot #:nodoc:
         # 
         # Completely rebuild the index for this class. First removes all
         # instances from the index, then loads records and save them. If the
-        # +batch+ argument is passed, records will be retrieved from the
+        # +batch_size+ argument is passed, records will be retrieved from the
         # database in batches of that size (recommended for larger data sets).
         #
         # ==== Parameters
         #
-        # batch<Integer>:: Batch size with which to load records. Default is none.
+        # batch_size<Integer>:: Batch size with which to load records. Default is none.
         #
-        def reindex(batch = nil)
+        def reindex(batch_size = nil)
           remove_all_from_index
-          unless batch
+          unless batch_size
             Sunspot.index(all)
           else
-            offset = 0
-            while(offset < count)
-              Sunspot.index(all(:offset => offset, :limit => batch))
-              offset += batch
+            counter = 1
+            if self.respond_to?(:find_in_batches)
+              self.find_in_batches(:batch_size => batch_size) do |batch| 
+                benchmark batch_size, counter do
+                  Sunspot.index(batch)
+                end
+                counter += 1
+              end
+            else
+              offset = 0
+              while(offset < count)
+                benchmark batch_size, counter do
+                  Sunspot.index(all(:offset => offset, :limit => batch_size))
+                end
+                offset += batch_size
+                counter += 1
+              end
             end
           end
         end
@@ -206,6 +219,20 @@ module Sunspot #:nodoc:
         def searchable?
           true
         end
+        
+        protected
+        
+        # 
+        # Does some logging for benchmarking indexing performance
+        #
+        def benchmark(batch_size, counter,  &block)
+          start = Time.now
+          logger.info("[#{Time.now}] Start Indexing")
+          yield
+          elapsed = Time.now-start
+          logger.info("[#{Time.now}] Completed Indexing. Rows indexed #{counter * batch_size}. Rows/sec: #{batch_size/elapsed.to_f} (Elapsed: #{elapsed} sec.)")
+        end
+        
       end
 
       module InstanceMethods

data/spec/model_spec.rb

@@ -163,12 +163,6 @@ describe 'ActiveRecord mixin' do
       Post.search.results.to_set.should == @posts.to_set
     end
 
-    it 'should index with a batch size' do
-      Post.reindex(1)
-      Sunspot.commit
-      Post.search.results.to_set.should == @posts.to_set
-    end
-
     it 'should remove all currently indexed instances' do
       old_post = Post.create!
       old_post.index!
@@ -177,5 +171,35 @@ describe 'ActiveRecord mixin' do
       Sunspot.commit
       Post.search.results.to_set.should == @posts.to_set
     end
+    
+    describe "using batch sizes" do
+      
+      it 'should index with a batch size' do
+        Post.reindex(1)
+        Sunspot.commit
+        Post.search.results.to_set.should == @posts.to_set
+      end
+      
+      it "should look for find_in_batches" do
+        pending "Have to figure out how to remove stubs for Class Methods so this will work"
+        Post.stub!(:respond_to?).with(:to_ary).and_return(false)
+        Post.should_receive(:respond_to?).with(:find_in_batches).and_return(true)
+        Post.reindex(100)
+      end
+
+      it "should use find_in_batches" do
+        pending "Have to figure out how to remove stubs for Class Methods so this will work"
+        Post.should_receive(:find_in_batches).with(:batch_size => 100).and_return([])
+        Post.reindex(100)
+      end
+      
+      it "should find all with the batch size and offset if it can't use find_by_batches" do
+        pending "Have to figure out how to remove stubs for Class Methods so this will work"
+        Post.stub!(:respond_to?).with(:to_ary).and_return(false)
+        Post.stub!(:respond_to?).with(:find_in_batches).and_return(false)
+        Post.should_receive(:all).with(:offset => 0, :limit => 100).and_return([])
+        Post.reindex(100)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: outoftime-sunspot_rails
 version: !ruby/object:Gem::Version 
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors: 
 - Mat Brown
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-27 00:00:00 -07:00
+date: 2009-06-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,8 +89,10 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- LICENSE
 - README.rdoc
 files: 
+- LICENSE
 - MIT-LICENSE
 - README.rdoc
 - Rakefile