sunspot_rails 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c03385c874a558e6fdbf6390e452bfc5c87a09f8a6c3d5efae34854e7fdab3d5
-  data.tar.gz: 472395a2311af2ef0323a5332c444275876958c4d2f8c6dacd50cee7fef0da56
+  metadata.gz: 44a1a366cb8852c32d51937b3c94145cb825a03b978e5ca66ee749d3d909e065
+  data.tar.gz: 0377a545b9d2f0aaa387486e43d90d4ce1f1c37aae3164f5467b0358788f8fa9
 SHA512:
-  metadata.gz: ccdf1424ba07fa9b7f9e2e6e0f4efc421f4da5aea49c3be1359616bb8727256fd72e7895ef0e294878d2e9f2c440661fbe97507b0219409eedb949c45cd2bf9d
-  data.tar.gz: 84c1b362c773e4c4a47a4e662ab0c9ac1bc8afdd018da8c8c88d9f88092846a44e86755c93692e9fbbed550947c54c23545466092cc9cb50f858f650d784fe14
+  metadata.gz: 8c2a3c9ffc207113b86ab022a50b2128031dcdb3a4caf9ae2d346a78a2541235c55953035d9128a60a4d479a7f380ad09b2123f8c8b50a78e8318af9389bf973
+  data.tar.gz: f417ab24fdd8be1100b2e7f0968e5e7e240e04f4142d3a3a74ae40bfbf3c3983874e6f5ad942a4be908515da6ae02682bf27eaabeed66c549997bf174d68e4d2

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,24 @@ 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 '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])
 

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

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/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/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
@@ -32,15 +32,21 @@ Gem::Specification.new do |s|
   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.4.0
 platform: ruby
 authors:
 - Mat Brown
@@ -26,7 +26,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-08 00:00:00.000000000 Z
+date: 2019-07-05 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.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.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
@@ -212,7 +212,7 @@ 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: {}
@@ -236,8 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: sunspot
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Rails integration for the Sunspot Solr search library