sunspot 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 757abddaa2a6004ccb6f5a9b3dda71c672f80d0b
-  data.tar.gz: 0fb4c5b1b0212b8a70b71dacaea88daa6452c3a7
+  metadata.gz: ddf4e1e101c7789cbba01b5d4a46d69ac295f0e3
+  data.tar.gz: ef751e6cb93dbdd4bda40b18b661e044cee927fe
 SHA512:
-  metadata.gz: ce0f840a319bf645f653529ec91b5738a9ea90327e274c78b07149faeed5650f6ea770680d5ea83899d1a547ddfbca8c19eb39f6b47856541ac9d67ea91a06a0
-  data.tar.gz: 615a3f2b08be30c2cc54bd9a204e3efde81a8f0a67af0fda9ec22e6b95b3b10a340bed9502dcdb6ff5d0c13c8f8687499c959ad8942d0b307ad6c26419670485
+  metadata.gz: 2dd0adb2ce792ce3fa11ebbf9c05d7043e3402ba946e06a8b2ac78d84e885dc6cdda942528804f674e219d08ac1555e44fd392f8d993dd7feb4b24725e2368a6
+  data.tar.gz: feaeaa4d3d41676e5d063dad39cccbf1bca1ebe6968e9f952037e9b362886f76f1f8b2e7118078ee4335435da39c5b6f4e1e3323faab0d1eb636836863c5d123

data/lib/sunspot/configuration.rb

@@ -25,6 +25,7 @@ module Sunspot
             url 'http://127.0.0.1:8983/solr/default'
             read_timeout nil
             open_timeout nil
+            proxy nil
           end
           master_solr do
             url nil
@@ -37,7 +38,7 @@ module Sunspot
           end
         end
       end
-      
+
       # Location for the default solr configuration files,
       # required for bootstrapping a new solr installation
       #

data/lib/sunspot/query/more_like_this.rb

@@ -50,7 +50,7 @@ module Sunspot
         params[:"mlt.fl"] = @fields.keys.join(",")
         boosted_fields = @fields.values.select { |field| field.boost }
         unless boosted_fields.empty?
-          params[:qf] = boosted_fields.map do |field|
+          params[:"mlt.qf"] = boosted_fields.map do |field|
             field.to_boosted_field
           end.join(' ')
         end

data/lib/sunspot/session.rb

@@ -1,5 +1,5 @@
 module Sunspot
-  # 
+  #
   # A Sunspot session encapsulates a connection to Solr and a set of
   # configuration choices. Though users of Sunspot may manually instantiate
   # Session objects, in the general case it's easier to use the singleton
@@ -10,8 +10,8 @@ module Sunspot
   class Session
     class <<self
       attr_writer :connection_class #:nodoc:
-      
-      # 
+
+      #
       # For testing purposes
       #
       def connection_class #:nodoc:
@@ -19,12 +19,12 @@ module Sunspot
       end
     end
 
-    # 
+    #
     # Sunspot::Configuration object for this session
     #
     attr_reader :config
 
-    # 
+    #
     # Sessions are initialized with a Sunspot configuration and a Solr
     # connection. Usually you will want to stick with the default arguments
     # when instantiating your own sessions.
@@ -36,7 +36,7 @@ module Sunspot
       @deletes = @adds = 0
     end
 
-    # 
+    #
     # See Sunspot.new_search
     #
     def new_search(*types, &block)
@@ -59,7 +59,7 @@ module Sunspot
       search.execute
     end
 
-    # 
+    #
     # See Sunspot.new_more_like_this
     #
     def new_more_like_this(object, *types, &block)
@@ -91,7 +91,7 @@ module Sunspot
       indexer.add(objects)
     end
 
-    # 
+    #
     # See Sunspot.index!
     #
     def index!(*objects)
@@ -131,7 +131,7 @@ module Sunspot
       connection.optimize
     end
 
-    # 
+    #
     # See Sunspot.remove
     #
     def remove(*objects, &block)
@@ -155,7 +155,7 @@ module Sunspot
       end
     end
 
-    # 
+    #
     # See Sunspot.remove!
     #
     def remove!(*objects, &block)
@@ -163,7 +163,7 @@ module Sunspot
       commit
     end
 
-    # 
+    #
     # See Sunspot.remove_by_id
     #
     def remove_by_id(clazz, *ids)
@@ -176,7 +176,7 @@ module Sunspot
       indexer.remove_by_id(class_name, ids)
     end
 
-    # 
+    #
     # See Sunspot.remove_by_id!
     #
     def remove_by_id!(clazz, *ids)
@@ -198,7 +198,7 @@ module Sunspot
       end
     end
 
-    # 
+    #
     # See Sunspot.remove_all!
     #
     def remove_all!(*classes)
@@ -206,35 +206,35 @@ module Sunspot
       commit
     end
 
-    # 
+    #
     # See Sunspot.dirty?
     #
     def dirty?
       (@deletes + @adds) > 0
     end
 
-    # 
+    #
     # See Sunspot.commit_if_dirty
     #
     def commit_if_dirty(soft_commit = false)
       commit soft_commit if dirty?
     end
-    
-    # 
+
+    #
     # See Sunspot.delete_dirty?
     #
     def delete_dirty?
       @deletes > 0
     end
 
-    # 
+    #
     # See Sunspot.commit_if_delete_dirty
     #
     def commit_if_delete_dirty(soft_commit = false)
       commit soft_commit if delete_dirty?
     end
-    
-    # 
+
+    #
     # See Sunspot.batch
     #
     def batch
@@ -245,7 +245,7 @@ module Sunspot
 
     private
 
-    # 
+    #
     # Retrieve the Solr connection for this session, creating one if it does not
     # already exist.
     #
@@ -257,7 +257,8 @@ module Sunspot
       @connection ||=
         self.class.connection_class.connect(:url          => config.solr.url,
                                             :read_timeout => config.solr.read_timeout,
-                                            :open_timeout => config.solr.open_timeout)
+                                            :open_timeout => config.solr.open_timeout,
+                                            :proxy        => config.solr.proxy)
     end
 
     def indexer

data/lib/sunspot/session_proxy/thread_local_session_proxy.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'abstract_session_proxy')
 
 module Sunspot
   module SessionProxy
-    # 
+    #
     # This class implements a session proxy that creates a different Session
     # object for each thread. Any multithreaded application should use this
     # proxy.
@@ -21,12 +21,12 @@ module Sunspot
                :new_search, :optimize, :remove, :remove!, :remove_all, :remove_all!, :remove_by_id, :remove_by_id!,
                :search, :more_like_this, :new_more_like_this, :atomic_update, :atomic_update!, :to => :session
 
-      # 
+      #
       # Optionally pass an existing Sunspot::Configuration object. If none is
       # passed, a default configuration is used; it can then be modified using
       # the #config attribute.
       #
-      def initialize(config = Sunspot::Configuration.new)
+      def initialize(config = Sunspot::Configuration.build)
         @config = config
         ObjectSpace.define_finalizer(self, FINALIZER)
       end

data/lib/sunspot/version.rb

@@ -1,3 +1,3 @@
 module Sunspot
-  VERSION = '2.2.4'
+  VERSION = '2.2.5'
 end

data/spec/api/query/more_like_this_spec.rb

@@ -36,7 +36,7 @@ describe 'more_like_this' do
       fields :body, :tags => 8
     end
     connection.searches.last[:"mlt.fl"].split(',').sort.should == %w(body_textsv tags_textv)
-    connection.should have_last_search_with(:qf => "tags_textv^8")
+    connection.should have_last_search_with(:"mlt.qf" => "tags_textv^8")
   end
 
   it 'doesn\'t assign boosts to fields when not specified' do

data/spec/api/session_proxy/thread_local_session_proxy_spec.rb

@@ -2,38 +2,48 @@ require File.expand_path('spec_helper', File.dirname(__FILE__))
 require 'weakref'
 
 describe Sunspot::SessionProxy::ThreadLocalSessionProxy do
-  before :each do
-    @config = Sunspot::Configuration.build
-    @proxy = Sunspot::SessionProxy::ThreadLocalSessionProxy.new(@config)
-  end
+  context 'when not passing a config' do
+    before :each do
+      @proxy = Sunspot::SessionProxy::ThreadLocalSessionProxy.new
+    end
 
-  it 'should have the same session for the same thread' do
-    @proxy.session.should eql(@proxy.session)
+    it_should_behave_like 'session proxy'
   end
 
-  it 'should not have the same session for different threads' do
-    session1 = @proxy.session
-    session2 = nil
-    Thread.new do
-      session2 = @proxy.session
-    end.join
-    session1.should_not eql(session2)
-  end
+  context 'when passing a config' do
+    before :each do
+      @config = Sunspot::Configuration.build
+      @proxy = Sunspot::SessionProxy::ThreadLocalSessionProxy.new(@config)
+    end
 
-  it 'should not have the same session for the same thread in different proxy instances' do
-    proxy2 = Sunspot::SessionProxy::ThreadLocalSessionProxy.new(@config)
-    @proxy.session.should_not eql(proxy2.session)
-  end
+    it 'should have the same session for the same thread' do
+      @proxy.session.should eql(@proxy.session)
+    end
 
-  (Sunspot::Session.public_instance_methods(false) - ['config', :config]).each do |method|
-    it "should delegate #{method.inspect} to its session" do
-      args = Array.new(Sunspot::Session.instance_method(method).arity.abs) do
-        stub('arg')
+    it 'should not have the same session for different threads' do
+      session1 = @proxy.session
+      session2 = nil
+      Thread.new do
+        session2 = @proxy.session
+      end.join
+      session1.should_not eql(session2)
+    end
+
+    it 'should not have the same session for the same thread in different proxy instances' do
+      proxy2 = Sunspot::SessionProxy::ThreadLocalSessionProxy.new(@config)
+      @proxy.session.should_not eql(proxy2.session)
+    end
+
+    (Sunspot::Session.public_instance_methods(false) - ['config', :config]).each do |method|
+      it "should delegate #{method.inspect} to its session" do
+        args = Array.new(Sunspot::Session.instance_method(method).arity.abs) do
+          stub('arg')
+        end
+        @proxy.session.should_receive(method).with(*args)
+        @proxy.send(method, *args)
       end
-      @proxy.session.should_receive(method).with(*args)
-      @proxy.send(method, *args)
     end
-  end
 
-  it_should_behave_like 'session proxy'
+    it_should_behave_like 'session proxy'
+  end
 end

data/spec/api/session_spec.rb

@@ -117,6 +117,12 @@ describe 'Session' do
       Sunspot.commit
       connection.opts[:open_timeout].should == 0.5
     end
+
+    it 'should open a connection through a provided proxy' do
+      Sunspot.config.solr.proxy = 'http://proxy.com:1234'
+      Sunspot.commit
+      connection.opts[:proxy].should == 'http://proxy.com:1234'
+    end
   end
 
   context 'custom session' do
@@ -143,7 +149,7 @@ describe 'Session' do
     it 'should start out not dirty' do
       @session.dirty?.should be_false
     end
-    
+
     it 'should start out not delete_dirty' do
       @session.delete_dirty?.should be_false
     end
@@ -152,7 +158,7 @@ describe 'Session' do
       @session.index(Post.new)
       @session.dirty?.should be_true
     end
-    
+
     it 'should be not be delete_dirty after adding an item' do
       @session.index(Post.new)
       @session.delete_dirty?.should be_false
@@ -182,12 +188,12 @@ describe 'Session' do
       @session.remove_all
       @session.dirty?.should be_true
     end
-    
+
     it 'should be delete_dirty after a global remove_all' do
       @session.remove_all
       @session.delete_dirty?.should be_true
     end
-    
+
     it 'should not be dirty after a commit' do
       @session.index(Post.new)
       @session.commit
@@ -227,14 +233,14 @@ describe 'Session' do
       @session.commit_if_dirty
       connection.should have(1).commits
     end
-    
+
     it 'should soft commit when commit_if_dirty called on dirty session' do
       @session.index(Post.new)
       @session.commit_if_dirty(true)
       connection.should have(1).commits
       connection.should have(1).soft_commits
     end
-    
+
     it 'should hard commit when commit_if_delete_dirty called on delete_dirty session' do
       @session.remove(Post.new)
       @session.commit_if_delete_dirty

data/sunspot.gemspec

@@ -26,7 +26,7 @@ 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 'rsolr', '~>1.0.7'
+  s.add_dependency 'rsolr', '~>1.1.1'
   s.add_dependency 'pr_geohash', '~>1.0'
 
   s.add_development_dependency 'rspec', '~>2.6.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors:
 - Mat Brown
@@ -29,7 +29,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -37,14 +37,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: pr_geohash
   requirement: !ruby/object:Gem::Requirement