sunspot_rails 1.2.0 → 1.2.1

data/lib/sunspot/rails/searchable.rb

@@ -187,7 +187,7 @@ module Sunspot #:nodoc:
         #
         # Add/update all existing records in the Solr index. 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,
+        # database at a time. The default batch size is 50; 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. If associated
@@ -197,7 +197,7 @@ module Sunspot #:nodoc:
         # ==== Options (passed as a hash)
         #
         # batch_size<Integer>:: Batch size with which to load records. Passing
-        #                       'nil' will skip batches.  Default is 500.
+        #                       'nil' will skip batches.  Default is 50.
         # batch_commit<Boolean>:: Flag signalling if a commit should be done after
         #                         after each batch is indexed, default is 'true'
         # include<Mixed>:: include option to be passed to the ActiveRecord find,
@@ -210,13 +210,13 @@ module Sunspot #:nodoc:
         #
         # ==== Examples
         #   
-        #   # index in batches of 500, commit after each
+        #   # index in batches of 50, commit after each
         #   Post.index 
         #
         #   # index all rows at once, then commit
         #   Post.index(:batch_size => nil) 
         #
-        #   # index in batches of 500, commit when all batches complete
+        #   # index in batches of 50, commit when all batches complete
         #   Post.index(:batch_commit => false) 
         #
         #   # include the associated +author+ object when loading to index
@@ -224,18 +224,20 @@ module Sunspot #:nodoc:
         #
         def solr_index(opts={})
           options = {
-            :batch_size => 500,
+            :batch_size => 50,
             :batch_commit => true,
             :include => self.sunspot_options[:include],
             :first_id => 0
           }.merge(opts)
 
           if options[:batch_size]
+            counter = 0
             find_in_batches(:include => options[:include], :batch_size => options[:batch_size]) do |records|
               solr_benchmark options[:batch_size], counter do
                 Sunspot.index(records)
               end
               Sunspot.commit if options[:batch_commit]
+              counter += 1
             end
             Sunspot.commit unless options[:batch_commit]
           else

data/lib/sunspot/rails/tasks.rb

@@ -27,7 +27,7 @@ namespace :sunspot do
   desc "Reindex all solr models that are located in your application's models directory."
   # This task depends on the standard Rails file naming \
   # conventions, in that the file name matches the defined class name. \
-  # By default the indexing system works in batches of 500 records, you can \
+  # By default the indexing system works in batches of 50 records, you can \
   # set your own value for this by using the batch_size argument. You can \
   # also optionally define a list of models to separated by a forward slash '/'
   # 

data/lib/sunspot/rails/version.rb

@@ -1,5 +1,5 @@
 module Sunspot
   module Rails
-    VERSION = '1.2.0'
+    VERSION = '1.2.1'
   end
 end

data/spec/model_spec.rb

@@ -301,56 +301,6 @@ describe 'ActiveRecord mixin' do
     end
 
     describe "when using batches" do
-      
-      it "should use the default options" do
-        Post.should_receive(:all).with do |params|
-          params[:limit].should == 500
-          params[:include].should == []
-          params[:conditions].should == ['posts.id > ?', 0]
-          params[:order].should == 'posts.id'
-        end.and_return(@posts)
-        Post.reindex
-      end
-
-      it "should set the conditions using the overridden table attributes" do
-        @posts = Array.new(2) { Author.create }
-        Author.should_receive(:all).with do |params|
-          params[:conditions].should == ['writers.writer_id > ?', 0]
-          params[:order].should == 'writers.writer_id'
-        end.and_return(@posts)
-        Author.reindex
-      end
-
-      it "should count the number of records to index" do
-        Post.should_receive(:count).and_return(10)
-        Post.reindex
-      end
-
-      it "should override the batch_size" do
-        Post.should_receive(:all).with do |params|
-          params[:limit].should == 20
-          @posts
-        end.and_return(@posts)
-        Post.reindex(:batch_size => 20)
-      end
-
-      it "should set the include option" do
-        Post.should_receive(:all).with do |params|
-          params[:include].should == [{:author => :address}]
-          @posts
-        end.and_return(@posts)
-        Post.reindex(:include => [{:author => :address}])
-      end
-      
-      it "should set the include option from the searchable options" do
-        @blogs = Array.new(2) { Blog.create }
-        Blog.should_receive(:all).with do |params|
-          params[:include].should == [{ :posts => :author }, :comments]
-          @blogs
-        end.and_return(@blogs)
-        Blog.reindex
-      end
-
       it "should commit after indexing each batch" do
         Sunspot.should_receive(:commit).twice
         Post.reindex(:batch_size => 1)
@@ -360,7 +310,6 @@ describe 'ActiveRecord mixin' do
         Sunspot.should_receive(:commit).once
         Post.reindex(:batch_commit => false)
       end
-      
     end
   end
   

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: sunspot_rails
 version: !ruby/object:Gem::Version 
-  hash: 31
   prerelease: false
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Mat Brown
@@ -23,7 +22,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-29 00:00:00 -05:00
+date: 2010-12-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,44 +33,54 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 1
         - 2
-        - 0
-        version: 1.2.0
+        - 1
+        version: 1.2.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: nokogiri
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 1
         - 2
         version: "1.2"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 1
         - 2
         version: "1.2"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 description: |
   Sunspot::Rails is an extension to the Sunspot library for Solr search.
   Sunspot::Rails adds integration between Sunspot and ActiveRecord, including
@@ -88,47 +97,47 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- VERSION.yml
-- TESTING.md
-- Rakefile
-- MIT-LICENSE
-- LICENSE
 - History.txt
-- TODO
+- LICENSE
+- MIT-LICENSE
+- Rakefile
 - README.rdoc
-- lib/sunspot_rails.rb
-- lib/sunspot/rails/solr_logging.rb
-- lib/sunspot/rails/railtie.rb
-- lib/sunspot/rails/version.rb
-- lib/sunspot/rails/server.rb
+- TESTING.md
+- TODO
+- VERSION.yml
+- lib/generators/sunspot_rails/install/install_generator.rb
+- lib/generators/sunspot_rails/install/templates/config/sunspot.yml
+- lib/generators/sunspot_rails.rb
+- lib/sunspot/rails/adapters.rb
 - lib/sunspot/rails/configuration.rb
+- lib/sunspot/rails/init.rb
+- lib/sunspot/rails/railtie.rb
 - lib/sunspot/rails/request_lifecycle.rb
-- lib/sunspot/rails/stub_session_proxy.rb
+- lib/sunspot/rails/searchable.rb
+- lib/sunspot/rails/server.rb
+- lib/sunspot/rails/solr_logging.rb
 - lib/sunspot/rails/spec_helper.rb
+- lib/sunspot/rails/stub_session_proxy.rb
 - lib/sunspot/rails/tasks.rb
-- lib/sunspot/rails/searchable.rb
-- lib/sunspot/rails/adapters.rb
-- lib/sunspot/rails/init.rb
+- lib/sunspot/rails/version.rb
 - lib/sunspot/rails.rb
-- lib/generators/sunspot_rails.rb
-- lib/generators/sunspot_rails/install/install_generator.rb
-- lib/generators/sunspot_rails/install/templates/config/sunspot.yml
-- dev_tasks/spec.rake
-- dev_tasks/release.rake
+- lib/sunspot_rails.rb
 - dev_tasks/rdoc.rake
+- dev_tasks/release.rake
+- dev_tasks/spec.rake
 - dev_tasks/todo.rake
-- generators/sunspot/templates/sunspot.yml
 - generators/sunspot/sunspot_generator.rb
+- generators/sunspot/templates/sunspot.yml
 - install.rb
-- spec/session_spec.rb
-- spec/schema.rb
 - spec/configuration_spec.rb
 - spec/model_lifecycle_spec.rb
-- spec/spec_helper.rb
-- spec/stub_session_proxy_spec.rb
-- spec/request_lifecycle_spec.rb
 - spec/model_spec.rb
+- spec/request_lifecycle_spec.rb
+- spec/schema.rb
 - spec/server_spec.rb
+- spec/session_spec.rb
+- spec/spec_helper.rb
+- spec/stub_session_proxy_spec.rb
 has_rdoc: true
 homepage: http://github.com/outoftime/sunspot_rails
 licenses: []
@@ -143,7 +152,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -152,7 +160,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"