pallan-sunspot_rails 0.9.10 → 0.9.12

data/README.rdoc

@@ -236,8 +236,9 @@ http://outoftime.lighthouseapp.com/projects/20339-sunspot
 
 == Contributors
 
-Mat Brown (mat@patch.com)
-Peer Allan (peer.allan@gmail.com)
+- Mat Brown (mat@patch.com)
+- Peer Allan (peer.allan@gmail.com)
+- Michael Moen (michael@underpantsgnome.com)
 
 == License
 

data/VERSION.yml

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

data/lib/sunspot/rails/configuration.rb

@@ -54,7 +54,8 @@ module Sunspot #:nodoc:
       end
 
       #
-      # The URL to call if you are running Solr with multicore. Default '/solr'.
+      # The path to the Solr servlet (useful if you are running multicore).
+      # Default '/solr'.
       #
       # ==== Returns
       #
@@ -83,8 +84,7 @@ module Sunspot #:nodoc:
             path = File.join(::Rails.root, 'config', 'sunspot.yml')
             if File.exist?(path)
               File.open(path) do |file|
-                # only changed this to allow me to test the path attribute
-                YAML.load(file)[RAILS_ENV]
+                YAML.load(file)[::Rails.env]
               end
             end
           end

data/lib/sunspot/rails/searchable.rb

@@ -142,37 +142,37 @@ 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_size+ argument is passed, records will be retrieved from the
-        # database in batches of that size (recommended for larger data sets).
+        # instances from the index, then loads records and save them. The
+        # +batch_size+ argument specifies how many records to load out of the
+        # database at a time. The default batch size is 500; if nil is passed,
+        # records will not be indexed in batches. By default, a commit is issued
+        # after each batch; passing +false+ for +batch_commit+ will disable
+        # this, and only issue a commit at the end of the process.
         #
         # ==== Parameters
         #
-        # batch_size<Integer>:: Batch size with which to load records. Default is none.
+        # batch_size<Integer>:: Batch size with which to load records. Passing
+        #                       'nil' will skip batches.  Default is 500.
+        # batch_commit<Boolean>:: Flag singaling if a commit should be done after
+        #                         after each batch is indexed, default is 'true'
         #
-        def reindex(batch_size = nil)
+        def reindex(batch_size = 500, batch_commit = true)
           remove_all_from_index
           unless batch_size
-            Sunspot.index(all)
+            Sunspot.index!(all)
           else
+            record_count = count(:order => primary_key)
             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
+            offset = 0
+            while(offset < record_count)
+              benchmark batch_size, counter do
+                Sunspot.index(all(:offset => offset, :limit => batch_size, :order => primary_key))
               end
+              Sunspot.commit if batch_commit
+              offset += batch_size
+              counter += 1
             end
+            Sunspot.commit unless batch_commit
           end
         end
 

data/spec/configuration_spec.rb

@@ -0,0 +1,16 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe "Configuration" do
+  it "should handle the 'path' property when not set" do
+    config = Sunspot::Rails::Configuration.new
+    config.path.should == '/solr'
+  end
+
+  it "should handle the 'path' property when set" do
+    silence_stderr do
+      Rails.stub!(:env => 'path_test')
+      config = Sunspot::Rails::Configuration.new
+      config.path.should == '/solr/path_test'
+    end
+  end
+end

data/spec/model_spec.rb

@@ -173,33 +173,11 @@ describe 'ActiveRecord mixin' do
     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: pallan-sunspot_rails
 version: !ruby/object:Gem::Version 
-  version: 0.9.10
+  version: 0.9.12
 platform: ruby
 authors: 
 - Mat Brown
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-03 00:00:00 -07:00
+date: 2009-06-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -108,6 +108,7 @@ files:
 - lib/sunspot/rails/searchable.rb
 - lib/sunspot/rails/tasks.rb
 - rails/init.rb
+- spec/configuration_spec.rb
 - spec/mock_app/app/controllers/application.rb
 - spec/mock_app/app/controllers/application_controller.rb
 - spec/mock_app/app/controllers/posts_controller.rb
@@ -156,6 +157,7 @@ specification_version: 3
 summary: Rails integration for the Sunspot Solr search library
 test_files: 
 - spec/spec_helper.rb
+- spec/configuration_spec.rb
 - spec/model_lifecycle_spec.rb
 - spec/schema.rb
 - spec/model_spec.rb