sunspot 2.3.0 → 2.6.0

data/spec/integration/scoped_search_spec.rb

@@ -538,4 +538,82 @@ describe 'scoped_search' do
       expect(search.results.first).to eq(@p1)
     end
   end
+
+  describe 'boosting' do
+    before :all do
+      Sunspot.remove_all
+      @p1 = Post.new(:title => 'Post', :body => 'Lorem', :blog_id => 1, :category_ids => [3], :ratings_average => 30)
+      @p2 = Post.new(:title => 'Post', :body => 'Ipsum', :blog_id => 2, :category_ids => [2], :ratings_average => 60)
+      @p3 = Post.new(:title => 'Post', :body => 'Dolor', :blog_id => 3, :category_ids => [1], :ratings_average => 90)
+      Sunspot.index([@p1, @p2, @p3])
+      Sunspot.commit
+    end
+
+    it 'without boost should returns post in default order' do
+      search = Sunspot.search(Post) {}
+
+      expect(search.results[0]).to eq(@p1)
+      expect(search.results[1]).to eq(@p2)
+      expect(search.results[2]).to eq(@p3)
+    end
+
+    it 'should apply boost function' do
+      search = Sunspot.search(Post) do
+        boost(function() { field(:average_rating) })
+      end
+
+      expect(search.results[0]).to eq(@p3)
+      expect(search.results[1]).to eq(@p2)
+      expect(search.results[2]).to eq(@p1)
+    end
+
+    it 'should apply multilicative boost function' do
+      search = Sunspot.search(Post) do
+        boost_multiplicative(function() { field(:average_rating) })
+      end
+
+      expect(search.results[0]).to eq(@p3)
+      expect(search.results[1]).to eq(@p2)
+      expect(search.results[2]).to eq(@p1)
+    end
+
+    it 'should apply boost query' do
+      search = Sunspot.search(Post) do
+        boost(5) do
+          with(:blog_id, 1)
+        end
+
+        boost(10) do
+          with(:blog_id, 3)
+        end
+      end
+
+      expect(search.results[0]).to eq(@p3)
+      expect(search.results[1]).to eq(@p1)
+      expect(search.results[2]).to eq(@p2)
+    end
+
+    it 'should work properly when combined with fulltext' do
+      search = Sunspot.search(Post) do
+        fulltext('Post Ipsum') do
+          boost_fields :body => 0.2
+          minimum_match 1
+        end
+
+        boost(0.9) do
+          with(:blog_id, 1)
+        end
+
+        boost(function() { div(field(:average_rating), 100) })
+
+        fulltext('Post') do
+          minimum_match 1
+        end
+      end
+
+      expect(search.results[0]).to eq(@p2)
+      expect(search.results[1]).to eq(@p3)
+      expect(search.results[2]).to eq(@p1)
+    end
+  end
 end

data/spec/mocks/adapters.rb

@@ -7,7 +7,40 @@ end
 class UnseenModel < AbstractModel
 end
 
+class ModelWithPrefixId < AbstractModel
+  def id
+    1
+  end
+end
+
+Sunspot.setup(ModelWithPrefixId) do
+  id_prefix { "USERDATA!" }
+end
+
+class ModelWithNestedPrefixId < AbstractModel
+  def id
+    1
+  end
+end
+
+Sunspot.setup(ModelWithNestedPrefixId) do
+  id_prefix { "USER!USERDATA!" }
+end
+
+class ModelWithoutPrefixId < AbstractModel
+  def id
+    1
+  end
+end
+
+Sunspot.setup(ModelWithoutPrefixId) do
+end
+
+
 class AbstractModelInstanceAdapter < Sunspot::Adapters::InstanceAdapter
+  def id
+    @instance.id
+  end
 end
 
 class AbstractModelDataAccessor < Sunspot::Adapters::DataAccessor

data/spec/mocks/connection.rb

@@ -92,6 +92,12 @@ module Mock
       end
     end
 
+    def has_no_delete?(*ids)
+      @deletes.none? do |delete|
+        delete & ids == ids
+      end
+    end
+
     def has_delete_by_query?(query)
       @deletes_by_query.include?(query)
     end

data/spec/mocks/photo.rb

@@ -1,5 +1,5 @@
 class Photo < MockRecord
-  attr_accessor :caption, :description, :lat, :lng, :size, :average_rating, :created_at, :post_id, :photo_container_id
+  attr_accessor :caption, :description, :lat, :lng, :size, :average_rating, :created_at, :post_id, :photo_container_id, :published
 end
 
 Sunspot.setup(Photo) do
@@ -7,12 +7,23 @@ Sunspot.setup(Photo) do
   text :description
   string :caption
   integer :photo_container_id
+  boolean :published
   boost 0.75
   integer :size, :trie => true
   float :average_rating, :trie => true
   time :created_at, :trie => true
 end
 
+class Picture < MockRecord
+  attr_accessor :description, :photo_container_id, :published
+end
+
+Sunspot.setup(Picture) do
+  text :description
+  integer :photo_container_id
+  boolean :published
+end
+
 class PhotoContainer < MockRecord
   attr_accessor :description
 
@@ -25,8 +36,11 @@ Sunspot.setup(PhotoContainer) do
   integer :id
   text :description, :default_boost => 1.2
 
-  join(:caption, :target => Photo, :type => :string, :join => { :from => :photo_container_id, :to => :id })
-  join(:photo_rating, :target => Photo, :type => :trie_float, :join => { :from => :photo_container_id, :to => :id }, :as => 'average_rating_ft')
-  join(:caption, :target => Photo, :type => :text, :join => { :from => :photo_container_id, :to => :id })
-  join(:description, :prefix => "photo", :target => Photo, :type => :text, :join => { :from => :photo_container_id, :to => :id })
+  join(:caption,      :target => 'Photo',   :type => :string,     :join => { :from => :photo_container_id, :to => :id })
+  join(:photo_rating, :target => 'Photo',   :type => :trie_float, :join => { :from => :photo_container_id, :to => :id }, :as => 'average_rating_ft')
+  join(:caption,      :target => 'Photo',   :type => :text,       :join => { :from => :photo_container_id, :to => :id })
+  join(:description,  :target => 'Photo',   :type => :text,       :join => { :from => :photo_container_id, :to => :id }, :prefix => "photo")
+  join(:published,    :target => 'Photo',   :type => :boolean,    :join => { :from => :photo_container_id, :to => :id }, :prefix => "photo")
+  join(:description,  :target => 'Picture', :type => :text,       :join => { :from => :photo_container_id, :to => :id }, :prefix => "picture")
+  join(:published,    :target => 'Picture', :type => :boolean,    :join => { :from => :photo_container_id, :to => :id }, :prefix => "picture")
 end

data/spec/mocks/post.rb

@@ -37,7 +37,7 @@ end
 
 Sunspot.setup(Post) do
   text :title, :boost => 2
-  text :text_array, :boost => 3 do
+  text :text_array do
     [title, title]
   end
   text :body, :stored => true, :more_like_this => true
@@ -99,3 +99,37 @@ end
 class PhotoPost < Post
 end
 
+class PostWithProcPrefixId < Post
+end
+
+Sunspot.setup(PostWithProcPrefixId) do
+  id_prefix { "USERDATA-#{id}!" }
+  string :title, :stored => true
+  boolean :featured, :using => :featured?, :stored => true
+end
+
+class PostWithSymbolPrefixId < Post
+end
+
+Sunspot.setup(PostWithSymbolPrefixId) do
+  id_prefix :title
+  string :title, :stored => true
+  boolean :featured, :using => :featured?, :stored => true
+end
+
+class PostWithStringPrefixId < Post
+end
+
+Sunspot.setup(PostWithStringPrefixId) do
+  id_prefix 'USERDATA!'
+  string :title, :stored => true
+  boolean :featured, :using => :featured?, :stored => true
+end
+
+class PostWithoutPrefixId < Post
+end
+
+Sunspot.setup(PostWithoutPrefixId) do
+  string :title, :stored => true
+  boolean :featured, :using => :featured?, :stored => true
+end

data/sunspot.gemspec

@@ -20,8 +20,6 @@ Gem::Specification.new do |s|
     can be performed without hand-writing any boolean queries or building Solr parameters by hand.
   TEXT
 
-  s.rubyforge_project = "sunspot"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Mat Brown
@@ -27,10 +27,10 @@ authors:
 - Nicholas Jakobsen
 - Bragadeesh J
 - Ethiraj Srinivasan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-08 00:00:00.000000000 Z
+date: 2022-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -126,7 +126,6 @@ files:
 - LICENSE
 - Rakefile
 - TODO
-- gemfiles/.gitkeep
 - lib/light_config.rb
 - lib/sunspot.rb
 - lib/sunspot/adapters.rb
@@ -240,6 +239,7 @@ files:
 - spec/api/batcher_spec.rb
 - spec/api/binding_spec.rb
 - spec/api/class_set_spec.rb
+- spec/api/data_extractor_spec.rb
 - spec/api/hit_enumerable_spec.rb
 - spec/api/indexer/attributes_spec.rb
 - spec/api/indexer/batch_spec.rb
@@ -250,6 +250,7 @@ files:
 - spec/api/indexer/spec_helper.rb
 - spec/api/indexer_spec.rb
 - spec/api/query/advanced_manipulation_examples.rb
+- spec/api/query/connective_boost_examples.rb
 - spec/api/query/connectives_examples.rb
 - spec/api/query/dsl_spec.rb
 - spec/api/query/dynamic_fields_examples.rb
@@ -289,6 +290,7 @@ files:
 - spec/api/session_proxy/spec_helper.rb
 - spec/api/session_proxy/thread_local_session_proxy_spec.rb
 - spec/api/session_spec.rb
+- spec/api/setup_spec.rb
 - spec/api/spec_helper.rb
 - spec/api/sunspot_spec.rb
 - spec/ext.rb
@@ -305,6 +307,7 @@ files:
 - spec/integration/geospatial_spec.rb
 - spec/integration/highlighting_spec.rb
 - spec/integration/indexing_spec.rb
+- spec/integration/join_spec.rb
 - spec/integration/keyword_search_spec.rb
 - spec/integration/local_search_spec.rb
 - spec/integration/more_like_this_spec.rb
@@ -335,7 +338,7 @@ homepage: http://outoftime.github.com/sunspot
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--webcvs=http://github.com/outoftime/sunspot/tree/master/%s"
 - "--title"
@@ -355,9 +358,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: sunspot
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Library for expressive, powerful interaction with the Solr search engine
 test_files:
@@ -365,6 +367,7 @@ test_files:
 - spec/api/batcher_spec.rb
 - spec/api/binding_spec.rb
 - spec/api/class_set_spec.rb
+- spec/api/data_extractor_spec.rb
 - spec/api/hit_enumerable_spec.rb
 - spec/api/indexer/attributes_spec.rb
 - spec/api/indexer/batch_spec.rb
@@ -375,6 +378,7 @@ test_files:
 - spec/api/indexer/spec_helper.rb
 - spec/api/indexer_spec.rb
 - spec/api/query/advanced_manipulation_examples.rb
+- spec/api/query/connective_boost_examples.rb
 - spec/api/query/connectives_examples.rb
 - spec/api/query/dsl_spec.rb
 - spec/api/query/dynamic_fields_examples.rb
@@ -414,6 +418,7 @@ test_files:
 - spec/api/session_proxy/spec_helper.rb
 - spec/api/session_proxy/thread_local_session_proxy_spec.rb
 - spec/api/session_spec.rb
+- spec/api/setup_spec.rb
 - spec/api/spec_helper.rb
 - spec/api/sunspot_spec.rb
 - spec/ext.rb
@@ -430,6 +435,7 @@ test_files:
 - spec/integration/geospatial_spec.rb
 - spec/integration/highlighting_spec.rb
 - spec/integration/indexing_spec.rb
+- spec/integration/join_spec.rb
 - spec/integration/keyword_search_spec.rb
 - spec/integration/local_search_spec.rb
 - spec/integration/more_like_this_spec.rb