sunspot 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06d94f7de37bd42e2766b04b245a4529620124558e275e7f6a0aca6b905978ab
-  data.tar.gz: 1966e3348ed17403862dc3d677225e2da0da85d62b6d1071f1c7ad7d9a3c423c
+  metadata.gz: f9749564050cadeb45de77d96ed183f7bb07a856b5199fea3bbede0365147e97
+  data.tar.gz: 5bdedfb6911ecbad36de8314822b536c6fb698e6432dcea03bd23be14672dcf7
 SHA512:
-  metadata.gz: 93134646633877883e4b3ea6b6f8308f4c40d2806daf78a249816bf92dddf7ca80c0f06e48a12a5e85c84665e26fb0666d181a5b71ba8c88462ccd2a6160479e
-  data.tar.gz: c31692b2cb14e5cae05ecc294f5d9ce7fb761d9712ad838a78f037eb3a107c03d05c13e6ef2f52055d32047a0fd9679ea044ac16156cf90c1464e510a3ee3fb0
+  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/version.rb

@@ -1,3 +1,3 @@
 module Sunspot
-  VERSION = '2.7.0'
+  VERSION = '2.7.1'
 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/retry_5xx_session_proxy_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path('spec_helper', File.dirname(__FILE__))
+require 'uri'
 
 describe Sunspot::SessionProxy::Retry5xxSessionProxy do
 

data/sunspot.gemspec

@@ -25,7 +25,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.1.1', '< 2.6'
+  s.add_dependency 'rsolr', '>= 1.1.1', '< 3'
   s.add_dependency 'pr_geohash', '~>1.0'
   s.add_dependency 'bigdecimal'
   s.add_development_dependency 'rake', '~> 13.2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Mat Brown
@@ -30,7 +30,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-07 00:00:00.000000000 Z
+date: 2024-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -41,7 +41,7 @@ dependencies:
         version: 1.1.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
         version: 1.1.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: pr_geohash
   requirement: !ruby/object:Gem::Requirement