sunspot 2.2.7 → 2.5.0

data/spec/integration/stats_spec.rb

@@ -3,45 +3,86 @@ 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, :blog_id => 2),
-             Post.new(:ratings_average => 4.0, :blog_id => 1),
-             Post.new(:ratings_average => 3.0, :blog_id => 2)
+    @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
-    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
+
+  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

@@ -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/photo.rb

@@ -13,6 +13,15 @@ Sunspot.setup(Photo) do
   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
 
@@ -25,8 +34,9 @@ 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(:description,  :target => Picture, :type => :text,       :join => { :from => :photo_container_id, :to => :id }, :prefix => "picture")
 end

data/spec/mocks/post.rb

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

data/spec/spec_helper.rb

@@ -13,27 +13,28 @@ 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/}
+  config.include MockSessionHelper, type: :api, file_path: /spec[\\\/]api/
 
   # Real Solr instance is available to integration tests
-  config.include IntegrationHelper,
-                 :type => :integration,
-                 :example_group => {:file_path => /spec[\\\/]integration/}
+  config.include IntegrationHelper, type: :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', '~> 3.7'
+  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.5.0
 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: 2019-07-12 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: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '3.7'
+- !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.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,6 +119,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- Appraisals
 - Gemfile
 - History.txt
 - LICENSE
@@ -128,14 +158,17 @@ files:
 - lib/sunspot/query.rb
 - lib/sunspot/query/abstract_field_facet.rb
 - lib/sunspot/query/abstract_fulltext.rb
+- lib/sunspot/query/abstract_json_field_facet.rb
 - lib/sunspot/query/bbox.rb
 - lib/sunspot/query/boost_query.rb
 - lib/sunspot/query/common_query.rb
 - lib/sunspot/query/composite_fulltext.rb
 - lib/sunspot/query/connective.rb
 - lib/sunspot/query/date_field_facet.rb
+- lib/sunspot/query/date_field_json_facet.rb
 - lib/sunspot/query/dismax.rb
 - lib/sunspot/query/field_facet.rb
+- lib/sunspot/query/field_json_facet.rb
 - lib/sunspot/query/field_list.rb
 - lib/sunspot/query/field_stats.rb
 - lib/sunspot/query/filter.rb
@@ -151,6 +184,7 @@ files:
 - lib/sunspot/query/pagination.rb
 - lib/sunspot/query/query_facet.rb
 - lib/sunspot/query/range_facet.rb
+- lib/sunspot/query/range_json_facet.rb
 - lib/sunspot/query/restriction.rb
 - lib/sunspot/query/scope.rb
 - lib/sunspot/query/sort.rb
@@ -166,11 +200,14 @@ files:
 - lib/sunspot/search/facet_row.rb
 - lib/sunspot/search/field_facet.rb
 - lib/sunspot/search/field_group.rb
+- lib/sunspot/search/field_json_facet.rb
 - lib/sunspot/search/field_stats.rb
 - lib/sunspot/search/group.rb
 - lib/sunspot/search/highlight.rb
 - lib/sunspot/search/hit.rb
 - lib/sunspot/search/hit_enumerable.rb
+- lib/sunspot/search/json_facet_row.rb
+- lib/sunspot/search/json_facet_stats.rb
 - lib/sunspot/search/more_like_this_search.rb
 - lib/sunspot/search/paginated_collection.rb
 - lib/sunspot/search/query_facet.rb
@@ -178,6 +215,7 @@ files:
 - lib/sunspot/search/range_facet.rb
 - lib/sunspot/search/standard_search.rb
 - lib/sunspot/search/stats_facet.rb
+- lib/sunspot/search/stats_json_row.rb
 - lib/sunspot/search/stats_row.rb
 - lib/sunspot/session.rb
 - lib/sunspot/session_proxy.rb
@@ -201,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
@@ -262,9 +301,11 @@ 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
+- spec/integration/join_spec.rb
 - spec/integration/keyword_search_spec.rb
 - spec/integration/local_search_spec.rb
 - spec/integration/more_like_this_spec.rb
@@ -315,8 +356,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: sunspot
-rubygems_version: 2.5.0
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Library for expressive, powerful interaction with the Solr search engine
@@ -325,6 +365,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
@@ -386,9 +427,11 @@ 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
+- spec/integration/join_spec.rb
 - spec/integration/keyword_search_spec.rb
 - spec/integration/local_search_spec.rb
 - spec/integration/more_like_this_spec.rb