sunspot_rails 1.3.3 → 2.0.0.pre.111215

data/History.txt

@@ -1,4 +1,10 @@
-== 1.3.0
+== 2.0.0
+* Finds orphaned objects in batches to avoid excessive memory use (Peer Allan)
+* Default batch size can be specified by setting `Sunspot.config.indexing.default_batch_size`
+  (Peer Allan)
+* Explanation of `progress_bar` is written to stdout instead of stderr (Matt Gornick)
+
+== 1.3.0 2011-11-26
 * `Model.index` correctly uses `:first_id` option (Hamza Khan-Cheema)
 * Solr request performance is instrumented in Rails (Paco Guzmán)
 * Reindexing tasks display a progress bar if `progress_bar` gem is available (Paul Carey)

data/gemfiles/{rails-3.0.12 → rails-3.0.11}

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem 'rails', '3.0.12'
+gem 'rails', '3.0.11'
 gem 'sqlite3-ruby', '~> 1.3.1'
 
 gem 'sunspot', :path => File.expand_path('../../../sunspot', __FILE__)

data/gemfiles/{rails-3.1.4 → rails-3.1.3}

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem 'rails', '3.1.4'
+gem 'rails', '3.1.3'
 gem 'sqlite3-ruby', '~> 1.3.1'
 
 gem 'sunspot', :path => File.expand_path('../../../sunspot', __FILE__)

data/lib/sunspot/rails/railtie.rb

@@ -1,7 +1,7 @@
 module Sunspot
   module Rails
     class Railtie < ::Rails::Railtie
-      initializer 'sunspot_rails.init', :before=> :load_config_initializers do
+      initializer 'sunspot_rails.init' do
         Sunspot.session = Sunspot::Rails.build_session
         ActiveSupport.on_load(:active_record) do
           Sunspot::Adapters::InstanceAdapter.register(Sunspot::Rails::Adapters::ActiveRecordInstanceAdapter, ActiveRecord::Base)

data/lib/sunspot/rails/searchable.rb

@@ -238,7 +238,7 @@ module Sunspot #:nodoc:
         #
         def solr_index(opts={})
           options = {
-            :batch_size => 50,
+            :batch_size => Sunspot.config.indexing.default_batch_size,
             :batch_commit => true,
             :include => self.sunspot_options[:include],
             :start => opts.delete(:first_id) || 0
@@ -275,13 +275,19 @@ module Sunspot #:nodoc:
         # wrong. Usually you will want to rectify the situation by calling
         # #clean_index_orphans or #reindex
         # 
+        # ==== Options (passed as a hash)
+        #
+        # batch_size<Integer>:: Batch size with which to load records. Passing
+        #                       Default is 1000 (from ActiveRecord).
+        # 
         # ==== Returns
         #
         # Array:: Collection of IDs that exist in Solr but not in the database
-        def solr_index_orphans
+        def solr_index_orphans(opts={})
+          batch_size = opts[:batch_size] || Sunspot.config.indexing.default_batch_size
           count = self.count
           indexed_ids = solr_search_ids { paginate(:page => 1, :per_page => count) }.to_set
-          all(:select => 'id').each do |object|
+          find_each(:select => 'id', :batch_size => batch_size) do |object|
             indexed_ids.delete(object.id)
           end
           indexed_ids.to_a
@@ -293,8 +299,13 @@ module Sunspot #:nodoc:
         # circumstances, this should not be necessary; this method is provided
         # in case something goes wrong.
         #
-        def solr_clean_index_orphans
-          solr_index_orphans.each do |id|
+        # ==== Options (passed as a hash)
+        #
+        # batch_size<Integer>:: Batch size with which to load records
+        #                       Default is 50
+        # 
+        def solr_clean_index_orphans(opts={})
+          solr_index_orphans(opts).each do |id|
             new do |fake_instance|
               fake_instance.id = id
             end.solr_remove_from_index

data/lib/sunspot/rails/solr_instrumentation.rb

@@ -7,11 +7,12 @@ module Sunspot
         alias_method_chain :execute, :as_instrumentation
       end
 
-
-      def execute_with_as_instrumentation(path, params={}, *extra)
-        ActiveSupport::Notifications.instrument("request.rsolr",
-                                                {:path => path, :parameters => params}) do
-          execute_without_as_instrumentation(path, params, *extra)
+      module InstanceMethods
+        def execute_with_as_instrumentation(path, params={}, *extra)
+          ActiveSupport::Notifications.instrument("request.rsolr",
+                                                  {:path => path, :parameters => params}) do
+            execute_without_as_instrumentation(path, params, *extra)
+          end
         end
       end
     end

data/lib/sunspot/rails/stub_session_proxy.rb

@@ -55,11 +55,7 @@ module Sunspot
       def new_search(*types)
         Search.new
       end
-
-      def more_like_this(*args)
-        Search.new
-      end
-
+      
       def new_more_like_this(*args)
         Search.new
       end

data/lib/sunspot/rails/tasks.rb

@@ -15,10 +15,6 @@ namespace :sunspot do
   #                                       # batchs of 1000
   # $ rake sunspot:reindex[,Post+Author]  # reindex Post and Author model
   task :reindex, [:batch_size, :models] => [:environment] do |t, args|
-
-    # Retry once or gracefully fail for a 5xx error so we don't break reindexing
-    Sunspot.session = Sunspot::SessionProxy::Retry5xxSessionProxy.new(Sunspot.session)
-
     # Set up general options for reindexing
     reindex_options = { :batch_commit => false }
     
@@ -48,26 +44,22 @@ namespace :sunspot do
       total_documents = sunspot_models.map { | m | m.count }.sum
       reindex_options[:progress_bar] = ProgressBar.new(total_documents)
     rescue LoadError => e
-      $stderr.puts "Skipping progress bar: for progress reporting, add gem 'progress_bar' to your Gemfile"
+      $stdout.puts "Skipping progress bar: for progress reporting, add gem 'progress_bar' to your Gemfile"
     rescue Exception => e
       $stderr.puts "Error using progress bar: #{e.message}"
     end
-
+    
     # Finally, invoke the class-level solr_reindex on each model
     sunspot_models.each do |model|
       model.solr_reindex(reindex_options)
     end
   end
 
-  def sunspot_solr_in_load_path?
-    # http://www.rubular.com/r/rJGDh7eOSc
-    $:.any? { |path| path =~ %r{sunspot_solr(-[^/]+)?/lib$} }
-  end
 
-  unless sunspot_solr_in_load_path?
+  unless defined?(Sunspot::Solr)
     namespace :solr do
-      task :moved_to_sunspot_solr do
-        abort %(
+  		task :moved_to_sunspot_solr do
+  	    abort %(
   Note: This task has been moved to the sunspot_solr gem. To install, start and
   stop a local Solr instance, please add sunspot_solr to your Gemfile:
 
@@ -76,19 +68,17 @@ namespace :sunspot do
   end
 
 )
-      end
-
+  		end
+  		
       desc 'Start the Solr instance'
       task :start => :moved_to_sunspot_solr
-
       desc 'Run the Solr instance in the foreground'
       task :run => :moved_to_sunspot_solr
-
       desc 'Stop the Solr instance'
       task :stop => :moved_to_sunspot_solr
-
-      # for backwards compatibility
+  		# for backwards compatibility
       task :reindex => :"sunspot:reindex"
     end
   end
+  
 end

data/spec/model_spec.rb

@@ -211,6 +211,12 @@ describe 'ActiveRecord mixin' do
     it 'should return IDs of objects that are in the index but not the database' do
       Post.index_orphans.should == [@posts.first.id]
     end
+
+    it 'should find the orphans in batches to improve performance' do
+      Post.should_receive(:find_each).with(hash_including(:batch_size => 10)).and_return([])
+      Post.index_orphans(:batch_size => 10)
+    end
+
   end
 
   describe 'clean_index_orphans()' do

data/spec/stub_session_proxy_spec.rb

@@ -79,6 +79,11 @@ describe 'specs with Sunspot stubbed' do
     Post.search
   end
 
+  it 'should not execute a search when #search called' do
+    @session.should_not_receive(:search)
+    Post.search
+  end
+
   it 'should not execute a search when #search called with parameters' do
     @session.should_not_receive(:search)
     Post.search(:include => :blog, :select => 'id, title')
@@ -89,11 +94,6 @@ describe 'specs with Sunspot stubbed' do
     Sunspot.new_search(Post).should respond_to(:execute)
   end
 
-  it 'should not send more_like_this to session' do
-    @session.should_not_receive(:more_like_this)
-    Sunspot.more_like_this(@post)
-  end
-
   describe 'stub search' do
     before :each do
       @search = Post.search

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: sunspot_rails
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: 
+  prerelease: true
   segments: 
-  - 1
-  - 3
-  - 3
-  version: 1.3.3
+  - 2
+  - 0
+  - 0
+  - pre
+  - 111215
+  version: 2.0.0.pre.111215
 platform: ruby
 authors: 
 - Mat Brown
@@ -33,33 +34,32 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-11 00:00:00 Z
+date: 2011-12-15 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sunspot
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 29
         segments: 
-        - 1
-        - 3
-        - 3
-        version: 1.3.3
+        - 2
+        - 0
+        - 0
+        - pre
+        - 111215
+        version: 2.0.0.pre.111215
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -69,11 +69,9 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 1
         - 2
@@ -84,11 +82,9 @@ dependencies:
   name: rspec-rails
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 1
         - 2
@@ -118,9 +114,8 @@ files:
 - dev_tasks/spec.rake
 - dev_tasks/todo.rake
 - gemfiles/rails-2.3.14
-- gemfiles/rails-3.0.12
-- gemfiles/rails-3.1.4
-- gemfiles/rails-3.2.3
+- gemfiles/rails-3.0.11
+- gemfiles/rails-3.1.3
 - generators/sunspot/sunspot_generator.rb
 - generators/sunspot/templates/sunspot.yml
 - install.rb
@@ -171,6 +166,7 @@ files:
 - spec/stub_session_proxy_spec.rb
 - sunspot_rails.gemspec
 - tmp/.gitkeep
+has_rdoc: true
 homepage: http://github.com/outoftime/sunspot/tree/master/sunspot_rails
 licenses: []
 
@@ -184,27 +180,25 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: sunspot
-rubygems_version: 1.8.15
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Rails integration for the Sunspot Solr search library

data/gemfiles/rails-3.2.3

@@ -1,12 +0,0 @@
-source :rubygems
-
-gem 'rails', '3.2.3'
-gem 'sqlite3-ruby', '~> 1.3.1'
-
-gem 'sunspot', :path => File.expand_path('../../../sunspot', __FILE__)
-gem 'sunspot_solr', :path => File.expand_path('../../../sunspot_solr', __FILE__)
-gem 'sunspot_rails', :path => File.expand_path('../..', __FILE__)
-
-group :test do
-  gem 'rspec-rails', '~> 2.8.1'
-end