sunspot_rails 2.2.6 → 2.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0ce283378203c1a9f3bdccf1670ee3f10ff7e55
-  data.tar.gz: 9c888704f1b8150db2ec3f3f2c8f18caabb3b051
+  metadata.gz: 9c73686a623e0b8085e678093d6d80a94a65f988
+  data.tar.gz: 218687305e166d54d3e5240be43cde53c8487abd
 SHA512:
-  metadata.gz: 630ae3479120da9bc341c3a6b4a0bd5c170c44bbab0b00329901f871344ec07f59834c6d8b7dee519f7145b7478705a6c65391c9a91179da9a673e87871dba8d
-  data.tar.gz: 6b8d86ad3397a93422b5eb67401aa682ebf2a498c7bef90e45d8eadf0479ff0a7839402f1555ed02b8c96d6260ec16d0a44a2e2ec8628ae0691674eabef0aad6
+  metadata.gz: fb98a7c070f2ca26b62911ca89011bb84f9ac02aa67a6a63f11021a3825d52e65a4956ad647563b82f14ebdc953486a7fd9b58bb40a78643dc3155fb5ebd3339
+  data.tar.gz: 98c9d8a7acc171cda06429a97eaa6a9ca0874a26c8bb923cd1008b69926d88b0ca882ce847f2df51bf425787fa622909db25095da39fa1cd4c5afc9f3062d320

data/gemfiles/rails-3.0.0

@@ -13,7 +13,7 @@ group :test do
 end
 
 group :postgres do
-  gem 'pg'
+  gem 'pg', '~> 0.18.4'
 end
 
 group :sqlite do

data/gemfiles/rails-3.1.0

@@ -13,7 +13,7 @@ group :test do
 end
 
 group :postgres do
-  gem 'pg'
+  gem 'pg', '~> 0.18.4'
 end
 
 group :sqlite do

data/gemfiles/rails-3.2.0

@@ -13,7 +13,7 @@ group :test do
 end
 
 group :postgres do
-  gem 'pg'
+  gem 'pg', '~> 0.18.4'
 end
 
 group :sqlite do

data/gemfiles/rails-4.0.0

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'rails', '~> 4.0.0'
-if SystemRubyVersion.new.to_s =~ /1.9/
+if RUBY_VERSION < '2.0'
   gem 'mime-types', '~> 2.99.0'
 end
 
@@ -17,7 +17,7 @@ group :test do
 end
 
 group :postgres do
-  gem 'pg'
+  gem 'pg', '~> 0.18.4'
 end
 
 group :sqlite do

data/gemfiles/rails-4.1.0

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'rails', '~> 4.1.0'
-if SystemRubyVersion.new.to_s =~ /1.9/
+if RUBY_VERSION < '2.0'
   gem 'mime-types', '~> 2.99.0'
 end
 
@@ -16,7 +16,7 @@ group :test do
 end
 
 group :postgres do
-  gem 'pg'
+  gem 'pg', '~> 0.18.4'
 end
 
 group :sqlite do

data/gemfiles/rails-4.2.0

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'rails', '~> 4.2.0'
-if SystemRubyVersion.new.to_s =~ /1.9/
+if RUBY_VERSION < '2.0'
   gem 'mime-types', '~> 2.99.0'
 end
 
@@ -16,7 +16,7 @@ group :test do
 end
 
 group :postgres do
-  gem 'pg'
+  gem 'pg', '~> 0.18.4'
 end
 
 group :sqlite do

data/gemfiles/rails-5.0

@@ -0,0 +1,20 @@
+source 'http://rubygems.org'
+
+gem 'rails', '~> 5.0'
+gem 'sunspot', :path => File.expand_path('../../../sunspot', __FILE__)
+gem 'sunspot_solr', :path => File.expand_path('../../../sunspot_solr', __FILE__)
+gem 'sunspot_rails', :path => File.expand_path('../..', __FILE__)
+
+group :test do
+  gem 'protected_attributes_continued'
+  gem 'rspec-rails', '~> 2.14.0'
+  gem 'progress_bar', '~> 1.0.5', require: false
+end
+
+group :postgres do
+  gem 'pg', '~> 0.18.4'
+end
+
+group :sqlite do
+  gem 'sqlite3', '~> 1.3.7'
+end

data/lib/sunspot/rails/request_lifecycle.rb

@@ -20,8 +20,10 @@ module Sunspot #:nodoc:
           # this case, since after_filter uses the inheritable_attribute
           # structure, the already-loaded subclasses don't get the filters. So,
           # the below ensures that all loaded controllers have the filter.
+          callback = ::Rails::VERSION::MAJOR > 3 ? :after_action : :after_filter
+
           loaded_controllers.each do |controller|
-            controller.after_filter do
+            controller.send(callback) do
               if Sunspot::Rails.configuration.auto_commit_after_request?
                 Sunspot.commit_if_dirty
               elsif Sunspot::Rails.configuration.auto_commit_after_delete_request?

data/lib/sunspot/rails/solr_instrumentation.rb

@@ -4,10 +4,10 @@ module Sunspot
       extend ActiveSupport::Concern
 
       included do
-        alias_method_chain :send_and_receive, :as_instrumentation
+        alias_method :send_and_receive_without_as_instrumentation, :send_and_receive
+        alias_method :send_and_receive, :send_and_receive_with_as_instrumentation
       end
 
-
       def send_and_receive_with_as_instrumentation(path, opts)
         parameters = (opts[:params] || {})
         parameters.merge!(opts[:data]) if opts[:data].is_a? Hash

data/lib/sunspot/rails/solr_logging.rb

@@ -2,12 +2,6 @@ module Sunspot
   module Rails
     module SolrLogging
 
-      class <<self
-        def included(base)
-          base.alias_method_chain :execute, :rails_logging
-        end
-      end
-
       COMMIT = %r{<commit/>}
 
       def execute_with_rails_logging(client, request_context)
@@ -17,7 +11,6 @@ module Sunspot
           action = "Commit"
           body = ""
         end
-        body = body[0, 800] + '...' if body.length > 800
 
         # Make request and log.
         response = nil
@@ -56,4 +49,6 @@ end
 
 RSolr::Connection.module_eval do
   include Sunspot::Rails::SolrLogging
+  alias_method :execute_without_rails_logging, :execute
+  alias_method :execute, :execute_with_rails_logging
 end

data/spec/rails_template/config/initializers/rails_5_override.rb

@@ -0,0 +1 @@
+Rails.application.config.active_record.belongs_to_required_by_default = false if Rails::VERSION::MAJOR == 5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot_rails
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 2.2.7
 platform: ruby
 authors:
 - Mat Brown
@@ -26,7 +26,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -48,14 +48,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.6
+        version: 2.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.6
+        version: 2.2.7
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -129,6 +129,7 @@ files:
 - gemfiles/rails-4.0.0
 - gemfiles/rails-4.1.0
 - gemfiles/rails-4.2.0
+- gemfiles/rails-5.0
 - generators/sunspot/sunspot_generator.rb
 - generators/sunspot/templates/sunspot.yml
 - install.rb
@@ -166,6 +167,7 @@ files:
 - 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
@@ -226,6 +228,7 @@ test_files:
 - 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