sunspot 1.3.3 → 2.0.0.pre.111215

data/lib/sunspot/search.rb

@@ -1,5 +1,5 @@
 %w(abstract_search standard_search more_like_this_search query_facet field_facet
-   date_facet facet_row hit highlight).each do |file|
+   date_facet facet_row hit highlight field_group group hit_enumerable).each do |file|
   require File.join(File.dirname(__FILE__), 'search', file)
 end
 

data/lib/sunspot/session_proxy.rb

@@ -83,13 +83,5 @@ module Sunspot
         'silent_fail_session_proxy'
       )
     )
-    autoload(
-      :Retry5xxSessionProxy,
-      File.join(
-        File.dirname(__FILE__),
-        'session_proxy',
-        'retry_5xx_session_proxy'
-      )
-    )
   end
 end

data/lib/sunspot/type.rb

@@ -354,6 +354,27 @@ module Sunspot
       end
     end
 
+    # 
+    # The Latlon type encodes geographical coordinates in the native
+    # Solr LatLonType.
+    #
+    # The data for this type must respond to the `lat` and `lng` methods; you
+    # can use Sunspot::Util::Coordinates as a wrapper if your source data does
+    # not follow this API.
+    #
+    # Location fields can be used with the geospatial DSL. See the
+    # Geospatial section of the README for examples.
+    #
+    class LatlonType < AbstractType
+      def indexed_name(name)
+        "#{name}_ll"
+      end
+
+      def to_indexed(value)
+        "#{value.lat.to_f},#{value.lng.to_f}"
+      end
+    end
+
     class ClassType < AbstractType
       def indexed_name(name) #:nodoc:
         'class_name'

data/lib/sunspot/version.rb

@@ -1,3 +1,3 @@
 module Sunspot
-  VERSION = '1.3.3'
+  VERSION = '2.0.0.pre.111215'
 end

data/spec/api/class_set_spec.rb

@@ -7,7 +7,7 @@ describe Sunspot::ClassSet do
     set = described_class.new
     set << class1 << class2
 
-    set.to_a.should == [class1, class2]
+    set.to_a.should =~ [class1, class2]
   end
 
   it "replaces classes with the same name" do

data/spec/api/hit_enumerable_spec.rb

@@ -0,0 +1,47 @@
+require File.join(File.dirname(__FILE__), "spec_helper")
+
+describe Sunspot::Search::HitEnumerable do
+  subject do
+    Class.new do
+      include Sunspot::Search::HitEnumerable
+    end.new
+  end
+
+  describe "#hits" do
+    before do
+      subject.stub(:solr_docs).and_return([{"id" => "Post 1", "score" => 3.14}])
+      subject.stub(:highlights_for)
+    end
+
+    it "retrieves the raw Solr response from #solr_docs and constructs Hit objects" do
+      Sunspot::Search::Hit.should_receive(:new).
+                           with({"id" => "Post 1", "score" => 3.14}, anything, anything)
+
+      subject.hits
+    end
+
+    it "constructs Hit objects with highlights" do
+      subject.should_receive(:highlights_for).with({"id" => "Post 1", "score" => 3.14})
+
+      subject.hits
+    end
+
+    it "returns only verified hits if :verify => true is passed" do
+      Sunspot::Search::Hit.any_instance.stub(:result).and_return(nil)
+
+      subject.hits(:verify => true).should be_empty
+    end
+
+    it "returns an empty array if no results are available from Solr" do
+      subject.stub(:solr_docs).and_return(nil)
+
+      subject.hits.should == []
+    end
+
+    it "provides #populate_hits so that querying for one hit result will eager load the rest" do
+      Sunspot::Search::Hit.any_instance.should_receive(:result=)
+
+      subject.populate_hits
+    end
+  end
+end

data/spec/api/query/group_spec.rb

@@ -0,0 +1,32 @@
+require File.expand_path('spec_helper', File.dirname(__FILE__))
+
+describe "field grouping" do
+  it "sends grouping parameters to solr" do
+    session.search Post do
+      group :title
+    end
+
+    connection.should have_last_search_including(:group, "true")
+    connection.should have_last_search_including(:"group.field", "title_ss")
+  end
+
+  it "sends grouping limit parameters to solr" do
+    session.search Post do
+      group :title do
+        limit 2
+      end
+    end
+
+    connection.should have_last_search_including(:"group.limit", 2)
+  end
+
+  it "sends grouping sort parameters to solr" do
+    session.search Post do
+      group :title do
+        order_by :average_rating
+      end
+    end
+
+    connection.should have_last_search_including(:"group.sort", "average_rating_ft asc")
+  end
+end

data/spec/api/query/ordering_pagination_examples.rb

@@ -75,6 +75,13 @@ shared_examples_for 'sortable query' do
     connection.should have_last_search_with(:sort => 'score desc')
   end
 
+  it 'orders by geodist' do
+    search do
+      order_by_geodist :coordinates_new, 32, -68, :desc
+    end
+    connection.should have_last_search_with(:sort => 'geodist(coordinates_new_ll,32,-68) desc')
+  end
+
   it 'throws an ArgumentError if a bogus order direction is given' do
     lambda do
       search do

data/spec/api/query/spatial_examples.rb

@@ -0,0 +1,11 @@
+require 'bigdecimal'
+
+shared_examples_for "spatial query" do
+  it 'filters by radius' do
+    search do
+      with(:coordinates_new).in_radius(23, -46, 100)
+    end
+
+    connection.should have_last_search_including(:fq, "{!geofilt sfield=coordinates_new_ll pt=23,-46 d=100}")
+  end
+end

data/spec/api/query/standard_spec.rb

@@ -11,6 +11,7 @@ describe 'standard query', :type => :query do
   it_should_behave_like "sortable query"
   it_should_behave_like "query with text field scoping"
   it_should_behave_like "geohash query"
+  it_should_behave_like "spatial query"
 
   it 'adds a no-op query to :q parameter when no :q provided' do
     session.search Post do

data/spec/api/search/paginated_collection_spec.rb

@@ -14,6 +14,16 @@ describe "PaginatedCollection" do
     it { subject.next_page.should eql(2) }
     it { subject.out_of_bounds?.should_not be_true }
     it { subject.offset.should eql(0) }
+
+    it 'should allow setting total_count' do
+      subject.total_count = 1
+      subject.total_count.should eql(1)
+    end
+
+    it 'should allow setting total_entries' do
+      subject.total_entries = 1
+      subject.total_entries.should eql(1)
+    end
   end
 
   context "behaves like Kaminari" do

data/spec/api/search/results_spec.rb

@@ -42,6 +42,12 @@ describe 'search results', :type => :search do
     session.search(Post) { paginate(:page => 1) }.total.should == 4
   end
 
+  it 'returns query time' do
+    stub_nil_results
+    connection.response['responseHeader'] = { 'QTime' => 42 }
+    session.search(Post) { paginate(:page => 1) }.query_time.should == 42
+  end
+
   it 'returns total for nil search' do
     stub_nil_results
     session.search(Post).total.should == 0

data/spec/integration/field_grouping_spec.rb

@@ -0,0 +1,65 @@
+require File.expand_path("../spec_helper", File.dirname(__FILE__))
+
+describe "field grouping" do
+  before :each do
+    Sunspot.remove_all
+
+    @posts = [
+      Post.new(:title => "Title1", :ratings_average => 4),
+      Post.new(:title => "Title1", :ratings_average => 5),
+      Post.new(:title => "Title2", :ratings_average => 3)
+    ]
+
+    Sunspot.index!(*@posts)
+  end
+
+  it "allows grouping by a field" do
+    search = Sunspot.search(Post) do
+      group :title
+    end
+
+    search.group(:title).groups.should include { |g| g.value == "Title1" }
+    search.group(:title).groups.should include { |g| g.value == "Title2" }
+  end
+
+  it "provides access to the number of matches before grouping" do
+    search = Sunspot.search(Post) do
+      group :title
+    end
+
+    search.group(:title).matches.should == @posts.length
+  end
+
+  it "allows grouping by multiple fields" do
+    search = Sunspot.search(Post) do
+      group :title, :sort_title
+    end
+
+    search.group(:title).groups.should_not be_empty
+    search.group(:sort_title).groups.should_not be_empty
+  end
+
+  it "allows specification of the number of documents per group" do
+    search = Sunspot.search(Post) do
+      group :title do
+        limit 2
+      end
+    end
+
+    title1_group = search.group(:title).groups.detect { |g| g.value == "Title1" }
+    title1_group.hits.length.should == 2
+  end
+
+  it "allows specification of the sort within groups" do
+    search = Sunspot.search(Post) do
+      group :title do
+        order_by(:average_rating, :desc)
+      end
+    end
+
+    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
+  end
+end

data/spec/integration/geospatial_spec.rb

@@ -0,0 +1,59 @@
+require File.expand_path('../spec_helper', File.dirname(__FILE__))
+
+describe "geospatial search" do
+  describe "filtering by radius" do
+    before :all do
+      Sunspot.remove_all
+
+      @post = Post.new(:title       => "Howdy",
+                       :coordinates => Sunspot::Util::Coordinates.new(32, -68))
+      Sunspot.index!(@post)
+    end
+
+    it "matches posts with the radius" do
+      results = Sunspot.search(Post) {
+        with(:coordinates_new).in_radius(32, -68, 1)
+      }.results
+
+      results.should include(@post)
+    end
+
+    it "filters out posts not in the radius" do
+      results = Sunspot.search(Post) {
+        with(:coordinates_new).in_radius(33, -68, 1)
+      }.results
+
+      results.should_not include(@post)
+    end
+  end
+
+  describe "ordering by geodist" do
+    before :all do
+      Sunspot.remove_all
+
+      @posts = [
+        Post.new(:title => "Howdy", :coordinates => Sunspot::Util::Coordinates.new(34, -68)),
+        Post.new(:title => "Howdy", :coordinates => Sunspot::Util::Coordinates.new(33, -68)),
+        Post.new(:title => "Howdy", :coordinates => Sunspot::Util::Coordinates.new(32, -68))
+      ]
+
+      Sunspot.index!(@posts)
+    end
+
+    it "orders posts by distance ascending" do
+      results = Sunspot.search(Post) {
+        order_by_geodist(:coordinates_new, 32, -68)
+      }.results
+
+      results.should == @posts.reverse
+    end
+
+    it "orders posts by distance descending" do
+      results = Sunspot.search(Post) {
+        order_by_geodist(:coordinates_new, 32, -68, :desc)
+      }.results
+
+      results.should == @posts
+    end
+  end
+end

data/spec/integration/highlighting_spec.rb

@@ -5,6 +5,7 @@ describe 'keyword highlighting' do
     @posts = []
     @posts << Post.new(:body => 'And the fox laughed')
     @posts << Post.new(:body => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit', :blog_id => 1)
+    @posts << Post.new(:body => 'Lorem ipsum dolor sit amet', :title => 'consectetur adipiscing elit', :blog_id => 1)
     Sunspot.index!(*@posts)
     @search_result = Sunspot.search(Post) { keywords 'fox', :highlight => true }
   end
@@ -21,4 +22,23 @@ describe 'keyword highlighting' do
     search_result = Sunspot.search(Post){ with :blog_id, 1 }
     search_result.hits.first.highlights.should be_empty
   end
+  
+  it "should process multiple keyword request on different fields with highlights correctly" do
+    search_results = nil
+    lambda do
+      search_results = Sunspot.search(Post) do 
+        keywords 'Lorem ipsum', :fields => [:body] do
+          highlight :body
+        end
+        keywords 'consectetur', :fields => [:title] do
+          highlight :title
+        end
+      end
+    end.should_not raise_error(RSolr::Error::Http)
+    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
+    # search_results.hits.first.highlights.should_not be_empty
+  end
+  
 end

data/spec/mocks/post.rb

@@ -54,6 +54,7 @@ Sunspot.setup(Post) do
     Time.now
   end
   location :coordinates
+  latlon(:coordinates_new) { coordinates }
 
   dynamic_string :custom_string, :stored => true
   dynamic_float :custom_float, :multiple => true, :using => :custom_fl

data/sunspot.gemspec

@@ -25,7 +25,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'rsolr', '~>1.0.7'
+  s.add_dependency 'rsolr', '~>1.0.6'
+  s.add_dependency 'escape', '~>0.0.4'
   s.add_dependency 'pr_geohash', '~>1.0'
 
   s.add_development_dependency 'rspec', '~>2.6.0'

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: sunspot
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: 
+  prerelease: true
   segments: 
-  - 1
-  - 3
-  - 3
-  version: 1.3.3
+  - 2
+  - 0
+  - 0
+  - pre
+  - 111215
+  version: 2.0.0.pre.111215
 platform: ruby
 authors: 
 - Mat Brown
@@ -33,69 +34,76 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-11 00:00:00 Z
+date: 2011-12-15 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rsolr
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
         segments: 
         - 1
         - 0
-        - 7
-        version: 1.0.7
+        - 6
+        version: 1.0.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: pr_geohash
+  name: escape
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        segments: 
+        - 0
+        - 0
+        - 4
+        version: 0.0.4
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: pr_geohash
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
         segments: 
         - 1
         - 0
         version: "1.0"
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 2
         - 6
         - 0
         version: 2.6.0
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: hanna
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 description: "    Sunspot is a library providing a powerful, all-ruby API for the Solr search engine. Sunspot manages the configuration of persistent\n    Ruby classes for search and indexing and exposes Solr's most powerful features through a collection of DSLs. Complex search operations\n    can be performed without hand-writing any boolean queries or building Solr parameters by hand.\n"
 email: 
 - mat@patch.com
@@ -121,6 +129,7 @@ files:
 - lib/sunspot/data_extractor.rb
 - lib/sunspot/dsl.rb
 - lib/sunspot/dsl/adjustable.rb
+- lib/sunspot/dsl/field_group.rb
 - lib/sunspot/dsl/field_query.rb
 - lib/sunspot/dsl/fields.rb
 - lib/sunspot/dsl/fulltext.rb
@@ -146,9 +155,11 @@ files:
 - lib/sunspot/query/date_field_facet.rb
 - lib/sunspot/query/dismax.rb
 - lib/sunspot/query/field_facet.rb
+- lib/sunspot/query/field_group.rb
 - lib/sunspot/query/filter.rb
 - lib/sunspot/query/function_query.rb
 - lib/sunspot/query/geo.rb
+- lib/sunspot/query/geofilt.rb
 - lib/sunspot/query/highlighting.rb
 - lib/sunspot/query/more_like_this.rb
 - lib/sunspot/query/more_like_this_query.rb
@@ -166,8 +177,11 @@ files:
 - lib/sunspot/search/date_facet.rb
 - lib/sunspot/search/facet_row.rb
 - lib/sunspot/search/field_facet.rb
+- lib/sunspot/search/field_group.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/more_like_this_search.rb
 - lib/sunspot/search/paginated_collection.rb
 - lib/sunspot/search/query_facet.rb
@@ -178,7 +192,6 @@ files:
 - lib/sunspot/session_proxy/class_sharding_session_proxy.rb
 - lib/sunspot/session_proxy/id_sharding_session_proxy.rb
 - lib/sunspot/session_proxy/master_slave_session_proxy.rb
-- lib/sunspot/session_proxy/retry_5xx_session_proxy.rb
 - lib/sunspot/session_proxy/sharding_session_proxy.rb
 - lib/sunspot/session_proxy/silent_fail_session_proxy.rb
 - lib/sunspot/session_proxy/thread_local_session_proxy.rb
@@ -193,6 +206,7 @@ files:
 - spec/api/adapters_spec.rb
 - spec/api/binding_spec.rb
 - spec/api/class_set_spec.rb
+- spec/api/hit_enumerable_spec.rb
 - spec/api/indexer/attributes_spec.rb
 - spec/api/indexer/batch_spec.rb
 - spec/api/indexer/dynamic_fields_spec.rb
@@ -209,10 +223,12 @@ files:
 - spec/api/query/fulltext_examples.rb
 - spec/api/query/function_spec.rb
 - spec/api/query/geo_examples.rb
+- spec/api/query/group_spec.rb
 - spec/api/query/highlighting_examples.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/text_field_scoping_examples.rb
@@ -228,7 +244,6 @@ files:
 - 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
-- spec/api/session_proxy/retry_5xx_session_proxy_spec.rb
 - spec/api/session_proxy/sharding_session_proxy_spec.rb
 - spec/api/session_proxy/silent_fail_session_proxy_spec.rb
 - spec/api/session_proxy/spec_helper.rb
@@ -244,6 +259,8 @@ files:
 - spec/helpers/search_helper.rb
 - spec/integration/dynamic_fields_spec.rb
 - spec/integration/faceting_spec.rb
+- spec/integration/field_grouping_spec.rb
+- spec/integration/geospatial_spec.rb
 - spec/integration/highlighting_spec.rb
 - spec/integration/indexing_spec.rb
 - spec/integration/keyword_search_spec.rb
@@ -270,6 +287,7 @@ files:
 - tasks/rdoc.rake
 - tasks/schema.rake
 - tasks/todo.rake
+has_rdoc: true
 homepage: http://outoftime.github.com/sunspot
 licenses: []
 
@@ -283,27 +301,25 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: sunspot
-rubygems_version: 1.8.15
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Library for expressive, powerful interaction with the Solr search engine
@@ -311,6 +327,7 @@ test_files:
 - spec/api/adapters_spec.rb
 - spec/api/binding_spec.rb
 - spec/api/class_set_spec.rb
+- spec/api/hit_enumerable_spec.rb
 - spec/api/indexer/attributes_spec.rb
 - spec/api/indexer/batch_spec.rb
 - spec/api/indexer/dynamic_fields_spec.rb
@@ -327,10 +344,12 @@ test_files:
 - spec/api/query/fulltext_examples.rb
 - spec/api/query/function_spec.rb
 - spec/api/query/geo_examples.rb
+- spec/api/query/group_spec.rb
 - spec/api/query/highlighting_examples.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/text_field_scoping_examples.rb
@@ -346,7 +365,6 @@ test_files:
 - 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
-- spec/api/session_proxy/retry_5xx_session_proxy_spec.rb
 - spec/api/session_proxy/sharding_session_proxy_spec.rb
 - spec/api/session_proxy/silent_fail_session_proxy_spec.rb
 - spec/api/session_proxy/spec_helper.rb
@@ -362,6 +380,8 @@ test_files:
 - spec/helpers/search_helper.rb
 - spec/integration/dynamic_fields_spec.rb
 - spec/integration/faceting_spec.rb
+- spec/integration/field_grouping_spec.rb
+- spec/integration/geospatial_spec.rb
 - spec/integration/highlighting_spec.rb
 - spec/integration/indexing_spec.rb
 - spec/integration/keyword_search_spec.rb