thinking-sphinx 1.3.17 → 1.3.18

data/README.textile

@@ -163,3 +163,5 @@ Since I first released this library, there's been quite a few people who have su
 * Edgars Beigarts
 * Ivan Ukhov
 * Tomáš Pospíšek
+* Tom Stuart
+* James Brooks

data/VERSION

@@ -1 +1 @@
-1.3.17
+1.3.18

data/features/attribute_updates.feature

@@ -38,7 +38,33 @@ Feature: Update attributes directly to Sphinx
     
     When I search for the document id of beta eight in the beta_delta index
     Then it should not exist
-
+  
+  Scenario: Updating attributes in a delta index
+    Given Sphinx is running
+    And I am searching on betas
+    
+    When I change the name of beta nine to nineteen
+    And I change the value of beta nineteen to 19
+    And I wait for Sphinx to catch up
+    
+    When I filter by 19 on value
+    And I use index beta_delta
+    Then I should get 1 result
+    
+  Scenario: Updating attributes in a delta index with deltas disabled
+    Given Sphinx is running
+    And I am searching on betas
+  
+    When I change the name of beta eleven to twentyone
+    And I disable delta updates
+    And I change the value of beta twentyone to 21
+    And I wait for Sphinx to catch up
+  
+    When I filter by 21 on value
+    And I use index beta_delta
+    Then I should get 1 result
+    And I enable delta updates
+  
   Scenario: Updating boolean attribute in Sphinx
     Given Sphinx is running
     And I am searching on alphas

data/features/searching_by_model.feature

@@ -63,7 +63,7 @@ Feature: Searching on a single model
   Scenario: Filtering on timestamp MVAs
     Given Sphinx is running
     And I am searching on posts
-    When I filter by 978307200 on comments_created_at
+    When I filter by 2001-01-01 on comments_created_at
     Then I should get 1 result
   
   Scenario: Searching by NULL/0 values in MVAs

data/features/step_definitions/common_steps.rb

@@ -71,6 +71,11 @@ When /^I filter by (\w+) on (\w+)$/ do |filter, attribute|
   @with[attribute.to_sym] = filter.to_i
 end
 
+When /^I filter by (\d\d\d\d)\-(\d\d)\-(\d\d) on (\w+)$/ do |y, m, d, attribute|
+  @results = nil
+  @with[attribute.to_sym] = Time.local(y.to_i, m.to_i, d.to_i).to_i
+end
+
 When /^I filter by (\d+) and (\d+) on (\w+)$/ do |value_one, value_two, attribute|
   @results = nil
   @with[attribute.to_sym] = [value_one.to_i, value_two.to_i]

data/features/thinking_sphinx/database.yml

@@ -1,4 +1,3 @@
-username: root
-host: localhost
+username: thinking_sphinx
 pool: 1
 min_messages: warning

data/features/thinking_sphinx/db/fixtures/betas.rb

@@ -8,3 +8,4 @@ Beta.create :name => "seven", :value => 7
 Beta.create :name => "eight", :value => 8
 Beta.create :name => "nine", :value => 9
 Beta.create :name => "ten", :value => 10
+Beta.create :name => "eleven", :value => 11

data/features/thinking_sphinx/db/fixtures/comments.rb

@@ -4,7 +4,7 @@ Comment.create(
   :content      => "+1",
   :post_id      => 1,
   :category_id  => 1
-).update_attribute(:created_at, Time.utc(2001, 01, 01).getlocal)
+).update_attribute(:created_at, Time.local(2001, 01, 01).getutc)
 
 Comment.create(
   :name         => "Menno",

data/features/thinking_sphinx/models/developer.rb

@@ -1,5 +1,5 @@
-require 'features/thinking_sphinx/models/tag'
-require 'features/thinking_sphinx/models/tagging'
+require "#{File.dirname(__FILE__)}/tag"
+require "#{File.dirname(__FILE__)}/tagging"
 
 class Developer < ActiveRecord::Base
   has_many :taggings, :as => :taggable

data/features/thinking_sphinx/models/extensible_beta.rb

@@ -1,4 +1,4 @@
-require 'features/support/lib/generic_delta_handler'
+require "#{Dir.pwd}/features/support/lib/generic_delta_handler"
 
 class ExtensibleBeta < ActiveRecord::Base
   define_index do

data/lib/cucumber/thinking_sphinx/internal_world.rb

@@ -9,11 +9,12 @@ module Cucumber
         :password, :host
       
       def initialize
-        @temporary_directory  = "#{Dir.pwd}/tmp"
-        @migrations_directory = "features/thinking_sphinx/db/migrations"
-        @models_directory     = "features/thinking_sphinx/models"
-        @fixtures_directory   = "features/thinking_sphinx/db/fixtures"
-        @database_file        = "features/thinking_sphinx/database.yml"
+        pwd = Dir.pwd
+        @temporary_directory  = "#{pwd}/tmp"
+        @migrations_directory = "#{pwd}/features/thinking_sphinx/db/migrations"
+        @models_directory     = "#{pwd}/features/thinking_sphinx/models"
+        @fixtures_directory   = "#{pwd}/features/thinking_sphinx/db/fixtures"
+        @database_file        = "#{pwd}/features/thinking_sphinx/database.yml"
         
         @adapter  = ENV['DATABASE'] || 'mysql'
         @database = 'thinking_sphinx'

data/lib/thinking_sphinx.rb

@@ -1,7 +1,6 @@
 require 'active_record'
 require 'after_commit'
 require 'yaml'
-require 'cgi'
 require 'riddle'
 
 require 'thinking_sphinx/auto_version'
@@ -19,6 +18,7 @@ require 'thinking_sphinx/class_facet'
 require 'thinking_sphinx/facet_search'
 require 'thinking_sphinx/field'
 require 'thinking_sphinx/index'
+require 'thinking_sphinx/join'
 require 'thinking_sphinx/source'
 require 'thinking_sphinx/rails_additions'
 require 'thinking_sphinx/search'
@@ -70,7 +70,7 @@ module ThinkingSphinx
     if @@context.nil?
       @@sphinx_mutex.synchronize do
         if @@context.nil?
-          set_context
+          @@context = ThinkingSphinx::Context.new
           @@context.prepare
         end
       end
@@ -79,21 +79,11 @@ module ThinkingSphinx
     @@context
   end
   
-  def self.set_context(*classes)    
-    @@context = ThinkingSphinx::Context.new(*classes)
-  end
-
   def self.reset_context!
     @@sphinx_mutex.synchronize do
       @@context = nil
     end
   end
-  
-  def self.indexed_models=(classes = [])
-    @@sphinx_mutex.synchronize do
-      set_context *classes
-    end
-  end
 
   def self.unique_id_expression(offset = nil)
     "* #{context.indexed_models.size} + #{offset || 0}"
@@ -225,6 +215,8 @@ module ThinkingSphinx
 
   def self.pid_active?(pid)
     !!Process.kill(0, pid.to_i)
+  rescue Errno::EPERM => e
+    true
   rescue Exception => e
     false
   end

data/lib/thinking_sphinx/active_record/attribute_updates.rb

@@ -13,9 +13,6 @@ module ThinkingSphinx
         return true unless ThinkingSphinx.updates_enabled? &&
           ThinkingSphinx.sphinx_running?
         
-        config = ThinkingSphinx::Configuration.instance
-        client = config.client
-        
         self.class.sphinx_indexes.each do |index|
           attribute_pairs  = attribute_values_for_index(index)
           attribute_names  = attribute_pairs.keys
@@ -23,9 +20,9 @@ module ThinkingSphinx
             attribute_pairs[key]
           }
           
-          client.update "#{index.core_name}", attribute_names, {
-            sphinx_document_id => attribute_values
-          } if self.class.search_for_id(sphinx_document_id, index.core_name)
+          update_index index.core_name, attribute_names, attribute_values
+          next unless index.delta?
+          update_index index.delta_name, attribute_names, attribute_values
         end
         
         true
@@ -41,6 +38,13 @@ module ThinkingSphinx
           hash
         }
       end
+      
+      def update_index(index_name, attribute_names, attribute_values)
+        config = ThinkingSphinx::Configuration.instance
+        config.client.update index_name, attribute_names, {
+          sphinx_document_id => attribute_values
+        } if self.class.search_for_id(sphinx_document_id, index_name)
+      end
     end
   end
 end

data/lib/thinking_sphinx/active_record/scopes.rb

@@ -46,7 +46,7 @@ module ThinkingSphinx
           @sphinx_scopes ||= []
           @sphinx_scopes << method
           
-          metaclass.instance_eval do
+          singleton_class.instance_eval do
             define_method(method) do |*args|
               options = {:classes => classes_option}
               options.merge! block.call(*args)
@@ -64,7 +64,7 @@ module ThinkingSphinx
         
         def remove_sphinx_scopes
           sphinx_scopes.each do |scope|
-            metaclass.send(:undef_method, scope)
+            singleton_class.send(:undef_method, scope)
           end
           
           sphinx_scopes.clear

data/lib/thinking_sphinx/adapters/mysql_adapter.rb

@@ -50,5 +50,9 @@ module ThinkingSphinx
     def time_difference(diff)
       "DATE_SUB(NOW(), INTERVAL #{diff} SECOND)"
     end
+    
+    def utc_query_pre
+      "SET TIME_ZONE = '+0:00'"
+    end
   end
-end
+end

data/lib/thinking_sphinx/adapters/postgresql_adapter.rb

@@ -67,6 +67,10 @@ module ThinkingSphinx
       "current_timestamp - interval '#{diff} seconds'"
     end
     
+    def utc_query_pre
+      'SET TIME ZONE UTC'
+    end
+    
     private
     
     def execute(command, output_error = false)

data/lib/thinking_sphinx/configuration.rb

@@ -65,7 +65,7 @@ module ThinkingSphinx
     CustomOptions = %w( disable_range )
         
     attr_accessor :searchd_file_path, :allow_star, :database_yml_file,
-      :app_root, :model_directories, :delayed_job_priority
+      :app_root, :model_directories, :delayed_job_priority, :indexed_models
     
     attr_accessor :source_options, :index_options
     attr_accessor :version
@@ -109,6 +109,7 @@ module ThinkingSphinx
       self.model_directories    = ["#{app_root}/app/models/"] +
         Dir.glob("#{app_root}/vendor/plugins/*/app/models/")
       self.delayed_job_priority = 0
+      self.indexed_models       = []
       
       self.source_options  = {}
       self.index_options   = {

data/lib/thinking_sphinx/context.rb

@@ -3,12 +3,15 @@ class ThinkingSphinx::Context
   
   def initialize(*models)
     @indexed_models = []
-    models.each do |model|
-      add_indexed_model model
-    end
   end
   
   def prepare
+    ThinkingSphinx::Configuration.instance.indexed_models.each do |model|
+      add_indexed_model model
+    end
+    
+    return unless indexed_models.empty?
+    
     load_models
     add_indexed_models
   end

data/lib/thinking_sphinx/excerpter.rb

@@ -14,7 +14,7 @@ module ThinkingSphinx
     end
     
     def method_missing(method, *args, &block)
-      string = CGI::escapeHTML @instance.send(method, *args, &block).to_s
+      string = @instance.send(method, *args, &block).to_s
       
       @search.excerpt_for(string, @instance.class)
     end

data/lib/thinking_sphinx/index/builder.rb

@@ -164,6 +164,12 @@ module ThinkingSphinx
         end
       end
       
+      def join(*args)
+        args.each do |association|
+          Join.new(source, association)
+        end
+      end
+      
       # Use this method to add some manual SQL conditions for your index
       # request. You can pass in as many strings as you like, they'll get
       # joined together with ANDs later on.

data/lib/thinking_sphinx/index/faux_column.rb

@@ -42,6 +42,10 @@ module ThinkingSphinx
         @stack
       end
       
+      def __path
+        @stack + [@name]
+      end
+      
       # Returns true if the stack is empty *and* if the name is a string -
       # which is an indication that of raw SQL, as opposed to a value from a
       # table's column.

data/lib/thinking_sphinx/join.rb

@@ -0,0 +1,37 @@
+module ThinkingSphinx
+  class Join
+    attr_accessor :source, :column, :associations
+    
+    def initialize(source, column)
+      @source = source
+      @column = column
+      
+      @associations = association_stack(column.__path.clone).each { |assoc|
+        assoc.join_to(source.base)
+      }
+      
+      source.joins << self
+    end
+    
+    private
+    
+    # Gets a stack of associations for a specific path.
+    # 
+    def association_stack(path, parent = nil)
+      assocs = []
+      
+      if parent.nil?
+        assocs = @source.association(path.shift)
+      else
+        assocs = parent.children(path.shift)
+      end
+      
+      until path.empty?
+        point  = path.shift
+        assocs = assocs.collect { |assoc| assoc.children(point) }.flatten
+      end
+      
+      assocs
+    end
+  end
+end

data/lib/thinking_sphinx/rails_additions.rb

@@ -136,8 +136,8 @@ Class.extend(
 ) unless Class.respond_to?(:cattr_reader)
 
 module ThinkingSphinx
-  module MetaClass
-    def metaclass
+  module SingletonClass
+    def singleton_class
       class << self
         self
       end
@@ -145,6 +145,6 @@ module ThinkingSphinx
   end
 end
 
-unless Object.new.respond_to?(:metaclass)
-  Object.send(:include, ThinkingSphinx::MetaClass)
+unless Object.new.respond_to?(:singleton_class)
+  Object.send(:include, ThinkingSphinx::SingletonClass)
 end

data/lib/thinking_sphinx/search.rb

@@ -294,7 +294,7 @@ module ThinkingSphinx
         excerpter = ThinkingSphinx::Excerpter.new self, object
         block = lambda { excerpter }
         
-        object.metaclass.instance_eval do
+        object.singleton_class.instance_eval do
           define_method(:excerpts, &block)
         end
       end
@@ -307,7 +307,7 @@ module ThinkingSphinx
         match = match_hash object
         next if match.nil?
         
-        object.metaclass.instance_eval do
+        object.singleton_class.instance_eval do
           define_method(:sphinx_attributes) { match[:attributes] }
         end
       end
@@ -323,7 +323,7 @@ module ThinkingSphinx
           @results[:fields], match[:weight]
         )
         
-        object.metaclass.instance_eval do
+        object.singleton_class.instance_eval do
           define_method(:matching_fields) { fields }
         end
       end

data/lib/thinking_sphinx/source.rb

@@ -6,7 +6,7 @@ module ThinkingSphinx
     include ThinkingSphinx::Source::InternalProperties
     include ThinkingSphinx::Source::SQL
     
-    attr_accessor :model, :fields, :attributes, :conditions, :groupings,
+    attr_accessor :model, :fields, :attributes, :joins, :conditions, :groupings,
       :options
     attr_reader :base, :index, :database_configuration
     
@@ -15,6 +15,7 @@ module ThinkingSphinx
       @model        = index.model
       @fields       = []
       @attributes   = []
+      @joins        = []
       @conditions   = []
       @groupings    = []
       @options      = options
@@ -110,6 +111,7 @@ module ThinkingSphinx
       end
       
       source.sql_query_pre += [adapter.utf8_query_pre].compact if utf8?
+      source.sql_query_pre << adapter.utc_query_pre
     end
     
     def set_source_settings(source)
@@ -139,7 +141,11 @@ module ThinkingSphinx
         # attribute associations
         @attributes.collect { |attrib|
           attrib.associations.values if attrib.include_as_association?
-        }.compact.flatten
+        }.compact.flatten +
+        # explicit joins
+        @joins.collect { |join|
+          join.associations
+        }.flatten
       ).uniq.collect { |assoc|
         # get ancestors as well as column-level associations
         assoc.ancestors

data/spec/thinking_sphinx/active_record/delta_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe "ThinkingSphinx::ActiveRecord::Delta" do
   it "should call the toggle_delta method after a save" do

data/spec/thinking_sphinx/active_record/has_many_association_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe 'ThinkingSphinx::ActiveRecord::HasManyAssociation' do
   describe "search method" do

data/spec/thinking_sphinx/active_record/scopes_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ThinkingSphinx::ActiveRecord::Scopes do
   after :each do

data/spec/thinking_sphinx/active_record_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ThinkingSphinx::ActiveRecord do
   before :each do

data/spec/thinking_sphinx/association_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ThinkingSphinx::Association do
   describe '.children' do

data/spec/thinking_sphinx/attribute_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ThinkingSphinx::Attribute do
   before :each do

data/spec/thinking_sphinx/auto_version_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ThinkingSphinx::AutoVersion do
   describe '.detect' do

data/spec/thinking_sphinx/configuration_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ThinkingSphinx::Configuration do
   describe "environment class method" do
@@ -87,7 +87,8 @@ describe ThinkingSphinx::Configuration do
           "ignore_chars"      => "e",
           "searchd_binary_name" => "sphinx-searchd",
           "indexer_binary_name" => "sphinx-indexer",
-          "index_exact_words" => true
+          "index_exact_words" => true,
+          "indexed_models"    => ['Alpha', 'Beta']
         }
       }
 

data/spec/thinking_sphinx/context_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ThinkingSphinx::Context do
   before :each do
@@ -59,6 +59,13 @@ describe ThinkingSphinx::Context do
         @context.prepare
       }.should_not raise_error
     end
+    
+    it "should not load models if they're explicitly set in the configuration" do
+      @config.indexed_models = ['Alpha', 'Beta']
+      @context.prepare
+      
+      @context.indexed_models.should == ['Alpha', 'Beta']
+    end
   end
   
   describe '#define_indexes' do

data/spec/thinking_sphinx/core/array_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Array do
   describe '.===' do

data/spec/thinking_sphinx/core/string_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe String do  
   describe "to_crc32 instance method" do

data/spec/thinking_sphinx/excerpter_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ThinkingSphinx::Excerpter do
   before :each do
@@ -40,14 +40,6 @@ describe ThinkingSphinx::Excerpter do
       @excerpter.big_name
     end
     
-    it "should escape the text in the excerpt" do
-      @search.should_receive(:excerpt_for) do |string, model|
-        string.should == 'test "escaping" <characters>'
-      end
-      
-      @excerpter.string_to_escape
-    end
-    
     it "should still raise an exception if no column or method exists" do
       lambda {
         @excerpter.foo

data/spec/thinking_sphinx/facet_search_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ThinkingSphinx::FacetSearch do
   describe 'populate' do

data/spec/thinking_sphinx/facet_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ThinkingSphinx::Facet do
   describe ".name_for" do

data/spec/thinking_sphinx/field_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ThinkingSphinx::Field do
   before :each do

data/spec/thinking_sphinx/index/builder_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ThinkingSphinx::Index::Builder do
   describe ".generate without source scope" do
@@ -109,6 +109,22 @@ describe ThinkingSphinx::Index::Builder do
     end
   end
   
+  describe '#join' do
+    before :each do
+      @index = ThinkingSphinx::Index::Builder.generate(Person) do
+        indexes first_name
+        
+        join contacts
+      end
+      
+      @source = @index.sources.first
+    end
+    
+    it "should include the explicit join" do
+      @source.joins.length.should == 1
+    end
+  end
+  
   describe "faceted field" do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do

data/spec/thinking_sphinx/index/faux_column_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ThinkingSphinx::Index::FauxColumn do  
   describe "coerce class method" do

data/spec/thinking_sphinx/index_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ThinkingSphinx::Index do
   describe "prefix_fields method" do

data/spec/thinking_sphinx/rails_additions_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ThinkingSphinx::HashExcept do
   before(:each) do
@@ -118,14 +118,14 @@ describe ThinkingSphinx::ActiveRecordStoreFullSTIClass do
   end
 end
 
-describe ThinkingSphinx::MetaClass do
-  describe 'metaclass' do
+describe ThinkingSphinx::SingletonClass do
+  describe 'singleton_class' do
     it "should exist as an instance method in Object" do
-      Object.new.should respond_to('metaclass')
+      Object.new.should respond_to('singleton_class')
     end
     
     it "should return the meta/eigen/singleton class" do
-      Object.new.metaclass.should be_a(Class)
+      Object.new.singleton_class.should be_a(Class)
     end
   end
 end

data/spec/thinking_sphinx/search_methods_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ThinkingSphinx::SearchMethods do
   it "should be included into models with indexes" do

data/spec/thinking_sphinx/search_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 require 'will_paginate/collection'
 
 describe ThinkingSphinx::Search do

data/spec/thinking_sphinx/source_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ThinkingSphinx::Source do
   before :each do
@@ -49,6 +49,10 @@ describe ThinkingSphinx::Source do
         :as => :contact_ids, :source => :query
       )
       
+      ThinkingSphinx::Join.new(
+        @source, ThinkingSphinx::Index::FauxColumn.new(:links)
+      )
+      
       @source.conditions << "`birthday` <= NOW()"
       @source.groupings  << "`first_name`"
       
@@ -136,6 +140,10 @@ describe ThinkingSphinx::Source do
         @query.should_not match(/LEFT OUTER JOIN `contacts`/)
       end
       
+      it "should include explicitly requested joins" do
+        @query.should match(/LEFT OUTER JOIN `links`/)
+      end
+      
       it "should include any defined conditions" do
         @query.should match(/WHERE.+`birthday` <= NOW()/)
       end

data/spec/thinking_sphinx_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ThinkingSphinx do
   describe '.context' do
@@ -16,22 +16,6 @@ describe ThinkingSphinx do
     end
   end
   
-  describe '.set_context' do
-    before :each do
-      ThinkingSphinx.reset_context!
-    end
-    
-    it "should set the context instance" do
-      ThinkingSphinx.set_context
-      ThinkingSphinx.context.should be_a(ThinkingSphinx::Context)
-    end
-    
-    it "should pass through any given arguments to the initialiser" do
-      ThinkingSphinx::Context.should_receive(:new).with(Alpha, Beta)
-      ThinkingSphinx.set_context Alpha, Beta
-    end
-  end
-  
   describe '.reset_context!' do
     it "should remove the existing Context instance" do
       existing = ThinkingSphinx.context
@@ -42,18 +26,7 @@ describe ThinkingSphinx do
       Thread.current[:thinking_sphinx_context] = existing
     end
   end
-  
-  describe '.indexed_models=' do
-    before :each do
-      ThinkingSphinx.reset_context!
-    end
     
-    it "should set the indexed models for the context" do
-      ThinkingSphinx.indexed_models = [Alpha, Beta]
-      ThinkingSphinx.context.indexed_models.should == ['Alpha', 'Beta']
-    end
-  end
-  
   describe '.define_indexes?' do
     it "should define indexes by default" do
       ThinkingSphinx.define_indexes?.should be_true

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thinking-sphinx
 version: !ruby/object:Gem::Version 
+  hash: 63
   prerelease: false
   segments: 
   - 1
   - 3
-  - 17
-  version: 1.3.17
+  - 18
+  version: 1.3.18
 platform: ruby
 authors: 
 - Pat Allan
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-05 00:00:00 +10:00
+date: 2010-06-29 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 39
         segments: 
         - 1
         - 15
@@ -35,9 +38,11 @@ dependencies:
   name: riddle
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 0
@@ -49,9 +54,11 @@ dependencies:
   name: after_commit
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 0
@@ -63,9 +70,11 @@ dependencies:
   name: yard
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -75,9 +84,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -89,9 +100,11 @@ dependencies:
   name: cucumber
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -101,9 +114,11 @@ dependencies:
   name: will_paginate
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 2
         - 3
@@ -115,9 +130,11 @@ dependencies:
   name: ginger
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
         - 2
@@ -129,9 +146,11 @@ dependencies:
   name: faker
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 0
         - 3
@@ -181,6 +200,7 @@ files:
 - lib/thinking_sphinx/index.rb
 - lib/thinking_sphinx/index/builder.rb
 - lib/thinking_sphinx/index/faux_column.rb
+- lib/thinking_sphinx/join.rb
 - lib/thinking_sphinx/property.rb
 - lib/thinking_sphinx/rails_additions.rb
 - lib/thinking_sphinx/search.rb
@@ -194,6 +214,118 @@ files:
 - tasks/distribution.rb
 - tasks/rails.rake
 - tasks/testing.rb
+- features/abstract_inheritance.feature
+- features/alternate_primary_key.feature
+- features/attribute_transformation.feature
+- features/attribute_updates.feature
+- features/deleting_instances.feature
+- features/direct_attributes.feature
+- features/excerpts.feature
+- features/extensible_delta_indexing.feature
+- features/facets.feature
+- features/facets_across_model.feature
+- features/handling_edits.feature
+- features/retry_stale_indexes.feature
+- features/searching_across_models.feature
+- features/searching_by_index.feature
+- features/searching_by_model.feature
+- features/searching_with_find_arguments.feature
+- features/sphinx_detection.feature
+- features/sphinx_scopes.feature
+- features/step_definitions/alpha_steps.rb
+- features/step_definitions/beta_steps.rb
+- features/step_definitions/common_steps.rb
+- features/step_definitions/extensible_delta_indexing_steps.rb
+- features/step_definitions/facet_steps.rb
+- features/step_definitions/find_arguments_steps.rb
+- features/step_definitions/gamma_steps.rb
+- features/step_definitions/scope_steps.rb
+- features/step_definitions/search_steps.rb
+- features/step_definitions/sphinx_steps.rb
+- features/sti_searching.feature
+- features/support/env.rb
+- features/support/lib/generic_delta_handler.rb
+- features/thinking_sphinx/database.example.yml
+- features/thinking_sphinx/database.yml
+- features/thinking_sphinx/db/fixtures/alphas.rb
+- features/thinking_sphinx/db/fixtures/authors.rb
+- features/thinking_sphinx/db/fixtures/betas.rb
+- features/thinking_sphinx/db/fixtures/boxes.rb
+- features/thinking_sphinx/db/fixtures/categories.rb
+- features/thinking_sphinx/db/fixtures/cats.rb
+- features/thinking_sphinx/db/fixtures/comments.rb
+- features/thinking_sphinx/db/fixtures/developers.rb
+- features/thinking_sphinx/db/fixtures/dogs.rb
+- features/thinking_sphinx/db/fixtures/extensible_betas.rb
+- features/thinking_sphinx/db/fixtures/foxes.rb
+- features/thinking_sphinx/db/fixtures/gammas.rb
+- features/thinking_sphinx/db/fixtures/music.rb
+- features/thinking_sphinx/db/fixtures/people.rb
+- features/thinking_sphinx/db/fixtures/posts.rb
+- features/thinking_sphinx/db/fixtures/robots.rb
+- features/thinking_sphinx/db/fixtures/tags.rb
+- features/thinking_sphinx/db/migrations/create_alphas.rb
+- features/thinking_sphinx/db/migrations/create_animals.rb
+- features/thinking_sphinx/db/migrations/create_authors.rb
+- features/thinking_sphinx/db/migrations/create_authors_posts.rb
+- features/thinking_sphinx/db/migrations/create_betas.rb
+- features/thinking_sphinx/db/migrations/create_boxes.rb
+- features/thinking_sphinx/db/migrations/create_categories.rb
+- features/thinking_sphinx/db/migrations/create_comments.rb
+- features/thinking_sphinx/db/migrations/create_developers.rb
+- features/thinking_sphinx/db/migrations/create_extensible_betas.rb
+- features/thinking_sphinx/db/migrations/create_gammas.rb
+- features/thinking_sphinx/db/migrations/create_genres.rb
+- features/thinking_sphinx/db/migrations/create_music.rb
+- features/thinking_sphinx/db/migrations/create_people.rb
+- features/thinking_sphinx/db/migrations/create_posts.rb
+- features/thinking_sphinx/db/migrations/create_robots.rb
+- features/thinking_sphinx/db/migrations/create_taggings.rb
+- features/thinking_sphinx/db/migrations/create_tags.rb
+- features/thinking_sphinx/models/alpha.rb
+- features/thinking_sphinx/models/animal.rb
+- features/thinking_sphinx/models/author.rb
+- features/thinking_sphinx/models/beta.rb
+- features/thinking_sphinx/models/box.rb
+- features/thinking_sphinx/models/cat.rb
+- features/thinking_sphinx/models/category.rb
+- features/thinking_sphinx/models/comment.rb
+- features/thinking_sphinx/models/developer.rb
+- features/thinking_sphinx/models/dog.rb
+- features/thinking_sphinx/models/extensible_beta.rb
+- features/thinking_sphinx/models/fox.rb
+- features/thinking_sphinx/models/gamma.rb
+- features/thinking_sphinx/models/genre.rb
+- features/thinking_sphinx/models/medium.rb
+- features/thinking_sphinx/models/music.rb
+- features/thinking_sphinx/models/person.rb
+- features/thinking_sphinx/models/post.rb
+- features/thinking_sphinx/models/robot.rb
+- features/thinking_sphinx/models/tag.rb
+- features/thinking_sphinx/models/tagging.rb
+- spec/thinking_sphinx/active_record/delta_spec.rb
+- spec/thinking_sphinx/active_record/has_many_association_spec.rb
+- spec/thinking_sphinx/active_record/scopes_spec.rb
+- spec/thinking_sphinx/active_record_spec.rb
+- spec/thinking_sphinx/association_spec.rb
+- spec/thinking_sphinx/attribute_spec.rb
+- spec/thinking_sphinx/auto_version_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
+- spec/thinking_sphinx/facet_search_spec.rb
+- spec/thinking_sphinx/facet_spec.rb
+- spec/thinking_sphinx/field_spec.rb
+- spec/thinking_sphinx/index/builder_spec.rb
+- spec/thinking_sphinx/index/faux_column_spec.rb
+- spec/thinking_sphinx/index_spec.rb
+- spec/thinking_sphinx/rails_additions_spec.rb
+- spec/thinking_sphinx/search_methods_spec.rb
+- spec/thinking_sphinx/search_spec.rb
+- spec/thinking_sphinx/source_spec.rb
+- spec/thinking_sphinx_spec.rb
 has_rdoc: true
 homepage: http://ts.freelancing-gods.com
 licenses: []
@@ -207,23 +339,27 @@ 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"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: ActiveRecord/Rails Sphinx library