sunspot 0.9.8 → 0.10.0

data/spec/api/indexer/fixed_fields_spec.rb

@@ -0,0 +1,57 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe 'indexing fixed fields', :type => :indexer do
+  it 'should index id' do
+    session.index post
+    connection.should have_add_with(:id => "Post #{post.id}")
+  end
+
+  it 'should index type' do
+    session.index post
+    connection.should have_add_with(:type => ['Post', 'SuperClass', 'MockRecord'])
+  end
+
+  it 'should index class name' do
+    session.index post
+    connection.should have_add_with(:class_name => 'Post')
+  end
+
+  it 'should index the array of objects supplied' do
+    posts = Array.new(2) { Post.new }
+    session.index posts
+    connection.should have_add_with(
+      { :id => "Post #{posts.first.id}" },
+      { :id => "Post #{posts.last.id}" }
+    )
+  end
+
+  it 'should index an array containing more than one type of object' do
+    post1, comment, post2 = objects = [Post.new, Namespaced::Comment.new, Post.new]
+    session.index objects
+    connection.should have_add_with(
+      { :id => "Post #{post1.id}", :type => ['Post', 'SuperClass', 'MockRecord'] },
+      { :id => "Namespaced::Comment #{comment.id}", :type => ['Namespaced::Comment', 'MockRecord'] },
+      { :id => "Post #{post2.id}", :type => ['Post', 'SuperClass', 'MockRecord'] }
+    )
+  end
+
+  it 'commits immediately after index! called' do
+    connection.should_receive(:add).ordered
+    connection.should_receive(:commit).ordered
+    session.index!(post)
+  end
+
+  it 'raises an ArgumentError if an attempt is made to index an object that has no configuration' do
+    lambda { session.index(Blog.new) }.should raise_error(Sunspot::NoSetupError)
+  end
+
+  it 'raises a NoAdapterError if class without adapter is indexed' do
+    lambda { session.index(User.new) }.should raise_error(Sunspot::NoAdapterError)
+  end
+
+  it 'raises an ArgumentError if a non-word character is included in the field name' do
+    lambda do
+      Sunspot.setup(Post) { string :"bad name" }
+    end.should raise_error(ArgumentError)
+  end
+end

data/spec/api/indexer/fulltext_spec.rb

@@ -0,0 +1,43 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe 'indexing fulltext fields' do
+  it 'indexes text field' do
+    session.index(post(:title => 'A Title'))
+    connection.should have_add_with(:title_text => 'A Title')
+  end
+
+  it 'indexes stored text field' do
+    session.index(post(:body => 'Test body'))
+    connection.should have_add_with(:body_texts => 'Test body')
+  end
+
+  it 'indexes text field with boost' do
+    session.index(post(:title => 'A Title'))
+    connection.adds.last.first.field_by_name(:title_text).attrs[:boost].should == 2
+  end
+
+  it 'indexes multiple values for a text field' do
+    session.index(post(:body => %w(some title)))
+    connection.should have_add_with(:body_texts => %w(some title))
+  end
+
+  it 'indexes text via a block accessor' do
+    session.index(post(:title => 'backwards'))
+    connection.should have_add_with(:backwards_title_text => 'sdrawkcab')
+  end
+
+  it 'indexes document level boost using block' do
+    session.index(post(:ratings_average => 4.0))
+    connection.adds.last.first.attrs[:boost].should == 1.25
+  end
+
+  it 'indexes document level boost using attribute' do
+    session.index(Namespaced::Comment.new(:boost => 1.5))
+    connection.adds.last.first.attrs[:boost].should == 1.5
+  end
+
+  it 'indexes document level boost defined statically' do
+    session.index(Photo.new)
+    connection.adds.last.first.attrs[:boost].should == 0.75
+  end
+end

data/spec/api/indexer/removal_spec.rb

@@ -0,0 +1,46 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe 'document removal', :type => :indexer do
+  it 'removes an object from the index' do
+    session.remove(post)
+    connection.should have_delete("Post #{post.id}")
+  end
+
+  it 'removes an object by type and id' do
+    session.remove_by_id(Post, 1)
+    connection.should have_delete('Post 1')
+  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(:commit).ordered
+    session.remove_by_id!(Post, 1)
+  end
+
+  it 'removes an object from the index and immediately commits' do
+    connection.should_receive(:delete_by_id).ordered
+    connection.should_receive(:commit).ordered
+    session.remove!(post)
+  end
+
+  it 'removes everything from the index' do
+    session.remove_all
+    connection.should have_delete_by_query("type:[* TO *]")
+  end
+
+  it 'removes everything from the index and immediately commits' do
+    connection.should_receive(:delete_by_query).ordered
+    connection.should_receive(:commit).ordered
+    session.remove_all!
+  end
+
+  it 'removes everything of a given class from the index' do
+    session.remove_all(Post)
+    connection.should have_delete_by_query("type:Post")
+  end
+
+  it 'correctly escapes namespaced classes when removing everything from the index' do
+    connection.should_receive(:delete_by_query).with('type:Namespaced\:\:Comment')
+    session.remove_all(Namespaced::Comment)
+  end
+end

data/spec/api/indexer/spec_helper.rb

@@ -0,0 +1 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))

data/spec/api/indexer_spec.rb

@@ -1,311 +1,4 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
-describe 'indexer' do
-  describe 'when indexing an object' do
-    it 'should index id' do
-      session.index post
-      connection.should have_add_with(:id => "Post #{post.id}")
-    end
-
-    it 'should index type' do
-      session.index post
-      connection.should have_add_with(:type => ['Post', 'MockRecord'])
-    end
-
-    it 'should index class name' do
-      session.index post
-      connection.should have_add_with(:class_name => 'Post')
-    end
-
-    it 'should index the array of objects supplied' do
-      posts = Array.new(2) { Post.new }
-      session.index posts
-      connection.should have_add_with(
-        { :id => "Post #{posts.first.id}" },
-        { :id => "Post #{posts.last.id}" }
-      )
-    end
-
-    it 'should index an array containing more than one type of object' do
-      post1, comment, post2 = objects = [Post.new, Namespaced::Comment.new, Post.new]
-      session.index objects
-      connection.should have_add_with(
-        { :id => "Post #{post1.id}", :type => ['Post', 'MockRecord'] },
-        { :id => "Post #{post2.id}", :type => ['Post', 'MockRecord'] }
-      )
-      connection.should have_add_with(:id => "Namespaced::Comment #{comment.id}", :type => ['Namespaced::Comment', 'MockRecord'])
-    end
-
-    it 'should index text' do
-      session.index(post(:title => 'A Title', :body => 'A Post'))
-      connection.should have_add_with(:title_text => 'A Title', :body_text => 'A Post')
-    end
-
-    it 'should index text with boost' do
-      session.index(post(:title => 'A Title'))
-      connection.adds.last.first.field_by_name(:title_text).attrs[:boost].should == 2
-    end
-
-    it 'should index multiple values for a text field' do
-      session.index(post(:body => %w(some title)))
-      connection.should have_add_with(:body_text => %w(some title))
-    end
-
-    it 'should index text via a virtual field' do
-      session.index(post(:title => 'backwards'))
-      connection.should have_add_with(:backwards_title_text => 'backwards'.reverse)
-    end
-
-    it 'should correctly index a stored string attribute field' do
-      session.index(post(:title => 'A Title'))
-      connection.should have_add_with(:title_ss => 'A Title')
-    end
-
-    it 'should correctly index an integer attribute field' do
-      session.index(post(:blog_id => 4))
-      connection.should have_add_with(:blog_id_i => '4')
-    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 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'])
-    end
-
-    it 'should correctly index a time field' do
-      session.index(
-        post(:published_at => Time.parse('1983-07-08 05:00:00 -0400'))
-      )
-      connection.should have_add_with(:published_at_d => '1983-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')
-    end
-
-    it 'should correctly index a boolean field' do
-      session.index(post(:featured => true))
-      connection.should have_add_with(:featured_b => 'true')
-    end
-
-    it 'should correctly index a false boolean field' do
-      session.index(post(:featured => false))
-      connection.should have_add_with(:featured_b => 'false')
-    end
-
-    it 'should not index a nil boolean field' do
-      session.index(post)
-      connection.should_not have_add_with(:featured_b)
-    end
-
-    it 'should correctly index a virtual field' do
-      session.index(post(:title => 'The Blog Post'))
-      connection.should have_add_with(:sort_title_s => 'blog post')
-    end
-
-    it 'should correctly index an external virtual field' do
-      session.index(post(:category_ids => [1, 2, 3]))
-      connection.should have_add_with(:primary_category_id_i => '1')
-    end
-
-    it 'should correctly index a field that is defined on a superclass' do
-      Sunspot.setup(MockRecord) { string :author_name }
-      session.index(post(:author_name => 'Mat Brown'))
-      connection.should have_add_with(:author_name_s => 'Mat Brown')
-    end
-
-    it 'should commit immediately after index! called' do
-      connection.should_receive(:add).ordered
-      connection.should_receive(:commit).ordered
-      session.index!(post)
-    end
-
-    it 'should remove an object from the index' do
-      session.remove(post)
-      connection.should have_delete("Post #{post.id}")
-    end
-
-    it 'should remove an object by type and id' do
-      session.remove_by_id(Post, 1)
-      connection.should have_delete('Post 1')
-    end
-
-    it 'should remove an object by type and id and immediately commit' do
-      connection.should_receive(:delete_by_id).with('Post 1').ordered
-      connection.should_receive(:commit).ordered
-      session.remove_by_id!(Post, 1)
-    end
-
-    it 'should remove an object from the index and immediately commit' do
-      connection.should_receive(:delete_by_id).ordered
-      connection.should_receive(:commit).ordered
-      session.remove!(post)
-    end
-
-    it 'should remove everything from the index' do
-      session.remove_all
-      connection.should have_delete_by_query("type:[* TO *]")
-    end
-
-    it 'should remove everything from the index and immediately commit' do
-      connection.should_receive(:delete_by_query).ordered
-      connection.should_receive(:commit).ordered
-      session.remove_all!
-    end
-
-    it 'should be able to remove everything of a given class from the index' do
-      session.remove_all(Post)
-      connection.should have_delete_by_query("type:Post")
-    end
-
-    it 'should correctly escape namespaced classes when removing everything from the index' do
-      connection.should_receive(:delete_by_query).with('type:Namespaced\:\:Comment')
-      session.remove_all(Namespaced::Comment)
-    end
-  end
-
-  describe 'batches' do
-    it 'should send all batched adds in a single request' do
-      posts = Array.new(2) { Post.new }
-      session.batch do
-        for post in posts
-          session.index(post)
-        end
-      end
-      connection.adds.length.should == 1
-    end
-
-    it 'should add all batched adds' do
-      posts = Array.new(2) { Post.new }
-      session.batch do
-        for post in posts
-          session.index(post)
-        end
-      end
-      add = connection.adds.last
-      connection.adds.first.map { |add| add.field_by_name(:id).value }.should ==
-        posts.map { |post| "Post #{post.id}" }
-    end
-
-    it 'should not index changes to models that happen after index call' do
-      post = Post.new
-      session.batch do
-        session.index(post)
-        post.title = 'Title'
-      end
-      connection.adds.first.first.field_by_name(:title_ss).should be_nil
-    end
-  end
-
-  describe 'dynamic fields' do
-    it 'should index string data' do
-      session.index(post(:custom_string => { :test => 'string' }))
-      connection.should have_add_with(:"custom_string:test_s" => 'string')
-    end
-
-    it 'should index integer data with virtual accessor' do
-      session.index(post(:category_ids => [1, 2]))
-      connection.should have_add_with(:"custom_integer:1_i" => '1', :"custom_integer:2_i" => '1')
-    end
-
-    it 'should index float data' do
-      session.index(post(:custom_fl => { :test => 1.5 }))
-      connection.should have_add_with(:"custom_float:test_fm" => '1.5')
-    end
-
-    it 'should index time data' do
-      session.index(post(:custom_time => { :test => Time.parse('2009-05-18 18:05:00 -0400') }))
-      connection.should have_add_with(:"custom_time:test_d" => '2009-05-18T22:05:00Z')
-    end
-
-    it 'should index boolean data' do
-      session.index(post(:custom_boolean => { :test => false }))
-      connection.should have_add_with(:"custom_boolean:test_b" => 'false')
-    end
-
-    it 'should index multiple values for a field' 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
-  end
-
-  it 'should index document level boost using block' do
-    session.index(post(:ratings_average => 4.0))
-    connection.adds.last.first.attrs[:boost].should == 1.25
-  end
-
-  it 'should index document level boost using attribute' do
-    session.index(Namespaced::Comment.new(:boost => 1.5))
-    connection.adds.last.first.attrs[:boost].should == 1.5
-  end
-
-  it 'should index document level boost defined statically' do
-    session.index(Photo.new)
-    connection.adds.last.first.attrs[:boost].should == 0.75
-  end
-
-  it 'should throw a NoMethodError only if a nonexistent type is defined' do
-    lambda { Sunspot.setup(Post) { string :author_name }}.should_not raise_error
-    lambda { Sunspot.setup(Post) { bogus :journey }}.should raise_error(NoMethodError)
-  end
-
-  it 'should throw a NoMethodError if a nonexistent field argument is passed' do
-    lambda { Sunspot.setup(Post) { string :author_name, :bogus => :argument }}.should raise_error(ArgumentError)
-  end
-
-  it 'should throw an ArgumentError if an attempt is made to index an object that has no configuration' do
-    lambda { session.index(Blog.new) }.should raise_error(Sunspot::NoSetupError)
-  end
-
-  it 'should throw an ArgumentError if single-value field tries to index multiple values' do
-    lambda do
-      Sunspot.setup(Post) { string :author_name }
-      session.index(post(:author_name => ['Mat Brown', 'Matthew Brown']))
-    end.should raise_error(ArgumentError)
-  end
-
-  it 'should throw a NoAdapterError if class without adapter is indexed' do
-    lambda { session.index(User.new) }.should raise_error(Sunspot::NoAdapterError)
-  end
-
-  it 'should throw an ArgumentError if a non-word character is included in the field name' do
-    lambda do
-      Sunspot.setup(Post) { string :"bad name" }
-    end.should raise_error(ArgumentError)
-  end
-
-  private
-
-  def config
-    Sunspot::Configuration.build
-  end
-
-  def connection
-    @connection ||= Mock::Connection.new
-  end
-
-  def session
-    @session ||= Sunspot::Session.new(config, connection)
-  end
-
-  def post(attrs = {})
-    @post ||= Post.new(attrs)
-  end
-
-  def last_add
-    @connection.adds.last
-  end
-
-  def value_in_last_document_for(field_name)
-    @connection.adds.last.last.field_by_name(field_name).value
-  end
-
-  def values_in_last_document_for(field_name)
-    @connection.adds.last.last.fields_by_name(field_name).map { |field| field.value }
-  end
+describe 'indexer', :type => :indexer do
 end

data/spec/api/query/connectives_spec.rb

@@ -0,0 +1,162 @@
+describe 'connective in scope', :type => :query do
+  it 'creates a disjunction between two restrictions' do
+    session.search Post do
+      any_of do
+        with :category_ids, 1
+        with :blog_id, 2
+      end
+    end
+    connection.should have_last_search_including(
+      :fq, '(category_ids_im:1 OR blog_id_i:2)'
+    )
+  end
+
+  it 'creates a conjunction inside of a disjunction' do
+    session.search Post do
+      any_of do
+        with :blog_id, 2
+        all_of do
+          with :category_ids, 1
+          with(:average_rating).greater_than(3.0)
+        end
+      end
+    end
+    connection.should have_last_search_including(
+      :fq,
+      '(blog_id_i:2 OR (category_ids_im:1 AND average_rating_f:[3\.0 TO *]))'
+    )
+  end
+
+  it 'creates a disjunction with nested conjunction with negated restrictions' do
+    session.search Post do
+      any_of do
+        with :category_ids, 1
+        all_of do
+          without(:average_rating).greater_than(3.0)
+          with(:blog_id, 1)
+        end
+      end
+    end
+    connection.should have_last_search_including(
+      :fq, '(category_ids_im:1 OR (-average_rating_f:[3\.0 TO *] AND blog_id_i:1))'
+    )
+  end
+
+  it 'does nothing special if #all_of called from the top level' do
+    session.search Post do
+      all_of do
+        with :blog_id, 2
+        with :category_ids, 1
+      end
+    end
+    connection.should have_last_search_including(
+      :fq, 'blog_id_i:2', 'category_ids_im:1'
+    )
+  end
+
+  it 'creates a disjunction with negated restrictions' do
+    session.search Post do
+      any_of do
+        with :category_ids, 1
+        without(:average_rating).greater_than(3.0)
+      end
+    end
+    connection.should have_last_search_including(
+      :fq, '-(-category_ids_im:1 AND average_rating_f:[3\.0 TO *])'
+    )
+  end
+
+  it 'creates a disjunction with a negated restriction and a nested disjunction in a conjunction with a negated restriction' do
+    session.search(Post) do
+      any_of do
+        without(:title, 'Yes')
+        all_of do
+          with(:blog_id, 1)
+          any_of do
+            with(:category_ids, 4)
+            without(:average_rating, 2.0)
+          end
+        end
+      end
+    end
+    connection.should have_last_search_including(
+      :fq, '-(title_ss:Yes AND -(blog_id_i:1 AND -(-category_ids_im:4 AND average_rating_f:2\.0)))'
+    )
+  end
+  it 'creates a disjunction with nested conjunction with nested disjunction with negated restriction' do
+    session.search(Post) do
+      any_of do
+        with(:title, 'Yes')
+        all_of do
+          with(:blog_id, 1)
+          any_of do
+            with(:category_ids, 4)
+            without(:average_rating, 2.0)
+          end
+        end
+      end
+    end
+    connection.should have_last_search_including(
+      :fq, '(title_ss:Yes OR (blog_id_i:1 AND -(-category_ids_im:4 AND average_rating_f:2\.0)))'
+    )
+  end
+
+  #
+  # This is important because if a disjunction could be nested in another
+  # disjunction, then the inner disjunction could denormalize (and thus
+  # become negated) after the outer disjunction denormalized (checking to
+  # see if the inner one is negated). Since conjunctions never need to
+  # denormalize, if a disjunction can only contain conjunctions or restrictions,
+  # we can guarantee that the negation state of a disjunction's components will
+  # not change when #to_params is called on them.
+  #
+  # Since disjunction is associative, this behavior has no effect on the actual
+  # logical semantics of the disjunction.
+  #
+  it 'creates a single disjunction when disjunctions nested' do
+    session.search(Post) do
+      any_of do
+        with(:title, 'Yes')
+        any_of do
+          with(:blog_id, 1)
+          with(:category_ids, 4)
+        end
+      end
+    end
+    connection.should have_last_search_including(
+      :fq, '(title_ss:Yes OR blog_id_i:1 OR category_ids_im:4)'
+    )
+  end
+
+  it 'creates a disjunction with instance exclusion' do
+    post = Post.new
+    session.search Post do
+      any_of do
+        without(post)
+        with(:category_ids, 1)
+      end
+    end
+    connection.should have_last_search_including(
+      :fq, "-(id:Post\\ #{post.id} AND -category_ids_im:1)"
+    )
+  end
+
+  it 'creates a disjunction with empty restriction' do
+    session.search Post do
+      any_of do
+        with(:average_rating, nil)
+        with(:average_rating).greater_than(3.0)
+      end
+    end
+    connection.should have_last_search_including(
+      :fq, '-(average_rating_f:[* TO *] AND -average_rating_f:[3\.0 TO *])'
+    )
+  end
+
+  it 'should ignore empty connectives' do
+    session.search Post do
+      any_of {}
+    end
+    connection.should_not have_last_search_including(:fq, '')
+  end
+end

data/spec/api/query/dsl_spec.rb

@@ -0,0 +1,12 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe 'query DSL', :type => :query do
+  it 'should allow building search using block argument rather than instance_eval' do
+    @blog_id = 1
+    session.search Post do |query|
+      query.with(:blog_id, @blog_id)
+    end
+    connection.should have_last_search_including(:fq, 'blog_id_i:1')
+  end
+end
+