thinking-sphinx 1.3.6 → 1.3.7

data/VERSION

@@ -1 +1 @@
-1.3.6
+1.3.7

data/features/facets.feature

@@ -74,3 +74,9 @@ Feature: Search and browse models by their defined facets
     Then the Tags facet should have an "Australia" key
     Then the Tags facet should have an "Melbourne" key
     Then the Tags facet should have an "Victoria" key
+
+  Scenario: Requesting MVA facets from source queries
+    Given Sphinx is running
+    And I am searching on posts
+    When I am requesting facet results
+    Then the Comment Ids facet should have 9 keys

data/features/facets_across_model.feature

@@ -5,7 +5,7 @@ Feature: Search and browse across models by their defined facets
     When I am requesting facet results
     And I want all possible attributes
     Then I should have valid facet results
-    And I should have 10 facets
+    And I should have 11 facets
     And I should have the facet Class
     And the Class facet should have a "Person" key
     And I should have the facet Gender
@@ -19,7 +19,7 @@ Feature: Search and browse across models by their defined facets
     When I am requesting facet results
     And I want all possible attributes
     And I don't want classes included
-    Then I should have 9 facets
+    Then I should have 10 facets
     And I should not have the facet Class
   
   Scenario: Requesting facets common to all indexed models

data/features/step_definitions/facet_steps.rb

@@ -87,6 +87,10 @@ Then /^the ([\w_\s]+) facet should have an? (\d+\.?\d*) key$/ do |name, key|
   results[facet_name(name)].keys.should include(key)
 end
 
+Then /^the ([\w\s]+) facet should have (\d+) keys$/ do |name, count|
+  results[facet_name(name)].keys.length.should == count.to_i
+end
+
 def facet_name(string)
   string.gsub(/\s/, '').underscore.to_sym
 end

data/features/sti_searching.feature

@@ -12,3 +12,8 @@ Feature: Searching via STI model relationships
     Given Sphinx is running
     And I am searching on cats
     Then I should get as many results as there are cats
+
+  Scenario: Searching across super and subclass indexes
+    Given Sphinx is running
+    When I search for "fantastic"
+    Then I should get 1 result

data/features/support/db/fixtures/foxes.rb

@@ -0,0 +1,3 @@
+%w( fantastic ).each do |name|
+  Fox.create :name => name
+end

data/features/support/models/comment.rb

@@ -1,10 +1,10 @@
 class Comment < ActiveRecord::Base
-  belongs_to :post
-  belongs_to :category
-  
   define_index do 
     indexes :content
     
     has category.name, :facet => true, :as => :category_name, :type => :string
   end
+  
+  belongs_to :post
+  belongs_to :category
 end

data/features/support/models/fox.rb

@@ -0,0 +1,5 @@
+class Fox < Animal
+  define_index do
+    indexes :name
+  end
+end

data/features/support/models/post.rb

@@ -12,7 +12,8 @@ class Post < ActiveRecord::Base
     indexes comments.content, :as => :comments
     indexes authors.name, :as => :authors
     
-    has comments(:id), :as => :comment_ids, :source => :ranged_query
+    has comments(:id), :as => :comment_ids, :source => :ranged_query,
+      :facet => true
     has category.name, :facet => true, :as => :category_name, :type => :string
     has 'COUNT(DISTINCT comments.id)', :as => :comments_count, :type => :integer
     has comments.created_at, :as => :comments_created_at

data/lib/thinking_sphinx.rb

@@ -10,6 +10,7 @@ require 'thinking_sphinx/active_record'
 require 'thinking_sphinx/association'
 require 'thinking_sphinx/attribute'
 require 'thinking_sphinx/configuration'
+require 'thinking_sphinx/context'
 require 'thinking_sphinx/excerpter'
 require 'thinking_sphinx/facet'
 require 'thinking_sphinx/class_facet'
@@ -60,12 +61,17 @@ module ThinkingSphinx
   # The collection of indexed models. Keep in mind that Rails lazily loads
   # its classes, so this may not actually be populated with _all_ the models
   # that have Sphinx indexes.
-  def self.indexed_models
-    Thread.current[:thinking_sphinx_indexed_models] ||= []
+  def self.context
+    if Thread.current[:thinking_sphinx_context].nil?
+      Thread.current[:thinking_sphinx_context] = ThinkingSphinx::Context.new
+      Thread.current[:thinking_sphinx_context].prepare
+    end
+    
+    Thread.current[:thinking_sphinx_context]
   end
 
   def self.unique_id_expression(offset = nil)
-    "* #{indexed_models.size} + #{offset || 0}"
+    "* #{context.indexed_models.size} + #{offset || 0}"
   end
 
   # Check if index definition is disabled.

data/lib/thinking_sphinx/active_record.rb

@@ -16,6 +16,8 @@ module ThinkingSphinx
         extend ThinkingSphinx::ActiveRecord::ClassMethods
         
         class << self
+          attr_accessor :sphinx_index_blocks
+          
           def set_sphinx_primary_key(attribute)
             @sphinx_primary_key_attribute = attribute
           end
@@ -53,6 +55,14 @@ module ThinkingSphinx
           
           private
           
+          def defined_indexes?
+            @defined_indexes
+          end
+          
+          def defined_indexes=(value)
+            @defined_indexes = value
+          end
+          
           def sphinx_delta?
             self.sphinx_indexes.any? { |index| index.delta? }
           end
@@ -118,21 +128,37 @@ module ThinkingSphinx
       # at ThinkingSphinx::Index::Builder.
       # 
       def define_index(name = nil, &block)
-        return unless ThinkingSphinx.define_indexes?
-        
-        self.sphinx_indexes ||= []
-        self.sphinx_facets  ||= []
+        self.sphinx_index_blocks ||= []
+        self.sphinx_indexes      ||= []
+        self.sphinx_facets       ||= []
         
-        index = ThinkingSphinx::Index::Builder.generate self, name, &block
+        ThinkingSphinx.context.add_indexed_model self
         
-        unless ThinkingSphinx.indexed_models.include?(self.name)
-          ThinkingSphinx.indexed_models << self.name
+        if sphinx_index_blocks.empty?
+          before_validation :define_indexes
+          before_destroy    :define_indexes
         end
         
-        add_sphinx_callbacks_and_extend(index.delta?)
-        self.sphinx_indexes << index
+        self.sphinx_index_blocks << lambda {
+          index = ThinkingSphinx::Index::Builder.generate self, name, &block
+          add_sphinx_callbacks_and_extend(index.delta?)
+          add_sphinx_index index
+        }
+        
+        include ThinkingSphinx::ActiveRecord::Scopes
+        include ThinkingSphinx::SearchMethods
+      end
+      
+      def define_indexes
+        return if sphinx_index_blocks.nil? ||
+          defined_indexes?                 ||
+          !ThinkingSphinx.define_indexes?
+        
+        sphinx_index_blocks.each do |block|
+          block.call
+        end
         
-        index
+        self.defined_indexes = true
         
         # We want to make sure that if the database doesn't exist, then Thinking
         # Sphinx doesn't mind when running non-TS tasks (like db:create, db:drop
@@ -146,6 +172,11 @@ module ThinkingSphinx
         end
       end
       
+      def add_sphinx_index(index)
+        self.sphinx_indexes << index
+        subclasses.each { |klass| klass.add_sphinx_index(index) }
+      end
+      
       def indexed_by_sphinx?
         sphinx_indexes && sphinx_indexes.length > 0
       end
@@ -155,26 +186,31 @@ module ThinkingSphinx
       end
       
       def sphinx_index_names
+        define_indexes
         sphinx_indexes.collect(&:all_names).flatten
       end
       
       def core_index_names
+        define_indexes
         sphinx_indexes.collect(&:core_name)
       end
       
       def delta_index_names
+        define_indexes
         sphinx_indexes.select(&:delta?).collect(&:delta_name)
       end
       
-      def to_riddle(offset)
+      def to_riddle
+        define_indexes
         sphinx_database_adapter.setup
         
         local_sphinx_indexes.collect { |index|
-          index.to_riddle(offset)
+          index.to_riddle(sphinx_offset)
         }.flatten
       end
       
       def source_of_sphinx_index
+        define_indexes
         possible_models = self.sphinx_indexes.collect { |index| index.model }
         return self if possible_models.include?(self)
 
@@ -195,8 +231,13 @@ module ThinkingSphinx
         )
       end
       
-      private
+      def sphinx_offset
+        ThinkingSphinx.context.superclass_indexed_models.
+          index eldest_indexed_ancestor
+      end
       
+      private
+            
       def local_sphinx_indexes
         sphinx_indexes.select { |index|
           index.model == self
@@ -206,10 +247,8 @@ module ThinkingSphinx
       def add_sphinx_callbacks_and_extend(delta = false)
         unless indexed_by_sphinx?
           after_destroy :toggle_deleted
-      
-          include ThinkingSphinx::SearchMethods
+          
           include ThinkingSphinx::ActiveRecord::AttributeUpdates
-          include ThinkingSphinx::ActiveRecord::Scopes
         end
         
         if delta && !delta_indexed_by_sphinx?
@@ -219,6 +258,12 @@ module ThinkingSphinx
           after_commit  :index_delta
         end
       end
+      
+      def eldest_indexed_ancestor
+        ancestors.reverse.detect { |ancestor|
+          ThinkingSphinx.context.indexed_models.include?(ancestor.name)
+        }.name
+      end
     end
     
     def in_index?(suffix)
@@ -262,8 +307,8 @@ module ThinkingSphinx
     end
     
     def sphinx_document_id
-      primary_key_for_sphinx * ThinkingSphinx.indexed_models.size +
-        ThinkingSphinx.indexed_models.index(self.class.source_of_sphinx_index.name)
+      primary_key_for_sphinx * ThinkingSphinx.context.indexed_models.size +
+        self.class.sphinx_offset
     end
 
     private
@@ -271,5 +316,9 @@ module ThinkingSphinx
     def sphinx_index_name(suffix)
       "#{self.class.source_of_sphinx_index.name.underscore.tr(':/\\', '_')}_#{suffix}"
     end
+    
+    def define_indexes
+      self.class.define_indexes
+    end
   end
 end

data/lib/thinking_sphinx/configuration.rb

@@ -54,8 +54,8 @@ module ThinkingSphinx
       sql_query_killlist sql_ranged_throttle sql_query_post_index unpack_zlib
       unpack_mysqlcompress unpack_mysqlcompress_maxsize )
     
-    IndexOptions  = %w( charset_table charset_type docinfo enable_star
-      exceptions html_index_attrs html_remove_elements html_strip
+    IndexOptions  = %w( charset_table charset_type charset_dictpath docinfo
+      enable_star exceptions html_index_attrs html_remove_elements html_strip
       index_exact_words ignore_chars inplace_docinfo_gap inplace_enable
       inplace_hit_gap inplace_reloc_factor inplace_write_factor min_infix_len
       min_prefix_len min_stemming_len min_word_len mlock morphology ngram_chars
@@ -142,13 +142,14 @@ module ThinkingSphinx
     # indexer and searchd configuration, and sources and indexes details.
     #
     def build(file_path=nil)
-      load_models
       file_path ||= "#{self.config_file}"
       
       @configuration.indexes.clear
       
-      ThinkingSphinx.indexed_models.each_with_index do |model, model_index|
-        @configuration.indexes.concat model.constantize.to_riddle(model_index)
+      ThinkingSphinx.context.indexed_models.each do |model|
+        model = model.constantize
+        model.define_indexes
+        @configuration.indexes.concat model.to_riddle
       end
       
       open(file_path, "w") do |file|
@@ -156,37 +157,6 @@ module ThinkingSphinx
       end
     end
     
-    # Make sure all models are loaded - without reloading any that
-    # ActiveRecord::Base is already aware of (otherwise we start to hit some
-    # messy dependencies issues).
-    # 
-    def load_models
-      return if defined?(Rails) &&
-        Rails::VERSION::STRING.to_f > 2.1 &&
-        Rails.configuration.cache_classes
-      
-      self.model_directories.each do |base|
-        Dir["#{base}**/*.rb"].each do |file|
-          model_name = file.gsub(/^#{base}([\w_\/\\]+)\.rb/, '\1')
-        
-          next if model_name.nil?
-          next if ::ActiveRecord::Base.send(:subclasses).detect { |model|
-            model.name == model_name
-          }
-        
-          begin
-            model_name.camelize.constantize
-          rescue LoadError
-            model_name.gsub!(/.*[\/\\]/, '').nil? ? next : retry
-          rescue NameError
-            next
-          rescue StandardError
-            puts "Warning: Error loading #{file}"
-          end
-        end
-      end
-    end
-    
     def address
       @configuration.searchd.address
     end
@@ -235,7 +205,7 @@ module ThinkingSphinx
     
     def models_by_crc
       @models_by_crc ||= begin
-        ThinkingSphinx.indexed_models.inject({}) do |hash, model|
+        ThinkingSphinx.context.indexed_models.inject({}) do |hash, model|
           hash[model.constantize.to_crc32] = model
           Object.subclasses_of(model.constantize).each { |subclass|
             hash[subclass.to_crc32] = subclass.name

data/lib/thinking_sphinx/context.rb

@@ -0,0 +1,65 @@
+class ThinkingSphinx::Context
+  attr_reader :indexed_models
+  
+  def initialize
+    @indexed_models = []
+  end
+  
+  def prepare
+    load_models
+  end
+  
+  def define_indexes
+    indexed_models.each { |model|
+      model.constantize.define_indexes
+    }
+  end
+  
+  def add_indexed_model(model)
+    model = model.name if model.is_a?(Class)
+    
+    indexed_models << model
+    indexed_models.uniq!
+    indexed_models.sort!
+  end
+  
+  def superclass_indexed_models
+    klasses = indexed_models.collect { |name| name.constantize }
+    klasses.reject { |klass|
+      klass.superclass.ancestors.any? { |ancestor| klasses.include?(ancestor) }
+    }.collect { |klass| klass.name }
+  end
+  
+  private
+  
+  # Make sure all models are loaded - without reloading any that
+  # ActiveRecord::Base is already aware of (otherwise we start to hit some
+  # messy dependencies issues).
+  #
+  def load_models
+    return if defined?(Rails) &&
+      Rails::VERSION::STRING.to_f > 2.1 &&
+      Rails.configuration.cache_classes
+    
+    ThinkingSphinx::Configuration.instance.model_directories.each do |base|
+      Dir["#{base}**/*.rb"].each do |file|
+        model_name = file.gsub(/^#{base}([\w_\/\\]+)\.rb/, '\1')
+      
+        next if model_name.nil?
+        next if ::ActiveRecord::Base.send(:subclasses).detect { |model|
+          model.name == model_name
+        }
+      
+        begin
+          model_name.camelize.constantize
+        rescue LoadError
+          model_name.gsub!(/.*[\/\\]/, '').nil? ? next : retry
+        rescue NameError
+          next
+        rescue StandardError
+          STDERR.puts "Warning: Error loading #{file}"
+        end
+      end
+    end
+  end
+end

data/lib/thinking_sphinx/facet_search.rb

@@ -3,6 +3,8 @@ module ThinkingSphinx
     attr_accessor :args, :options
     
     def initialize(*args)
+      ThinkingSphinx.context.define_indexes
+      
       @options      = args.extract_options!
       @args         = args
       
@@ -64,7 +66,7 @@ module ThinkingSphinx
     
     def facet_classes
       (
-        options[:classes] || ThinkingSphinx.indexed_models.collect { |model|
+        options[:classes] || ThinkingSphinx.context.indexed_models.collect { |model|
           model.constantize
         }
       ).select { |klass| klass.sphinx_facets.any? }

data/lib/thinking_sphinx/search.rb

@@ -58,6 +58,8 @@ module ThinkingSphinx
     end
     
     def initialize(*args)
+      ThinkingSphinx.context.define_indexes
+      
       @array    = []
       @options  = args.extract_options!
       @args     = args

data/lib/thinking_sphinx/source.rb

@@ -145,7 +145,7 @@ module ThinkingSphinx
     end
     
     def utf8?
-      @index.options[:charset_type] == "utf-8"
+      @index.options[:charset_type] =~ /utf-8|zh_cn.utf-8/
     end
   end
 end

data/lib/thinking_sphinx/source/sql.rb

@@ -55,7 +55,7 @@ GROUP BY #{ sql_group_clause }
       # 
       def to_sql_query_info(offset)
         "SELECT * FROM #{@model.quoted_table_name} WHERE " +
-        "#{quote_column(@model.primary_key_for_sphinx)} = (($id - #{offset}) / #{ThinkingSphinx.indexed_models.size})"
+        "#{quote_column(@model.primary_key_for_sphinx)} = (($id - #{offset}) / #{ThinkingSphinx.context.indexed_models.size})"
       end
 
       def sql_select_clause(offset)

data/rails/init.rb

@@ -13,6 +13,4 @@ ActionController::Dispatcher.to_prepare :thinking_sphinx do
   elsif Rails::VERSION::STRING.to_f > 2.1
     I18n.backend.load_translations(*I18n.load_path)
   end
-  
-  ThinkingSphinx::Configuration.instance.load_models
 end

data/spec/thinking_sphinx/active_record_spec.rb

@@ -5,6 +5,9 @@ describe ThinkingSphinx::ActiveRecord do
     @existing_alpha_indexes = Alpha.sphinx_indexes.clone
     @existing_beta_indexes  = Beta.sphinx_indexes.clone
     
+    Alpha.send :defined_indexes=, false
+    Beta.send  :defined_indexes=, false
+    
     Alpha.sphinx_indexes.clear
     Beta.sphinx_indexes.clear
   end
@@ -12,6 +15,9 @@ describe ThinkingSphinx::ActiveRecord do
   after :each do
     Alpha.sphinx_indexes.replace @existing_alpha_indexes
     Beta.sphinx_indexes.replace  @existing_beta_indexes
+    
+    Alpha.sphinx_index_blocks.clear
+    Beta.sphinx_index_blocks.clear
   end
   
   describe '.define_index' do
@@ -20,62 +26,80 @@ describe ThinkingSphinx::ActiveRecord do
       ThinkingSphinx::Index.should_not_receive(:new)
       
       Alpha.define_index { }
+      Alpha.define_indexes
       
       ThinkingSphinx.define_indexes = true
     end
     
-    it "should add a new index to the model" do
-      index = Alpha.define_index { indexes :name }
-      
-      Alpha.sphinx_indexes.should include(index)
-    end
-    
-    it "should add to ThinkingSphinx.indexed_models if the model doesn't already exist in the array" do
-      Alpha.define_index { indexes :name }
-      
-      ThinkingSphinx.indexed_models.should include("Alpha")
+    it "should not evaluate the index block automatically" do
+      lambda {
+        Alpha.define_index { raise StandardError }
+      }.should_not raise_error
     end
     
-    it "shouldn't add to ThinkingSphinx.indexed_models if the model already exists in the array" do
-      Alpha.define_index { indexes :name }
+    it "should add the model to the context collection" do
       Alpha.define_index { indexes :name }
       
-      ThinkingSphinx.indexed_models.select { |model|
-        model == "Alpha"
-      }.length.should == 1
-    end
-    
-    it "should return the new index" do
-      Alpha.define_index.should be_a(ThinkingSphinx::Index)
+      ThinkingSphinx.context.indexed_models.should include("Alpha")
     end
     
     it "should die quietly if there is a database error" do
       ThinkingSphinx::Index::Builder.stub(:generate) { raise Mysql::Error }
+      Alpha.define_index { indexes :name }
       
       lambda {
-        Alpha.define_index { indexes :name }
+        Alpha.define_indexes
       }.should_not raise_error
     end
     
     it "should die noisily if there is a non-database error" do
       ThinkingSphinx::Index::Builder.stub(:generate) { raise StandardError }
+      Alpha.define_index { indexes :name }
       
       lambda {
-        Alpha.define_index { indexes :name }
+        Alpha.define_indexes
       }.should raise_error
     end
     
     it "should set the index's name using the parameter if provided" do
-      index = Alpha.define_index('custom') { indexes :name }
+      Alpha.define_index('custom') { indexes :name }
+      Alpha.define_indexes
       
-      index.name.should == 'custom'
+      Alpha.sphinx_indexes.first.name.should == 'custom'
     end
     
     context 'callbacks' do
-      it "should add a toggle_deleted callback" do
+      it "should add a before_validation callback to define_indexes" do
+        Alpha.should_receive(:before_validation).with(:define_indexes)
+
+        Alpha.define_index { }
+      end
+      
+      it "should not add a before_validation callback twice" do
+        Alpha.should_receive(:before_validation).with(:define_indexes).once
+
+        Alpha.define_index { }
+        Alpha.define_index { }
+      end
+
+      it "should add a before_destroy callback to define_indexes" do
+        Alpha.should_receive(:before_destroy).with(:define_indexes)
+
+        Alpha.define_index { }
+      end
+      
+      it "should not add a before_destroy callback twice" do
+        Alpha.should_receive(:before_destroy).with(:define_indexes).once
+
+        Alpha.define_index { }
+        Alpha.define_index { }
+      end
+      
+      it "should add a toggle_deleted callback when defined" do
         Alpha.should_receive(:after_destroy).with(:toggle_deleted)
       
         Alpha.define_index { indexes :name }
+        Alpha.define_indexes
       end
       
       it "should not add toggle_deleted callback more than once" do
@@ -83,12 +107,14 @@ describe ThinkingSphinx::ActiveRecord do
       
         Alpha.define_index { indexes :name }
         Alpha.define_index { indexes :name }
+        Alpha.define_indexes
       end
       
-      it "should add a update_attribute_values callback" do
+      it "should add a update_attribute_values callback when defined" do
         Alpha.should_receive(:after_commit).with(:update_attribute_values)
       
         Alpha.define_index { indexes :name }
+        Alpha.define_indexes
       end
     
       it "should not add update_attribute_values callback more than once" do
@@ -96,6 +122,7 @@ describe ThinkingSphinx::ActiveRecord do
       
         Alpha.define_index { indexes :name }
         Alpha.define_index { indexes :name }
+        Alpha.define_indexes
       end
       
       it "should add a toggle_delta callback if deltas are enabled" do
@@ -105,12 +132,14 @@ describe ThinkingSphinx::ActiveRecord do
           indexes :name
           set_property :delta => true
         }
+        Beta.define_indexes
       end
       
       it "should not add a toggle_delta callback if deltas are disabled" do
         Alpha.should_not_receive(:before_save).with(:toggle_delta)
 
         Alpha.define_index { indexes :name }
+        Alpha.define_indexes
       end
       
       it "should add the toggle_delta callback if deltas are disabled in other indexes" do
@@ -121,6 +150,7 @@ describe ThinkingSphinx::ActiveRecord do
           indexes :name
           set_property :delta => true
         }
+        Beta.define_indexes
       end
       
       it "should only add the toggle_delta callback once" do
@@ -134,6 +164,7 @@ describe ThinkingSphinx::ActiveRecord do
           indexes :name
           set_property :delta => true
         }
+        Beta.define_indexes
       end
       
       it "should add an index_delta callback if deltas are enabled" do
@@ -144,12 +175,14 @@ describe ThinkingSphinx::ActiveRecord do
           indexes :name
           set_property :delta => true
         }
+        Beta.define_indexes
       end
       
       it "should not add an index_delta callback if deltas are disabled" do
         Alpha.should_not_receive(:after_commit).with(:index_delta)
 
         Alpha.define_index { indexes :name }
+        Alpha.define_indexes
       end
       
       it "should add the index_delta callback if deltas are disabled in other indexes" do
@@ -161,6 +194,7 @@ describe ThinkingSphinx::ActiveRecord do
           indexes :name
           set_property :delta => true
         }
+        Beta.define_indexes
       end
       
       it "should only add the index_delta callback once" do
@@ -175,10 +209,29 @@ describe ThinkingSphinx::ActiveRecord do
           indexes :name
           set_property :delta => true
         }
+        Beta.define_indexes
       end
     end    
   end
-
+  
+  describe '.define_indexes' do
+    it "should process define_index blocks" do
+      Beta.define_index { indexes :name }
+      Beta.sphinx_indexes.length.should == 0
+      
+      Beta.define_indexes
+      Beta.sphinx_indexes.length.should == 1
+    end
+    
+    it "should not re-add indexes" do
+      Beta.define_index { indexes :name }
+      Beta.define_indexes
+      Beta.define_indexes
+      
+      Beta.sphinx_indexes.length.should == 1
+    end
+  end
+  
   describe "index methods" do
     before(:all) do
       @person = Person.find(:first)
@@ -364,20 +417,10 @@ describe ThinkingSphinx::ActiveRecord do
     
     it "should return values with the expected offset" do
       person      = Person.find(:first)
-      model_count = ThinkingSphinx.indexed_models.length
-      offset      = ThinkingSphinx.indexed_models.index("Person")
+      model_count = ThinkingSphinx.context.indexed_models.length
+      Person.stub!(:sphinx_offset => 3)
       
-      (person.id * model_count + offset).should == person.sphinx_document_id
-      
-      alpha       = Alpha.find(:first)
-      offset      = ThinkingSphinx.indexed_models.index("Alpha")
-      
-      (alpha.id * model_count + offset).should == alpha.sphinx_document_id
-      
-      beta        = Beta.find(:first)
-      offset      = ThinkingSphinx.indexed_models.index("Beta")
-      
-      (beta.id * model_count + offset).should == beta.sphinx_document_id
+      (person.id * model_count + 3).should == person.sphinx_document_id
     end
   end
   
@@ -409,6 +452,7 @@ describe ThinkingSphinx::ActiveRecord do
   describe '.sphinx_index_names' do
     it "should return the core index" do
       Alpha.define_index { indexes :name }
+      Alpha.define_indexes
       Alpha.sphinx_index_names.should == ['alpha_core']
     end
     
@@ -417,6 +461,7 @@ describe ThinkingSphinx::ActiveRecord do
         indexes :name
         set_property :delta => true
       }
+      Beta.define_indexes
       
       Beta.sphinx_index_names.should == ['beta_core', 'beta_delta']
     end
@@ -429,6 +474,7 @@ describe ThinkingSphinx::ActiveRecord do
   describe '.indexed_by_sphinx?' do
     it "should return true if there is at least one index on the model" do
       Alpha.define_index { indexes :name }
+      Alpha.define_indexes
       
       Alpha.should be_indexed_by_sphinx
     end
@@ -444,12 +490,14 @@ describe ThinkingSphinx::ActiveRecord do
         indexes :name
         set_property :delta => true
       }
+      Beta.define_indexes
       
       Beta.should be_delta_indexed_by_sphinx
     end
     
     it "should return false if there are no delta indexes on the model" do
       Alpha.define_index { indexes :name }
+      Alpha.define_indexes
       
       Alpha.should_not be_delta_indexed_by_sphinx
     end
@@ -490,10 +538,11 @@ describe ThinkingSphinx::ActiveRecord do
   
   describe '.core_index_names' do
     it "should return each index's core name" do
-      foo = Alpha.define_index { indexes :name }
-      foo.name = 'foo'
-      bar = Alpha.define_index { indexes :name }
-      bar.name = 'bar'
+      Alpha.define_index { indexes :name }
+      Alpha.define_index { indexes :name }
+      Alpha.define_indexes
+      Alpha.sphinx_indexes.first.name = 'foo'
+      Alpha.sphinx_indexes.last.name = 'bar'
       
       Alpha.core_index_names.should == ['foo_core', 'bar_core']
     end
@@ -501,13 +550,39 @@ describe ThinkingSphinx::ActiveRecord do
   
   describe '.delta_index_names' do
     it "should return index delta names, for indexes with deltas enabled" do
-      foo = Alpha.define_index { indexes :name }
-      foo.name = 'foo'
-      foo.delta_object = stub('delta')
-      bar = Alpha.define_index { indexes :name }
-      bar.name = 'bar'
+      Alpha.define_index { indexes :name }
+      Alpha.define_index { indexes :name }
+      Alpha.define_indexes
+      Alpha.sphinx_indexes.first.name = 'foo'
+      Alpha.sphinx_indexes.first.delta_object = stub('delta')
+      Alpha.sphinx_indexes.last.name = 'bar'
       
       Alpha.delta_index_names.should == ['foo_delta']
     end
   end
+  
+  describe '.sphinx_offset' do
+    before :each do
+      @context = ThinkingSphinx.context
+    end
+    
+    it "should return the index of the model's name in all known indexed models" do
+      @context.stub!(:indexed_models => ['Alpha', 'Beta'])
+      
+      Alpha.sphinx_offset.should == 0
+      Beta.sphinx_offset.should  == 1
+    end
+    
+    it "should ignore classes that have indexed superclasses" do
+      @context.stub!(:indexed_models => ['Alpha', 'Parent', 'Person'])
+      
+      Person.sphinx_offset.should == 1
+    end
+    
+    it "should respect first known indexed parents" do
+      @context.stub!(:indexed_models => ['Alpha', 'Parent', 'Person'])
+      
+      Parent.sphinx_offset.should == 1
+    end
+  end
 end

data/spec/thinking_sphinx/configuration_spec.rb

@@ -130,62 +130,6 @@ describe ThinkingSphinx::Configuration do
     end
   end
 
-  describe "#load_models" do
-    before :each do
-      @config = ThinkingSphinx::Configuration.instance
-      @config.model_directories = ['']
-
-      @file_name        = 'a.rb'
-      @model_name_lower = 'a'
-      @class_name       = 'A'
-
-      @file_name.stub!(:gsub).and_return(@model_name_lower)
-      @model_name_lower.stub!(:camelize).and_return(@class_name)
-      Dir.stub(:[]).and_return([@file_name])
-    end
-
-    it "should load the files by guessing the file name" do
-      @class_name.should_receive(:constantize).and_return(true)
-
-      @config.load_models
-    end
-
-    it "should not raise errors if the model name is nil" do
-      @file_name.stub!(:gsub).and_return(nil)
-
-      lambda {
-        @config.load_models
-      }.should_not raise_error
-    end
-
-    it "should not raise errors if the file name does not represent a class name" do
-      @class_name.should_receive(:constantize).and_raise(NameError)
-
-      lambda {
-        @config.load_models
-      }.should_not raise_error
-    end
-
-    it "should retry if the first pass fails and contains a directory" do
-      @model_name_lower.stub!(:gsub!).and_return(true, nil)
-      @class_name.stub(:constantize).and_raise(LoadError)
-      @model_name_lower.should_receive(:camelize).twice
-
-      lambda {
-        @config.load_models
-      }.should_not raise_error
-    end
-
-    it "should catch database errors with a warning" do
-      @class_name.should_receive(:constantize).and_raise(Mysql::Error)
-      @config.should_receive(:puts).with('Warning: Error loading a.rb')
-
-      lambda {
-        @config.load_models
-      }.should_not raise_error
-    end
-  end
-
   it "should insert set index options into the configuration file" do
     config = ThinkingSphinx::Configuration.instance
     

data/spec/thinking_sphinx/context_spec.rb

@@ -0,0 +1,119 @@
+require 'spec/spec_helper'
+
+describe ThinkingSphinx::Context do
+  before :each do
+    @context = ThinkingSphinx::Context.new
+  end
+  
+  describe '#prepare' do
+    before :each do
+      @config = ThinkingSphinx::Configuration.instance
+      @config.model_directories = ['']
+
+      @file_name        = 'a.rb'
+      @model_name_lower = 'a'
+      @class_name       = 'A'
+
+      @file_name.stub!(:gsub).and_return(@model_name_lower)
+      @model_name_lower.stub!(:camelize).and_return(@class_name)
+      Dir.stub(:[]).and_return([@file_name])
+    end
+
+    it "should load the files by guessing the file name" do
+      @class_name.should_receive(:constantize).and_return(true)
+
+      @context.prepare
+    end
+
+    it "should not raise errors if the model name is nil" do
+      @file_name.stub!(:gsub).and_return(nil)
+
+      lambda {
+        @context.prepare
+      }.should_not raise_error
+    end
+
+    it "should not raise errors if the file name does not represent a class name" do
+      @class_name.should_receive(:constantize).and_raise(NameError)
+
+      lambda {
+        @context.prepare
+      }.should_not raise_error
+    end
+
+    it "should retry if the first pass fails and contains a directory" do
+      @model_name_lower.stub!(:gsub!).and_return(true, nil)
+      @class_name.stub(:constantize).and_raise(LoadError)
+      @model_name_lower.should_receive(:camelize).twice
+
+      lambda {
+        @context.prepare
+      }.should_not raise_error
+    end
+
+    it "should catch database errors with a warning" do
+      @class_name.should_receive(:constantize).and_raise(Mysql::Error)
+      STDERR.should_receive(:puts).with('Warning: Error loading a.rb')
+
+      lambda {
+        @context.prepare
+      }.should_not raise_error
+    end
+  end
+  
+  describe '#define_indexes' do
+    it "should call define_indexes on all known indexed models" do
+      @context.stub!(:indexed_models => ['Alpha', 'Beta'])
+      Alpha.should_receive(:define_indexes)
+      Beta.should_receive(:define_indexes)
+      
+      @context.define_indexes
+    end
+  end
+  
+  describe '#add_indexed_model' do
+    before :each do
+      @context.indexed_models.clear
+    end
+    
+    it "should add the model to the collection" do
+      @context.add_indexed_model 'Alpha'
+      
+      @context.indexed_models.should == ['Alpha']
+    end
+    
+    it "should not duplicate models in the collection" do
+      @context.add_indexed_model 'Alpha'
+      @context.add_indexed_model 'Alpha'
+      
+      @context.indexed_models.should == ['Alpha']
+    end
+    
+    it "should keep the collection in alphabetical order" do
+      @context.add_indexed_model 'Beta'
+      @context.add_indexed_model 'Alpha'
+      
+      @context.indexed_models.should == ['Alpha', 'Beta']
+    end
+    
+    it "should translate classes to their names" do
+      @context.add_indexed_model Alpha
+      
+      @context.indexed_models.should == ['Alpha']
+    end
+  end
+  
+  describe '#superclass_indexed_models' do
+    it "should return indexed model names" do
+      @context.stub!(:indexed_models => ['Alpha', 'Beta'])
+      
+      @context.superclass_indexed_models.should == ['Alpha', 'Beta']
+    end
+    
+    it "should not include classes which have indexed superclasses" do
+      @context.stub!(:indexed_models => ['Parent', 'Person'])
+      
+      @context.superclass_indexed_models.should == ['Person']
+    end
+  end
+end

data/spec/thinking_sphinx/source_spec.rb

@@ -161,7 +161,7 @@ describe ThinkingSphinx::Source do
       end
       
       it "should filter the primary key with the offset" do
-        model_count = ThinkingSphinx.indexed_models.size
+        model_count = ThinkingSphinx.context.indexed_models.size
         @query.should match(/WHERE `id` = \(\(\$id - 1\) \/ #{model_count}\)/)
       end
     end

data/spec/thinking_sphinx_spec.rb

@@ -1,6 +1,17 @@
 require 'spec/spec_helper'
 
 describe ThinkingSphinx do
+  describe '.context' do
+    it "should return a Context instance" do
+      ThinkingSphinx.context.should be_a(ThinkingSphinx::Context)
+    end
+    
+    it "should remember changes to the Context instance" do
+      ThinkingSphinx.context.indexed_models.replace([:model])
+      ThinkingSphinx.context.indexed_models.should == [:model]
+    end
+  end
+  
   describe '.define_indexes?' do
     it "should define indexes by default" do
       ThinkingSphinx.define_indexes?.should be_true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.3.6
+  version: 1.3.7
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-26 00:00:00 +11:00
+date: 2009-11-29 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,6 +72,7 @@ files:
 - lib/thinking_sphinx/attribute.rb
 - lib/thinking_sphinx/class_facet.rb
 - lib/thinking_sphinx/configuration.rb
+- lib/thinking_sphinx/context.rb
 - lib/thinking_sphinx/core/array.rb
 - lib/thinking_sphinx/core/string.rb
 - lib/thinking_sphinx/deltas.rb
@@ -169,6 +170,7 @@ test_files:
 - features/support/db/fixtures/developers.rb
 - features/support/db/fixtures/dogs.rb
 - features/support/db/fixtures/extensible_betas.rb
+- features/support/db/fixtures/foxes.rb
 - features/support/db/fixtures/gammas.rb
 - features/support/db/fixtures/people.rb
 - features/support/db/fixtures/posts.rb
@@ -203,6 +205,7 @@ test_files:
 - features/support/models/developer.rb
 - features/support/models/dog.rb
 - features/support/models/extensible_beta.rb
+- features/support/models/fox.rb
 - features/support/models/gamma.rb
 - features/support/models/person.rb
 - features/support/models/post.rb
@@ -216,6 +219,7 @@ test_files:
 - spec/thinking_sphinx/association_spec.rb
 - spec/thinking_sphinx/attribute_spec.rb
 - spec/thinking_sphinx/configuration_spec.rb
+- spec/thinking_sphinx/context_spec.rb
 - spec/thinking_sphinx/core/array_spec.rb
 - spec/thinking_sphinx/core/string_spec.rb
 - spec/thinking_sphinx/excerpter_spec.rb