sunspot 2.2.7 → 2.2.8

data/spec/integration/spellcheck_spec.rb

@@ -21,7 +21,7 @@ describe 'spellcheck' do
     search = Sunspot.search(Post) do
       keywords 'Closure'
     end
-    search.spellcheck_suggestions.should == {}
+    expect(search.spellcheck_suggestions).to eq({})
   end
 
   it 'returns the list of suggestions' do
@@ -29,9 +29,9 @@ describe 'spellcheck' do
       keywords 'Closure'
       spellcheck :count => 3
     end
-    search.spellcheck_suggestions['closure']['suggestion'].should == [
+    expect(search.spellcheck_suggestions['closure']['suggestion']).to eq([
       {'word'=>'clojure', 'freq'=>2}, {'word'=>'conjure', 'freq'=>1}
-    ]
+    ])
   end
 
   it 'returns suggestion with highest frequency' do
@@ -39,7 +39,7 @@ describe 'spellcheck' do
       keywords 'Closure'
       spellcheck :count => 3
     end
-    search.spellcheck_suggestion_for('closure').should == 'clojure'
+    expect(search.spellcheck_suggestion_for('closure')).to eq('clojure')
   end
 
   it 'returns suggestion without collation when only more popular is true' do
@@ -48,7 +48,7 @@ describe 'spellcheck' do
       spellcheck :count => 3, :only_more_popular => true, :collate => false
     end
 
-    search.spellcheck_suggestion_for('closure').should == 'clojure'
+    expect(search.spellcheck_suggestion_for('closure')).to eq('clojure')
   end
 
   context 'spellcheck collation' do
@@ -58,7 +58,7 @@ describe 'spellcheck' do
         keywords 'lojure developing'
         spellcheck :count => 3, :only_more_popular => true
       end
-      search.spellcheck_collation('lojure', 'developing').should == 'clojure developing'
+      expect(search.spellcheck_collation('lojure', 'developing')).to eq('clojure developing')
     end
 
     it 'returns Solr collation if terms are not provided' do
@@ -67,7 +67,52 @@ describe 'spellcheck' do
         keywords 'lojure developing'
         spellcheck :count => 3, :only_more_popular => true
       end
-      search.spellcheck_collation.should == 'clojure developer'
+      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
 

data/spec/integration/stats_spec.rb

@@ -10,38 +10,38 @@ describe 'search stats' do
   end
 
   it 'returns minimum stats' do
-    Sunspot.search(Post) do
+    expect(Sunspot.search(Post) do
       stats :average_rating
-    end.stats(:average_rating).min.should == 3.0
+    end.stats(:average_rating).min).to eq(3.0)
   end
 
   it 'returns maximum stats' do
-    Sunspot.search(Post) do
+    expect(Sunspot.search(Post) do
       stats :average_rating
-    end.stats(:average_rating).max.should == 4.0
+    end.stats(:average_rating).max).to eq(4.0)
   end
 
   it 'returns count stats' do
-    Sunspot.search(Post) do
+    expect(Sunspot.search(Post) do
       stats :average_rating
-    end.stats(:average_rating).count.should == 3
+    end.stats(:average_rating).count).to eq(3)
   end
 
   describe 'facets' do
     it 'returns minimum on facet row with two blog ids' do
-      Sunspot.search(Post) do
+      expect(Sunspot.search(Post) do
         stats :average_rating do
           facet :blog_id
         end
-      end.stats(:average_rating).facet(:blog_id).rows[1].min.should == 3.0
+      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
-      Sunspot.search(Post) do
+      expect(Sunspot.search(Post) do
         stats :average_rating do
           facet :blog_id
         end
-      end.stats(:average_rating).facet(:blog_id).rows[1].max.should == 4.0
+      end.stats(:average_rating).facet(:blog_id).rows[1].max).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/post.rb

@@ -85,7 +85,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

data/spec/spec_helper.rb

@@ -13,27 +13,32 @@ end
 require File.join(File.dirname(__FILE__), 'ext')
 
 RSpec.configure do |config|
-  # Run only examples with :focus => true
-  config.filter_run :focus => true
+  config.filter_run :focus
   config.run_all_when_everything_filtered = true
 
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+
   # Mock session available to all spec/api tests
   config.include MockSessionHelper,
                  :type => :api,
-                 :example_group => {:file_path => /spec[\\\/]api/}
+                 :file_path => /spec[\\\/]api/
 
   # Real Solr instance is available to integration tests
   config.include IntegrationHelper,
                  :type => :integration,
-                 :example_group => {:file_path => /spec[\\\/]integration/}
+                 :file_path => /spec[\\\/]integration/
 
   # Nested under spec/api
   [:indexer, :query, :search].each do |spec_type|
     helper_name = "#{spec_type}_helper"
 
     config.include Sunspot::Util.full_const_get(Sunspot::Util.camel_case(helper_name)),
-                   :type          => spec_type,
-                   :example_group => {:file_path => /spec[\\\/]api[\\\/]#{spec_type}/}
+                   :type => spec_type,
+                   :file_path => /spec[\\\/]api[\\\/]#{spec_type}/
   end
 end
 

data/sunspot.gemspec

@@ -30,7 +30,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'rsolr', '>= 1.1.1', '< 3'
   s.add_dependency 'pr_geohash', '~>1.0'
 
-  s.add_development_dependency 'rspec', '~>2.6.0'
+  s.add_development_dependency 'rake', '< 12.3'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'appraisal', '2.2.0'
 
   s.rdoc_options << '--webcvs=http://github.com/outoftime/sunspot/tree/master/%s' <<
                   '--title' << 'Sunspot - Solr-powered search for Ruby objects - API Documentation' <<

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot
 version: !ruby/object:Gem::Version
-  version: 2.2.7
+  version: 2.2.8
 platform: ruby
 authors:
 - Mat Brown
@@ -30,7 +30,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -66,20 +66,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '12.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.2.0
 description: |2
       Sunspot is a library providing a powerful, all-ruby API for the Solr search engine. Sunspot manages the configuration of persistent
       Ruby classes for search and indexing and exposes Solr's most powerful features through a collection of DSLs. Complex search operations
@@ -91,11 +119,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- Appraisals
 - Gemfile
 - History.txt
 - LICENSE
 - Rakefile
 - TODO
+- gemfiles/.gitkeep
 - lib/light_config.rb
 - lib/sunspot.rb
 - lib/sunspot/adapters.rb
@@ -262,6 +293,7 @@ files:
 - spec/integration/dynamic_fields_spec.rb
 - spec/integration/faceting_spec.rb
 - spec/integration/field_grouping_spec.rb
+- spec/integration/field_lists_spec.rb
 - spec/integration/geospatial_spec.rb
 - spec/integration/highlighting_spec.rb
 - spec/integration/indexing_spec.rb
@@ -316,7 +348,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sunspot
-rubygems_version: 2.5.0
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Library for expressive, powerful interaction with the Solr search engine
@@ -386,6 +418,7 @@ test_files:
 - spec/integration/dynamic_fields_spec.rb
 - spec/integration/faceting_spec.rb
 - spec/integration/field_grouping_spec.rb
+- spec/integration/field_lists_spec.rb
 - spec/integration/geospatial_spec.rb
 - spec/integration/highlighting_spec.rb
 - spec/integration/indexing_spec.rb