sunspot 2.2.7 → 2.2.8

data/spec/api/sunspot_spec.rb

@@ -7,8 +7,8 @@ describe Sunspot do
       Sunspot.setup(User) do
         text :name
       end
-      Sunspot.searchable.should_not be_empty
-      Sunspot.searchable.should include(User)
+      expect(Sunspot.searchable).not_to be_empty
+      expect(Sunspot.searchable).to include(User)
     end
   end
 
@@ -16,14 +16,14 @@ describe Sunspot do
     it "should reset current session" do
       old_session = Sunspot.send(:session)
       Sunspot.reset!(true)
-      Sunspot.send(:session).should_not == old_session
+      expect(Sunspot.send(:session)).not_to eq(old_session)
     end
 
     it "should keep keep configuration if specified" do
       Sunspot.config.solr.url = "http://localhost:9999/path/solr"
       config_before_reset = Sunspot.config
       Sunspot.reset!(true)
-      Sunspot.config.should == config_before_reset
+      expect(Sunspot.config).to eq(config_before_reset)
     end
   end
 end

data/spec/integration/atomic_updates_spec.rb

@@ -5,14 +5,16 @@ describe 'atomic updates' do
     Sunspot.remove_all
   end
 
-  def validate_hit(hit, title, featured)
-    hit.stored(:title).should == title
-    hit.stored(:featured).should == featured
+  def validate_hit(hit, values = {})
+    values.each do |field, value|
+      stored = hit.stored(field)
+      expect(stored).to eq(value), "expected #{value.inspect}, but got #{stored.inspect} for field '#{field}'"
+    end
   end
 
   def find_indexed_post(id)
     hit = Sunspot.search(Post).hits.find{ |h| h.primary_key.to_i == id }
-    hit.should_not be_nil
+    expect(hit).not_to be_nil
     hit
   end
 
@@ -20,13 +22,13 @@ describe 'atomic updates' do
     post = Post.new(title: 'A Title', featured: true)
     Sunspot.index!(post)
     
-    validate_hit(find_indexed_post(post.id), post.title, post.featured)
+    validate_hit(find_indexed_post(post.id), title: post.title, featured: post.featured)
 
     Sunspot.atomic_update!(Post, post.id => {title: 'A New Title'})
-    validate_hit(find_indexed_post(post.id), 'A New Title', true)
+    validate_hit(find_indexed_post(post.id), title: 'A New Title', featured: true)
 
     Sunspot.atomic_update!(Post, post.id => {featured: false})
-    validate_hit(find_indexed_post(post.id), 'A New Title', false)
+    validate_hit(find_indexed_post(post.id), title: 'A New Title', featured: false)
   end
 
   it 'should update fields for multiple records' do
@@ -34,11 +36,23 @@ describe 'atomic updates' do
     post2 = Post.new(title: 'A Second Title', featured: false)
     Sunspot.index!(post1, post2)
 
-    validate_hit(find_indexed_post(post1.id), post1.title, post1.featured)
-    validate_hit(find_indexed_post(post2.id), post2.title, post2.featured)
+    validate_hit(find_indexed_post(post1.id), title: post1.title, featured: post1.featured)
+    validate_hit(find_indexed_post(post2.id), title: post2.title, featured: post2.featured)
 
     Sunspot.atomic_update!(Post, post1.id => {title: 'A New Title'}, post2.id => {featured: true})
-    validate_hit(find_indexed_post(post1.id), 'A New Title', true)
-    validate_hit(find_indexed_post(post2.id), 'A Second Title', true)
+    validate_hit(find_indexed_post(post1.id), title: 'A New Title', featured: true)
+    validate_hit(find_indexed_post(post2.id), title: 'A Second Title', featured: true)
+  end
+
+  it 'should clear field value properly' do
+    post = Post.new(title: 'A Title', tags: %w(tag1 tag2), featured: true)
+    Sunspot.index!(post)
+    validate_hit(find_indexed_post(post.id), title: post.title, tag_list: post.tags, featured: true)
+
+    Sunspot.atomic_update!(Post, post.id => {tag_list: []})
+    validate_hit(find_indexed_post(post.id), title: post.title, tag_list: nil, featured: true)
+
+    Sunspot.atomic_update!(Post, post.id => {featured: nil})
+    validate_hit(find_indexed_post(post.id), title: post.title, tag_list: nil, featured: nil)
   end
 end

data/spec/integration/dynamic_fields_spec.rb

@@ -10,11 +10,11 @@ shared_examples 'dynamic fields' do
   end
 
   it 'should search for dynamic string field' do
-    Sunspot.search(Post) do
+    expect(Sunspot.search(Post) do
       dynamic(field_name) do
         with(:cuisine, 'Pizza')
       end
-    end.results.should == [@posts.first]
+    end.results).to eq([@posts.first])
   end
 
   describe 'faceting' do
@@ -28,31 +28,31 @@ shared_examples 'dynamic fields' do
 
     it 'should return value "value" with count 2' do
       row = @search.dynamic_facet(field_name, :cuisine).rows[0]
-      row.value.should == 'Greek'
-      row.count.should == 2
+      expect(row.value).to eq('Greek')
+      expect(row.count).to eq(2)
     end
 
     it 'should return value "other" with count 1' do
       row = @search.dynamic_facet(field_name, :cuisine).rows[1]
-      row.value.should == 'Pizza'
-      row.count.should == 1
+      expect(row.value).to eq('Pizza')
+      expect(row.count).to eq(1)
     end
   end
 
   it 'should order by dynamic string field ascending' do
-    Sunspot.search(Post) do
+    expect(Sunspot.search(Post) do
       dynamic field_name do
         order_by :cuisine, :asc
       end
-    end.results.last.should == @posts.first
+    end.results.last).to eq(@posts.first)
   end
 
   it 'should order by dynamic string field descending' do
-    Sunspot.search(Post) do
+    expect(Sunspot.search(Post) do
       dynamic field_name do
         order_by :cuisine, :desc
       end
-    end.results.first.should == @posts.first
+    end.results.first).to eq(@posts.first)
   end
 end
 

data/spec/integration/faceting_spec.rb

@@ -27,14 +27,14 @@ describe 'search faceting' do
 
       it "should return value #{value1.inspect} with count 2" do
         row = @search.facet(field).rows[0]
-        row.value.should == value1
-        row.count.should == 2
+        expect(row.value).to eq(value1)
+        expect(row.count).to eq(2)
       end
 
       it "should return value #{value2.inspect} with count 1" do
         row = @search.facet(field).rows[1]
-        row.value.should == value2
-        row.count.should == 1
+        expect(row.value).to eq(value2)
+        expect(row.count).to eq(1)
       end
     end
   end
@@ -66,7 +66,7 @@ describe 'search faceting' do
       search = Sunspot.search(Post) do
         facet :title, :limit => 3
       end
-      search.facet(:title).should have(3).rows
+      expect(search.facet(:title).rows.size).to eq(3)
     end
 
     it 'should not return zeros by default' do
@@ -74,7 +74,7 @@ describe 'search faceting' do
         with :blog_id, 1
         facet :title
       end
-      search.facet(:title).rows.map { |row| row.value }.should_not include('zero')
+      expect(search.facet(:title).rows.map { |row| row.value }).not_to include('zero')
     end
 
     it 'should return zeros when specified' do
@@ -82,14 +82,14 @@ describe 'search faceting' do
         with :blog_id, 1
         facet :title, :zeros => true
       end
-      search.facet(:title).rows.map { |row| row.value }.should include('zero')
+      expect(search.facet(:title).rows.map { |row| row.value }).to include('zero')
     end
     
     it 'should return facet rows from an offset' do
       search = Sunspot.search(Post) do
         facet :title, :offset => 3
       end
-      search.facet(:title).rows.map { |row| row.value }.should == %w(one zero)
+      expect(search.facet(:title).rows.map { |row| row.value }).to eq(%w(one zero))
     end
 
     it 'should return a specified minimum count' do
@@ -97,7 +97,7 @@ describe 'search faceting' do
         with :blog_id, 1
         facet :title, :minimum_count => 2
       end
-      search.facet(:title).rows.map { |row| row.value }.should == %w(four three two)
+      expect(search.facet(:title).rows.map { |row| row.value }).to eq(%w(four three two))
     end
 
     it 'should order facets lexically' do
@@ -105,7 +105,7 @@ describe 'search faceting' do
         with :blog_id, 1
         facet :title, :sort => :index
       end
-      search.facet(:title).rows.map { |row| row.value }.should == %w(four one three two)
+      expect(search.facet(:title).rows.map { |row| row.value }).to eq(%w(four one three two))
     end
 
     it 'should order facets by count' do
@@ -113,7 +113,7 @@ describe 'search faceting' do
         with :blog_id, 1
         facet :title, :sort => :count
       end
-      search.facet(:title).rows.map { |row| row.value }.should == %w(four three two one)
+      expect(search.facet(:title).rows.map { |row| row.value }).to eq(%w(four three two one))
     end
 
     it 'should limit facet values by prefix' do
@@ -121,7 +121,7 @@ describe 'search faceting' do
         with :blog_id, 1
         facet :title, :prefix => 't'
       end
-      search.facet(:title).rows.map { |row| row.value }.sort.should == %w(three two)
+      expect(search.facet(:title).rows.map { |row| row.value }.sort).to eq(%w(three two))
     end
 
     it 'should return :all facet' do
@@ -129,8 +129,8 @@ describe 'search faceting' do
         with :blog_id, 1
         facet :title, :extra => :any
       end
-      search.facet(:title).rows.first.value.should == :any
-      search.facet(:title).rows.first.count.should == 10
+      expect(search.facet(:title).rows.first.value).to eq(:any)
+      expect(search.facet(:title).rows.first.count).to eq(10)
     end
 
     it 'should return :none facet' do
@@ -138,8 +138,8 @@ describe 'search faceting' do
         with :blog_id, 1
         facet :title, :extra => :none
       end
-      search.facet(:title).rows.first.value.should == :none
-      search.facet(:title).rows.first.count.should == 1
+      expect(search.facet(:title).rows.first.value).to eq(:none)
+      expect(search.facet(:title).rows.first.count).to eq(1)
     end
 
     it 'gives correct facet count when group == true and truncate == true' do
@@ -152,7 +152,7 @@ describe 'search faceting' do
       end
 
       # Should be 5 instead of 11
-      search.facet(:title).rows.first.count.should == 5
+      expect(search.facet(:title).rows.first.count).to eq(5)
     end
   end
 
@@ -170,7 +170,7 @@ describe 'search faceting' do
         with :blog_id, 1
         facet :title, :prefix => 'title '
       end
-      search.facet(:title).rows.map { |row| row.value }.sort.should == ["title with spaces 1", "title with spaces 2"]
+      expect(search.facet(:title).rows.map { |row| row.value }.sort).to eq(["title with spaces 1", "title with spaces 2"])
     end
 
     it 'should limit facet values by a prefix with slashes' do
@@ -178,7 +178,7 @@ describe 'search faceting' do
         with :blog_id, 1
         facet :title, :prefix => 'title/'
       end
-      search.facet(:title).rows.map { |row| row.value }.sort.should == ["title/with/slashes/1", "title/with/slashes/2"]
+      expect(search.facet(:title).rows.map { |row| row.value }.sort).to eq(["title/with/slashes/1", "title/with/slashes/2"])
     end
   end
 
@@ -199,7 +199,7 @@ describe 'search faceting' do
           category_filter = with(:category_ids, 1)
           facet(:category_ids, :exclude => category_filter)
         end
-        search.facet(:category_ids).rows.map { |row| row.value }.to_set.should == Set[1, 2]
+        expect(search.facet(:category_ids).rows.map { |row| row.value }.to_set).to eq(Set[1, 2])
       end
 
       it 'should use facet keys to facet more than once with different exclusions' do
@@ -209,8 +209,8 @@ describe 'search faceting' do
           facet(:category_ids)
           facet(:category_ids, :exclude => category_filter, :name => :all_category_ids)
         end
-        search.facet(:category_ids).rows.map { |row| row.value }.should == [1]
-        search.facet(:all_category_ids).rows.map { |row| row.value }.to_set.should == Set[1, 2]
+        expect(search.facet(:category_ids).rows.map { |row| row.value }).to eq([1])
+        expect(search.facet(:all_category_ids).rows.map { |row| row.value }.to_set).to eq(Set[1, 2])
       end
     end
 
@@ -228,7 +228,7 @@ describe 'search faceting' do
             end
           end
         end
-        search.facet(:category_ids).rows.map { |row| [row.value, row.count] }.to_set.should == Set[[:category_1, 1], [:category_2, 1]]
+        expect(search.facet(:category_ids).rows.map { |row| [row.value, row.count] }.to_set).to eq(Set[[:category_1, 1], [:category_2, 1]])
       end
 
       it 'should use facet keys to facet more than once with different exclusions' do
@@ -253,8 +253,8 @@ describe 'search faceting' do
             end
           end
         end
-        search.facet(:category_ids).rows.map { |row| [row.value, row.count] }.to_set.should == Set[[:category_1, 1]]
-        search.facet(:all_category_ids).rows.map { |row| [row.value, row.count] }.to_set.should == Set[[:category_1, 1], [:category_2, 1]]
+        expect(search.facet(:category_ids).rows.map { |row| [row.value, row.count] }.to_set).to eq(Set[[:category_1, 1]])
+        expect(search.facet(:all_category_ids).rows.map { |row| [row.value, row.count] }.to_set).to eq(Set[[:category_1, 1], [:category_2, 1]])
       end
     end
   end
@@ -273,10 +273,10 @@ describe 'search faceting' do
       search = Sunspot.search(Post) do
         facet :published_at, :time_range => time..(time + 60*60*24*2), :sort => :count
       end
-      search.facet(:published_at).rows.first.value.should == (time..(time + 60*60*24))
-      search.facet(:published_at).rows.first.count.should == 2
-      search.facet(:published_at).rows.last.value.should == ((time + 60*60*24)..(time + 60*60*24*2))
-      search.facet(:published_at).rows.last.count.should == 1
+      expect(search.facet(:published_at).rows.first.value).to eq(time..(time + 60*60*24))
+      expect(search.facet(:published_at).rows.first.count).to eq(2)
+      expect(search.facet(:published_at).rows.last.value).to eq((time + 60*60*24)..(time + 60*60*24*2))
+      expect(search.facet(:published_at).rows.last.count).to eq(1)
     end
   end
 
@@ -290,10 +290,10 @@ describe 'search faceting' do
       search = Sunspot.search(Post, Namespaced::Comment) do
         facet(:class, :sort => :count)
       end
-      search.facet(:class).rows.first.value.should == Post
-      search.facet(:class).rows.first.count.should == 2
-      search.facet(:class).rows.last.value.should == Namespaced::Comment
-      search.facet(:class).rows.last.count.should == 1
+      expect(search.facet(:class).rows.first.value).to eq(Post)
+      expect(search.facet(:class).rows.first.count).to eq(2)
+      expect(search.facet(:class).rows.last.value).to eq(Namespaced::Comment)
+      expect(search.facet(:class).rows.last.count).to eq(1)
     end
   end
 
@@ -319,12 +319,12 @@ describe 'search faceting' do
         end
       end
       facet = search.facet(:rating_range)
-      facet.rows[0].value.should == (3.0..4.0)
-      facet.rows[0].count.should == 3
-      facet.rows[1].value.should == (1.0..2.0)
-      facet.rows[1].count.should == 2
-      facet.rows[2].value.should == (4.0..5.0)
-      facet.rows[2].count.should == 1
+      expect(facet.rows[0].value).to eq(3.0..4.0)
+      expect(facet.rows[0].count).to eq(3)
+      expect(facet.rows[1].value).to eq(1.0..2.0)
+      expect(facet.rows[1].count).to eq(2)
+      expect(facet.rows[2].value).to eq(4.0..5.0)
+      expect(facet.rows[2].count).to eq(1)
     end
   end
 end

data/spec/integration/field_grouping_spec.rb

@@ -19,8 +19,8 @@ describe "field grouping" do
       group :title
     end
 
-    search.group(:title).groups.should include { |g| g.value == "Title1" }
-    search.group(:title).groups.should include { |g| g.value == "Title2" }
+    expect(search.group(:title).groups).to include { |g| g.value == "Title1" }
+    expect(search.group(:title).groups).to include { |g| g.value == "Title2" }
   end
 
   it "returns the number of matches unique groups" do
@@ -28,7 +28,7 @@ describe "field grouping" do
       group :title
     end
 
-    search.group(:title).total.should == 2
+    expect(search.group(:title).total).to eq(2)
   end
 
   it "provides access to the number of matches before grouping" do
@@ -36,7 +36,7 @@ describe "field grouping" do
       group :title
     end
 
-    search.group(:title).matches.should == @posts.length
+    expect(search.group(:title).matches).to eq(@posts.length)
   end
 
   it "allows grouping by multiple fields" do
@@ -44,8 +44,8 @@ describe "field grouping" do
       group :title, :sort_title
     end
 
-    search.group(:title).groups.should_not be_empty
-    search.group(:sort_title).groups.should_not be_empty
+    expect(search.group(:title).groups).not_to be_empty
+    expect(search.group(:sort_title).groups).not_to be_empty
   end
 
   it "allows specification of the number of documents per group" do
@@ -56,7 +56,7 @@ describe "field grouping" do
     end
 
     title1_group = search.group(:title).groups.detect { |g| g.value == "Title1" }
-    title1_group.hits.length.should == 2
+    expect(title1_group.hits.length).to eq(2)
   end
 
   it "allows specification of the sort within groups" do
@@ -69,7 +69,7 @@ describe "field grouping" do
     highest_ranked_post = @posts.sort_by { |p| -p.ratings_average }.first
 
     title1_group = search.group(:title).groups.detect { |g| g.value == "Title1" }
-    title1_group.hits.first.primary_key.to_i.should == highest_ranked_post.id
+    expect(title1_group.hits.first.primary_key.to_i).to eq(highest_ranked_post.id)
   end
 
   it "allows specification of an ordering function within groups" do
@@ -82,7 +82,7 @@ describe "field grouping" do
     highest_ranked_post = @posts.sort_by { |p| -p.ratings_average }.first
 
     title1_group = search.group(:title).groups.detect { |g| g.value == "Title1" }
-    title1_group.hits.first.primary_key.to_i.should == highest_ranked_post.id
+    expect(title1_group.hits.first.primary_key.to_i).to eq(highest_ranked_post.id)
   end
 
   it "allows pagination within groups" do
@@ -91,8 +91,8 @@ describe "field grouping" do
       paginate :per_page => 1, :page => 2
     end
 
-    search.group(:title).groups.length.should eql(1)
-    search.group(:title).groups.first.results.should == [ @posts.last ]
+    expect(search.group(:title).groups.length).to eql(1)
+    expect(search.group(:title).groups.first.results).to eq([ @posts.last ])
   end
 
   context "returns a paginated collection" do
@@ -104,10 +104,10 @@ describe "field grouping" do
       search.group(:title).groups
     end
 
-    it { subject.per_page.should      eql(1)   }
-    it { subject.total_pages.should   eql(2)   }
-    it { subject.current_page.should  eql(2)   }
-    it { subject.first_page?.should   be_false }
-    it { subject.last_page?.should    be_true  }
+    it { expect(subject.per_page).to      eql(1)   }
+    it { expect(subject.total_pages).to   eql(2)   }
+    it { expect(subject.current_page).to  eql(2)   }
+    it { expect(subject.first_page?).to   be(false) }
+    it { expect(subject.last_page?).to    be(true)  }
   end
 end