sunspot_rails 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63d24337902829c8c14a7ea0d9f081c7392b457e0604ff78887ed67037fcedc5
-  data.tar.gz: 77c235ecfc5bc55c4758abece0d0336bc0c541bf6461d5f134b7bec57eec3c88
+  metadata.gz: a11d76b704b04ea9a9181464f3aa7608d3fdf0b279f6cfbe1aa0722253a3d6b6
+  data.tar.gz: 8fcaca341cc28674811eff16fb88919cd6f1ef3c25353e6b1fd1ba54179be2f6
 SHA512:
-  metadata.gz: a3a95a7312b3dd3b3402fee02ff137c85b357cf17c1babf7c98f5a37456515882d5e8978729d368b42fa67c4163d02704b7540f9878cd4dd9d09cde22f78f1b8
-  data.tar.gz: 3b031829d6bfac5ee89d7cc33ebc76375614e4ac21f9b1864b55d313a537d08a4ef96cd57d60cc41fabc5eca589a2e42052169172c77756adf382aac7e108dae
+  metadata.gz: 385ea6146e9bce459ebff718391d0ad03ed2bf007d8ebcd1f456fe4cfc9287971342faf23f94b873f6042230d2d18a25e93424f9c30b85d358e770cda3e8b6b2
+  data.tar.gz: 94b98fe7eef52efd8169160dabb8015835f4e9f00924f6ff5541e6f5151c67b9a820c848a89c6972949e61cbf71048e832e94dea19554bf233e0eaaea1378120

data/Appraisals

@@ -1,64 +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/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/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/sunspot_rails.gemspec

@@ -30,21 +30,13 @@ Gem::Specification.new do |s|
   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.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Mat Brown
@@ -26,7 +26,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-30 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.6.0
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.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,6 +157,7 @@ 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
@@ -239,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Rails integration for the Sunspot Solr search library
@@ -268,6 +227,7 @@ 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