sunspot_rails 2.2.0 → 2.2.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9c73686a623e0b8085e678093d6d80a94a65f988
+  data.tar.gz: 218687305e166d54d3e5240be43cde53c8487abd
+SHA512:
+  metadata.gz: fb98a7c070f2ca26b62911ca89011bb84f9ac02aa67a6a63f11021a3825d52e65a4956ad647563b82f14ebdc953486a7fd9b58bb40a78643dc3155fb5ebd3339
+  data.tar.gz: 98c9d8a7acc171cda06429a97eaa6a9ca0874a26c8bb923cd1008b69926d88b0ca882ce847f2df51bf425787fa622909db25095da39fa1cd4c5afc9f3062d320

data/gemfiles/rails-3.0.0

@@ -8,12 +8,14 @@ gem 'sunspot_rails', :path => File.expand_path('../..', __FILE__)
 
 group :test do
   gem 'rspec-rails', '~> 2.14.0'
+  gem 'progress_bar', '~> 1.0.5', require: false
+  gem 'test-unit', '~> 3.2.0' if RUBY_VERSION >= '2.2.0'
 end
 
 group :postgres do
-	gem 'pg'
+  gem 'pg', '~> 0.18.4'
 end
 
 group :sqlite do
-	gem 'sqlite3', '~> 1.3.7'
-end
+  gem 'sqlite3', '~> 1.3.7'
+end

data/gemfiles/rails-3.1.0

@@ -8,12 +8,14 @@ gem 'sunspot_rails', :path => File.expand_path('../..', __FILE__)
 
 group :test do
   gem 'rspec-rails', '~> 2.14.0'
+  gem 'progress_bar', '~> 1.0.5', require: false
+  gem 'test-unit', '~> 3.2.0' if RUBY_VERSION >= '2.2.0'
 end
 
 group :postgres do
-	gem 'pg'
+  gem 'pg', '~> 0.18.4'
 end
 
 group :sqlite do
-	gem 'sqlite3', '~> 1.3.7'
-end
+  gem 'sqlite3', '~> 1.3.7'
+end

data/gemfiles/rails-3.2.0

@@ -8,12 +8,14 @@ gem 'sunspot_rails', :path => File.expand_path('../..', __FILE__)
 
 group :test do
   gem 'rspec-rails', '~> 2.14.0'
+  gem 'progress_bar', '~> 1.0.5', require: false
+  gem 'test-unit', '~> 3.2.0' if RUBY_VERSION >= '2.2.0'
 end
 
 group :postgres do
-	gem 'pg'
+  gem 'pg', '~> 0.18.4'
 end
 
 group :sqlite do
-	gem 'sqlite3', '~> 1.3.7'
-end
+  gem 'sqlite3', '~> 1.3.7'
+end

data/gemfiles/rails-4.0.0

@@ -1,20 +1,25 @@
 source 'http://rubygems.org'
 
 gem 'rails', '~> 4.0.0'
+if RUBY_VERSION < '2.0'
+  gem 'mime-types', '~> 2.99.0'
+end
 
 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 'protected_attributes' # Rails 4 support for attr_accessor so specs still work
+  gem 'protected_attributes' # Rails 4 support for attr_accessor so specs still work
   gem 'rspec-rails', '~> 2.14.0'
+  gem 'progress_bar', '~> 1.0.5', require: false
+  gem 'test-unit', '~> 3.2.0' if RUBY_VERSION >= '2.2.0'
 end
 
 group :postgres do
-	gem 'pg'
+  gem 'pg', '~> 0.18.4'
 end
 
 group :sqlite do
-	gem 'sqlite3', '~> 1.3.7'
-end
+  gem 'sqlite3', '~> 1.3.7'
+end

data/gemfiles/rails-4.1.0

@@ -0,0 +1,24 @@
+source 'http://rubygems.org'
+
+gem 'rails', '~> 4.1.0'
+if RUBY_VERSION < '2.0'
+  gem 'mime-types', '~> 2.99.0'
+end
+
+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 'protected_attributes' # Rails 4 support for attr_accessor so specs still work
+  gem 'rspec-rails', '~> 2.14.0'
+  gem 'progress_bar', '~> 1.0.5', require: false
+end
+
+group :postgres do
+  gem 'pg', '~> 0.18.4'
+end
+
+group :sqlite do
+  gem 'sqlite3', '~> 1.3.7'
+end

data/gemfiles/rails-4.2.0

@@ -0,0 +1,24 @@
+source 'http://rubygems.org'
+
+gem 'rails', '~> 4.2.0'
+if RUBY_VERSION < '2.0'
+  gem 'mime-types', '~> 2.99.0'
+end
+
+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 'protected_attributes' # Rails 4 support for attr_accessor so specs still work
+  gem 'rspec-rails', '~> 2.14.0'
+  gem 'progress_bar', '~> 1.0.5', require: false
+end
+
+group :postgres do
+  gem 'pg', '~> 0.18.4'
+end
+
+group :sqlite do
+  gem 'sqlite3', '~> 1.3.7'
+end

data/gemfiles/rails-5.0

@@ -0,0 +1,20 @@
+source 'http://rubygems.org'
+
+gem 'rails', '~> 5.0'
+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 'protected_attributes_continued'
+  gem 'rspec-rails', '~> 2.14.0'
+  gem 'progress_bar', '~> 1.0.5', require: false
+end
+
+group :postgres do
+  gem 'pg', '~> 0.18.4'
+end
+
+group :sqlite do
+  gem 'sqlite3', '~> 1.3.7'
+end

data/lib/sunspot/rails.rb

@@ -52,6 +52,7 @@ module Sunspot #:nodoc:
         ).to_s
         config.solr.read_timeout = sunspot_rails_configuration.read_timeout
         config.solr.open_timeout = sunspot_rails_configuration.open_timeout
+        config.solr.proxy = sunspot_rails_configuration.proxy
         config
       end
 
@@ -66,6 +67,7 @@ module Sunspot #:nodoc:
         ).to_s
         config.solr.read_timeout = sunspot_rails_configuration.read_timeout
         config.solr.open_timeout = sunspot_rails_configuration.open_timeout
+        config.solr.proxy = sunspot_rails_configuration.proxy
         config
       end
     end

data/lib/sunspot/rails/adapters.rb

@@ -21,11 +21,12 @@ module Sunspot #:nodoc:
       class ActiveRecordDataAccessor < Sunspot::Adapters::DataAccessor
         # options for the find
         attr_accessor :include
+        attr_accessor :scopes
         attr_reader :select
 
         def initialize(clazz)
           super(clazz)
-          @inherited_attributes = [:include, :select]
+          @inherited_attributes = [:include, :select, :scopes]
         end
 
         #
@@ -77,6 +78,9 @@ module Sunspot #:nodoc:
           scope = relation
           scope = scope.includes(@include) if @include.present?
           scope = scope.select(@select)    if @select.present?
+          Array.wrap(@scopes).each do |s|
+            scope = scope.send(s)
+          end
           scope 
         end
 

data/lib/sunspot/rails/configuration.rb

@@ -12,10 +12,10 @@ module Sunspot #:nodoc:
     #     solr:
     #       hostname: localhost
     #       port: 8982
-    #       min_memory: 512M
-    #       max_memory: 1G
+    #       memory: 1G
     #       solr_jar: /some/path/solr15/start.jar
     #       bind_address: 0.0.0.0
+    #       proxy: false
     #     disabled: false
     #   test:
     #     solr:
@@ -24,6 +24,7 @@ module Sunspot #:nodoc:
     #       log_level: OFF
     #       open_timeout: 0.5
     #       read_timeout: 2
+    #       proxy: false
     #   production:
     #     solr:
     #       scheme: http
@@ -36,6 +37,7 @@ module Sunspot #:nodoc:
     #       solr_home: /some/path
     #       open_timeout: 0.5
     #       read_timeout: 2
+    #       proxy: http://proxy.com:12345
     #     master_solr:
     #       hostname: localhost
     #       port: 8982
@@ -247,10 +249,6 @@ module Sunspot #:nodoc:
         @log_file ||= (user_configuration_from_key('solr', 'log_file') || default_log_file_location )
       end
 
-      def data_path
-        @data_path ||= user_configuration_from_key('solr', 'data_path') || File.join(::Rails.root, 'solr', 'data', ::Rails.env)
-      end
-
       def pid_dir
         @pid_dir ||= user_configuration_from_key('solr', 'pid_dir') || File.join(::Rails.root, 'solr', 'pids', ::Rails.env)
       end
@@ -277,22 +275,15 @@ module Sunspot #:nodoc:
       #
       # Solr start jar
       #
-      def solr_jar
-        @solr_jar ||= user_configuration_from_key('solr', 'solr_jar')
-      end
-
-      #
-      # Minimum java heap size for Solr instance
-      #
-      def min_memory
-        @min_memory ||= user_configuration_from_key('solr', 'min_memory')
+      def solr_executable
+        @solr_executable ||= user_configuration_from_key('solr', 'solr_executable')
       end
 
       #
-      # Maximum java heap size for Solr instance
+      # java heap size for Solr instance
       #
-      def max_memory
-        @max_memory ||= user_configuration_from_key('solr', 'max_memory')
+      def memory
+        @memory ||= user_configuration_from_key('solr', 'memory')
       end
 
       #
@@ -310,6 +301,10 @@ module Sunspot #:nodoc:
         @open_timeout ||= user_configuration_from_key('solr', 'open_timeout')
       end
 
+      def proxy
+        @proxy ||= user_configuration_from_key('solr', 'proxy')
+      end
+
       #
       # Whether or not to disable Solr.
       # Defaults to false.

data/lib/sunspot/rails/request_lifecycle.rb

@@ -20,8 +20,10 @@ module Sunspot #:nodoc:
           # this case, since after_filter uses the inheritable_attribute
           # structure, the already-loaded subclasses don't get the filters. So,
           # the below ensures that all loaded controllers have the filter.
+          callback = ::Rails::VERSION::MAJOR > 3 ? :after_action : :after_filter
+
           loaded_controllers.each do |controller|
-            controller.after_filter do
+            controller.send(callback) do
               if Sunspot::Rails.configuration.auto_commit_after_request?
                 Sunspot.commit_if_dirty
               elsif Sunspot::Rails.configuration.auto_commit_after_delete_request?

data/lib/sunspot/rails/searchable.rb

@@ -134,6 +134,8 @@ module Sunspot #:nodoc:
             alias_method :index, :solr_index unless method_defined? :index
             alias_method :index_orphans, :solr_index_orphans unless method_defined? :index_orphans
             alias_method :clean_index_orphans, :solr_clean_index_orphans unless method_defined? :clean_index_orphans
+            alias_method :atomic_update, :solr_atomic_update unless method_defined? :atomic_update
+            alias_method :atomic_update!, :solr_atomic_update! unless method_defined? :atomic_update!
           end
         end
         # 
@@ -257,9 +259,9 @@ module Sunspot #:nodoc:
           if options[:batch_size].to_i > 0
             batch_counter = 0
             self.includes(options[:include]).find_in_batches(options.slice(:batch_size, :start)) do |records|
-              
+
               solr_benchmark(options[:batch_size], batch_counter += 1) do
-                Sunspot.index(records.select { |model| model.indexable? })
+                Sunspot.index(records.select(&:indexable?))
                 Sunspot.commit if options[:batch_commit]
               end
 
@@ -273,6 +275,46 @@ module Sunspot #:nodoc:
           Sunspot.commit unless options[:batch_commit]
         end
 
+        #
+        # Update properties of existing records in the Solr index.
+        # Atomic updates available only for the stored properties.
+        #
+        # ==== Updates (passed as a hash)
+        #
+        # updates should be specified as a hash, where key - is the object ID
+        # and values is hash with property name/values to be updated.
+        #
+        # ==== Examples
+        #
+        #   class Post < ActiveRecord::Base
+        #     searchable do
+        #       string :title, stored: true
+        #       string :description, stored: true
+        #     end
+        #   end
+        #
+        #   post1 = Post.create(title: 'A Title', description: nil)
+        #
+        #   # update single property
+        #   Post.atomic_update(post1.id => {description: 'New post description'})
+        #
+        # ==== Notice
+        # all non-stored properties in Solr index will be lost after update.
+        # Read Solr wiki page: https://wiki.apache.org/solr/Atomic_Updates
+        def solr_atomic_update(updates = {})
+          Sunspot.atomic_update(self, updates)
+        end
+
+        #
+        # Update properties of existing records in the Solr index atomically, and
+        # immediately commits.
+        #
+        # See #solr_atomic_update for information on options, etc.
+        #
+        def solr_atomic_update!(updates = {})
+          Sunspot.atomic_update!(self, updates)
+        end
+
         # 
         # Return the IDs of records of this class that are indexed in Solr but
         # do not exist in the database. Under normal circumstances, this should
@@ -282,8 +324,7 @@ module Sunspot #:nodoc:
         # 
         # ==== Options (passed as a hash)
         #
-        # batch_size<Integer>:: Batch size with which to load records. Passing
-        #                       Default is 1000 (from ActiveRecord).
+        # batch_size<Integer>:: Override default batch size with which to load records.
         # 
         # ==== Returns
         #
@@ -294,7 +335,7 @@ module Sunspot #:nodoc:
           solr_page = 0
           solr_ids = []
           while (solr_page = solr_page.next)
-            ids = solr_search_ids { paginate(:page => solr_page, :per_page => 1000) }.to_a
+            ids = solr_search_ids { paginate(:page => solr_page, :per_page => batch_size) }.to_a
             break if ids.empty?
             solr_ids.concat ids
           end
@@ -310,8 +351,7 @@ module Sunspot #:nodoc:
         #
         # ==== Options (passed as a hash)
         #
-        # batch_size<Integer>:: Batch size with which to load records
-        #                       Default is 50
+        # batch_size<Integer>:: Override default batch size with which to load records
         # 
         def solr_clean_index_orphans(opts={})
           solr_index_orphans(opts).each do |id|
@@ -334,15 +374,15 @@ module Sunspot #:nodoc:
         end
         
         def solr_execute_search(options = {})
-          options.assert_valid_keys(:include, :select)
+          inherited_attributes = [:include, :select, :scopes]
+          options.assert_valid_keys(*inherited_attributes)
           search = yield
           unless options.empty?
             search.build do |query|
-              if options[:include]
-                query.data_accessor_for(self).include = options[:include]
-              end
-              if options[:select]
-                query.data_accessor_for(self).select = options[:select]
+              inherited_attributes.each do |attr|
+                if options[attr]
+                  query.data_accessor_for(self).send("#{attr}=", options[attr])
+                end
               end
             end
           end
@@ -378,6 +418,8 @@ module Sunspot #:nodoc:
             alias_method :remove_from_index!, :solr_remove_from_index! unless method_defined? :remove_from_index!
             alias_method :more_like_this, :solr_more_like_this unless method_defined? :more_like_this
             alias_method :more_like_this_ids, :solr_more_like_this_ids unless method_defined? :more_like_this_ids
+            alias_method :atomic_update, :solr_atomic_update unless method_defined? :atomic_update
+            alias_method :atomic_update!, :solr_atomic_update! unless method_defined? :atomic_update!
           end
         end
         # 
@@ -398,6 +440,23 @@ module Sunspot #:nodoc:
         def solr_index!
           Sunspot.index!(self)
         end
+
+        #
+        # Updates specified model properties in Solr.
+        # Unlike ClassMethods#solr_atomic_update you dont need to pass object id,
+        # you only need to pass hash with property changes
+        #
+        def solr_atomic_update(updates = {})
+          Sunspot.atomic_update(self.class, self.id => updates)
+        end
+
+        #
+        # Updates specified model properties in Solr and immediately commit.
+        # See #solr_atomic_update
+        #
+        def solr_atomic_update!(updates = {})
+          Sunspot.atomic_update!(self.class, self.id => updates)
+        end
         
         # 
         # Remove the model from the Solr index. Using the defaults, this should

data/lib/sunspot/rails/server.rb

@@ -2,32 +2,21 @@ module Sunspot
   module Rails
     class Server < Sunspot::Solr::Server
 
-      # 
+      #
       # Directory in which to store PID files
       #
       def pid_dir
         configuration.pid_dir || File.join(::Rails.root, 'tmp', 'pids')
       end
 
-      # 
+      #
       # Name of the PID file
       #
       def pid_file
         "sunspot-solr-#{::Rails.env}.pid"
       end
 
-      # 
-      # Directory to store lucene index data files
-      #
-      # ==== Returns
       #
-      # String:: data_path
-      #
-      def solr_data_dir
-        configuration.data_path
-      end
-
-      # 
       # Directory to use for Solr home.
       #
       def solr_home
@@ -37,18 +26,18 @@ module Sunspot
       #
       # Solr start jar
       #
-      def solr_jar
-        configuration.solr_jar || super
+      def solr_executable
+        configuration.solr_executable || super
       end
 
-      # 
+      #
       # Address on which to run Solr
       #
       def bind_address
         configuration.bind_address
       end
 
-      # 
+      #
       # Port on which to run Solr
       #
       def port
@@ -59,25 +48,18 @@ module Sunspot
         configuration.log_level
       end
 
-      # 
+      #
       # Log file for Solr. File is in the rails log/ directory.
       #
       def log_file
         File.join(::Rails.root, 'log', "sunspot-solr-#{::Rails.env}.log")
       end
 
-      # 
-      # Minimum Java heap size for Solr
       #
-      def min_memory
-        configuration.min_memory
-      end
-
-      # 
-      # Maximum Java heap size for Solr
+      # Java heap size for Solr
       #
-      def max_memory
-        configuration.max_memory
+      def memory
+        configuration.memory
       end
 
       private

data/lib/sunspot/rails/solr_instrumentation.rb

@@ -4,10 +4,10 @@ module Sunspot
       extend ActiveSupport::Concern
 
       included do
-        alias_method_chain :send_and_receive, :as_instrumentation
+        alias_method :send_and_receive_without_as_instrumentation, :send_and_receive
+        alias_method :send_and_receive, :send_and_receive_with_as_instrumentation
       end
 
-
       def send_and_receive_with_as_instrumentation(path, opts)
         parameters = (opts[:params] || {})
         parameters.merge!(opts[:data]) if opts[:data].is_a? Hash

data/lib/sunspot/rails/solr_logging.rb

@@ -2,12 +2,6 @@ module Sunspot
   module Rails
     module SolrLogging
 
-      class <<self
-        def included(base)
-          base.alias_method_chain :execute, :rails_logging
-        end
-      end
-
       COMMIT = %r{<commit/>}
 
       def execute_with_rails_logging(client, request_context)
@@ -17,7 +11,6 @@ module Sunspot
           action = "Commit"
           body = ""
         end
-        body = body[0, 800] + '...' if body.length > 800
 
         # Make request and log.
         response = nil
@@ -56,4 +49,6 @@ end
 
 RSolr::Connection.module_eval do
   include Sunspot::Rails::SolrLogging
+  alias_method :execute_without_rails_logging, :execute
+  alias_method :execute, :execute_with_rails_logging
 end

data/lib/sunspot/rails/stub_session_proxy.rb

@@ -17,6 +17,12 @@ module Sunspot
       def index!(*objects)
       end
 
+      def atomic_update(clazz, updates = {})
+      end
+
+      def atomic_update!(clazz, updates = {})
+      end
+
       def remove(*objects)
       end
 
@@ -110,6 +116,10 @@ module Sunspot
           DataAccessorStub.new
         end
 
+        def stats(name)
+          StatsStub.new
+        end
+
         def execute
           self
         end
@@ -148,6 +158,7 @@ module Sunspot
         def previous_page
           nil
         end
+        alias :prev_page :previous_page
 
         def next_page
           nil
@@ -171,6 +182,49 @@ module Sunspot
 
       end
 
+      class StatsStub
+        def min
+          0
+        end
+
+        def max
+          100
+        end
+
+        def count
+          30
+        end
+
+        def sum
+          500
+        end
+
+        def missing
+          3
+        end
+
+        def sum_of_squares
+          5000
+        end
+
+        def mean
+          50
+        end
+
+        def standard_deviation
+          20
+        end
+
+        def facets
+          []
+        end
+
+        def facet(name)
+          FacetStub.new
+        end
+
+      end
+
     end
   end
 end

data/lib/sunspot/rails/tasks.rb

@@ -49,6 +49,8 @@ namespace :sunspot do
         reindex_options[:progress_bar] = ProgressBar.new(total_documents)
       rescue LoadError => e
         $stdout.puts "Skipping progress bar: for progress reporting, add gem 'progress_bar' to your Gemfile"
+      rescue ProgressBar::ArgumentError => e
+        $stdout.puts "You have no data in the database. Reindexing does nothing here."
       rescue Exception => e
         $stderr.puts "Error using progress bar: #{e.message}"
       end unless args[:silence]

data/spec/configuration_spec.rb

@@ -22,6 +22,10 @@ describe Sunspot::Rails::Configuration, "default values without a sunspot.yml" d
     @config.userinfo.should be_nil
   end
 
+  it "should not set a proxy" do
+    @config.proxy.should be_nil
+  end
+
   describe "port" do
     it "should default to port 8981 in test" do
       ::Rails.stub(:env => 'test')
@@ -67,11 +71,6 @@ describe Sunspot::Rails::Configuration, "default values without a sunspot.yml" d
     @config.solr_home.should == '/some/path/solr'
   end
 
-  it "should handle the 'data_path' property when not set" do
-    Rails.should_receive(:root).at_least(1).and_return('/some/path')
-    @config.data_path.should == '/some/path/solr/data/test'
-  end
-
   it "should handle the 'pid_dir' property when not set" do
     Rails.should_receive(:root).at_least(1).and_return('/some/path')
     @config.pid_dir.should == '/some/path/solr/pids/test'
@@ -136,10 +135,6 @@ describe Sunspot::Rails::Configuration, "user provided sunspot.yml" do
     @config.solr_home.should == '/my_superior_path'
   end
 
-  it "should handle the 'data_path' property when set" do
-    @config.data_path.should == '/my_superior_path/data'
-  end
-
   it "should handle the 'pid_dir' property when set" do
     @config.pid_dir.should == '/my_superior_path/pids'
   end
@@ -167,11 +162,15 @@ describe Sunspot::Rails::Configuration, "user provided sunspot.yml" do
   it "should handle the 'open_timeout' property when set" do
     @config.open_timeout.should == 0.5
   end
+
+  it "should handle the 'proxy' property when set" do
+    @config.proxy.should == 'http://proxy.com:12345'
+  end
 end
 
 describe Sunspot::Rails::Configuration, "with auto_index_callback and auto_remove_callback set" do
   before do
-    ::Rails.stub!(:env => 'config_commit_test')
+    ::Rails.stub(:env => 'config_commit_test')
     @config = Sunspot::Rails::Configuration.new
   end
 

data/spec/model_spec.rb

@@ -165,6 +165,22 @@ describe 'ActiveRecord mixin' do
       end.results.first.attribute_names.sort.should == ['body', 'id', 'title']
     end
 
+    it 'should use the scoped option from search call to data accessor' do
+      Post.search(:scopes => [:includes_location]) do
+        with :title, 'Test Post'
+      end.data_accessor_for(Post).scopes.should == [:includes_location]
+    end
+
+    it 'should use the scopes option on the data accessor when specified' do
+      @post.update_attribute(:location, Location.create)
+      post = Post.search do
+        with :title, 'Test Post'
+        data_accessor_for(Post).scopes = [:includes_location]
+      end.results.first
+
+      (Rails.version >= '3.1' ? post.association(:location).loaded? : post.loaded_location?).should be_true # Rails 3.1 removed "loaded_#{association}" method
+    end
+
     it 'should gracefully handle nonexistent records' do
       post2 = Post.create!(:title => 'Test Post')
       post2.index!

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

@@ -10,4 +10,8 @@ class Post < ActiveRecord::Base
     text :body, :more_like_this => true
     location :location
   end
+
+  scope :includes_location, -> {
+    includes(:location)
+  }
 end

data/spec/rails_template/config/initializers/rails_5_override.rb

@@ -0,0 +1 @@
+Rails.application.config.active_record.belongs_to_required_by_default = false if Rails::VERSION::MAJOR == 5

data/spec/rails_template/config/sunspot.yml

@@ -17,12 +17,12 @@ config_test:
     port: 1234
     path: /solr/idx
     log_level: WARNING
-    data_path: /my_superior_path/data
     pid_dir: /my_superior_path/pids
     solr_home: /my_superior_path
     bind_address: 127.0.0.1
     read_timeout: 2
     open_timeout: 0.5
+    proxy: http://proxy.com:12345
   auto_commit_after_request: false
   auto_commit_after_delete_request: true
 config_disabled_test:

data/spec/rake_task_spec.rb

@@ -30,6 +30,12 @@ describe 'sunspot namespace rake task' do
 
       run_rake_task("sunspot:reindex", '', "Post+Author", true)
     end
+
+    it "should raise exception when all tables of sunspot models are empty" do
+      STDOUT.should_receive(:puts).with("You have no data in the database. Reindexing does nothing here.")
+      empty_tables
+      run_rake_task("sunspot:reindex")
+    end
   end
 end
 

data/spec/server_spec.rb

@@ -16,10 +16,6 @@ describe Sunspot::Rails::Server do
     @server.pid_path.should == File.join(@server.pid_dir, 'sunspot-solr-test.pid')
   end
 
-  it "sets the correct Solr data dir" do
-    @server.solr_data_dir.should == File.join(@solr_home, 'data', 'test')
-  end
-
   it "sets the correct port" do
     @server.port.should == 8983
   end

data/spec/stub_session_proxy_spec.rb

@@ -10,7 +10,7 @@ describe 'specs with Sunspot stubbed' do
   end
 
   it 'should batch' do
-    foo = mock('Foo')
+    foo = double('Foo')
     block = lambda { foo.bar }
 
     foo.should_receive(:bar)
@@ -28,6 +28,16 @@ describe 'specs with Sunspot stubbed' do
     @post.index!
   end
 
+  it 'should not send atomic_update to session' do
+    @session.should_not_receive(:atomic_update)
+    @post.index
+  end
+
+  it 'should not send atomic_update! to session' do
+    @session.should_not_receive(:atomic_update!)
+    @post.index!
+  end
+
   it 'should not send commit to session' do
     @session.should_not_receive(:commit)
     Sunspot.commit
@@ -154,5 +164,32 @@ describe 'specs with Sunspot stubbed' do
         @accessor.should respond_to(:include, :include=)
       end
     end
+
+    describe '#stats' do
+      before do
+        @stats = @search.stats(:price)
+      end
+
+      it 'should response to all the available data methods' do
+        @stats.should respond_to(
+          :min,
+          :max,
+          :count,
+          :sum,
+          :missing,
+          :sum_of_squares,
+          :mean,
+          :standard_deviation)
+      end
+
+      it 'should return empty results for a given facet' do
+        @stats.facet(:category_id).rows.should == []
+      end
+
+      it 'should return empty array if listing facets' do
+        @stats.facets.should == []
+      end
+
+    end
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot_rails
 version: !ruby/object:Gem::Version
-  version: 2.2.0
-  prerelease: 
+  version: 2.2.7
 platform: ruby
 authors:
 - Mat Brown
@@ -27,12 +26,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -40,7 +38,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -48,23 +45,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sunspot
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.7
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -72,7 +66,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -80,7 +73,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -88,7 +80,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -96,7 +87,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -104,7 +94,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -138,6 +127,9 @@ files:
 - gemfiles/rails-3.1.0
 - gemfiles/rails-3.2.0
 - gemfiles/rails-4.0.0
+- gemfiles/rails-4.1.0
+- gemfiles/rails-4.2.0
+- gemfiles/rails-5.0
 - generators/sunspot/sunspot_generator.rb
 - generators/sunspot/templates/sunspot.yml
 - install.rb
@@ -175,6 +167,7 @@ files:
 - spec/rails_template/app/models/post_with_only_some_attributes_triggering_reindex.rb
 - spec/rails_template/app/models/rake_task_auto_load_test_model.rb
 - spec/rails_template/config/database.yml
+- spec/rails_template/config/initializers/rails_5_override.rb
 - spec/rails_template/config/routes.rb
 - spec/rails_template/config/sunspot.yml
 - spec/rails_template/db/schema.rb
@@ -193,6 +186,7 @@ files:
 homepage: http://github.com/outoftime/sunspot/tree/master/sunspot_rails
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - "--webcvs=http://github.com/outoftime/sunspot/tree/master/%s"
@@ -203,22 +197,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sunspot
-rubygems_version: 1.8.25
+rubygems_version: 2.5.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rails integration for the Sunspot Solr search library
 test_files:
 - spec/configuration_spec.rb
@@ -236,6 +228,7 @@ test_files:
 - spec/rails_template/app/models/post_with_only_some_attributes_triggering_reindex.rb
 - spec/rails_template/app/models/rake_task_auto_load_test_model.rb
 - spec/rails_template/config/database.yml
+- spec/rails_template/config/initializers/rails_5_override.rb
 - spec/rails_template/config/routes.rb
 - spec/rails_template/config/sunspot.yml
 - spec/rails_template/db/schema.rb