sunspot 2.1.0 → 2.1.1

data/spec/integration/highlighting_spec.rb

@@ -25,8 +25,8 @@ describe 'keyword highlighting' do
   
   it "should process multiple keyword request on different fields with highlights correctly" do
     search_results = nil
-    lambda do
-      search_results = Sunspot.search(Post) do 
+    expect do
+      search_results = Sunspot.search(Post) do
         keywords 'Lorem ipsum', :fields => [:body] do
           highlight :body
         end
@@ -34,7 +34,7 @@ describe 'keyword highlighting' do
           highlight :title
         end
       end
-    end.should_not raise_error(RSolr::Error::Http)
+    end.to_not raise_error
     search_results.results.length.should eq(1)
     search_results.results.first.should eq(@posts.last)
     # this one might be a Solr bug, therefore not related to Sunspot itself

data/spec/integration/indexing_spec.rb

@@ -25,10 +25,11 @@ describe 'indexing' do
     Sunspot.remove_all!
     posts = [Post.new(:title => 'birds'), Post.new(:title => 'monkeys')]
     Sunspot.index!(posts)
-    Sunspot.remove! do
+
+    Sunspot.remove!(Post) do
       with(:title, 'birds')
     end
-    Sunspot.search(Post).should have(2).results
+    Sunspot.search(Post).should have(1).results
   end
 
 

data/spec/integration/scoped_search_spec.rb

@@ -457,4 +457,34 @@ describe 'scoped_search' do
       end
     end
   end
+
+  describe 'ordering by function' do
+    before :all do
+      Sunspot.remove_all
+      @p1 = Post.new(:blog_id => 1, :category_ids => [3])
+      @p2 = Post.new(:blog_id => 2, :category_ids => [1])
+      Sunspot.index([@p1,@p2])
+      Sunspot.commit
+    end
+    it 'should order by sum' do
+      # 1+3 > 2+1
+      search = Sunspot.search(Post) {order_by_function :sum, :blog_id, :primary_category_id, :desc}
+      search.results.first.should == @p1
+    end
+    it 'should order by product and sum' do
+      # 1 * (1+3) < 2 * (2+1)
+      search = Sunspot.search(Post) { order_by_function :product, :blog_id, [:sum,:blog_id,:primary_category_id], :desc}
+      search.results.first.should == @p2
+    end
+    it 'should accept string literals' do
+      # (1 * -2) > (2 * -2)
+      search = Sunspot.search(Post) {order_by_function :product, :blog_id, '-2', :desc}
+      search.results.first.should == @p1
+    end
+    it 'should accept non-string literals' do
+      # (1 * -2) > (2 * -2)
+      search = Sunspot.search(Post) {order_by_function :product, :blog_id, -2, :desc}
+      search.results.first.should == @p1
+    end
+  end
 end

data/spec/integration/stats_spec.rb

@@ -0,0 +1,47 @@
+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)
+    Sunspot.index!(@posts)
+  end
+
+  it 'returns minimum stats' do
+    Sunspot.search(Post) do
+      stats :average_rating
+    end.stats(:average_rating).min.should == 3.0
+  end
+
+  it 'returns maximum stats' do
+    Sunspot.search(Post) do
+      stats :average_rating
+    end.stats(:average_rating).max.should == 4.0
+  end
+
+  it 'returns count stats' do
+    Sunspot.search(Post) do
+      stats :average_rating
+    end.stats(:average_rating).count.should == 3
+  end
+
+  describe 'facets' do
+    it 'returns minimum on facet row with two blog ids' do
+      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
+
+    it 'returns maximum on facet row with two blog ids' do
+      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
+  end
+end

data/spec/mocks/photo.rb

@@ -1,11 +1,24 @@
 class Photo < MockRecord
-  attr_accessor :caption, :lat, :lng, :size, :average_rating, :created_at
+  attr_accessor :caption, :lat, :lng, :size, :average_rating, :created_at, :post_id, :photo_container_id
 end
 
 Sunspot.setup(Photo) do
   text :caption, :default_boost => 1.5
+  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 PhotoContainer < MockRecord
+  def id
+    1
+  end
+end
+
+Sunspot.setup(PhotoContainer) do
+  join(:caption, :type => :string, :join_string => 'from=photo_container_id to=id')
+  join(:photo_rating, :type => :trie_float, :join_string => 'from=photo_container_id to=id', :as => 'average_rating_ft')
+end

data/sunspot.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Mat Brown', 'Peer Allan', 'Dmitriy Dzema', 'Benjamin Krause', 'Marcel de Graaf', 'Brandon Keepers', 'Peter Berkenbosch',
                   'Brian Atkinson', 'Tom Coleman', 'Matt Mitchell', 'Nathan Beyer', 'Kieran Topping', 'Nicolas Braem', 'Jeremy Ashkenas',
-                  'Dylan Vaughn', 'Brian Durand', 'Sam Granieri', 'Nick Zadrozny', 'Jason Ronallo']
+                  'Dylan Vaughn', 'Brian Durand', 'Sam Granieri', 'Nick Zadrozny', 'Jason Ronallo', 'Ryan Wallace', 'Nicholas Jakobsen']
   s.email       = ["mat@patch.com"]
   s.homepage    = "http://outoftime.github.com/sunspot"
   s.summary = 'Library for expressive, powerful interaction with the Solr search engine'
@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'pr_geohash', '~>1.0'
 
   s.add_development_dependency 'rspec', '~>2.6.0'
-  s.add_development_dependency 'hanna'
 
   s.rdoc_options << '--webcvs=http://github.com/outoftime/sunspot/tree/master/%s' <<
                   '--title' << 'Sunspot - Solr-powered search for Ruby objects - API Documentation' <<

data/tasks/rdoc.rake

@@ -1,19 +1,27 @@
-begin
-  require 'hanna/rdoctask'
-rescue LoadError
-  if require 'rubygems'
-    retry
+require 'sunspot/version'
+
+rdoc_task =
+  begin
+    require 'rdoc/task'
+    RDoc::Task
+  rescue LoadError
+    begin
+      require 'rake/rdoctask'
+      Rake::RDocTask
+    rescue
+      nil
+    end
   end
-  # It's OK if hanna isn't installed.
-end
 
-Rake::RDocTask.new(:doc) do |rdoc|
-  version = Sunspot::VERSION
-  rdoc.title = "Sunspot #{version} - Solr-powered search for Ruby objects - API Documentation"
-  rdoc.main = 'README.md'
-  rdoc.rdoc_files.include('README.md', 'lib/sunspot.rb', 'lib/sunspot/**/*.rb')
-  rdoc.rdoc_dir = 'doc'
-  rdoc.options << "--webcvs=http://github.com/outoftime/sunspot/tree/v#{version}/%s" << '--title' << 'Sunspot - Solr-powered search for Ruby objects - API Documentation'
+if rdoc_task
+  rdoc_task.new(:doc) do |rdoc|
+    version = Sunspot::VERSION
+    rdoc.title = "Sunspot #{version} - Solr-powered search for Ruby objects - API Documentation"
+    rdoc.main = '../README.md'
+    rdoc.rdoc_files.include('../README.md', 'lib/sunspot.rb', 'lib/sunspot/**/*.rb')
+    rdoc.rdoc_dir = 'doc'
+    rdoc.options << "--webcvs=http://github.com/outoftime/sunspot/tree/v#{version}/%s" << '--title' << 'Sunspot - Solr-powered search for Ruby objects - API Documentation'
+  end
 end
 
 namespace :doc do

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot
 version: !ruby/object:Gem::Version
-  version: 2.1.0
-  prerelease: 
+  version: 2.1.1
 platform: ruby
 authors:
 - Mat Brown
@@ -24,75 +23,55 @@ authors:
 - Sam Granieri
 - Nick Zadrozny
 - Jason Ronallo
+- Ryan Wallace
+- Nicholas Jakobsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.7
 - !ruby/object:Gem::Dependency
   name: pr_geohash
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.6.0
-- !ruby/object:Gem::Dependency
-  name: hanna
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '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
@@ -103,7 +82,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - History.txt
 - LICENSE
@@ -121,6 +100,7 @@ files:
 - lib/sunspot/dsl/adjustable.rb
 - lib/sunspot/dsl/field_group.rb
 - lib/sunspot/dsl/field_query.rb
+- lib/sunspot/dsl/field_stats.rb
 - lib/sunspot/dsl/fields.rb
 - lib/sunspot/dsl/fulltext.rb
 - lib/sunspot/dsl/function.rb
@@ -147,6 +127,7 @@ files:
 - lib/sunspot/query/dismax.rb
 - lib/sunspot/query/field_facet.rb
 - lib/sunspot/query/field_group.rb
+- lib/sunspot/query/field_stats.rb
 - lib/sunspot/query/filter.rb
 - lib/sunspot/query/function_query.rb
 - lib/sunspot/query/geo.rb
@@ -170,6 +151,7 @@ files:
 - lib/sunspot/search/facet_row.rb
 - lib/sunspot/search/field_facet.rb
 - lib/sunspot/search/field_group.rb
+- lib/sunspot/search/field_stats.rb
 - lib/sunspot/search/group.rb
 - lib/sunspot/search/highlight.rb
 - lib/sunspot/search/hit.rb
@@ -179,6 +161,8 @@ files:
 - lib/sunspot/search/query_facet.rb
 - lib/sunspot/search/range_facet.rb
 - lib/sunspot/search/standard_search.rb
+- lib/sunspot/search/stats_facet.rb
+- lib/sunspot/search/stats_row.rb
 - lib/sunspot/session.rb
 - lib/sunspot/session_proxy.rb
 - lib/sunspot/session_proxy/abstract_session_proxy.rb
@@ -220,12 +204,14 @@ files:
 - spec/api/query/geo_examples.rb
 - spec/api/query/group_spec.rb
 - spec/api/query/highlighting_examples.rb
+- spec/api/query/join_spec.rb
 - spec/api/query/more_like_this_spec.rb
 - spec/api/query/ordering_pagination_examples.rb
 - spec/api/query/scope_examples.rb
 - spec/api/query/spatial_examples.rb
 - spec/api/query/spec_helper.rb
 - spec/api/query/standard_spec.rb
+- spec/api/query/stats_examples.rb
 - spec/api/query/text_field_scoping_examples.rb
 - spec/api/query/types_spec.rb
 - spec/api/search/dynamic_fields_spec.rb
@@ -236,6 +222,7 @@ files:
 - spec/api/search/results_spec.rb
 - spec/api/search/search_spec.rb
 - spec/api/search/spec_helper.rb
+- spec/api/search/stats_spec.rb
 - spec/api/session_proxy/class_sharding_session_proxy_spec.rb
 - spec/api/session_proxy/id_sharding_session_proxy_spec.rb
 - spec/api/session_proxy/master_slave_session_proxy_spec.rb
@@ -263,6 +250,7 @@ files:
 - spec/integration/local_search_spec.rb
 - spec/integration/more_like_this_spec.rb
 - spec/integration/scoped_search_spec.rb
+- spec/integration/stats_spec.rb
 - spec/integration/stored_fields_spec.rb
 - spec/integration/test_pagination.rb
 - spec/integration/unicode_spec.rb
@@ -286,32 +274,31 @@ files:
 homepage: http://outoftime.github.com/sunspot
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --webcvs=http://github.com/outoftime/sunspot/tree/master/%s
-- --title
+- "--webcvs=http://github.com/outoftime/sunspot/tree/master/%s"
+- "--title"
 - Sunspot - Solr-powered search for Ruby objects - API Documentation
-- --main
+- "--main"
 - README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sunspot
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Library for expressive, powerful interaction with the Solr search engine
 test_files:
 - spec/api/adapters_spec.rb
@@ -337,12 +324,14 @@ test_files:
 - spec/api/query/geo_examples.rb
 - spec/api/query/group_spec.rb
 - spec/api/query/highlighting_examples.rb
+- spec/api/query/join_spec.rb
 - spec/api/query/more_like_this_spec.rb
 - spec/api/query/ordering_pagination_examples.rb
 - spec/api/query/scope_examples.rb
 - spec/api/query/spatial_examples.rb
 - spec/api/query/spec_helper.rb
 - spec/api/query/standard_spec.rb
+- spec/api/query/stats_examples.rb
 - spec/api/query/text_field_scoping_examples.rb
 - spec/api/query/types_spec.rb
 - spec/api/search/dynamic_fields_spec.rb
@@ -353,6 +342,7 @@ test_files:
 - spec/api/search/results_spec.rb
 - spec/api/search/search_spec.rb
 - spec/api/search/spec_helper.rb
+- spec/api/search/stats_spec.rb
 - spec/api/session_proxy/class_sharding_session_proxy_spec.rb
 - spec/api/session_proxy/id_sharding_session_proxy_spec.rb
 - spec/api/session_proxy/master_slave_session_proxy_spec.rb
@@ -380,6 +370,7 @@ test_files:
 - spec/integration/local_search_spec.rb
 - spec/integration/more_like_this_spec.rb
 - spec/integration/scoped_search_spec.rb
+- spec/integration/stats_spec.rb
 - spec/integration/stored_fields_spec.rb
 - spec/integration/test_pagination.rb
 - spec/integration/unicode_spec.rb