sunspot_rails 2.2.6 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e0ce283378203c1a9f3bdccf1670ee3f10ff7e55
-  data.tar.gz: 9c888704f1b8150db2ec3f3f2c8f18caabb3b051
+SHA256:
+  metadata.gz: 63d24337902829c8c14a7ea0d9f081c7392b457e0604ff78887ed67037fcedc5
+  data.tar.gz: 77c235ecfc5bc55c4758abece0d0336bc0c541bf6461d5f134b7bec57eec3c88
 SHA512:
-  metadata.gz: 630ae3479120da9bc341c3a6b4a0bd5c170c44bbab0b00329901f871344ec07f59834c6d8b7dee519f7145b7478705a6c65391c9a91179da9a673e87871dba8d
-  data.tar.gz: 6b8d86ad3397a93422b5eb67401aa682ebf2a498c7bef90e45d8eadf0479ff0a7839402f1555ed02b8c96d6260ec16d0a44a2e2ec8628ae0691674eabef0aad6
+  metadata.gz: a3a95a7312b3dd3b3402fee02ff137c85b357cf17c1babf7c98f5a37456515882d5e8978729d368b42fa67c4163d02704b7540f9878cd4dd9d09cde22f78f1b8
+  data.tar.gz: 3b031829d6bfac5ee89d7cc33ebc76375614e4ac21f9b1864b55d313a537d08a4ef96cd57d60cc41fabc5eca589a2e42052169172c77756adf382aac7e108dae

data/.gitignore

@@ -3,5 +3,4 @@ doc
 pkg/*
 log
 .bundle
-tmp/*
-gemfiles/*.lock
+gemfiles/*.gemfile*

data/Appraisals

@@ -0,0 +1,64 @@
+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|
+    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.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|
+    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
+    end
+  end
+end

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/lib/sunspot/rails/configuration.rb

@@ -301,6 +301,10 @@ module Sunspot #:nodoc:
         @open_timeout ||= user_configuration_from_key('solr', 'open_timeout')
       end
 
+      def update_format
+        @update_format ||= user_configuration_from_key('solr', 'update_format')
+      end
+
       def proxy
         @proxy ||= user_configuration_from_key('solr', 'proxy')
       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/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])
 
@@ -258,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?))
@@ -281,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
@@ -297,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.
@@ -447,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
 
         #
@@ -455,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/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,28 +2,21 @@ 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)
+      def execute_with_rails_logging(request_context)
         body = (request_context[:data]||"").dup
         action = request_context[:path].capitalize
         if body =~ COMMIT
           action = "Commit"
           body = ""
         end
-        body = body[0, 800] + '...' if body.length > 800
 
         # Make request and log.
         response = nil
         begin
           ms = Benchmark.ms do
-            response = execute_without_rails_logging(client, request_context)
+            response = execute_without_rails_logging(request_context)
           end
           log_name = 'Solr %s (%.1fms)' % [action, ms]
           ::Rails.logger.debug(format_log_entry(log_name, body))
@@ -54,6 +47,8 @@ module Sunspot
   end
 end
 
-RSolr::Connection.module_eval do
+RSolr::Client.class_eval do
   include Sunspot::Rails::SolrLogging
+  alias_method :execute_without_rails_logging, :execute
+  alias_method :execute, :execute_with_rails_logging
 end

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

@@ -53,6 +53,7 @@ module Sunspot #:nodoc:
         config.solr.read_timeout = sunspot_rails_configuration.read_timeout
         config.solr.open_timeout = sunspot_rails_configuration.open_timeout
         config.solr.proxy = sunspot_rails_configuration.proxy
+        config.solr.update_format = sunspot_rails_configuration.update_format
         config
       end
 
@@ -68,6 +69,7 @@ module Sunspot #:nodoc:
         config.solr.read_timeout = sunspot_rails_configuration.read_timeout
         config.solr.open_timeout = sunspot_rails_configuration.open_timeout
         config.solr.proxy = sunspot_rails_configuration.proxy
+        config.solr.update_format = sunspot_rails_configuration.update_format
         config
       end
     end