sunspot_rails 2.2.7 → 2.5.0

data/spec/shared_examples/indexed_after_save.rb

@@ -3,6 +3,6 @@ shared_examples_for 'indexed after save' do
     subject.save!
     Sunspot.commit
 
-    subject.class.search.results.should include(subject)
+    expect(subject.class.search.results).to include(subject)
   end
 end

data/spec/shared_examples/not_indexed_after_save.rb

@@ -3,6 +3,6 @@ shared_examples_for 'not indexed after save' do
     subject.save!
     Sunspot.commit
 
-    subject.class.search.results.should_not include(subject)
+    expect(subject.class.search.results).not_to include(subject)
   end
 end

data/spec/spec_helper.rb

@@ -1,75 +1,42 @@
-# This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
-if rsolr_version = ENV['RSOLR_GEM_VERSION']
-  STDERR.puts("Forcing RSolr version #{rsolr_version}")
-  gem "rsolr", rsolr_version
-end
-
-# Require the Database-specific gems
-ENV['DB'] ||= 'sqlite'
-Bundler.require(ENV['DB'])
 
-require File.expand_path('config/environment', ENV['RAILS_ROOT'])
+require File.expand_path('config/environment', File.expand_path('../rails_app', __FILE__))
+require File.expand_path('../../lib/sunspot_rails', __FILE__)
 require 'rspec/rails'
-require 'rspec/autorun'
-require File.join('sunspot', 'rails', 'solr_logging')
 
-# Requires supporting ruby files with custom matchers and macros, etc, in
-# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
-# run as spec files by default. This means that files in spec/support that end
-# in _spec.rb will both be required and run as specs, causing the specs to be
-# run twice. It is recommended that you do not name files matching this glob to
-# end with _spec.rb. You can configure this pattern with with the --pattern
-# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
-Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+if RSolr::VERSION >= '2'
+  require File.join('sunspot', 'rails', 'solr_logging')
+end
 
 # Load all shared examples
-Dir[File.expand_path("shared_examples/*.rb", File.dirname(__FILE__))].each {|f| require f}
+Dir[File.expand_path("shared_examples/*.rb", File.dirname(__FILE__))].each { |f| require f }
 
 # Load the schema
-load File.join(ENV['RAILS_ROOT'], 'db', 'schema.rb')
+load File.join(File.expand_path('../rails_app', __FILE__), 'db', 'schema.rb')
 
 RSpec.configure do |config|
-  # ## Mock Framework
-  #
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
-
-  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
-
-  # If you're not using ActiveRecord, or you'd prefer not to run each of your
-  # examples within a transaction, remove the following line or assign false
-  # instead of true.
   config.use_transactional_fixtures = true
-
-  # If true, the base class of anonymous controllers will be inferred
-  # automatically. This will be the default behavior in future versions of
-  # rspec-rails.
   config.infer_base_class_for_anonymous_controllers = false
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  # --seed 1234
-  config.order = "random"
+  config.order = 'random'
+  config.infer_spec_type_from_file_location!
 
   config.before(:each) do
     empty_tables
     Sunspot.remove_all!
-  end  
+  end
 end
 
 def empty_tables
-  ActiveRecord::Base.connection.tables.each do |table_name|
+  sources = if Rails::VERSION::MAJOR > 4
+              ActiveRecord::Base.connection.data_sources
+            else
+              ActiveRecord::Base.connection.tables
+            end
+  sources.each do |table_name|
     ActiveRecord::Base.connection.execute("DELETE FROM #{table_name}") unless table_name == 'schema_migrations'
   end
 end
 
-# COMPATIBILITY: Rails 4 has deprecated the 'scoped' method in favour of 'all'
 def relation(clazz)
-  ::Rails.version >= '4' ? clazz.all : clazz.scoped
-end
+  Rails::VERSION::MAJOR >= 4 ? clazz.all : clazz.scoped
+end

data/spec/stub_session_proxy_spec.rb

@@ -13,142 +13,146 @@ describe 'specs with Sunspot stubbed' do
     foo = double('Foo')
     block = lambda { foo.bar }
 
-    foo.should_receive(:bar)
+    expect(foo).to receive(:bar)
 
     Sunspot.batch(&block)
   end
 
   it 'should not send index to session' do
-    @session.should_not_receive(:index)
+    expect(@session).not_to receive(:index)
     @post.index
   end
 
   it 'should not send index! to session' do
-    @session.should_not_receive(:index!)
+    expect(@session).not_to receive(:index!)
     @post.index!
   end
 
   it 'should not send atomic_update to session' do
-    @session.should_not_receive(:atomic_update)
+    expect(@session).not_to receive(:atomic_update)
     @post.index
   end
 
   it 'should not send atomic_update! to session' do
-    @session.should_not_receive(:atomic_update!)
+    expect(@session).not_to receive(:atomic_update!)
     @post.index!
   end
 
   it 'should not send commit to session' do
-    @session.should_not_receive(:commit)
+    expect(@session).not_to receive(:commit)
     Sunspot.commit
   end
 
   it 'should not send remove to session' do
-    @session.should_not_receive(:remove)
+    expect(@session).not_to receive(:remove)
     @post.remove_from_index
   end
 
   it 'should not send remove! to session' do
-    @session.should_not_receive(:remove)
+    expect(@session).not_to receive(:remove)
     @post.remove_from_index!
   end
 
   it 'should not send remove_by_id to session' do
-    @session.should_not_receive(:remove_by_id)
+    expect(@session).not_to receive(:remove_by_id)
     Sunspot.remove_by_id(Post, 1)
   end
 
   it 'should not send remove_by_id! to session' do
-    @session.should_not_receive(:remove_by_id!)
+    expect(@session).not_to receive(:remove_by_id!)
     Sunspot.remove_by_id!(Post, 1)
   end
 
   it 'should not send remove_all to session' do
-    @session.should_not_receive(:remove_all)
+    expect(@session).not_to receive(:remove_all)
     Post.remove_all_from_index
   end
 
   it 'should not send remove_all! to session' do
-    @session.should_not_receive(:remove_all!)
+    expect(@session).not_to receive(:remove_all!)
     Post.remove_all_from_index!
   end
 
   it 'should not send optimize to session' do
-    @session.should_not_receive(:optimize)
+    expect(@session).not_to receive(:optimize)
     Sunspot.optimize
   end
 
   it 'should return false for dirty?' do
-    @session.should_not_receive(:dirty?)
-    Sunspot.dirty?.should == false
+    expect(@session).not_to receive(:dirty?)
+    expect(Sunspot.dirty?).to eq(false)
   end
 
   it 'should not send commit_if_dirty to session' do
-    @session.should_not_receive(:commit_if_dirty)
+    expect(@session).not_to receive(:commit_if_dirty)
     Sunspot.commit_if_dirty
   end
 
   it 'should return false for delete_dirty?' do
-    @session.should_not_receive(:delete_dirty?)
-    Sunspot.delete_dirty?.should == false
+    expect(@session).not_to receive(:delete_dirty?)
+    expect(Sunspot.delete_dirty?).to eq(false)
   end
 
   it 'should not send commit_if_delete_dirty to session' do
-    @session.should_not_receive(:commit_if_delete_dirty)
+    expect(@session).not_to receive(:commit_if_delete_dirty)
     Sunspot.commit_if_delete_dirty
   end
 
   it 'should not execute a search when #search called' do
-    @session.should_not_receive(:search)
+    expect(@session).not_to receive(:search)
     Post.search
   end
 
   it 'should not execute a search when #search called with parameters' do
-    @session.should_not_receive(:search)
+    expect(@session).not_to receive(:search)
     Post.search(:include => :blog, :select => 'id, title')
   end
 
   it 'should return a new search' do
-    @session.should_not_receive(:new_search)
-    Sunspot.new_search(Post).should respond_to(:execute)
+    expect(@session).not_to receive(:new_search)
+    expect(Sunspot.new_search(Post)).to respond_to(:execute)
   end
 
   it 'should not send more_like_this to session' do
-    @session.should_not_receive(:more_like_this)
+    expect(@session).not_to receive(:more_like_this)
     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
     end
 
     it 'should return empty results' do
-      @search.results.should == []
+      expect(@search.results).to eq([])
     end
 
     it 'should return empty hits' do
-      @search.hits.should == []
+      expect(@search.hits).to eq([])
     end
 
     it 'should return the same for raw_results as hits' do
-      @search.raw_results.should == @search.hits
+      expect(@search.raw_results).to eq(@search.hits)
     end
 
     it 'should return zero total' do
-      @search.total.should == 0
+      expect(@search.total).to eq(0)
     end
 
     it 'should return empty results for a given facet' do
-      @search.facet(:category_id).rows.should == []
+      expect(@search.facet(:category_id).rows).to eq([])
     end
 
     it 'should return empty results for a given dynamic facet' do
-      @search.dynamic_facet(:custom).rows.should == []
+      expect(@search.dynamic_facet(:custom).rows).to eq([])
     end
 
     it 'should return empty array if listing facets' do
-      @search.facets.should == []
+      expect(@search.facets).to eq([])
     end
 
     describe '#data_accessor_for' do
@@ -157,11 +161,11 @@ describe 'specs with Sunspot stubbed' do
       end
 
       it 'should provide accessor for select' do
-        @accessor.should respond_to(:select, :select=)
+        expect(@accessor).to respond_to(:select, :select=)
       end
 
       it 'should provide accessor for include' do
-        @accessor.should respond_to(:include, :include=)
+        expect(@accessor).to respond_to(:include, :include=)
       end
     end
 
@@ -171,7 +175,7 @@ describe 'specs with Sunspot stubbed' do
       end
 
       it 'should response to all the available data methods' do
-        @stats.should respond_to(
+        expect(@stats).to respond_to(
           :min,
           :max,
           :count,
@@ -183,11 +187,11 @@ describe 'specs with Sunspot stubbed' do
       end
 
       it 'should return empty results for a given facet' do
-        @stats.facet(:category_id).rows.should == []
+        expect(@stats.facet(:category_id).rows).to eq([])
       end
 
       it 'should return empty array if listing facets' do
-        @stats.facets.should == []
+        expect(@stats.facets).to eq([])
       end
 
     end

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,12 +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
-  s.add_dependency 'nokogiri'
+  if RUBY_VERSION < '2.2'
+    s.add_dependency 'rails', '>= 3', '< 5'
+  else
+    s.add_dependency 'rails', '>= 3'
+  end
 
-  s.add_development_dependency 'rspec', '~> 1.2'
-  s.add_development_dependency 'rspec-rails', '~> 1.2'
+  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.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.2.7
+  version: 2.5.0
 platform: ruby
 authors:
 - Mat Brown
@@ -26,7 +26,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2019-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -48,56 +48,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.7
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.7
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        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: '0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        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: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        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
@@ -113,6 +141,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- Appraisals
+- Gemfile
 - History.txt
 - LICENSE
 - MIT-LICENSE
@@ -121,15 +151,8 @@ files:
 - TODO
 - dev_tasks/rdoc.rake
 - dev_tasks/release.rake
-- dev_tasks/spec.rake
 - dev_tasks/todo.rake
-- gemfiles/rails-3.0.0
-- 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
+- gemfiles/.gitkeep
 - generators/sunspot/sunspot_generator.rb
 - generators/sunspot/templates/sunspot.yml
 - install.rb
@@ -155,22 +178,29 @@ files:
 - spec/configuration_spec.rb
 - spec/model_lifecycle_spec.rb
 - spec/model_spec.rb
-- spec/rails_template/app/controllers/application_controller.rb
-- spec/rails_template/app/controllers/posts_controller.rb
-- spec/rails_template/app/models/author.rb
-- spec/rails_template/app/models/blog.rb
-- spec/rails_template/app/models/location.rb
-- spec/rails_template/app/models/photo_post.rb
-- spec/rails_template/app/models/post.rb
-- spec/rails_template/app/models/post_with_auto.rb
-- spec/rails_template/app/models/post_with_default_scope.rb
-- 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
+- spec/rails_app/app/controllers/application_controller.rb
+- spec/rails_app/app/controllers/posts_controller.rb
+- spec/rails_app/app/models/author.rb
+- spec/rails_app/app/models/blog.rb
+- spec/rails_app/app/models/location.rb
+- spec/rails_app/app/models/photo_post.rb
+- spec/rails_app/app/models/post.rb
+- spec/rails_app/app/models/post_with_auto.rb
+- spec/rails_app/app/models/post_with_default_scope.rb
+- spec/rails_app/app/models/post_with_only_some_attributes_triggering_reindex.rb
+- spec/rails_app/app/models/rake_task_auto_load_test_model.rb
+- spec/rails_app/config.ru
+- spec/rails_app/config/application.rb
+- spec/rails_app/config/boot.rb
+- spec/rails_app/config/database.yml
+- spec/rails_app/config/environment.rb
+- spec/rails_app/config/environments/test.rb
+- spec/rails_app/config/initializers/rails_5_override.rb
+- 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/sunspot.yml
+- spec/rails_app/db/schema.rb
 - spec/rake_task_spec.rb
 - spec/request_lifecycle_spec.rb
 - spec/schema.rb
@@ -182,8 +212,7 @@ files:
 - spec/spec_helper.rb
 - spec/stub_session_proxy_spec.rb
 - sunspot_rails.gemspec
-- tmp/.gitkeep
-homepage: http://github.com/outoftime/sunspot/tree/master/sunspot_rails
+homepage: http://github.com/sunspot/sunspot/tree/master/sunspot_rails
 licenses:
 - MIT
 metadata: {}
@@ -207,8 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: sunspot
-rubygems_version: 2.5.0
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Rails integration for the Sunspot Solr search library
@@ -216,22 +244,29 @@ test_files:
 - spec/configuration_spec.rb
 - spec/model_lifecycle_spec.rb
 - spec/model_spec.rb
-- spec/rails_template/app/controllers/application_controller.rb
-- spec/rails_template/app/controllers/posts_controller.rb
-- spec/rails_template/app/models/author.rb
-- spec/rails_template/app/models/blog.rb
-- spec/rails_template/app/models/location.rb
-- spec/rails_template/app/models/photo_post.rb
-- spec/rails_template/app/models/post.rb
-- spec/rails_template/app/models/post_with_auto.rb
-- spec/rails_template/app/models/post_with_default_scope.rb
-- 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
+- spec/rails_app/app/controllers/application_controller.rb
+- spec/rails_app/app/controllers/posts_controller.rb
+- spec/rails_app/app/models/author.rb
+- spec/rails_app/app/models/blog.rb
+- spec/rails_app/app/models/location.rb
+- spec/rails_app/app/models/photo_post.rb
+- spec/rails_app/app/models/post.rb
+- spec/rails_app/app/models/post_with_auto.rb
+- spec/rails_app/app/models/post_with_default_scope.rb
+- spec/rails_app/app/models/post_with_only_some_attributes_triggering_reindex.rb
+- spec/rails_app/app/models/rake_task_auto_load_test_model.rb
+- spec/rails_app/config.ru
+- spec/rails_app/config/application.rb
+- spec/rails_app/config/boot.rb
+- spec/rails_app/config/database.yml
+- spec/rails_app/config/environment.rb
+- spec/rails_app/config/environments/test.rb
+- spec/rails_app/config/initializers/rails_5_override.rb
+- 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/sunspot.yml
+- spec/rails_app/db/schema.rb
 - spec/rake_task_spec.rb
 - spec/request_lifecycle_spec.rb
 - spec/schema.rb