sunspot_rails 2.0.0.pre.111215 → 2.0.0.pre.120415

data/History.txt

@@ -3,6 +3,8 @@
 * 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)
+* Fixes deprecated behavior of using InstanceMethods module with
+  ActiveSupport::Concern (Everton J. Carpes)
 
 == 1.3.0 2011-11-26
 * `Model.index` correctly uses `:first_id` option (Hamza Khan-Cheema)

data/README.rdoc

@@ -143,7 +143,7 @@ Do it like this:
   Post.search do
     with :blog_id, 1
     with(:updated_at).greater_than(Time.now - 2.weeks)
-    order :sort_title, :asc
+    order_by :sort_title, :asc
     paginate :page => 1, :per_page => 15
   end
 
@@ -168,7 +168,7 @@ be added, so just use the interface provided by Sunspot:
 
   Sunspot.search(Post, Comment) do
     with :blog_id, 1
-    order :created_at, :asc
+    order_by :created_at, :asc
   end
 
 Be sure to check out the Sunspot documentation for all the details.

data/Rakefile

@@ -1,5 +1,10 @@
 require 'rake'
-require 'rake/rdoctask'
+
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rake/rdoctask'
+end
 
 if File.exist?(sunspot_lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'sunspot', 'lib')))
   STDERR.puts("Using sunspot lib at #{sunspot_lib}")

data/gemfiles/rails-2.3.14

@@ -9,7 +9,4 @@ gem 'sunspot_rails', :path => File.expand_path('../..', __FILE__)
 
 group :test do
 	gem 'rspec-rails', '~> 1.3.4'
-  gem 'ruby-debug19', :require => nil,  :platforms => :mri_19
-  gem 'test-unit', '1.2.3',             :platforms => :mri_19
-  gem 'ruby-debug', :require => nil,    :platforms => :mri_18
 end

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

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem 'rails', '3.1.3'
+gem 'rails', '3.0.12'
 gem 'sqlite3-ruby', '~> 1.3.1'
 
 gem 'sunspot', :path => File.expand_path('../../../sunspot', __FILE__)
@@ -8,8 +8,5 @@ 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.0.0'
-  gem 'ruby-debug19', :require => nil,  :platforms => :mri_19
-  gem 'test-unit', '1.2.3',             :platforms => :mri_19
-  gem 'ruby-debug', :require => nil,    :platforms => :mri_18
+  gem 'rspec-rails', '~> 2.8.1'
 end

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

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem 'rails', '3.0.11'
+gem 'rails', '3.1.4'
 gem 'sqlite3-ruby', '~> 1.3.1'
 
 gem 'sunspot', :path => File.expand_path('../../../sunspot', __FILE__)
@@ -8,8 +8,5 @@ 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.0.0'
-  gem 'ruby-debug19', :require => nil,  :platforms => :mri_19
-  gem 'test-unit', '1.2.3',             :platforms => :mri_19
-  gem 'ruby-debug', :require => nil,    :platforms => :mri_18
+  gem 'rspec-rails', '~> 2.8.1'
 end

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/generators/sunspot/templates/sunspot.yml

@@ -3,6 +3,8 @@ production:
     hostname: localhost
     port: 8983
     log_level: WARNING
+    # read_timeout: 2
+    # open_timeout: 0.5
 
 development:
   solr:
@@ -15,4 +17,4 @@ test:
     hostname: localhost
     port: 8981
     log_level: WARNING
-    
+    

data/lib/generators/sunspot_rails/install/templates/config/sunspot.yml

@@ -3,6 +3,8 @@ production:
     hostname: localhost
     port: 8983
     log_level: WARNING
+    # read_timeout: 2
+    # open_timeout: 0.5
 
 development:
   solr:
@@ -14,4 +16,4 @@ test:
   solr:
     hostname: localhost
     port: 8981
-    log_level: WARNING
+    log_level: WARNING

data/lib/sunspot/rails.rb

@@ -48,6 +48,8 @@ module Sunspot #:nodoc:
           :port => sunspot_rails_configuration.master_port,
           :path => sunspot_rails_configuration.master_path
         ).to_s
+        config.solr.read_timeout = sunspot_rails_configuration.read_timeout
+        config.solr.open_timeout = sunspot_rails_configuration.open_timeout
         config
       end
 
@@ -58,6 +60,8 @@ module Sunspot #:nodoc:
           :port => sunspot_rails_configuration.port,
           :path => sunspot_rails_configuration.path
         ).to_s
+        config.solr.read_timeout = sunspot_rails_configuration.read_timeout
+        config.solr.open_timeout = sunspot_rails_configuration.open_timeout
         config
       end
     end

data/lib/sunspot/rails/configuration.rb

@@ -21,6 +21,8 @@ module Sunspot #:nodoc:
     #       hostname: localhost
     #       port: 8983
     #       log_level: OFF
+    #       open_timeout: 0.5
+    #       read_timeout: 2
     #   production:
     #     solr:
     #       hostname: localhost
@@ -28,6 +30,8 @@ module Sunspot #:nodoc:
     #       path: /solr/myindex
     #       log_level: WARNING
     #       solr_home: /some/path
+    #       open_timeout: 0.5
+    #       read_timeout: 2
     #     master_solr:
     #       hostname: localhost
     #       port: 8982
@@ -247,6 +251,14 @@ module Sunspot #:nodoc:
       def bind_address
         @bind_address ||= user_configuration_from_key('solr', 'bind_address')
       end
+      
+      def read_timeout
+        @read_timeout ||= user_configuration_from_key('solr', 'read_timeout')
+      end
+
+      def open_timeout
+        @open_timeout ||= user_configuration_from_key('solr', 'open_timeout')
+      end
 
       #
       # Whether or not to disable Solr.

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,14 +7,13 @@ 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
   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,15 +52,20 @@ 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
 
+  # Assume that if the sunspot_solr gem is in the load path that this deprication warning is
+  # redundant.
+  def sunspot_solr_in_load_path
+    $:.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 %(

data/spec/configuration_spec.rb

@@ -36,6 +36,14 @@ describe Sunspot::Rails::Configuration, "default values without a sunspot.yml" d
       @config.port.should == 8983
     end
   end
+  
+  it "should set the read timeout to nil when not set" do
+    @config.read_timeout == nil
+  end
+
+  it "should set the open timeout to nil when not set" do
+    @config.open_timeout == nil
+  end
 
   it "should handle the 'log_level' property when not set" do
     @config.log_level.should == 'INFO'
@@ -126,6 +134,12 @@ describe Sunspot::Rails::Configuration, "user provided sunspot.yml" do
   it "should handle the 'bind_address' property when set" do
     @config.bind_address.should == "127.0.0.1"
   end
+  it "should handle the 'read_timeout' property when set" do
+    @config.read_timeout.should == 2
+  end
+  it "should handle the 'open_timeout' property when set" do
+    @config.open_timeout.should == 0.5
+  end
 end
 
 describe Sunspot::Rails::Configuration, "with disabled: true in sunspot.yml" do

data/spec/rails_template/app/models/author.rb

@@ -1,6 +1,6 @@
 class Author < ActiveRecord::Base
-  set_table_name :writers
-  set_primary_key :writer_id
+  self.table_name  = :writers
+  self.primary_key = :writer_id
 
   searchable do
     string :name

data/spec/rails_template/config/sunspot.yml

@@ -16,6 +16,8 @@ config_test:
     pid_dir: /my_superior_path/pids
     solr_home: /my_superior_path
     bind_address: 127.0.0.1
+    read_timeout: 2
+    open_timeout: 0.5
   auto_commit_after_request: false
   auto_commit_after_delete_request: true
 config_disabled_test:

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sunspot_rails
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  hash: 2889093829
+  prerelease: 6
   segments: 
   - 2
   - 0
   - 0
   - pre
-  - 111215
-  version: 2.0.0.pre.111215
+  - 120415
+  version: 2.0.0.pre.120415
 platform: ruby
 authors: 
 - Mat Brown
@@ -34,32 +35,35 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-15 00:00:00 -07:00
-default_executable: 
+date: 2012-04-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sunspot
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 2889093829
         segments: 
         - 2
         - 0
         - 0
         - pre
-        - 111215
-        version: 2.0.0.pre.111215
+        - 120415
+        version: 2.0.0.pre.120415
   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,9 +73,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 1
         - 2
@@ -82,9 +88,11 @@ dependencies:
   name: rspec-rails
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 1
         - 2
@@ -114,8 +122,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
@@ -166,7 +175,6 @@ 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: []
 
@@ -180,16 +188,20 @@ 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: 25
       segments: 
       - 1
       - 3
@@ -198,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sunspot
-rubygems_version: 1.3.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Rails integration for the Sunspot Solr search library