sunspot_rails 2.3.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c03385c874a558e6fdbf6390e452bfc5c87a09f8a6c3d5efae34854e7fdab3d5
-  data.tar.gz: 472395a2311af2ef0323a5332c444275876958c4d2f8c6dacd50cee7fef0da56
+  metadata.gz: 63d24337902829c8c14a7ea0d9f081c7392b457e0604ff78887ed67037fcedc5
+  data.tar.gz: 77c235ecfc5bc55c4758abece0d0336bc0c541bf6461d5f134b7bec57eec3c88
 SHA512:
-  metadata.gz: ccdf1424ba07fa9b7f9e2e6e0f4efc421f4da5aea49c3be1359616bb8727256fd72e7895ef0e294878d2e9f2c440661fbe97507b0219409eedb949c45cd2bf9d
-  data.tar.gz: 84c1b362c773e4c4a47a4e662ab0c9ac1bc8afdd018da8c8c88d9f88092846a44e86755c93692e9fbbed550947c54c23545466092cc9cb50f858f650d784fe14
+  metadata.gz: a3a95a7312b3dd3b3402fee02ff137c85b357cf17c1babf7c98f5a37456515882d5e8978729d368b42fa67c4163d02704b7540f9878cd4dd9d09cde22f78f1b8
+  data.tar.gz: 3b031829d6bfac5ee89d7cc33ebc76375614e4ac21f9b1864b55d313a537d08a4ef96cd57d60cc41fabc5eca589a2e42052169172c77756adf382aac7e108dae

data/Appraisals

@@ -3,6 +3,7 @@ ruby_version = Gem::Version.new(RUBY_VERSION)
 if ruby_version < Gem::Version.new('2.2.0')
   ['3.0.0', '3.1.0'].each do |rails_version|
     appraise "rails-#{rails_version}" do
+      gem 'bundler',  '>= 1.3.0', '< 2.0'
       gem 'sunspot', path: File.expand_path('sunspot', ENV['SUNSPOT_LIB_HOME'])
       gem 'sunspot_solr', path: File.expand_path('sunspot_solr', ENV['SUNSPOT_LIB_HOME'])
       gem 'rails', "~> #{rails_version}"
@@ -15,6 +16,7 @@ end
 
 if ruby_version < Gem::Version.new('2.4.0')
   appraise 'rails-3.2.0' do
+    gem 'bundler',  '>= 1.3.0', '< 2.0'
     gem 'sunspot', path: File.expand_path('sunspot', ENV['SUNSPOT_LIB_HOME'])
     gem 'sunspot_solr', path: File.expand_path('sunspot_solr', ENV['SUNSPOT_LIB_HOME'])
     gem 'rails', '~> 3.2.0'
@@ -26,10 +28,10 @@ if ruby_version < Gem::Version.new('2.4.0')
 
   ['4.0.0', '4.1.0'].each do |rails_version|
     appraise "rails-#{rails_version}" do
+      gem 'bundler',  '>= 1.3.0', '< 2.0'
       gem 'sunspot', path: File.expand_path('sunspot', ENV['SUNSPOT_LIB_HOME'])
       gem 'sunspot_solr', path: File.expand_path('sunspot_solr', ENV['SUNSPOT_LIB_HOME'])
       gem 'rails', "~> #{rails_version}"
-      gem 'protected_attributes'
       gem 'progress_bar', '~> 1.0.5', require: false
       gem 'rspec', '~> 3.4.0'
       gem 'rspec-rails', '~> 3.4.0'
@@ -37,23 +39,25 @@ if ruby_version < Gem::Version.new('2.4.0')
   end
 end
 
-appraise 'rails-4.2.0' do
-  gem 'sunspot', path: File.expand_path('sunspot', ENV['SUNSPOT_LIB_HOME'])
-  gem 'sunspot_solr', path: File.expand_path('sunspot_solr', ENV['SUNSPOT_LIB_HOME'])
-  gem 'rails', '~> 4.2.0'
-  gem 'protected_attributes'
-  gem 'progress_bar', '~> 1.0.5', require: false
-  gem 'rspec', '~> 3.4.0'
-  gem 'rspec-rails', '~> 3.4.0'
+if ruby_version < Gem::Version.new('2.5.0')
+  appraise 'rails-4.2.0' do
+    gem 'bundler', '>= 1.3.0', '< 2.0'
+    gem 'sunspot', path: File.expand_path('sunspot', ENV['SUNSPOT_LIB_HOME'])
+    gem 'sunspot_solr', path: File.expand_path('sunspot_solr', ENV['SUNSPOT_LIB_HOME'])
+    gem 'rails', '~> 4.2.0'
+    gem 'progress_bar', '~> 1.0.5', require: false
+    gem 'rspec', '~> 3.4.0'
+    gem 'rspec-rails', '~> 3.4.0'
+  end
 end
 
 if ruby_version >= Gem::Version.new('2.2.0')
-  ['5.0.0', '5.1.0'].each do |rails_version|
+  ['5.0.0', '5.1.0', '5.2.0'].each do |rails_version|
     appraise "rails-#{rails_version}" do
       gem 'sunspot', path: File.expand_path('sunspot', ENV['SUNSPOT_LIB_HOME'])
       gem 'sunspot_solr', path: File.expand_path('sunspot_solr', ENV['SUNSPOT_LIB_HOME'])
       gem 'rails', "~> #{rails_version}"
-      gem 'protected_attributes_continued'
+      gem 'sprockets', '~> 3.0'
       gem 'progress_bar', '~> 1.0.5', require: false
     end
   end

data/lib/sunspot/rails/searchable.rb

@@ -99,9 +99,15 @@ module Sunspot #:nodoc:
 
             unless options[:auto_remove] == false
               # after_commit { |searchable| searchable.remove_from_index }, :on => :destroy
-              __send__ Sunspot::Rails.configuration.auto_remove_callback,
-                       proc { |searchable| searchable.remove_from_index },
-                       :on => :destroy
+              # Only add the on filter if the callback supports it
+              if Sunspot::Rails.configuration.auto_remove_callback =~ /save|destroy|create/
+                __send__ Sunspot::Rails.configuration.auto_remove_callback,
+                        proc { |searchable| searchable.remove_from_index }
+              else
+                __send__ Sunspot::Rails.configuration.auto_remove_callback,
+                        proc { |searchable| searchable.remove_from_index },
+                        :on => :destroy
+              end
             end
             options[:include] = Util::Array(options[:include])
 
@@ -258,7 +264,7 @@ 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|
+            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(&:indexable?))
@@ -281,7 +287,7 @@ module Sunspot #:nodoc:
         #
         # ==== Updates (passed as a hash)
         #
-        # updates should be specified as a hash, where key - is the object ID
+        # updates should be specified as a hash, where key - is the object or the object ID
         # and values is hash with property name/values to be updated.
         #
         # ==== Examples
@@ -297,6 +303,8 @@ module Sunspot #:nodoc:
         #
         #   # update single property
         #   Post.atomic_update(post1.id => {description: 'New post description'})
+        #   Or
+        #   Post.atomic_update(post1 => {description: 'New post description'})
         #
         # ==== Notice
         # all non-stored properties in Solr index will be lost after update.
@@ -447,7 +455,7 @@ module Sunspot #:nodoc:
         # you only need to pass hash with property changes
         #
         def solr_atomic_update(updates = {})
-          Sunspot.atomic_update(self.class, self.id => updates)
+          Sunspot.atomic_update(self.class, self => updates)
         end
 
         #
@@ -455,7 +463,7 @@ module Sunspot #:nodoc:
         # See #solr_atomic_update
         #
         def solr_atomic_update!(updates = {})
-          Sunspot.atomic_update!(self.class, self.id => updates)
+          Sunspot.atomic_update!(self.class, self => updates)
         end
         
         # 

data/lib/sunspot/rails/stub_session_proxy.rb

@@ -44,6 +44,10 @@ module Sunspot
       def optimize
       end
 
+      def config
+        Sunspot::Configuration.build
+      end
+
       def dirty?
         false
       end
@@ -104,7 +108,7 @@ module Sunspot
           []
         end
 
-        def facet(name)
+        def facet(name, dynamic_name = nil)
           FacetStub.new
         end
 
@@ -123,6 +127,9 @@ module Sunspot
         def execute
           self
         end
+
+        def spellcheck_collation
+        end
       end
 
 
@@ -219,7 +226,7 @@ module Sunspot
           []
         end
 
-        def facet(name)
+        def facet(name, dynamic_name = nil)
           FacetStub.new
         end
 

data/lib/sunspot/rails/tasks.rb

@@ -31,7 +31,6 @@ namespace :sunspot do
       # Load all the application's models. Models which invoke 'searchable' will register themselves
       # in Sunspot.searchable.
       Rails.application.eager_load!
-      Rails::Engine.subclasses.each{|engine| engine.instance.eager_load!}
 
       if args[:models].present?
         # Choose a specific subset of models, if requested

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

@@ -2,8 +2,6 @@ class Author < ActiveRecord::Base
   self.table_name  = :writers
   self.primary_key = :writer_id
 
-  attr_accessible :name
-
   searchable do
     string :name
   end

data/spec/rails_app/app/models/blog.rb

@@ -2,8 +2,6 @@ class Blog < ActiveRecord::Base
   has_many :posts
   has_many :comments, :through => :posts
 
-  attr_accessible :name, :subdomain
-
   searchable :include => { :posts => :author } do
     string :subdomain
     text :name

data/spec/rails_app/app/models/location.rb

@@ -1,3 +1,2 @@
 class Location < ActiveRecord::Base
-  attr_accessible :lat, :lng
 end

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

@@ -3,8 +3,6 @@ class Post < ActiveRecord::Base
   belongs_to :author
   has_many :comments
 
-  attr_accessible :title, :type, :location_id, :body, :blog
-
   searchable :auto_index => false, :auto_remove => false do
     string :title
     text :body, :more_like_this => true

data/spec/rails_app/app/models/post_with_auto.rb

@@ -3,8 +3,6 @@ class PostWithAuto < ActiveRecord::Base
     'posts'
   end
 
-  attr_accessible :title, :type, :location_id, :body, :blog
-
   searchable :ignore_attribute_changes_of => [ :updated_at ] do
     string :title
     text :body, :more_like_this => true

data/spec/rails_app/app/models/post_with_default_scope.rb

@@ -3,8 +3,6 @@ class PostWithDefaultScope < ActiveRecord::Base
     'posts'
   end
 
-  attr_accessible :title, :type, :location_id, :body, :blog
-
 	def self.default_scope
 		order(:title)
   end

data/spec/rails_app/app/models/post_with_only_some_attributes_triggering_reindex.rb

@@ -3,8 +3,6 @@ class PostWithOnlySomeAttributesTriggeringReindex < ActiveRecord::Base
     'posts'
   end
 
-  attr_accessible :title, :type, :location_id, :body, :blog
-
   searchable :only_reindex_attribute_changes_of => [ :title, :body ] do
     string :title
     text :body, :more_like_this => true

data/spec/rails_app/config/application.rb

@@ -4,6 +4,9 @@ require 'rails/all'
 
 Bundler.require(:default, Rails.env) if defined?(Bundler)
 
+# Load the test engine
+require File.expand_path('../../vendor/engines/test_engine/lib/test_engine', __FILE__)
+
 module RailsApp
   class Application < Rails::Application
     config.encoding = 'utf-8'

data/spec/rails_app/config/environments/test.rb

@@ -33,6 +33,9 @@ RailsApp::Application.configure do
   # like if you have constraints or database-specific column types
   # config.active_record.schema_format = :sql
 
+  # mute Rails 5.2 deprecation warning
+  config.active_record.sqlite3.represent_boolean_as_integer = true if config.active_record.sqlite3
+
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
 end

data/spec/rails_app/config/sunspot.yml

@@ -2,6 +2,7 @@ test:
   solr:
     hostname: localhost
     port: 8983
+    update_format: <%= ENV.fetch('UPDATE_FORMAT', 'xml') %>
   auto_index_callback: after_save
   auto_remove_callback: after_destroy
 development:

data/spec/rails_app/vendor/engines/test_engine/app/models/test_engine/rake_task_auto_load_test_model.rb

@@ -0,0 +1,15 @@
+# This model should not be used for any test other than the spec test that
+# checks if all models are loaded. We don't want to pre-load this model in
+# another test because we're checking to see if it will be auto-loaded by
+# the reindex task
+module TestEngine
+  class RakeTaskAutoLoadTestModel < ActiveRecord::Base
+    def self.table_name
+      'posts'
+    end
+
+    searchable do
+      string :name
+    end
+  end
+end

data/spec/rails_app/vendor/engines/test_engine/lib/test_engine/engine.rb

@@ -0,0 +1,5 @@
+module TestEngine
+  class Engine < ::Rails::Engine
+    engine_name 'sunspot_rails_test_engine'
+  end
+end

data/spec/rails_app/vendor/engines/test_engine/lib/test_engine.rb

@@ -0,0 +1,4 @@
+require_relative "test_engine/engine"
+
+module TestEngine
+end

data/spec/rake_task_spec.rb

@@ -11,8 +11,8 @@ describe 'sunspot namespace rake task' do
     it "should reindex all models if none are specified" do
       run_rake_task("sunspot:reindex", '', '', true)
 
-      # This model should not be used by any other test and therefore should only be loaded by this test
-      expect(Sunspot.searchable.collect(&:name)).to include('RakeTaskAutoLoadTestModel')
+      # This models should not be used by any other test and therefore should only be loaded by this test
+      expect(Sunspot.searchable.collect(&:name)).to include('RakeTaskAutoLoadTestModel', 'TestEngine::RakeTaskAutoLoadTestModel')
     end
 
     it "should accept a space delimited list of models to reindex" do

data/spec/stub_session_proxy_spec.rb

@@ -118,6 +118,10 @@ describe 'specs with Sunspot stubbed' do
     Sunspot.more_like_this(@post)
   end
 
+  it 'should not raise error when reindexing scope' do
+    expect{ Post.solr_index }.to_not raise_error
+  end
+
   describe 'stub search' do
     before :each do
       @search = Post.search

data/sunspot_rails.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
                   'Brian Atkinson', 'Tom Coleman', 'Matt Mitchell', 'Nathan Beyer', 'Kieran Topping', 'Nicolas Braem', 'Jeremy Ashkenas',
                   'Dylan Vaughn', 'Brian Durand', 'Sam Granieri', 'Nick Zadrozny', 'Jason Ronallo']
   s.email       = ["mat@patch.com"]
-  s.homepage = 'http://github.com/outoftime/sunspot/tree/master/sunspot_rails'
+  s.homepage = 'http://github.com/sunspot/sunspot/tree/master/sunspot_rails'
   s.summary     = 'Rails integration for the Sunspot Solr search library'
   s.license     = 'MIT'
   s.description = <<-TEXT
@@ -25,22 +25,26 @@ Gem::Specification.new do |s|
     Rails request.
   TEXT
 
-  s.rubyforge_project = "sunspot"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'rails', '>= 3'
-  s.add_dependency 'sunspot', Sunspot::VERSION
+  if RUBY_VERSION < '2.2'
+    s.add_dependency 'rails', '>= 3', '< 5'
+  else
+    s.add_dependency 'rails', '>= 3'
+  end
 
+  s.add_dependency 'sunspot', Sunspot::VERSION
+  
   s.add_development_dependency 'appraisal', '2.2.0'
+  s.add_development_dependency 'bundler',  '>= 1.3.0', '< 2.0' if RUBY_VERSION <= '2.0.0'
   s.add_development_dependency 'nokogiri', '< 1.7' if RUBY_VERSION <= '2.0.0'
   s.add_development_dependency 'rake', '< 12.3'
   s.add_development_dependency 'rspec', '~> 3.7'
   s.add_development_dependency 'rspec-rails', '~> 3.7'
-  s.add_development_dependency 'sqlite3',  '~> 1.3'
+  s.add_development_dependency 'sqlite3',  '~> 1.3.0'
 
   s.rdoc_options << '--webcvs=http://github.com/outoftime/sunspot/tree/master/%s' <<
                   '--title' << 'Sunspot-Rails - Rails integration for the Sunspot Solr search library - API Documentation' <<

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot_rails
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Mat Brown
@@ -23,10 +23,10 @@ authors:
 - Sam Granieri
 - Nick Zadrozny
 - Jason Ronallo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-08 00:00:00.000000000 Z
+date: 2022-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -48,14 +48,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -118,14 +118,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.0
 description: |2
       Sunspot::Rails is an extension to the Sunspot library for Solr search.
       Sunspot::Rails adds integration between Sunspot and ActiveRecord, including
@@ -201,6 +201,9 @@ files:
 - spec/rails_app/config/routes.rb
 - spec/rails_app/config/sunspot.yml
 - spec/rails_app/db/schema.rb
+- spec/rails_app/vendor/engines/test_engine/app/models/test_engine/rake_task_auto_load_test_model.rb
+- spec/rails_app/vendor/engines/test_engine/lib/test_engine.rb
+- spec/rails_app/vendor/engines/test_engine/lib/test_engine/engine.rb
 - spec/rake_task_spec.rb
 - spec/request_lifecycle_spec.rb
 - spec/schema.rb
@@ -212,11 +215,11 @@ files:
 - spec/spec_helper.rb
 - spec/stub_session_proxy_spec.rb
 - sunspot_rails.gemspec
-homepage: http://github.com/outoftime/sunspot/tree/master/sunspot_rails
+homepage: http://github.com/sunspot/sunspot/tree/master/sunspot_rails
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--webcvs=http://github.com/outoftime/sunspot/tree/master/%s"
 - "--title"
@@ -236,9 +239,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: sunspot
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Rails integration for the Sunspot Solr search library
 test_files:
@@ -268,6 +270,9 @@ test_files:
 - spec/rails_app/config/routes.rb
 - spec/rails_app/config/sunspot.yml
 - spec/rails_app/db/schema.rb
+- spec/rails_app/vendor/engines/test_engine/app/models/test_engine/rake_task_auto_load_test_model.rb
+- spec/rails_app/vendor/engines/test_engine/lib/test_engine.rb
+- spec/rails_app/vendor/engines/test_engine/lib/test_engine/engine.rb
 - spec/rake_task_spec.rb
 - spec/request_lifecycle_spec.rb
 - spec/schema.rb