sunspot_rails 2.2.7 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9c73686a623e0b8085e678093d6d80a94a65f988
-  data.tar.gz: 218687305e166d54d3e5240be43cde53c8487abd
+SHA256:
+  metadata.gz: fe1c1255087428230f0395ace478a130cc085d17ff4928901d3c3b5d8c533346
+  data.tar.gz: 59107a6f61bfe96c726969590ceda3842cee4f78c618e8d90e28eb1ce827cbb0
 SHA512:
-  metadata.gz: fb98a7c070f2ca26b62911ca89011bb84f9ac02aa67a6a63f11021a3825d52e65a4956ad647563b82f14ebdc953486a7fd9b58bb40a78643dc3155fb5ebd3339
-  data.tar.gz: 98c9d8a7acc171cda06429a97eaa6a9ca0874a26c8bb923cd1008b69926d88b0ca882ce847f2df51bf425787fa622909db25095da39fa1cd4c5afc9f3062d320
+  metadata.gz: 9e2d165e6ab6da5acecb593607c1d709111f6b211ed60bcc024dea60d8674f265d3c473073154d9f227e47c88cf6a61b039f28530419d290441de8edd05631db
+  data.tar.gz: e6e6ab5dd5d2abb029f240f256483f8710f67a689284630b9d42fcb0be690fb6a11789a9d522cab83ff6e59b446689a3b7bd0d0a6eac1b6d46e4c15b2a8acb85

data/.gitignore

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

data/Appraisals

@@ -0,0 +1,63 @@
+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 '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.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

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/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/solr_logging.rb

@@ -4,7 +4,7 @@ module Sunspot
 
       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
@@ -16,7 +16,7 @@ module Sunspot
         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))
@@ -47,7 +47,7 @@ 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

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/configuration_spec.rb

@@ -2,195 +2,203 @@ require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe Sunspot::Rails::Configuration, "default values without a sunspot.yml" do
   before(:each) do
-    File.stub(:exist?).and_return(false) # simulate sunspot.yml not existing
+    allow(File).to receive(:exist?).and_return(false) # simulate sunspot.yml not existing
     @config = Sunspot::Rails::Configuration.new
   end
 
   it "should handle the 'hostname' property when not set" do
-    @config.hostname.should == 'localhost'
+    expect(@config.hostname).to eq('localhost')
   end
 
   it "should handle the 'path' property when not set" do
-    @config.path.should == '/solr/default'
+    expect(@config.path).to eq('/solr/default')
   end
 
   it "should set the scheme to http" do
-    @config.scheme.should == "http"
+    expect(@config.scheme).to eq("http")
   end
 
   it "should not have userinfo" do
-    @config.userinfo.should be_nil
+    expect(@config.userinfo).to be_nil
   end
 
   it "should not set a proxy" do
-    @config.proxy.should be_nil
+    expect(@config.proxy).to be_nil
   end
 
   describe "port" do
     it "should default to port 8981 in test" do
-      ::Rails.stub(:env => 'test')
+      allow(::Rails).to receive(:env).and_return('test')
       @config = Sunspot::Rails::Configuration.new
-      @config.port.should == 8981
+      expect(@config.port).to eq(8981)
     end
     it "should default to port 8982 in development" do
-      ::Rails.stub(:env => 'development')
+      allow(::Rails).to receive(:env).and_return('development')
       @config = Sunspot::Rails::Configuration.new
-      @config.port.should == 8982
+      expect(@config.port).to eq(8982)
     end
     it "should default to 8983 in production" do
-      ::Rails.stub(:env => 'production')
+      allow(::Rails).to receive(:env).and_return('production')
       @config = Sunspot::Rails::Configuration.new
-      @config.port.should == 8983
+      expect(@config.port).to eq(8983)
     end
     it "should generally default to 8983" do
-      ::Rails.stub(:env => 'staging')
+      allow(::Rails).to receive(:env).and_return('staging')
       @config = Sunspot::Rails::Configuration.new
-      @config.port.should == 8983
+      expect(@config.port).to eq(8983)
     end
   end
 
   it "should set the read timeout to nil when not set" do
-    @config.read_timeout == nil
+    expect(@config.read_timeout).to be_nil
   end
 
   it "should set the open timeout to nil when not set" do
-    @config.open_timeout == nil
+    expect(@config.open_timeout).to be_nil
+  end
+
+  it "should set the update_format to nil when not set" do
+    expect(@config.update_format).to be_nil
   end
 
   it "should set 'log_level' property using Rails log level when not set" do
-    ::Rails.logger.stub(:level){ 3 }
-    @config.log_level.should == 'SEVERE'
+    allow(::Rails.logger).to receive(:level){ 3 }
+    expect(@config.log_level).to eq('SEVERE')
   end
 
   it "should handle the 'log_file' property" do
-    @config.log_file.should =~ /log\/solr_test.log/
+    expect(@config.log_file).to match(/log\/solr_test.log/)
   end
 
   it "should handle the 'solr_home' property when not set" do
-    Rails.should_receive(:root).at_least(1).and_return('/some/path')
-    @config.solr_home.should == '/some/path/solr'
+    expect(Rails).to receive(:root).at_least(1).and_return('/some/path')
+    expect(@config.solr_home).to eq('/some/path/solr')
   end
 
   it "should handle the 'pid_dir' property when not set" do
-    Rails.should_receive(:root).at_least(1).and_return('/some/path')
-    @config.pid_dir.should == '/some/path/solr/pids/test'
+    expect(Rails).to receive(:root).at_least(1).and_return('/some/path')
+    expect(@config.pid_dir).to eq('/some/path/solr/pids/test')
   end
 
   it "should handle the 'auto_commit_after_request' propery when not set" do
-    @config.auto_commit_after_request?.should == true
+    expect(@config.auto_commit_after_request?).to eq(true)
   end
 
   it "should handle the 'auto_commit_after_delete_request' propery when not set" do
-    @config.auto_commit_after_delete_request?.should == false
+    expect(@config.auto_commit_after_delete_request?).to eq(false)
   end
 
   it "should handle the 'bind_address' property when not set" do
-    @config.bind_address.should be_nil
+    expect(@config.bind_address).to be_nil
   end
 
   it "should handle the 'disabled' property when not set" do
-    @config.disabled?.should be_false
+    expect(@config.disabled?).to be_falsey
   end
 
   it "should handle the 'auto_index_callback' property when not set" do
-    @config.auto_index_callback.should == "after_save"
+    expect(@config.auto_index_callback).to eq("after_save")
   end
 
   it "should handle the 'auto_remove_callback' property when not set" do
-    @config.auto_remove_callback.should == "after_destroy"
+    expect(@config.auto_remove_callback).to eq("after_destroy")
   end
 end
 
 describe Sunspot::Rails::Configuration, "user provided sunspot.yml" do
   before(:each) do
-    ::Rails.stub(:env => 'config_test')
+    allow(::Rails).to receive(:env).and_return('config_test')
     @config = Sunspot::Rails::Configuration.new
   end
 
   it "should handle the 'scheme' property when set" do
-    @config.scheme.should == "http"
+    expect(@config.scheme).to eq("http")
   end
 
   it "should handle the 'user' and 'pass' properties when set" do
-    @config.userinfo.should == "user:pass"
+    expect(@config.userinfo).to eq("user:pass")
   end
 
   it "should handle the 'hostname' property when set" do
-    @config.hostname.should == 'some.host'
+    expect(@config.hostname).to eq('some.host')
   end
 
   it "should handle the 'port' property when set" do
-    @config.port.should == 1234
+    expect(@config.port).to eq(1234)
   end
 
   it "should handle the 'path' property when set" do
-    @config.path.should == '/solr/idx'
+    expect(@config.path).to eq('/solr/idx')
   end
 
   it "should handle the 'log_level' propery when set" do
-    @config.log_level.should == 'WARNING'
+    expect(@config.log_level).to eq('WARNING')
   end
 
   it "should handle the 'solr_home' propery when set" do
-    @config.solr_home.should == '/my_superior_path'
+    expect(@config.solr_home).to eq('/my_superior_path')
   end
 
   it "should handle the 'pid_dir' property when set" do
-    @config.pid_dir.should == '/my_superior_path/pids'
+    expect(@config.pid_dir).to eq('/my_superior_path/pids')
   end
 
   it "should handle the 'solr_home' property when set" do
-    @config.solr_home.should == '/my_superior_path'
+    expect(@config.solr_home).to eq('/my_superior_path')
   end
 
   it "should handle the 'auto_commit_after_request' propery when set" do
-    @config.auto_commit_after_request?.should == false
+    expect(@config.auto_commit_after_request?).to eq(false)
   end
 
   it "should handle the 'auto_commit_after_delete_request' propery when set" do
-    @config.auto_commit_after_delete_request?.should == true
+    expect(@config.auto_commit_after_delete_request?).to eq(true)
   end
 
   it "should handle the 'bind_address' property when set" do
-    @config.bind_address.should == "127.0.0.1"
+    expect(@config.bind_address).to eq("127.0.0.1")
   end
 
   it "should handle the 'read_timeout' property when set" do
-    @config.read_timeout.should == 2
+    expect(@config.read_timeout).to eq(2)
   end
 
   it "should handle the 'open_timeout' property when set" do
-    @config.open_timeout.should == 0.5
+    expect(@config.open_timeout).to eq(0.5)
+  end
+
+  it "should handle the 'update_format' property when set" do
+    expect(@config.update_format).to eq('json')
   end
 
   it "should handle the 'proxy' property when set" do
-    @config.proxy.should == 'http://proxy.com:12345'
+    expect(@config.proxy).to eq('http://proxy.com:12345')
   end
 end
 
 describe Sunspot::Rails::Configuration, "with auto_index_callback and auto_remove_callback set" do
   before do
-    ::Rails.stub(:env => 'config_commit_test')
+    allow(::Rails).to receive(:env).and_return('config_commit_test')
     @config = Sunspot::Rails::Configuration.new
   end
 
   it "should handle the 'auto_index_callback' property when set" do
-    @config.auto_index_callback.should == "after_commit"
+    expect(@config.auto_index_callback).to eq("after_commit")
   end
 
   it "should handle the 'auto_remove_callback' property when set" do
-    @config.auto_remove_callback.should == "after_commit"
+    expect(@config.auto_remove_callback).to eq("after_commit")
   end
 end
 
 describe Sunspot::Rails::Configuration, "with disabled: true in sunspot.yml" do
   before(:each) do
-    ::Rails.stub(:env => 'config_disabled_test')
+    allow(::Rails).to receive(:env).and_return('config_disabled_test')
     @config = Sunspot::Rails::Configuration.new
   end
 
   it "should handle the 'disabled' property when set" do
-    @config.disabled?.should be_true
+    expect(@config.disabled?).to be_truthy
   end
 end
 
@@ -200,7 +208,7 @@ describe Sunspot::Rails::Configuration, "with ENV['SOLR_URL'] overriding sunspot
   end
 
   before(:each) do
-    ::Rails.stub(:env => 'config_test')
+    allow(::Rails).to receive(:env).and_return('config_test')
     @config = Sunspot::Rails::Configuration.new
   end
 
@@ -209,15 +217,15 @@ describe Sunspot::Rails::Configuration, "with ENV['SOLR_URL'] overriding sunspot
   end
 
   it "should handle the 'hostname' property when set" do
-    @config.hostname.should == 'environment.host'
+    expect(@config.hostname).to eq('environment.host')
   end
 
   it "should handle the 'port' property when set" do
-    @config.port.should == 5432
+    expect(@config.port).to eq(5432)
   end
 
   it "should handle the 'path' property when set" do
-    @config.path.should == '/solr/env'
+    expect(@config.path).to eq('/solr/env')
   end
 end
 
@@ -227,7 +235,7 @@ describe Sunspot::Rails::Configuration, "with ENV['WEBSOLR_URL'] overriding suns
   end
 
   before(:each) do
-    ::Rails.stub(:env => 'config_test')
+    allow(::Rails).to receive(:env).and_return('config_test')
     @config = Sunspot::Rails::Configuration.new
   end
 
@@ -236,15 +244,15 @@ describe Sunspot::Rails::Configuration, "with ENV['WEBSOLR_URL'] overriding suns
   end
 
   it "should handle the 'hostname' property when set" do
-    @config.hostname.should == 'index.websolr.test'
+    expect(@config.hostname).to eq('index.websolr.test')
   end
 
   it "should handle the 'port' property when set" do
-    @config.port.should == 80
+    expect(@config.port).to eq(80)
   end
 
   it "should handle the 'path' property when set" do
-    @config.path.should == '/solr/a1b2c3d4e5f'
+    expect(@config.path).to eq('/solr/a1b2c3d4e5f')
   end
 end
 
@@ -254,7 +262,7 @@ describe Sunspot::Rails::Configuration, "with ENV['WEBSOLR_URL'] using https" do
   end
 
   before(:each) do
-    ::Rails.stub(:env => 'config_test')
+    allow(::Rails).to receive(:env).and_return('config_test')
     @config = Sunspot::Rails::Configuration.new
   end
 
@@ -263,19 +271,19 @@ describe Sunspot::Rails::Configuration, "with ENV['WEBSOLR_URL'] using https" do
   end
 
   it "should set the scheme to https" do
-    @config.scheme.should == "https"
+    expect(@config.scheme).to eq("https")
   end
 
   it "should handle the 'hostname' property when set" do
-    @config.hostname.should == 'index.websolr.test'
+    expect(@config.hostname).to eq('index.websolr.test')
   end
 
   it "should handle the 'port' property when set" do
-    @config.port.should == 443
+    expect(@config.port).to eq(443)
   end
 
   it "should handle the 'path' property when set" do
-    @config.path.should == '/solr/a1b2c3d4e5f'
+    expect(@config.path).to eq('/solr/a1b2c3d4e5f')
   end
 end
 
@@ -285,7 +293,7 @@ describe Sunspot::Rails::Configuration, "with ENV['WEBSOLR_URL'] including useri
   end
 
   before(:each) do
-    ::Rails.stub(:env => 'config_test')
+    allow(::Rails).to receive(:env).and_return('config_test')
     @config = Sunspot::Rails::Configuration.new
   end
 
@@ -294,22 +302,22 @@ describe Sunspot::Rails::Configuration, "with ENV['WEBSOLR_URL'] including useri
   end
 
   it "should include username and passowrd" do
-    @config.userinfo.should == "user:pass"
+    expect(@config.userinfo).to eq("user:pass")
   end
 
   it "should set the scheme to https" do
-    @config.scheme.should == "https"
+    expect(@config.scheme).to eq("https")
   end
 
   it "should handle the 'hostname' property when set" do
-    @config.hostname.should == 'index.websolr.test'
+    expect(@config.hostname).to eq('index.websolr.test')
   end
 
   it "should handle the 'port' property when set" do
-    @config.port.should == 443
+    expect(@config.port).to eq(443)
   end
 
   it "should handle the 'path' property when set" do
-    @config.path.should == '/solr/a1b2c3d4e5f'
+    expect(@config.path).to eq('/solr/a1b2c3d4e5f')
   end
 end