sunspot 0.10.9 → 1.0.0

data/solr/solr/conf/spellings.txt

@@ -0,0 +1,2 @@
+pizza
+history

data/solr/solr/conf/stopwords.txt

@@ -20,6 +20,7 @@ stopworda
 stopwordb
 
 #Standard english stop words taken from Lucene's StopAnalyzer
+a
 an
 and
 are

data/spec/api/binding_spec.rb

@@ -0,0 +1,38 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe "DSL bindings" do
+  it 'should give access to calling context\'s methods in search DSL' do
+    value = nil
+    session.search(Post) do
+      value = test_method
+    end
+    value.should == 'value'
+  end
+
+  it 'should give access to calling context\'s methods in nested DSL block' do
+    value = nil
+    session.search(Post) do
+      any_of do
+        value = test_method
+      end
+    end
+    value.should == 'value'
+  end
+
+  it 'should give access to calling context\'s methods in double-nested DSL block' do
+    value = nil
+    session.search(Post) do
+      any_of do
+        all_of do
+          value = test_method
+        end
+      end
+    end
+  end
+
+  private
+
+  def test_method
+    'value'
+  end
+end

data/spec/api/indexer/attributes_spec.rb

@@ -11,11 +11,36 @@ describe 'indexing attribute fields', :type => :indexer do
     connection.should have_add_with(:blog_id_i => '4')
   end
 
+  it 'should correctly index a long attribute field' do
+    session.index(Namespaced::Comment.new(:hash => 2**30))
+    connection.should have_add_with(:hash_l => '1073741824')
+  end
+
   it 'should correctly index a float attribute field' do
     session.index(post(:ratings_average => 2.23))
     connection.should have_add_with(:average_rating_f => '2.23')
   end
 
+  it 'should correctly index a double attribute field' do
+    session.index(Namespaced::Comment.new(:average_rating => 2.23))
+    connection.should have_add_with(:average_rating_e => '2.23')
+  end
+
+  it 'should correctly index a trie integer attribute field' do
+    session.index(Photo.new(:size => 104856))
+    connection.should have_add_with(:size_it => '104856')
+  end
+
+  it 'should correctly index a trie float attribute field' do
+    session.index(Photo.new(:average_rating => 2.23))
+    connection.should have_add_with(:average_rating_ft => '2.23')
+  end
+
+  it 'should correctly index a trie time attribute field' do
+    session.index(Photo.new(:created_at => Time.parse('2009-12-16 15:00:00 -0400')))
+    connection.should have_add_with(:created_at_dt => '2009-12-16T19:00:00Z')
+  end
+
   it 'should allow indexing by a multiple-value field' do
     session.index(post(:category_ids => [3, 14]))
     connection.should have_add_with(:category_ids_im => ['3', '14'])
@@ -33,6 +58,13 @@ describe 'indexing attribute fields', :type => :indexer do
     connection.should have_add_with(:published_at_d => '1983-07-08T09:00:00Z')
   end
 
+  it 'should correctly index a time field that\'s after 32-bit Y2K' do
+    session.index(
+      post(:published_at => DateTime.parse('2050-07-08 05:00:00 -0400'))
+    )
+    connection.should have_add_with(:published_at_d => '2050-07-08T09:00:00Z')
+  end
+
   it 'should correctly index a date field' do
     session.index(post(:expire_date => Date.new(2009, 07, 13)))
     connection.should have_add_with(:expire_date_d => '2009-07-13T00:00:00Z')
@@ -55,25 +87,26 @@ describe 'indexing attribute fields', :type => :indexer do
 
   it 'should index latitude and longitude as a pair' do
     session.index(post(:coordinates => [40.7, -73.5]))
-    connection.should have_add_with(:lat => 40.7, :long => -73.5)
+    connection.should have_add_with(:lat => 40.7, :lng => -73.5)
   end
 
   [
     [:lat, :lng],
     [:lat, :lon],
-    [:lat, :long]
+    [:lat, :long],
+    [:latitude, :longitude]
   ].each do |lat_attr, lng_attr|
     it "should index latitude and longitude from #{lat_attr.inspect}, #{lng_attr.inspect}" do
       session.index(post(
           :coordinates => OpenStruct.new(lat_attr => 40.7, lng_attr => -73.5)
       ))
-      connection.should have_add_with(:lat => 40.7, :long => -73.5)
+      connection.should have_add_with(:lat => 40.7, :lng => -73.5)
     end
   end
 
   it 'should index latitude and longitude from a block' do
     session.index(Photo.new(:lat => 30, :lng => -60))
-    connection.should have_add_with(:lat => 30, :long => -60)
+    connection.should have_add_with(:lat => 30.0, :lng => -60.0)
   end
 
   it 'should correctly index an attribute field with block access' do

data/spec/api/indexer/dynamic_fields_spec.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'spec_helper')
 describe 'indexing dynamic fields' do
   it 'indexes string data' do
     session.index(post(:custom_string => { :test => 'string' }))
-    connection.should have_add_with(:"custom_string:test_s" => 'string')
+    connection.should have_add_with(:"custom_string:test_ss" => 'string')
   end
 
   it 'indexes integer data with virtual accessor' do
@@ -30,4 +30,13 @@ describe 'indexing dynamic fields' do
     session.index(post(:custom_fl => { :test => [1.0, 2.1, 3.2] }))
     connection.should have_add_with(:"custom_float:test_fm" => %w(1.0 2.1 3.2))
   end
+
+  it 'should throw a NoMethodError if dynamic text field defined' do
+    lambda do
+      Sunspot.setup(Post) do
+        dynamic_text :custom_text
+      end
+    end.should raise_error(NoMethodError)
+  end
 end
+

data/spec/api/indexer/removal_spec.rb

@@ -12,7 +12,7 @@ describe 'document removal', :type => :indexer do
   end
 
   it 'removes an object by type and id and immediately commits' do
-    connection.should_receive(:delete_by_id).with('Post 1').ordered
+    connection.should_receive(:delete_by_id).with(['Post 1']).ordered
     connection.should_receive(:commit).ordered
     session.remove_by_id!(Post, 1)
   end
@@ -43,4 +43,11 @@ describe 'document removal', :type => :indexer do
     connection.should_receive(:delete_by_query).with('type:Namespaced\:\:Comment')
     session.remove_all(Namespaced::Comment)
   end
+
+  it 'should remove by query' do
+    session.remove(Post) do
+      with(:title, 'monkeys')
+    end
+    connection.should have_delete_by_query("(type:Post AND title_ss:monkeys)")
+  end
 end

data/spec/api/indexer_spec.rb

@@ -1,4 +1,14 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe 'indexer', :type => :indexer do
+  it 'should completely wipe setup if class redefined (reloaded)' do
+    Object::ReloadableClass = Class.new(MockRecord)
+    Sunspot.setup(ReloadableClass) { string(:title) }
+    Object.class_eval { remove_const(:ReloadableClass) }
+    Object::ReloadableClass = Class.new(MockRecord)
+    Sunspot.setup(ReloadableClass) {}
+    lambda do
+      Sunspot.search(ReloadableClass) { with(:title, 'title') }
+    end.should raise_error(Sunspot::UnrecognizedFieldError)
+  end
 end

data/spec/api/query/dsl_spec.rb

@@ -8,5 +8,11 @@ describe 'query DSL', :type => :query do
     end
     connection.should have_last_search_including(:fq, 'blog_id_i:1')
   end
+
+  it 'should accept a block in the #new_search method' do
+    search = session.new_search(Post) { with(:blog_id, 1) }
+    search.execute
+    connection.should have_last_search_including(:fq, 'blog_id_i:1')
+  end
 end
 

data/spec/api/query/dynamic_fields_spec.rb

@@ -7,7 +7,7 @@ describe 'dynamic field query', :type => :query do
         with :test, 'string'
       end
     end
-    connection.should have_last_search_including(:fq, 'custom_string\:test_s:string')
+    connection.should have_last_search_including(:fq, 'custom_string\:test_ss:string')
   end
 
   it 'restricts by dynamic integer field with less than restriction' do
@@ -53,7 +53,7 @@ describe 'dynamic field query', :type => :query do
         without :test, 'foo'
       end
     end
-    connection.should have_last_search_including(:fq, '-custom_string\:test_s:foo')
+    connection.should have_last_search_including(:fq, '-custom_string\:test_ss:foo')
   end
 
   it 'scopes by a dynamic field inside a disjunction' do
@@ -66,7 +66,7 @@ describe 'dynamic field query', :type => :query do
       end
     end
     connection.should have_last_search_including(
-      :fq, '(custom_string\:test_s:foo OR title_ss:bar)'
+      :fq, '(custom_string\:test_ss:foo OR title_ss:bar)'
     )
   end
 
@@ -101,7 +101,7 @@ describe 'dynamic field query', :type => :query do
     lambda do
       session.search Post do
         dynamic :custom_string do
-          paginate 3, 10
+          paginate :page => 3, :per_page => 10
         end
       end
     end.should raise_error(NoMethodError)
@@ -118,7 +118,7 @@ describe 'dynamic field query', :type => :query do
       end
     end
     connection.should have_last_search_with(
-      :"facet.query" => 'custom_string\:test_s:foo'
+      :"facet.query" => 'custom_string\:test_ss:foo'
     )
   end
 
@@ -134,16 +134,16 @@ describe 'dynamic field query', :type => :query do
     end
     connection.should have_last_search_including(
       :"facet.query",
-      'custom_string\:test_s:foo'
+      'custom_string\:test_ss:foo'
     )
   end
 
   it 'allows scoping on dynamic fields common to all types' do
     session.search Post, Namespaced::Comment do
-      dynamic :custom_string do
-        with(:test, 'test')
+      dynamic :custom_float do
+        with(:test, 1.23)
       end
     end
-    connection.should have_last_search_including(:fq, 'custom_string\\:test_s:test')
+    connection.should have_last_search_including(:fq, 'custom_float\\:test_fm:1\\.23')
   end
 end

data/spec/api/query/facet_local_params_spec.rb

@@ -0,0 +1,103 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe 'facet local params' do
+  it 'tags and excludes a scope filter in a field facet' do
+    session.search(Post) do
+      blog_filter = with(:blog_id, 1)
+      facet(:blog_id, :exclude => blog_filter)
+    end
+    filter_tag = get_filter_tag('blog_id_i:1')
+    connection.should have_last_search_with(
+      :"facet.field" => %W({!ex=#{filter_tag}}blog_id_i)
+    )
+  end
+
+  it 'tags and excludes a disjunction filter in a field facet' do
+    session.search(Post) do
+      blog_filter = any_of do
+        with(:blog_id, 1)
+        with(:blog_id, 2)
+      end
+      facet(:blog_id, :exclude => blog_filter)
+    end
+    filter_tag = get_filter_tag('(blog_id_i:1 OR blog_id_i:2)')
+    connection.should have_last_search_with(
+      :"facet.field" => %W({!ex=#{filter_tag}}blog_id_i)
+    )
+  end
+
+  it 'tags and excludes multiple filters in a field facet' do
+    session.search(Post) do
+      blog_filter = with(:blog_id, 1)
+      category_filter = with(:category_ids, 2)
+      facet(:blog_id, :exclude => [blog_filter, category_filter])
+    end
+    filter_tags = %w(blog_id_i:1 category_ids_im:2).map do |phrase|
+      get_filter_tag(phrase)
+    end.join(',')
+    connection.should have_last_search_with(
+      :"facet.field" => %W({!ex=#{filter_tags}}blog_id_i)
+    )
+  end
+
+  it 'does not tag a filter if it is not excluded' do
+    session.search(Post) do
+      with(:blog_id, 1)
+    end
+    connection.should have_last_search_including(:fq, "blog_id_i:1")
+  end
+
+  it 'names a field facet' do
+    session.search(Post) do
+      facet(:blog_id, :name => :blog)
+    end
+    connection.should have_last_search_including(:"facet.field", "{!key=blog}blog_id_i")
+  end
+
+  it 'uses the custom field facet name in facet option parameters' do
+    session.search(Post) do
+      facet(:blog_id, :name => :blog, :sort => :count)
+    end
+    connection.should have_last_search_with(:"f.blog.facet.sort" => 'true')
+  end
+
+  it 'raises an ArgumentError if exclusion attempted on a query facet' do
+    lambda do
+      session.search(Post) do
+        blog_filter = with(:blog_id, 1)
+        facet(:bad, :exclude => blog_filter) do
+          row(:bogus) { with(:blog_id, 1) }
+        end
+      end
+    end.should raise_error(ArgumentError)
+  end
+
+  it 'raises an ArgumentError if exclusion attempted on a restricted field facet' do
+    lambda do
+      session.search(Post) do
+        blog_filter = with(:blog_id, 1)
+        facet(:blog_id, :only => 1, :exclude => blog_filter)
+      end
+    end.should raise_error(ArgumentError)
+  end
+
+  it 'raises an ArgumentError if exclusion attempted on a facet with :extra' do
+    lambda do
+      session.search(Post) do
+        blog_filter = with(:blog_id, 1)
+        facet(:blog_id, :extra => :all, :exclude => blog_filter)
+      end
+    end.should raise_error(ArgumentError)
+  end
+
+  private
+
+  def get_filter_tag(boolean_query)
+    connection.searches.last[:fq].each do |fq|
+      if match = fq.match(/^\{!tag=(.+)\}#{Regexp.escape(boolean_query)}$/)
+        return match[1]
+      end
+    end
+    nil
+  end
+end

data/spec/api/query/local_spec.rb

@@ -1,62 +1,38 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe 'local query' do
-  it 'sets query type to geo when geo search performed' do
+  it 'sends lat and lng, and distance when geo search is performed' do
     session.search Post do
-      near [40.7, -73.5], 5
+      near [40.7, -73.5], :distance => 5
     end
-    connection.should have_last_search_with(:qt => 'geo')
+    connection.should have_last_search_with(:spatial => "{!radius=5}40.7,-73.5")
   end
 
-  it 'sets lat and lng when geo search is performed' do
+  it 'sets lat, lng, and sort flag when sorted geo search is performed' do
     session.search Post do
-      near [40.7, -73.5], 5
+      near [40.7, -73.5], :sort => true
     end
-    connection.should have_last_search_with(:lat => 40.7, :long => -73.5)
+    connection.should have_last_search_with(:spatial => "{!sort=true}40.7,-73.5")
   end
 
-  it 'sets radius when geo search is performed' do
+  it 'sets radius and sort when both are specified' do
     session.search Post do
-      near [40.7, -73.5], 5
+      near [40.7, -73.5], :distance => 5, :sort => true
     end
-    connection.should have_last_search_with(:radius => 5)
-  end
-
-  it 'puts all scope parameters into :q parameter when geo search is performed' do
-    session.search Post do
-      with :blog_id, 1
-      near [40.7, -73.5], 5
-    end
-    connection.should have_last_search_with(:q => '(type:Post AND blog_id_i:1)')
-  end
-
-  it 'raises error if keywords specified in local search' do
-    lambda do
-      session.search Post do
-        keywords 'fail'
-        near [40.7, -73.5], 5
-      end
-    end.should raise_error(Sunspot::IllegalSearchError)
+    connection.should have_last_search_with(:spatial => "{!radius=5 sort=true}40.7,-73.5")
   end
 
   [
     [:lat, :lng],
     [:lat, :lon],
-    [:lat, :long]
+    [:lat, :long],
+    [:latitude, :longitude]
   ].each do |lat_attr, lng_attr|
     it "sets coordinates using #{lat_attr.inspect}, #{lng_attr.inspect}" do
       session.search Post do
-        near OpenStruct.new(lat_attr => 40.7, lng_attr => -73.5), 5
+        near OpenStruct.new(lat_attr => 40.7, lng_attr => -73.5), :distance => 5
       end
-      connection.should have_last_search_with(:lat => 40.7, :long => -73.5)
+      connection.should have_last_search_with(:spatial => "{!radius=5}40.7,-73.5")
     end
   end
-
-  it 'raises ArgumentError if radius is less than 1' do
-    lambda do
-      session.search Post do
-        near [40, -70], 0.5
-      end
-    end.should raise_error(ArgumentError)
-  end
 end

data/spec/api/query/ordering_pagination_spec.rb

@@ -63,12 +63,6 @@ describe 'ordering and pagination' do
     connection.should have_last_search_with(:sort => 'score desc')
   end
 
-  it 'orders by geo distance' do
-    session.search Post do
-      order_by :distance, :asc
-    end
-  end
-
   it 'throws an ArgumentError if a bogus order direction is given' do
     lambda do
       session.search Post do

data/spec/api/search/dynamic_fields_spec.rb

@@ -2,14 +2,14 @@ require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe 'search with dynamic fields' do
   it 'returns dynamic string facet' do
-    stub_facet(:"custom_string:test_s", 'two' => 2, 'one' => 1)
+    stub_facet(:"custom_string:test_ss", 'two' => 2, 'one' => 1)
     result = session.search(Post) { dynamic(:custom_string) { facet(:test) }}
-    result.dynamic_facet(:custom_string, :test).rows.map { |row| row.value }.should == ['two', 'one']
+    result.facet(:custom_string, :test).rows.map { |row| row.value }.should == ['two', 'one']
   end
 
   it 'returns query facet specified in dynamic call' do
     stub_query_facet(
-      'custom_string\:test_s:(foo OR bar)' => 3
+      'custom_string\:test_ss:(foo OR bar)' => 3
     )
     search = session.search(Post) do
       dynamic :custom_string do