sunspot 2.6.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c13ef43c3d9e3c45ca9d1ccc170ba55947797e788911fda1982b817d34207c5d
-  data.tar.gz: 8a2dc3da8797d0ff4945c99732c9808e1ff9d06f94d0611b932a20cc49210d08
+  metadata.gz: f9749564050cadeb45de77d96ed183f7bb07a856b5199fea3bbede0365147e97
+  data.tar.gz: 5bdedfb6911ecbad36de8314822b536c6fb698e6432dcea03bd23be14672dcf7
 SHA512:
-  metadata.gz: dbdf307d46210db9f3430a7a46d615709aa181c61c2400f6e42d23edd5dfa0c619ecb249cf148eb7215d4dd37d9907c630acf4d13ec83319cff1cbdd2652882e
-  data.tar.gz: f77be8b5ee7ea9226565214951f4af0930b994f9fe568b4c79ac7d0733d414644d32018b4bdfb0ebd23a19b30ecece2c45da5d29b8bd46e28aafaf33ff58796f
+  metadata.gz: 1850a3b888c9589cb98878344d76d95882ebd95f8aae56095767a0ed3b49787a1c65cb5f1c3c84406afcc2c8cf8da4d533434b9e2850c3bd635a4417d45c14e4
+  data.tar.gz: 5d1a20b95d6f11caab821b186952d05e3c68a86b7e23bf673f451b23fa0429df0f4113e2a91cd12c50617375456b00d41656c7b5c7d402450b08e5df22b69b89

data/lib/sunspot/field.rb

@@ -243,6 +243,8 @@ module Sunspot
   end
 
   class TypeField #:nodoc:
+    MODULAR_MODEL_MARK = '\:\:'
+
     class <<self
       def instance
         @instance ||= new
@@ -256,6 +258,10 @@ module Sunspot
     def to_indexed(clazz)
       clazz.name
     end
+
+    def to_solr_conditional(value)
+      value.include?(MODULAR_MODEL_MARK) ? "\"#{value}\"" : value
+    end
   end
 
   class IdField #:nodoc:

data/lib/sunspot/query/restriction.rb

@@ -317,9 +317,14 @@ module Sunspot
           if @value.empty?
             "[* TO *]"
           else
-            "(#{@value.map { |v| solr_value v } * ' OR '})"
+            "(#{@value.map { |v| to_solr_conditional_per_value v } * ' OR '})"
           end
         end
+
+        def to_solr_conditional_per_value(v)
+          @field.respond_to?(:to_solr_conditional) ?
+            @field.to_solr_conditional(solr_value(v)) : "#{solr_value(v)}"
+        end
       end
 
       #

data/lib/sunspot/session.rb

@@ -256,7 +256,7 @@ module Sunspot
     def connection
       @connection ||= self.class.connection_class.connect(
         url: config.solr.url,
-        read_timeout: config.solr.read_timeout,
+        timeout: config.solr.read_timeout,
         open_timeout: config.solr.open_timeout,
         proxy: config.solr.proxy,
         update_format: update_format

data/lib/sunspot/util.rb

@@ -248,7 +248,7 @@ module Sunspot
     Coordinates = Struct.new(:lat, :lng)
 
     class ContextBoundDelegate
-      class <<self
+      class << self
         def instance_eval_with_context(receiver, &block)
           calling_context = eval('self', block.binding)
           if parent_calling_context = calling_context.instance_eval{@__calling_context__ if defined?(@__calling_context__)}
@@ -289,21 +289,31 @@ module Sunspot
         __proxy_method__(:sub, *args, &block)
       end
 
-      def method_missing(method, *args, &block)
-        __proxy_method__(method, *args, &block)
+      def method_missing(method, *args, **kwargs, &block)
+        __proxy_method__(method, *args, **kwargs, &block)
       end
 
-      def __proxy_method__(method, *args, &block)
-        begin
+      def respond_to_missing?(method, _)
+        @__receiver__.respond_to?(method, true) || super
+      end
+
+      def __proxy_method__(method, *args, **kwargs, &block)
+        if kwargs.empty?
           @__receiver__.__send__(method.to_sym, *args, &block)
-        rescue ::NoMethodError => e
-          begin
+        else
+          @__receiver__.__send__(method.to_sym, *args, **kwargs, &block)
+        end
+      rescue ::NoMethodError => e
+        begin
+          if kwargs.empty?
             @__calling_context__.__send__(method.to_sym, *args, &block)
-          rescue ::NoMethodError
-            raise(e)
+          else
+            @__calling_context__.__send__(method.to_sym, *args, **kwargs, &block)
           end
+        rescue ::NoMethodError
+          raise(e)
         end
-      end
+      end      
     end
   end
 end

data/lib/sunspot/version.rb

@@ -1,3 +1,3 @@
 module Sunspot
-  VERSION = '2.6.0'
+  VERSION = '2.7.1'
 end

data/spec/api/binding_spec.rb

@@ -36,6 +36,17 @@ describe "DSL bindings" do
         end
       end
     end
+    expect(value).to eq('value')
+  end
+
+  it 'should give access to calling context\'s methods with keyword arguments' do
+    value = nil
+    session.search(Post) do
+      any_of do
+        value = kwargs_method(a: 10, b: 20)
+      end
+    end
+    expect(value).to eq({ a: 10, b: 20 })
   end
 
   private
@@ -47,4 +58,8 @@ describe "DSL bindings" do
   def id
     16
   end
+
+  def kwargs_method(a:, b:)
+    { a: a, b: b }
+  end
 end

data/spec/api/indexer/attributes_spec.rb

@@ -98,7 +98,7 @@ describe 'indexing attribute fields', :type => :indexer do
 
   it 'should index latitude and longitude passed as non-Floats' do
     coordinates = Sunspot::Util::Coordinates.new(
-      BigDecimal.new('40.7'), BigDecimal.new('-73.5'))
+      BigDecimal('40.7'), BigDecimal('-73.5'))
     session.index(post(:coordinates => coordinates))
     expect(connection).to have_add_with(:coordinates_s => 'dr5xx3nytvgs')
   end

data/spec/api/query/geo_examples.rb

@@ -10,7 +10,7 @@ shared_examples_for 'geohash query' do
 
   it 'searches for nearby points with non-Float arguments' do
     search do
-      with(:coordinates).near(BigDecimal.new('40.7'), BigDecimal.new('-73.5'))
+      with(:coordinates).near(BigDecimal('40.7'), BigDecimal('-73.5'))
     end
     expect(connection).to have_last_search_including(:q, build_geo_query)
   end

data/spec/api/query/types_spec.rb

@@ -1,12 +1,12 @@
 describe 'typed query' do
   it 'properly escapes namespaced type names' do
     session.search(Namespaced::Comment)
-    expect(connection).to have_last_search_with(:fq => ['type:Namespaced\:\:Comment'])
+    expect(connection).to have_last_search_with(:fq => ['type:"Namespaced\:\:Comment"'])
   end
 
   it 'builds search for multiple types' do
     session.search(Post, Namespaced::Comment)
-    expect(connection).to have_last_search_with(:fq => ['type:(Post OR Namespaced\:\:Comment)'])
+    expect(connection).to have_last_search_with(:fq => ['type:(Post OR "Namespaced\:\:Comment")'])
   end
 
   it 'searches type of subclass when superclass is configured' do

data/spec/api/session_proxy/master_slave_session_proxy_spec.rb

@@ -38,7 +38,7 @@ describe Sunspot::SessionProxy::MasterSlaveSessionProxy do
   end
 
   it 'should raise ArgumentError when bogus config specified' do
-    expect { @proxy.config(:bogus) }.to raise_error
+    expect { @proxy.config(:bogus) }.to raise_error(ArgumentError)
   end
 
   it_should_behave_like 'session proxy'

data/spec/api/session_proxy/retry_5xx_session_proxy_spec.rb

@@ -1,7 +1,8 @@
 require File.expand_path('spec_helper', File.dirname(__FILE__))
+require 'uri'
 
 describe Sunspot::SessionProxy::Retry5xxSessionProxy do
-  
+
   before :each do
     Sunspot::Session.connection_class = Mock::ConnectionFactory.new
     @sunspot_session = Sunspot.session
@@ -21,11 +22,14 @@ describe Sunspot::SessionProxy::Retry5xxSessionProxy do
   end
 
   let :fake_rsolr_request do
-    {:uri => 'http://solr.test/uri'}
+    {:uri => URI('http://solr.test/uri')}
   end
 
   def fake_rsolr_response(status)
-    {:status => status.to_s}
+    {
+      :status => status.to_s,
+      :body => ''
+    }
   end
 
   let :post do
@@ -67,12 +71,12 @@ describe Sunspot::SessionProxy::Retry5xxSessionProxy do
   it "should not retry a 4xx" do
     e = FakeRSolrErrorHttp.new(fake_rsolr_request, fake_rsolr_response(400))
     expect(@sunspot_session).to receive(:index).and_raise(e)
-    expect { Sunspot.index(post) }.to raise_error
+    expect { Sunspot.index(post) }.to raise_error(FakeRSolrErrorHttp)
   end
 
   # TODO: try against more than just Sunspot.index? but that's just testing the
   # invocation of delegate, so probably not important. -nz 11Apr12
 
   it_should_behave_like 'session proxy'
-  
+
 end

data/spec/api/session_spec.rb

@@ -109,7 +109,7 @@ describe 'Session' do
     it 'should open a connection with custom read timeout' do
       Sunspot.config.solr.read_timeout = 0.5
       Sunspot.commit
-      expect(connection.opts[:read_timeout]).to eq(0.5)
+      expect(connection.opts[:timeout]).to eq(0.5)
     end
 
     it 'should open a connection with custom open timeout' do

data/spec/mocks/comment.rb

@@ -17,5 +17,5 @@ Sunspot.setup(Namespaced::Comment) do
   long :hash
   double :average_rating
   dynamic_float :custom_float, :multiple => true
-  boost :boost
+  boost(:boost)
 end

data/sunspot.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
                   'Dylan Vaughn', 'Brian Durand', 'Sam Granieri', 'Nick Zadrozny', 'Jason Ronallo', 'Ryan Wallace', 'Nicholas Jakobsen',
                   'Bragadeesh J', 'Ethiraj Srinivasan']
   s.email       = ["mat@patch.com"]
-  s.homepage    = "http://outoftime.github.com/sunspot"
+  s.homepage    = "https://sunspot.github.io"
   s.summary = 'Library for expressive, powerful interaction with the Solr search engine'
   s.license = 'MIT'
   s.description = <<-TEXT
@@ -27,10 +27,10 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'rsolr', '>= 1.1.1', '< 3'
   s.add_dependency 'pr_geohash', '~>1.0'
-
-  s.add_development_dependency 'rake', '< 12.3'
+  s.add_dependency 'bigdecimal'
+  s.add_development_dependency 'rake', '~> 13.2'
   s.add_development_dependency 'rspec', '~> 3.7'
-  s.add_development_dependency 'appraisal', '2.2.0'
+  s.add_development_dependency 'appraisal', '~> 2.5'
 
   s.rdoc_options << '--webcvs=http://github.com/outoftime/sunspot/tree/master/%s' <<
                   '--title' << 'Sunspot - Solr-powered search for Ruby objects - API Documentation' <<

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Mat Brown
@@ -30,7 +30,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-30 00:00:00.000000000 Z
+date: 2024-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -66,20 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +112,16 @@ dependencies:
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.5'
 description: |2
       Sunspot is a library providing a powerful, all-ruby API for the Solr search engine. Sunspot manages the configuration of persistent
       Ruby classes for search and indexing and exposes Solr's most powerful features through a collection of DSLs. Complex search operations
@@ -334,7 +348,7 @@ files:
 - tasks/rdoc.rake
 - tasks/schema.rake
 - tasks/todo.rake
-homepage: http://outoftime.github.com/sunspot
+homepage: https://sunspot.github.io
 licenses:
 - MIT
 metadata: {}
@@ -358,7 +372,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Library for expressive, powerful interaction with the Solr search engine