sunspot 2.0.0 → 2.5.0

data/spec/integration/spellcheck_spec.rb

@@ -0,0 +1,119 @@
+require File.expand_path('../spec_helper', File.dirname(__FILE__))
+include SearchHelper
+
+describe 'spellcheck' do
+  before :each do
+    Sunspot.remove_all
+
+    @posts = [
+      Post.new(:title => 'Clojure Developer'),
+      Post.new(:title => 'Conjure Flow'),
+      Post.new(:title => 'Clojure Analyst'),
+      Post.new(:title => 'C++ Developer'),
+      Post.new(:title => 'C++ Developing')
+    ]
+
+    Sunspot.index!(*@posts)
+    Sunspot.commit
+  end
+
+  it 'has no spellchecking by default' do
+    search = Sunspot.search(Post) do
+      keywords 'Closure'
+    end
+    expect(search.spellcheck_suggestions).to eq({})
+  end
+
+  it 'returns the list of suggestions' do
+    search = Sunspot.search(Post) do
+      keywords 'Closure'
+      spellcheck :count => 3
+    end
+    expect(search.spellcheck_suggestions['closure']['suggestion']).to eq([
+      {'word'=>'clojure', 'freq'=>2}, {'word'=>'conjure', 'freq'=>1}
+    ])
+  end
+
+  it 'returns suggestion with highest frequency' do
+    search = Sunspot.search(Post) do
+      keywords 'Closure'
+      spellcheck :count => 3
+    end
+    expect(search.spellcheck_suggestion_for('closure')).to eq('clojure')
+  end
+
+  it 'returns suggestion without collation when only more popular is true' do
+    search = Sunspot.search(Post) do
+      keywords 'Closure'
+      spellcheck :count => 3, :only_more_popular => true, :collate => false
+    end
+
+    expect(search.spellcheck_suggestion_for('closure')).to eq('clojure')
+  end
+
+  context 'spellcheck collation' do
+    it 'replaces terms that are not in the index if terms are provided' do
+
+      search = Sunspot.search(Post) do
+        keywords 'lojure developing'
+        spellcheck :count => 3, :only_more_popular => true
+      end
+      expect(search.spellcheck_collation('lojure', 'developing')).to eq('clojure developing')
+    end
+
+    it 'returns Solr collation if terms are not provided' do
+
+      search = Sunspot.search(Post) do
+        keywords 'lojure developing'
+        spellcheck :count => 3, :only_more_popular => true
+      end
+      expect(search.spellcheck_collation).to eq('clojure developer')
+    end
+
+    it 'returns Solr collation if terms are not provided even for single word' do
+
+      search = Sunspot.search(Post) do
+        keywords 'lojure'
+        spellcheck :count => 3, :only_more_popular => true
+      end
+      expect(search.spellcheck_collation).to eq('clojure')
+    end
+
+    it 'returns Solr collation if terms are provided even for single word' do
+
+      search = Sunspot.search(Post) do
+        keywords 'lojure'
+        spellcheck :count => 3
+      end
+      expect(search.spellcheck_collation).to eq('clojure')
+    end
+
+    it 'returns Solr collation if terms are provided even for single word' do
+
+      search = Sunspot.search(Post) do
+        keywords 'lojure'
+        spellcheck :count => 3
+      end
+      expect(search.spellcheck_collation('lojure')).to eq('clojure')
+    end
+
+    it 'returns Solr collation if terms are provided even if single keyword is word' do
+
+      search = Sunspot.search(Post) do
+        keywords 'C++, lojure Developer'
+        spellcheck :count => 3
+      end
+      expect(search.spellcheck_collation).to eq('C++, clojure Developer')
+    end
+
+    it 'returns nil if terms are provided which varies from actual keywords' do
+
+      search = Sunspot.search(Post) do
+        keywords 'clojure'
+        spellcheck :count => 3
+      end
+      expect(search.spellcheck_collation('lojure')).to eq(nil)
+    end
+  end
+
+end

data/spec/integration/stats_spec.rb

@@ -0,0 +1,88 @@
+require File.expand_path('../spec_helper', File.dirname(__FILE__))
+
+describe 'search stats' do
+  before :each do
+    Sunspot.remove_all
+    @posts = Post.new(:ratings_average => 4.0, :author_name => 'plinio', :blog_id => 2),
+             Post.new(:ratings_average => 4.0, :author_name => 'caio', :blog_id => 1),
+             Post.new(:ratings_average => 3.0, :author_name => 'sempronio', :blog_id => 2)
+    Sunspot.index!(@posts)
+  end
+
+  it 'returns minimum stats' do
+    expect(Sunspot.search(Post) do
+      stats :average_rating
+    end.stats(:average_rating).min).to eq(3.0)
+  end
+
+  it 'returns maximum stats' do
+    expect(Sunspot.search(Post) do
+      stats :average_rating
+    end.stats(:average_rating).max).to eq(4.0)
+  end
+
+  it 'returns count stats' do
+    expect(Sunspot.search(Post) do
+      stats :average_rating
+    end.stats(:average_rating).count).to eq(3)
+  end
+
+  describe 'facets' do
+    it 'returns minimum on facet row with two blog ids' do
+      expect(Sunspot.search(Post) do
+        stats :average_rating do
+          facet :blog_id
+        end
+      end.stats(:average_rating).facet(:blog_id).rows[1].min).to eq(3.0)
+    end
+
+    it 'returns maximum on facet row with two blog ids' do
+      expect(Sunspot.search(Post) do
+        stats :average_rating do
+          facet :blog_id
+        end
+      end.stats(:average_rating).facet(:blog_id).rows[1].max).to eq(4.0)
+    end
+  end
+
+  describe 'json facets' do
+    it 'returns minimum on facet row with two blog ids' do
+      expect(Sunspot.search(Post) do
+        stats :average_rating, sort: :min do
+          json_facet :blog_id
+        end
+      end.json_facet_stats(:blog_id).rows[1].min).to eq(3.0)
+    end
+
+    it 'returns maximum on facet row with two blog ids' do
+      expect(Sunspot.search(Post) do
+        stats :average_rating, sort: :max do
+          json_facet :blog_id
+        end
+      end.json_facet_stats(:blog_id).rows[1].max).to eq(4.0)
+    end
+
+    it 'returns only sum' do
+      search = Sunspot.search(Post) do
+        stats :average_rating, stats: [:sum] do
+          json_facet :blog_id
+        end
+      end
+      expect(search.json_facet_stats(:blog_id).rows[1].max).to eq(nil)
+      expect(search.json_facet_stats(:blog_id).rows[1].min).to eq(nil)
+      expect(search.json_facet_stats(:blog_id).rows[1].avg).to eq(nil)
+      expect(search.json_facet_stats(:blog_id).rows[1].sumsq).to eq(nil)
+      expect(search.json_facet_stats(:blog_id).rows[1].sum).to eq(4.0)
+    end
+
+    it 'works with nested facets' do
+      search = Sunspot.search(Post) do
+        stats :average_rating, sort: :min do
+          json_facet(:blog_id, nested: { field: :author_name, limit: 3, nested: { field: :average_rating } } )
+        end
+      end
+      expect(search.json_facet_stats(:blog_id).rows[1].nested.first.nested.first.min).to eq(4.0)
+    end
+
+  end
+end

data/spec/integration/stored_fields_spec.rb

@@ -7,6 +7,6 @@ describe 'stored fields' do
   end
 
   it 'should return stored fields' do
-    Sunspot.search(Post).hits.first.stored(:title).should == 'A Title'
+    expect(Sunspot.search(Post).hits.first.stored(:title)).to eq('A Title')
   end
 end

data/spec/integration/test_pagination.rb

@@ -11,7 +11,7 @@ describe 'pagination' do
 
   it 'should return all by default' do
     results = Sunspot.search(Post) { order_by :blog_id }.results
-    results.should == @posts
+    expect(results).to eq(@posts)
   end
 
   it 'should return first page of 10' do
@@ -19,7 +19,7 @@ describe 'pagination' do
       order_by :blog_id
       paginate :page => 1, :per_page => 10
     end.results
-    results.should == @posts[0,10]
+    expect(results).to eq(@posts[0,10])
   end
 
   it 'should return second page of 10' do
@@ -27,7 +27,7 @@ describe 'pagination' do
       order_by :blog_id
       paginate :page => 2, :per_page => 10
     end.results
-    results.should == @posts[10,10]
+    expect(results).to eq(@posts[10,10])
   end
 
   it 'should return pages with offsets' do
@@ -38,6 +38,6 @@ describe 'pagination' do
 
     # page 1 is 3, 4, 5, 6, 7
     # page 2 is 8, 9, 10, 11, 12
-    results.should == @posts[8,5]
+    expect(results).to eq(@posts[8,5])
   end
 end

data/spec/integration/unicode_spec.rb

@@ -10,6 +10,6 @@ describe "unicode characters" do
   end
 
   it "correctly retrieves the string as UTF-8" do
-    Sunspot.search(Post).hits.first.stored(:title).should == "Híghgrøøvé"
+    expect(Sunspot.search(Post).hits.first.stored(:title)).to eq("Híghgrøøvé")
   end
 end

data/spec/mocks/adapters.rb

@@ -4,7 +4,43 @@ end
 class Model < AbstractModel
 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

@@ -22,7 +22,7 @@ module Mock
   end
 
   class Connection
-    attr_reader :adds, :commits, :optims, :searches, :message, :opts, :deletes_by_query
+    attr_reader :adds, :commits, :soft_commits, :optims, :searches, :message, :opts, :deletes_by_query
     attr_accessor :response
     attr_writer :expected_handler
     undef_method :select # annoyingly defined on Object
@@ -30,7 +30,7 @@ module Mock
     def initialize(opts = {})
       @opts = opts
       @message = OpenStruct.new
-      @adds, @deletes, @deletes_by_query, @commits, @optims, @searches = Array.new(6) { [] }
+      @adds, @deletes, @deletes_by_query, @commits, @soft_commits, @optims, @searches = Array.new(7) { [] }
       @expected_handler = :select
     end
 
@@ -46,8 +46,10 @@ module Mock
       @deletes_by_query << query
     end
 
-    def commit
+    def commit(opts = {})
+      commit_attrs = opts.delete(:commit_attributes) || {}
       @commits << Time.now
+      @soft_commits << Time.now if commit_attrs[:softCommit]
     end
 
     def optimize

data/spec/mocks/photo.rb

@@ -1,11 +1,42 @@
 class Photo < MockRecord
-  attr_accessor :caption, :lat, :lng, :size, :average_rating, :created_at
+  attr_accessor :caption, :description, :lat, :lng, :size, :average_rating, :created_at, :post_id, :photo_container_id
 end
 
 Sunspot.setup(Photo) do
   text :caption, :default_boost => 1.5
+  text :description
+  string :caption
+  integer :photo_container_id
   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
+end
+
+Sunspot.setup(Picture) do
+  text :description
+  integer :photo_container_id
+end
+
+class PhotoContainer < MockRecord
+  attr_accessor :description
+
+  def id
+    1
+  end
+end
+
+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,  :target => Photo,   :type => :text,       :join => { :from => :photo_container_id, :to => :id }, :prefix => "photo")
+  join(:description,  :target => Picture, :type => :text,       :join => { :from => :photo_container_id, :to => :id }, :prefix => "picture")
+end

data/spec/mocks/post.rb

@@ -3,7 +3,8 @@ require File.join(File.dirname(__FILE__), 'super_class')
 
 class Post < SuperClass
   attr_accessor :title, :body, :blog_id, :published_at, :ratings_average,
-                :author_name, :featured, :expire_date, :coordinates, :tags
+                :author_name, :featured, :expire_date, :coordinates, :tags,
+                :featured_for
   alias_method :featured?, :featured
 
   def category_ids
@@ -14,6 +15,10 @@ class Post < SuperClass
     @custom_string ||= {}
   end
 
+  def custom_underscored_string
+    @custom_underscored_string ||= {}
+  end
+
   def custom_fl
     @custom_fl ||= {}
   end
@@ -27,22 +32,27 @@ class Post < SuperClass
   end
 
   private
-  attr_writer :category_ids, :custom_string, :custom_fl, :custom_time, :custom_boolean
+  attr_writer :category_ids, :custom_string, :custom_underscored_string, :custom_fl, :custom_time, :custom_boolean
 end
 
 Sunspot.setup(Post) do
   text :title, :boost => 2
+  text :text_array, :boost => 3 do
+    [title, title]
+  end
   text :body, :stored => true, :more_like_this => true
   text :backwards_title do
     title.reverse if title
   end
   text :tags, :more_like_this => true
   string :title, :stored => true
+  string :author_name
   integer :blog_id, :references => Blog
   integer :category_ids, :multiple => true
   float :average_rating, :using => :ratings_average, :trie => true
   time :published_at, :trie => true
   date :expire_date
+  date_range :featured_for
   boolean :featured, :using => :featured?, :stored => true
   string :sort_title do
     title.downcase.sub(/^(a|an|the)\W+/, '') if title
@@ -57,6 +67,7 @@ Sunspot.setup(Post) do
   latlon(:coordinates_new) { coordinates }
 
   dynamic_string :custom_string, :stored => true
+  dynamic_string :custom_underscored_string, separator: '__'
   dynamic_float :custom_float, :multiple => true, :using => :custom_fl
   dynamic_integer :custom_integer do
     category_ids.inject({}) do |hash, category_id|
@@ -78,7 +89,11 @@ Sunspot.setup(Post) do
 
   string :legacy_array, :as => :legacy_array_field_sm, :multiple => true do
     ['first string', 'second string']
- 	end
+  end
+
+  string :tag_list, :multiple => true, :stored => true do
+    tags
+  end
 end
 
 class PhotoPost < Post