sunspot_rails 1.3.1 → 1.3.2

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

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

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

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

data/gemfiles/rails-3.2.3

@@ -0,0 +1,12 @@
+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

data/lib/sunspot/rails/railtie.rb

@@ -1,7 +1,7 @@
 module Sunspot
   module Rails
     class Railtie < ::Rails::Railtie
-      initializer 'sunspot_rails.init' do
+      initializer 'sunspot_rails.init', :before=> :load_config_initializers 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/solr_instrumentation.rb

@@ -7,12 +7,11 @@ module Sunspot
         alias_method_chain :execute, :as_instrumentation
       end
 
-      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
+
+      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

data/lib/sunspot/rails/tasks.rb

@@ -15,6 +15,10 @@ 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,18 +52,22 @@ namespace :sunspot do
     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 defined?(Sunspot::Solr)
+  unless sunspot_solr_in_load_path?
     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:
 
@@ -68,17 +76,19 @@ 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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Mat Brown
@@ -32,7 +32,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-15 00:00:00 -07:00
+date: 2012-05-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,8 +45,8 @@ dependencies:
         segments: 
         - 1
         - 3
-        - 1
-        version: 1.3.1
+        - 2
+        version: 1.3.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -110,8 +110,9 @@ files:
 - dev_tasks/spec.rake
 - dev_tasks/todo.rake
 - gemfiles/rails-2.3.14
-- gemfiles/rails-3.0.11
-- gemfiles/rails-3.1.3
+- gemfiles/rails-3.0.12
+- gemfiles/rails-3.1.4
+- gemfiles/rails-3.2.3
 - generators/sunspot/sunspot_generator.rb
 - generators/sunspot/templates/sunspot.yml
 - install.rb