outoftime-sunspot 0.8.2 → 0.8.3

data/README.rdoc

@@ -152,6 +152,7 @@ http://outoftime.lighthouseapp.com/projects/20339-sunspot
 == Contributors
 
 Mat Brown (mat@patch.com)
+Peer Allan
 
 == License
 

data/TODO

@@ -1,6 +1,11 @@
 === 0.9 ===
+* Descriptive error messages during indexing
+* Date type
+* High-endian fields
+* Add omitNorms to typed fields
 * Instantiated facets!
 * Direct access to adapter
-* Facet by type (?)
+* sunspot-configure-solr
 * Switch to RSolr
+* Facet by type (?)
 * Query-based faceting (?)

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 8
-:patch: 2
+:patch: 3

data/lib/sunspot/indexer.rb

@@ -19,11 +19,7 @@ module Sunspot
     # model<Object>:: the model to index
     #
     def add(model)
-      hash = static_hash_for(model)
-      for field in @setup.all_fields
-        hash.merge!(field.pairs_for(model))
-      end
-      @connection.add(hash)
+      @connection.add(Array(model).map { |m| prepare(m) })
     end
 
     # 
@@ -42,6 +38,17 @@ module Sunspot
 
     protected
 
+    # 
+    # Convert documents into hash of indexed properties
+    #
+    def prepare(model)
+      hash = static_hash_for(model)
+      for field in @setup.all_fields
+        hash.merge!(field.pairs_for(model))
+      end
+      hash
+    end
+
     # 
     # All indexed documents index and store the +id+ and +type+ fields.
     # This method constructs the document hash containing those key-value
@@ -52,6 +59,7 @@ module Sunspot
         :type => Util.superclasses_for(model.class).map { |clazz| clazz.name }}
     end
 
+
     class <<self
       # 
       # Delete all documents from the Solr index

data/lib/sunspot/session.rb

@@ -44,11 +44,19 @@ module Sunspot
     #
     # See Sunspot.index
     #
+    #--
+    # FIXME The fact that we have to break this out by class and index each
+    #       class separately is artificial, imposed by the fact that indexers
+    #       are initialized with a particular setup, and are responsible for
+    #       sending add messages to Solr. It might be worth considering a
+    #       singleton indexer (per session) and have the indexer itself find
+    #       the appropriate setup to use for each object.
+    #
     def index(*objects)
       objects.flatten!
       @updates += objects.length
-      for object in objects
-        indexer_for(object).add(object)
+      objects.group_by { |object| object.class }.each_pair do |clazz, objs|
+        indexer_for(objs.first).add(objs)
       end
     end
 

data/spec/api/indexer_spec.rb

@@ -3,86 +3,101 @@ require File.join(File.dirname(__FILE__), 'spec_helper')
 describe 'indexer' do
   describe 'when indexing an object' do
     it 'should index id and type' do
-      connection.should_receive(:add).with(hash_including(:id => "Post #{post.id}", :type => ['Post', 'BaseClass']))
+      connection.should_receive(:add).with([hash_including(:id => "Post #{post.id}", :type => ['Post', 'BaseClass'])])
       session.index post
     end
 
+    it 'should index the array of objects supplied' do
+      posts = Array.new(2) { Post.new }
+      connection.should_receive(:add).with([hash_including(:id => "Post #{posts.first.id}", :type => ['Post', 'BaseClass']),
+                                            hash_including(:id => "Post #{posts.last.id}", :type => ['Post', 'BaseClass'])])
+      session.index posts
+    end
+
+    it 'should index an array containing more than one type of object' do
+      post1, comment, post2 = objects = [Post.new, Comment.new, Post.new]
+      connection.should_receive(:add).with([hash_including(:id => "Post #{post1.id}", :type => ['Post', 'BaseClass']),
+                                            hash_including(:id => "Post #{post2.id}", :type => ['Post', 'BaseClass'])])
+      connection.should_receive(:add).with([hash_including(:id => "Comment #{comment.id}", :type => ['Comment', 'BaseClass'])])
+      session.index objects
+    end
+
     it 'should index text' do
       post :title => 'A Title', :body => 'A Post'
-      connection.should_receive(:add).with(hash_including(:title_text => 'A Title', :body_text => 'A Post'))
+      connection.should_receive(:add).with([hash_including(:title_text => 'A Title', :body_text => 'A Post')])
       session.index post
     end
 
     it 'should index text via a virtual field' do
       post :title => 'backwards'
-      connection.should_receive(:add).with(hash_including(:backwards_title_text => 'backwards'.reverse))
-      session.index(post)
+      connection.should_receive(:add).with([hash_including(:backwards_title_text => 'backwards'.reverse)])
+      session.index post
     end
 
     it 'should correctly index a string attribute field' do
       post :title => 'A Title'
-      connection.should_receive(:add).with(hash_including(:title_s => 'A Title'))
+      connection.should_receive(:add).with([hash_including(:title_s => 'A Title')])
       session.index post
     end
 
     it 'should correctly index an integer attribute field' do
       post :blog_id => 4
-      connection.should_receive(:add).with(hash_including(:blog_id_i => '4'))
+      connection.should_receive(:add).with([hash_including(:blog_id_i => '4')])
       session.index post
     end
 
     it 'should correctly index a float attribute field' do
       post :ratings_average => 2.23
-      connection.should_receive(:add).with(hash_including(:average_rating_f => '2.23'))
+      connection.should_receive(:add).with([hash_including(:average_rating_f => '2.23')])
       session.index post
     end
 
     it 'should allow indexing by a multiple-value field' do
       post :category_ids => [3, 14]
-      connection.should_receive(:add).with(hash_including(:category_ids_im => ['3', '14']))
+      connection.should_receive(:add).with([hash_including(:category_ids_im => ['3', '14'])])
       session.index post
     end
 
     it 'should correctly index a time field' do
       post :published_at => Time.parse('1983-07-08 05:00:00 -0400')
-      connection.should_receive(:add).with(hash_including(:published_at_d => '1983-07-08T09:00:00Z'))
+      connection.should_receive(:add).with([hash_including(:published_at_d => '1983-07-08T09:00:00Z')])
       session.index post
     end
 
     it 'should correctly index a boolean field' do
       post :featured => true
-      connection.should_receive(:add).with(hash_including(:featured_b => 'true'))
+      connection.should_receive(:add).with([hash_including(:featured_b => 'true')])
       session.index post
     end
 
     it 'should correctly index a false boolean field' do
       post :featured => false
-      connection.should_receive(:add).with(hash_including(:featured_b => 'false'))
+      connection.should_receive(:add).with([hash_including(:featured_b => 'false')])
       session.index post
     end
 
     it 'should not index a nil boolean field' do
       post
-      connection.should_receive(:add).with(hash_not_including(:featured_b))
+      connection.should_receive(:add).with([hash_not_including(:featured_b)])
       session.index post
     end
 
     it 'should correctly index a virtual field' do
       post :title => 'The Blog Post'
-      connection.should_receive(:add).with(hash_including(:sort_title_s => 'blog post'))
+      connection.should_receive(:add).with([hash_including(:sort_title_s => 'blog post')])
       session.index post
     end
 
     it 'should correctly index an external virtual field' do
       post :category_ids => [1, 2, 3]
-      connection.should_receive(:add).with(hash_including(:primary_category_id_i => '1'))
+      connection.should_receive(:add).with([hash_including(:primary_category_id_i => '1')])
       session.index post
     end
 
     it 'should correctly index a field that is defined on a superclass' do
       Sunspot.setup(BaseClass) { string :author_name }
       post :author_name => 'Mat Brown'
-      connection.should_receive(:add).with(hash_including(:author_name_s => 'Mat Brown'))
+      connection.should_receive(:add).with([hash_including(:author_name_s => 'Mat Brown')])
       session.index post
     end
 
@@ -124,37 +139,37 @@ describe 'indexer' do
   describe 'dynamic fields' do
     it 'should index string data' do
       post(:custom_string => { :test => 'string' })
-      connection.should_receive(:add).with(hash_including(:"custom_string:test_s" => 'string'))
+      connection.should_receive(:add).with([hash_including(:"custom_string:test_s" => 'string')])
       session.index(post)
     end
 
     it 'should index integer data with virtual accessor' do
       post(:category_ids => [1, 2])
-      connection.should_receive(:add).with(hash_including(:"custom_integer:1_i" => '1', :"custom_integer:2_i" => '1'))
+      connection.should_receive(:add).with([hash_including(:"custom_integer:1_i" => '1', :"custom_integer:2_i" => '1')])
       session.index(post)
     end
 
     it 'should index float data' do
       post(:custom_fl => { :test => 1.5 })
-      connection.should_receive(:add).with(hash_including(:"custom_float:test_fm" => '1.5'))
+      connection.should_receive(:add).with([hash_including(:"custom_float:test_fm" => '1.5')])
       session.index(post)
     end
 
     it 'should index time data' do
       post(:custom_time => { :test => Time.parse('2009-05-18 18:05:00 -0400') })
-      connection.should_receive(:add).with(hash_including(:"custom_time:test_d" => '2009-05-18T22:05:00Z'))
+      connection.should_receive(:add).with([hash_including(:"custom_time:test_d" => '2009-05-18T22:05:00Z')])
       session.index(post)
     end
 
     it 'should index boolean data' do
       post(:custom_boolean => { :test => false })
-      connection.should_receive(:add).with(hash_including(:"custom_boolean:test_b" => 'false'))
+      connection.should_receive(:add).with([hash_including(:"custom_boolean:test_b" => 'false')])
       session.index(post)
     end
 
     it 'should index multiple values for a field' do
       post(:custom_fl => { :test => [1.0, 2.1, 3.2] })
-      connection.should_receive(:add).with(hash_including(:"custom_float:test_fm" => %w(1.0 2.1 3.2)))
+      connection.should_receive(:add).with([hash_including(:"custom_float:test_fm" => %w(1.0 2.1 3.2))])
       session.index(post)
     end
   end

data/spec/mocks/comment.rb

@@ -3,7 +3,7 @@ class Comment < BaseClass
   @@comments = [nil]
 
   attr_reader :id
-  attr_accessor :author_name, :published_at, :body
+  attr_accessor :author_name, :published_at, :body, :average_rating
 
   def initialize(attrs = {})
     @id = @@id += 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: outoftime-sunspot
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors: 
 - Mat Brown
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-27 00:00:00 -07:00
+date: 2009-06-03 00:00:00 -07:00
 default_executable: sunspot-solr
 dependencies: 
 - !ruby/object:Gem::Dependency