sunspot_rails 2.0.0.pre.130115 → 2.0.0

data/README.rdoc

@@ -226,7 +226,7 @@ Then, in your spec, use the #disconnect_sunspot method:
   describe Post do
     disconnect_sunspot
 
-    it 'should have some behavior'
+    it 'should have some behavior' do
       # ...
     end
   end
@@ -262,4 +262,4 @@ Please submit bug reports to https://github.com/sunspot/sunspot/issues
 
 == License
 
-Sunspot::Rails is distributed under the MIT License, copyright (c) 2009 Mat Brown
+Sunspot::Rails is distributed under the MIT License, copyright (c) 2013 Mat Brown

data/gemfiles/{rails-2.3.14 → rails-2.3.16}

@@ -1,13 +1,13 @@
 source :rubygems
 
-gem 'rails', '2.3.14'
-gem 'sqlite3-ruby', '~> 1.3.1'
+gem 'rails', '2.3.16'
+gem 'sqlite3', '~> 1.3.7'
 
 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', '~> 1.3.4'
+  gem 'rspec-rails', '~> 1.3.4'
   gem 'test-unit', '~> 1.2.3', :platform => :mri_19
 end

data/gemfiles/{rails-3.2.9 → rails-3.0.20}

@@ -1,7 +1,7 @@
 source :rubygems
 
-gem 'rails', '3.2.9'
-gem 'sqlite3', '~> 1.3.3'
+gem 'rails', '3.0.20'
+gem 'sqlite3', '~> 1.3.7'
 
 gem 'sunspot', :path => File.expand_path('../../../sunspot', __FILE__)
 gem 'sunspot_solr', :path => File.expand_path('../../../sunspot_solr', __FILE__)

data/gemfiles/{rails-3.1.8 → rails-3.1.10}

@@ -1,7 +1,7 @@
 source :rubygems
 
-gem 'rails', '3.1.8'
-gem 'sqlite3-ruby', '~> 1.3.1'
+gem 'rails', '3.1.10'
+gem 'sqlite3', '~> 1.3.7'
 
 gem 'sunspot', :path => File.expand_path('../../../sunspot', __FILE__)
 gem 'sunspot_solr', :path => File.expand_path('../../../sunspot_solr', __FILE__)

data/gemfiles/{rails-3.0.17 → rails-3.2.11}

@@ -1,7 +1,7 @@
 source :rubygems
 
-gem 'rails', '3.0.17'
-gem 'sqlite3-ruby', '~> 1.3.1'
+gem 'rails', '3.2.11'
+gem 'sqlite3', '~> 1.3.7'
 
 gem 'sunspot', :path => File.expand_path('../../../sunspot', __FILE__)
 gem 'sunspot_solr', :path => File.expand_path('../../../sunspot_solr', __FILE__)

data/lib/sunspot/rails/configuration.rb

@@ -47,6 +47,10 @@ module Sunspot #:nodoc:
     # configured under <code>solr</code> for all read operations.
     #
     class Configuration
+      # ActiveSupport log levels are integers; this array maps them to the
+      # appropriate java.util.logging.Level constant
+      LOG_LEVELS = %w(FINE INFO WARNING SEVERE SEVERE INFO)
+
       attr_writer :user_configuration
       #
       # The host name at which to connect to Solr. Default 'localhost'.
@@ -146,17 +150,21 @@ module Sunspot #:nodoc:
         @has_master = !!user_configuration_from_key('master_solr')
       end
 
-      # 
+      #
       # The default log_level that should be passed to solr. You can
       # change the individual log_levels in the solr admin interface.
-      # Default 'INFO'.
+      # If no level is specified in the sunspot configuration file, 
+      # use a level similar to Rails own logging level.
       #
       # ==== Returns
       #
       # String:: log_level
       #
       def log_level
-        @log_level ||= (user_configuration_from_key('solr', 'log_level') || 'INFO')
+        @log_level ||= (
+          user_configuration_from_key('solr', 'log_level') ||
+          LOG_LEVELS[::Rails.logger.level]
+        )
       end
       
       #

data/lib/sunspot/rails/server.rb

@@ -1,9 +1,6 @@
 module Sunspot
   module Rails
     class Server < Sunspot::Solr::Server
-      # ActiveSupport log levels are integers; this array maps them to the
-      # appropriate java.util.logging.Level constant
-      LOG_LEVELS = %w(FINE INFO WARNING SEVERE SEVERE INFO)
 
       # 
       # Directory in which to store PID files
@@ -58,12 +55,8 @@ module Sunspot
         configuration.port
       end
 
-      #
-      # Severity level for logging. This is based on the severity level for the
-      # Rails logger.
-      #
       def log_level
-        LOG_LEVELS[::Rails.logger.level]
+        configuration.log_level
       end
 
       # 

data/lib/sunspot/rails/tasks.rb

@@ -1,12 +1,12 @@
 namespace :sunspot do
 
-  desc "Reindex all solr models that are located in your application's models directory."
+  desc "Drop and then 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 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 '/'
-  # 
+  #
   # $ rake sunspot:reindex                # reindex all models
   # $ rake sunspot:reindex[1000]          # reindex in batches of 1000
   # $ rake sunspot:reindex[false]         # reindex without batching
@@ -15,17 +15,23 @@ 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|
+    puts "*Note: the reindex task will remove your current indexes and start from scratch."
+    puts "If you have a large dataset, reindexing can take a very long time, possibly weeks."
+    puts "This is not encouraged if you have anywhere near or over 1 million rows."
+    puts "Are you sure you want to drop your indexes and completely reindex? (y/n)"
+    answer = STDIN.gets.chomp
+    return false if answer == "n"
 
     # 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 }
-    
+
     case args[:batch_size]
     when 'false'
       reindex_options[:batch_size] = nil
-    when /^\d+$/ 
+    when /^\d+$/
       reindex_options[:batch_size] = args[:batch_size].to_i if args[:batch_size].to_i > 0
     end
 
@@ -41,7 +47,7 @@ namespace :sunspot do
       model_names = args[:models].split('+')
       sunspot_models = model_names.map{ |m| m.constantize }
     end
-    
+
     # Set up progress_bar to, ah, report progress
     begin
       require 'progress_bar'

data/spec/configuration_spec.rb

@@ -45,8 +45,9 @@ describe Sunspot::Rails::Configuration, "default values without a sunspot.yml" d
     @config.open_timeout == nil
   end
 
-  it "should handle the 'log_level' property when not set" do
-    @config.log_level.should == 'INFO'
+  it "should set 'log_level' property using Rails log level when not set" do
+    ::Rails.logger.stub(:level){ 3 }
+    @config.log_level.should == 'SEVERE'
   end
   
   it "should handle the 'log_file' property" do

data/spec/server_spec.rb

@@ -4,6 +4,7 @@ describe Sunspot::Rails::Server do
   before :each do
     @server = Sunspot::Rails::Server.new
     @config = Sunspot::Rails::Configuration.new
+    @server.stub(:configuration){ @config }
     @solr_home = File.join(@config.solr_home)
   end
 
@@ -23,8 +24,9 @@ describe Sunspot::Rails::Server do
     @server.port.should == 8983
   end
 
-  it "sets the correct log level" do
-    @server.log_level.should == "FINE"
+  it "sets the log level using configuration" do
+    @config.stub(:log_level){ 'WARNING' }
+    @server.log_level.should == "WARNING"
   end
 
   it "sets the correct log file" do

data/sunspot_rails.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.email       = ["mat@patch.com"]
   s.homepage = 'http://github.com/outoftime/sunspot/tree/master/sunspot_rails'
   s.summary     = 'Rails integration for the Sunspot Solr search library'
+  s.license     = 'MIT'
   s.description = <<-TEXT
     Sunspot::Rails is an extension to the Sunspot library for Solr search.
     Sunspot::Rails adds integration between Sunspot and ActiveRecord, including

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: sunspot_rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.130115
-  prerelease: 6
+  version: 2.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Mat Brown
@@ -27,72 +27,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sunspot
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.130115
-    none: false
+        version: 2.0.0
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.130115
-    none: false
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
-    none: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
-    none: false
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
-    none: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
-    none: false
 description: ! "    Sunspot::Rails is an extension to the Sunspot library for Solr
   search.\n    Sunspot::Rails adds integration between Sunspot and ActiveRecord, including\n
   \   defining search and indexing related methods on ActiveRecord models themselves,\n
@@ -116,10 +116,10 @@ files:
 - dev_tasks/release.rake
 - dev_tasks/spec.rake
 - dev_tasks/todo.rake
-- gemfiles/rails-2.3.14
-- gemfiles/rails-3.0.17
-- gemfiles/rails-3.1.8
-- gemfiles/rails-3.2.9
+- gemfiles/rails-2.3.16
+- gemfiles/rails-3.0.20
+- gemfiles/rails-3.1.10
+- gemfiles/rails-3.2.11
 - generators/sunspot/sunspot_generator.rb
 - generators/sunspot/templates/sunspot.yml
 - install.rb
@@ -172,7 +172,8 @@ files:
 - sunspot_rails.gemspec
 - tmp/.gitkeep
 homepage: http://github.com/outoftime/sunspot/tree/master/sunspot_rails
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options:
 - --webcvs=http://github.com/outoftime/sunspot/tree/master/%s
@@ -183,20 +184,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
-  none: false
+      version: '0'
 requirements: []
 rubyforge_project: sunspot
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Rails integration for the Sunspot Solr search library