sunspot_rails 2.5.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe1c1255087428230f0395ace478a130cc085d17ff4928901d3c3b5d8c533346
-  data.tar.gz: 59107a6f61bfe96c726969590ceda3842cee4f78c618e8d90e28eb1ce827cbb0
+  metadata.gz: a11d76b704b04ea9a9181464f3aa7608d3fdf0b279f6cfbe1aa0722253a3d6b6
+  data.tar.gz: 8fcaca341cc28674811eff16fb88919cd6f1ef3c25353e6b1fd1ba54179be2f6
 SHA512:
-  metadata.gz: 9e2d165e6ab6da5acecb593607c1d709111f6b211ed60bcc024dea60d8674f265d3c473073154d9f227e47c88cf6a61b039f28530419d290441de8edd05631db
-  data.tar.gz: e6e6ab5dd5d2abb029f240f256483f8710f67a689284630b9d42fcb0be690fb6a11789a9d522cab83ff6e59b446689a3b7bd0d0a6eac1b6d46e4c15b2a8acb85
+  metadata.gz: 385ea6146e9bce459ebff718391d0ad03ed2bf007d8ebcd1f456fe4cfc9287971342faf23f94b873f6042230d2d18a25e93424f9c30b85d358e770cda3e8b6b2
+  data.tar.gz: 94b98fe7eef52efd8169160dabb8015835f4e9f00924f6ff5541e6f5151c67b9a820c848a89c6972949e61cbf71048e832e94dea19554bf233e0eaaea1378120

data/Appraisals

@@ -1,63 +1,31 @@
 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}"
-      gem 'progress_bar', '~> 1.0.5', require: false
-      gem 'rspec', '~> 3.4.0'
-      gem 'rspec-rails', '~> 3.4.0'
-    end
-  end
-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'
-    gem 'progress_bar', '~> 1.0.5', require: false
-    gem 'test-unit', '~> 3.2.0'
-    gem 'rspec', '~> 3.4.0'
-    gem 'rspec-rails', '~> 3.4.0'
-  end
-
-  ['4.0.0', '4.1.0'].each do |rails_version|
+if ruby_version < Gem::Version.new('3.0.0')
+  ['5.0.0', '5.1.0', '5.2.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 'sprockets', '~> 3.0'
       gem 'progress_bar', '~> 1.0.5', require: false
-      gem 'rspec', '~> 3.4.0'
-      gem 'rspec-rails', '~> 3.4.0'
+      gem 'sqlite3', '~> 1.3.0'
+      gem 'rspec', '~> 3.7'
+      gem 'rspec-rails', '~> 3.7'
     end
   end
 end
 
-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', '5.2.0'].each do |rails_version|
+if Gem::Version.new('3.0.0') <= ruby_version && ruby_version < Gem::Version.new('3.4.0')
+  ['6.1.0', '7.0.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 'sprockets', '~> 3.0'
       gem 'progress_bar', '~> 1.0.5', require: false
+      gem 'sqlite3', '~> 1.4.0'
+      gem 'rspec', '~> 3'
+      gem 'rspec-rails', '~> 6'
     end
   end
 end

data/lib/sunspot/rails/configuration.rb

@@ -377,7 +377,8 @@ module Sunspot #:nodoc:
             if File.exist?(path)
               File.open(path) do |file|
                 processed = ERB.new(file.read).result
-                YAML.load(processed)[::Rails.env]
+                user_configurations = YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(processed) : YAML.load(processed)
+                user_configurations[::Rails.env]
               end
             else
               {}

data/lib/sunspot/rails/log_subscriber.rb

@@ -33,15 +33,15 @@ module Sunspot
         name = '%s (%.1fms)' % ["SOLR Request", event.duration]
 
         # produces: path=select parameters={fq: ["type:Tag"], q: "rossi", fl: "* score", qf: "tag_name_text", defType: "edismax", start: 0, rows: 20}
-        path = color(event.payload[:path], BOLD, true)
+        path = color(event.payload[:path], nil, bold: true)
         parameters = event.payload[:parameters].map { |k, v|
           v = "\"#{v}\"" if v.is_a? String
           v = v.to_s.gsub(/\\/,'') # unescape
-          "#{k}: #{color(v, BOLD, true)}"
+          "#{k}: #{color(v, nil, bold: true)}"
         }.join(', ')
         request = "path=#{path} parameters={#{parameters}}"
 
-        debug "  #{color(name, GREEN, true)}  [ #{request} ]"
+        debug "  #{color(name, GREEN, bold: true)}  [ #{request} ]"
       end
     end
   end

data/lib/sunspot/rails/searchable.rb

@@ -264,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?))
@@ -287,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
@@ -303,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.
@@ -453,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
 
         #
@@ -461,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

@@ -108,7 +108,7 @@ module Sunspot
           []
         end
 
-        def facet(name)
+        def facet(name, dynamic_name = nil)
           FacetStub.new
         end
 
@@ -127,6 +127,9 @@ module Sunspot
         def execute
           self
         end
+
+        def spellcheck_collation
+        end
       end
 
 
@@ -223,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/model_lifecycle_spec.rb

@@ -15,7 +15,7 @@ describe 'searchable with lifecycle' do
   describe 'on update' do
     before :each do
       @post = PostWithAuto.create
-      @post.update_attributes(:title => 'Test 1')
+      @post.update(:title => 'Test 1')
       Sunspot.commit
     end
 

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/boot.rb

@@ -3,4 +3,4 @@ require 'rubygems'
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])

data/spec/rails_app/config/storage.yml

@@ -0,0 +1,3 @@
+test:
+  service: Disk
+  root: <%= Rails.root.join("storage") %>

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/sunspot_rails.gemspec

@@ -25,28 +25,18 @@ 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"]
 
-  if RUBY_VERSION < '2.2'
-    s.add_dependency 'rails', '>= 3', '< 5'
-  else
-    s.add_dependency 'rails', '>= 3'
-  end
-
+  s.add_dependency 'rails', '>= 5'
   s.add_dependency 'sunspot', Sunspot::VERSION
   
-  s.add_development_dependency 'appraisal', '2.2.0'
+  s.add_development_dependency 'appraisal', '~> 2.5'
   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.0'
+  s.add_development_dependency 'rake', '~> 13.2'
 
   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.5.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Mat Brown
@@ -23,10 +23,10 @@ authors:
 - Sam Granieri
 - Nick Zadrozny
 - Jason Ronallo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-12 00:00:00.000000000 Z
+date: 2024-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,98 +34,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: sunspot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '12.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '12.3'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '13.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '13.2'
 description: |2
       Sunspot::Rails is an extension to the Sunspot library for Solr search.
       Sunspot::Rails adds integration between Sunspot and ActiveRecord, including
@@ -199,8 +157,12 @@ files:
 - spec/rails_app/config/initializers/secret_token.rb
 - spec/rails_app/config/initializers/session_store.rb
 - spec/rails_app/config/routes.rb
+- spec/rails_app/config/storage.yml
 - 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
@@ -216,7 +178,7 @@ 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,8 +198,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: Rails integration for the Sunspot Solr search library
 test_files:
@@ -265,8 +227,12 @@ test_files:
 - spec/rails_app/config/initializers/secret_token.rb
 - spec/rails_app/config/initializers/session_store.rb
 - spec/rails_app/config/routes.rb
+- spec/rails_app/config/storage.yml
 - 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