sunspot 2.5.0 → 2.7.1

data/spec/integration/atomic_updates_spec.rb

@@ -1,6 +1,79 @@
 require File.expand_path('../spec_helper', File.dirname(__FILE__))
 
-describe 'atomic updates' do
+shared_examples 'atomic update with instance as key' do
+  it 'updates record' do
+    post = clazz.new(title: 'A Title', featured: true)
+    Sunspot.index!(post)
+
+    validate_hit(find_and_validate_indexed_post_with_prefix_id(post, id_prefix), title: post.title, featured: post.featured)
+
+    Sunspot.atomic_update!(clazz, post => { title: 'A New Title' })
+    validate_hit(find_and_validate_indexed_post_with_prefix_id(post, id_prefix), title: 'A New Title', featured: true)
+
+    Sunspot.atomic_update!(clazz, post => { featured: false })
+    validate_hit(find_and_validate_indexed_post_with_prefix_id(post, id_prefix), title: 'A New Title', featured: false)
+  end
+
+  it 'does not print warning' do
+    post = clazz.new(title: 'A Title', featured: true)
+    Sunspot.index!(post)
+
+    validate_hit(find_and_validate_indexed_post_with_prefix_id(post, id_prefix), title: post.title, featured: post.featured)
+
+    expect do
+      Sunspot.atomic_update!(clazz, post => { title: 'A New Title' })
+    end.to_not output(Sunspot::AtomicUpdateRequireInstanceForCompositeIdMessage.call(clazz)).to_stderr
+  end
+
+  it 'does not create duplicate document' do
+    post = clazz.new(title: 'A Title', featured: true)
+    Sunspot.index!(post)
+
+    validate_hit(find_and_validate_indexed_post_with_prefix_id(post, id_prefix), title: post.title, featured: post.featured)
+
+    Sunspot.atomic_update!(clazz, post => { title: 'A New Title' })
+    hit = find_indexed_post_with_prefix_id(post, nil)
+    expect(hit).to be_nil
+  end
+end
+
+shared_examples 'atomic update with id as key' do
+  it 'does not update record' do
+    post = clazz.new(title: 'A Title', featured: true)
+    Sunspot.index!(post)
+
+    validate_hit(find_and_validate_indexed_post_with_prefix_id(post, id_prefix), title: post.title, featured: post.featured)
+
+    Sunspot.atomic_update!(clazz, post.id => { title: 'A New Title' })
+    validate_hit(find_and_validate_indexed_post_with_prefix_id(post, id_prefix), title: 'A Title', featured: true)
+
+    Sunspot.atomic_update!(clazz, post.id => { featured: false })
+    validate_hit(find_and_validate_indexed_post_with_prefix_id(post, id_prefix), title: 'A Title', featured: true)
+  end
+
+  it 'prints warning' do
+    post = clazz.new(title: 'A Title', featured: true)
+    Sunspot.index!(post)
+
+    validate_hit(find_and_validate_indexed_post_with_prefix_id(post, id_prefix), title: post.title, featured: post.featured)
+
+    expect do
+      Sunspot.atomic_update!(clazz, post.id => { title: 'A New Title' })
+    end.to output(Sunspot::AtomicUpdateRequireInstanceForCompositeIdMessage.call(clazz) + "\n").to_stderr
+  end
+
+  it 'creates duplicate document that have only fields provided for update' do
+    post = clazz.new(title: 'A Title', featured: true)
+    Sunspot.index!(post)
+
+    validate_hit(find_and_validate_indexed_post_with_prefix_id(post, id_prefix), title: post.title, featured: post.featured)
+
+    Sunspot.atomic_update!(clazz, post.id => { title: 'A New Title' })
+    validate_hit(find_and_validate_indexed_post_with_prefix_id(post, nil), title: 'A New Title', featured: nil)
+  end
+end
+
+describe 'Atomic Update feature' do
   before :all do
     Sunspot.remove_all
   end
@@ -18,10 +91,27 @@ describe 'atomic updates' do
     hit
   end
 
-  it 'should update single record fields one by one' do
+  def find_and_validate_indexed_post_with_prefix_id(post, id_prefix)
+    hit = find_indexed_post_with_prefix_id(post, id_prefix_value(post, id_prefix))
+    expect(hit).not_to be_nil
+    hit
+  end
+
+  def find_indexed_post_with_prefix_id(post, id_prefix)
+    Sunspot.search(post.class).hits.find { |h| h.primary_key.to_i == post.id && h.id_prefix == id_prefix }
+  end
+
+  def id_prefix_value(post, id_prefix)
+    return unless id_prefix
+    return id_prefix if id_prefix.is_a?(String)
+
+    id_prefix.call(post)
+  end
+
+  it 'updates single record fields one by one' do
     post = Post.new(title: 'A Title', featured: true)
     Sunspot.index!(post)
-    
+
     validate_hit(find_indexed_post(post.id), title: post.title, featured: post.featured)
 
     Sunspot.atomic_update!(Post, post.id => {title: 'A New Title'})
@@ -31,7 +121,7 @@ describe 'atomic updates' do
     validate_hit(find_indexed_post(post.id), title: 'A New Title', featured: false)
   end
 
-  it 'should update fields for multiple records' do
+  it 'updates fields for multiple records' do
     post1 = Post.new(title: 'A First Title', featured: true)
     post2 = Post.new(title: 'A Second Title', featured: false)
     Sunspot.index!(post1, post2)
@@ -44,7 +134,7 @@ describe 'atomic updates' do
     validate_hit(find_indexed_post(post2.id), title: 'A Second Title', featured: true)
   end
 
-  it 'should clear field value properly' do
+  it 'clears 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)
@@ -55,4 +145,78 @@ describe 'atomic updates' do
     Sunspot.atomic_update!(Post, post.id => {featured: nil})
     validate_hit(find_indexed_post(post.id), title: post.title, tag_list: nil, featured: nil)
   end
+
+  context 'when `id_prefix` is defined on model' do
+    context 'as Proc' do
+      let(:clazz) { PostWithProcPrefixId }
+      let(:id_prefix) { lambda { |post| "USERDATA-#{post.id}!" } }
+
+      context 'and instance passed as key' do
+        include_examples 'atomic update with instance as key'
+      end
+
+      context 'and id passed as key' do
+        include_examples 'atomic update with id as key'
+      end
+    end
+
+    context 'as Symbol' do
+      let(:clazz) { PostWithSymbolPrefixId }
+      let(:id_prefix) { lambda { |post| "#{post.title}!" } }
+
+      context 'and instance passed as key' do
+        include_examples 'atomic update with instance as key'
+      end
+
+      context 'and id passed as key' do
+        include_examples 'atomic update with id as key'
+      end
+    end
+
+    context 'as String' do
+      let(:clazz) { PostWithStringPrefixId }
+      let(:id_prefix) { 'USERDATA!' }
+
+      context 'and instance passed as key' do
+        include_examples 'atomic update with instance as key'
+      end
+
+      context 'and id passed as key' do
+        it 'updates record' do
+          post = clazz.new(title: 'A Title', featured: true)
+          Sunspot.index!(post)
+
+          validate_hit(find_and_validate_indexed_post_with_prefix_id(post, id_prefix), title: post.title, featured: post.featured)
+
+          Sunspot.atomic_update!(clazz, post.id => { title: 'A New Title' })
+          validate_hit(find_and_validate_indexed_post_with_prefix_id(post, id_prefix), title: 'A New Title', featured: true)
+
+          Sunspot.atomic_update!(clazz, post.id => { featured: false })
+          validate_hit(find_and_validate_indexed_post_with_prefix_id(post, id_prefix), title: 'A New Title', featured: false)
+        end
+
+        it 'does not print warning' do
+          post = clazz.new(title: 'A Title', featured: true)
+          Sunspot.index!(post)
+
+          validate_hit(find_and_validate_indexed_post_with_prefix_id(post, id_prefix), title: post.title, featured: post.featured)
+
+          expect do
+            Sunspot.atomic_update!(clazz, post.id => { title: 'A New Title' })
+          end.to_not output(Sunspot::AtomicUpdateRequireInstanceForCompositeIdMessage.call(clazz) + "\n").to_stderr
+        end
+
+        it 'does not create duplicate document' do
+          post = clazz.new(title: 'A Title', featured: true)
+          Sunspot.index!(post)
+
+          validate_hit(find_and_validate_indexed_post_with_prefix_id(post, id_prefix), title: post.title, featured: post.featured)
+
+          Sunspot.atomic_update!(clazz, post.id => { title: 'A New Title' })
+          hit = find_indexed_post_with_prefix_id(post, nil)
+          expect(hit).to be_nil
+        end
+      end
+    end
+  end
 end

data/spec/integration/faceting_spec.rb

@@ -84,7 +84,7 @@ describe 'search faceting' do
       end
       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
@@ -214,6 +214,15 @@ describe 'search faceting' do
       expect(search.facet(:title).rows.map { |row| row.value }).to eq(%w(four three two one))
     end
 
+    it 'should include allBuckets and missing' do
+      search = Sunspot.search(Post) do
+        with :blog_id, 1
+        json_facet :title, all_buckets: true, missing: true
+      end
+      expect(search.facet(:title).other_count('allBuckets')).to eq(10)
+      expect(search.facet(:title).other_count('missing')).to eq(1)
+    end
+
     it 'should limit facet values by prefix' do
       search = Sunspot.search(Post) do
         with :blog_id, 1
@@ -221,7 +230,64 @@ describe 'search faceting' do
       end
       expect(search.facet(:title).rows.map { |row| row.value }.sort).to eq(%w(three two))
     end
+  end
 
+  context 'date or time json facet' do
+    before :all do
+      Sunspot.remove_all
+      posts = [
+        Post.new(title: 'dt test', blog_id: 1, published_at: Time.new(2020, 8, 20)),
+        Post.new(title: 'dt test', blog_id: 1, published_at: Time.new(2020, 7, 20)),
+        Post.new(title: 'dt test', blog_id: 1, published_at: Time.new(2020, 6, 20)),
+        Post.new(title: 'dt test', blog_id: 1, published_at: Time.new(2020, 6, 15)),
+        Post.new(title: 'dt test', blog_id: 1, published_at: Time.new(2020, 5, 20)),
+        Post.new(title: 'dt test', blog_id: 1, published_at: Time.new(2020, 4, 20)),
+        Post.new(title: 'dt test', blog_id: 1, published_at: Time.new(2020, 3, 20))
+      ]
+      posts.each { |p| Sunspot.index(p) }
+      Sunspot.commit
+    end
+
+    it 'facets properly with the range specified as time_range' do
+      time_range = [Time.new(2020, 4, 1), Time.new(2020, 7, 31)]
+      search = Sunspot.search(Post) do
+        with :blog_id, 1
+        json_facet :published_at, time_range: time_range, gap: 1, gap_unit: 'MONTHS'
+      end
+      expected_rows = [
+        { count: 1, value: Time.new(2020, 4, 1).utc.iso8601 },
+        { count: 1, value: Time.new(2020, 5, 1).utc.iso8601 },
+        { count: 2, value: Time.new(2020, 6, 1).utc.iso8601 },
+        { count: 1, value: Time.new(2020, 7, 1).utc.iso8601 }
+      ]
+      expect(search.facet(:published_at).rows.map { |row| { count: row.count, value: row.value } }).to eq(expected_rows)
+    end
+
+    it 'should use custom gap parameters if provided' do
+      time_range = [Time.new(2020, 4, 1), Time.new(2020, 7, 31)]
+      search = Sunspot.search(Post) do
+        with :blog_id, 1
+        json_facet :published_at, range: time_range, gap: 1, gap_unit: 'MONTHS'
+      end
+      expected_rows = [
+        { count: 1, value: Time.new(2020, 4, 1).utc.iso8601 },
+        { count: 1, value: Time.new(2020, 5, 1).utc.iso8601 },
+        { count: 2, value: Time.new(2020, 6, 1).utc.iso8601 },
+        { count: 1, value: Time.new(2020, 7, 1).utc.iso8601 }
+      ]
+      expect(search.facet(:published_at).rows.map { |row| { count: row.count, value: row.value } }).to eq(expected_rows)
+    end
+
+    it 'should support computing other statistics' do
+      time_range = [Time.new(2020, 5, 1), Time.new(2020, 7, 1)]
+      search = Sunspot.search(Post) do
+        with :blog_id, 1
+        json_facet :published_at, range: time_range, gap: 1, gap_unit: 'MONTHS', other: 'all'
+      end
+      expect(search.facet(:published_at).other_count('before')).to eq(2)
+      expect(search.facet(:published_at).other_count('after')).to eq(2)
+      expect(search.facet(:published_at).other_count('between')).to eq(3)
+    end
   end
 
   context 'nested json facet' do
@@ -237,7 +303,7 @@ describe 'search faceting' do
       end
 
       0.upto(9) { |i| Sunspot.index(Post.new(:title => 'zero', :author_name => "another#{i}", :blog_id => 1)) }
-      
+
       Sunspot.commit
     end
 
@@ -459,38 +525,6 @@ describe 'search faceting' do
       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
-
-    it 'json facet should return time ranges' do
-      days_diff = 15
-      time_from = Time.utc(2009, 7, 8)
-      time_to = Time.utc(2009, 7, 8 + days_diff)
-      search = Sunspot.search(Post) do
-        json_facet(
-            :published_at,
-            :time_range => time_from..time_to
-        )
-      end
-
-      expect(search.facet(:published_at).rows.size).to eq(days_diff)
-      expect(search.facet(:published_at).rows[0].count).to eq(2)
-      expect(search.facet(:published_at).rows[1].count).to eq(1)
-    end
-
-    it 'json facet should return time ranges with custom gap' do
-      days_diff = 10
-      time_from = Time.utc(2009, 7, 8)
-      time_to = Time.utc(2009, 7, 8 + days_diff)
-      search = Sunspot.search(Post) do
-        json_facet(
-            :published_at,
-            :time_range => time_from..time_to,
-            gap: 60*60*24*2
-        )
-      end
-      expect(search.facet(:published_at).rows.size).to eq(days_diff / 2)
-      expect(search.facet(:published_at).rows[0].count).to eq(3)
-    end
-
   end
 
   context 'class facets' do

data/spec/integration/join_spec.rb

@@ -8,9 +8,9 @@ describe "searching by joined fields" do
     @container2 = PhotoContainer.new(:id => 2).tap { |c| allow(c).to receive(:id).and_return(2) }
     @container3 = PhotoContainer.new(:id => 3).tap { |c| allow(c).to receive(:id).and_return(3) }
 
-    @picture = Picture.new(:photo_container_id => @container1.id, :description => "one")
-    @photo1  = Photo.new(:photo_container_id => @container1.id, :description => "two")
-    @photo2  = Photo.new(:photo_container_id => @container2.id, :description => "three")
+    @picture = Picture.new(:photo_container_id => @container1.id, :description => "one", :published => true)
+    @photo1  = Photo.new(:photo_container_id => @container1.id, :description => "two", :published => true)
+    @photo2  = Photo.new(:photo_container_id => @container2.id, :description => "three", :published => false)
 
     Sunspot.index!(@container1, @container2, @photo1, @photo2, @picture)
   end
@@ -42,4 +42,23 @@ describe "searching by joined fields" do
       expect(results).to eq res
     end
   end
+
+  it "matches by joined fields when using filter queries" do
+    {
+      :photo_published => [
+        [true,  [@container1]],
+        [false, [@container2]]
+      ],
+      :picture_published => [
+        [true,  [@container1]],
+        [false, []]
+      ]
+    }.each do |key, data|
+      data.each do |(value, res)|
+        results = Sunspot.search(PhotoContainer) { with(key, value) }.results
+
+        expect(results).to eq res
+      end
+    end
+  end
 end

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/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/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,6 +7,7 @@ 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
@@ -14,12 +15,13 @@ Sunspot.setup(Photo) do
 end
 
 class Picture < MockRecord
-  attr_accessor :description, :photo_container_id
+  attr_accessor :description, :photo_container_id, :published
 end
 
 Sunspot.setup(Picture) do
   text :description
   integer :photo_container_id
+  boolean :published
 end
 
 class PhotoContainer < MockRecord
@@ -34,9 +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,  :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")
+  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

@@ -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
@@ -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) }
@@ -29,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' <<